From dc3f1faa8b8339a72da45efeeb3085045002ca28 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Fri, 16 Feb 2024 14:18:13 +0100 Subject: [PATCH 001/345] support/testing: remove hardcoded sleep from python-django test Instead of waiting for a hardcoded time of 30s we check periodically every second if the server is already up. If it isn't up after the full timeout (which is the same as before) expired the test fails. We need to redirect all output of the background started task to /dev/null now as it otherwise confuses the emulator.run() exit code parsing logic (as it gets out of order messages from the emulator). Signed-off-by: Marcus Hoffmann yann.morin.1998@free.fr: simplify assert test] Signed-off-by: Yann E. MORIN --- .../testing/tests/package/test_python_django.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/support/testing/tests/package/test_python_django.py b/support/testing/tests/package/test_python_django.py index e1ca50f6d8dc..29e8ee0b2e45 100644 --- a/support/testing/tests/package/test_python_django.py +++ b/support/testing/tests/package/test_python_django.py @@ -1,3 +1,5 @@ +import time + from tests.package.test_python import TestPythonPackageBase @@ -16,13 +18,16 @@ def run_sample_scripts(self): self.assertIn("Operations to perform:", output[0]) self.assertEqual(exit_code, 0) - cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 & " - # give some time to setup the server - cmd += "sleep {}".format(str(30 * self.emulator.timeout_multiplier)) + cmd = "cd /opt/testsite && " + self.interpreter + " ./manage.py runserver 0.0.0.0:1234 > /dev/null 2>&1 & " self.assertRunOk(cmd, timeout=timeout) - - cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" - self.assertRunOk(cmd) + # give some time to setup the server + for attempt in range(30 * self.emulator.timeout_multiplier): + time.sleep(1) + cmd = "netstat -ltn 2>/dev/null | grep 0.0.0.0:1234" + _, exit_code = self.emulator.run(cmd) + if exit_code == 0: + break + self.assertEqual(exit_code, 0, "Timeout while waiting for django server") class TestPythonPy3Django(TestPythonDjango): From 3e48306a43ed8f21dbd2c1899e0ca02e7e460801 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 20 Feb 2024 20:50:07 +0100 Subject: [PATCH 002/345] package/uacme: fix build Fix the following build failure raised since bump to version 1.7.5 in commit b7ee5f3b0e3ef703bafd007cc99da10312d99b9e and https://github.com/ndilieto/uacme/commit/fe826f4b1931ae508047d8b2693b5b6ac2cb21fd: checking if mmap(MAP_ANON|MAP_SHARED) works... configure: error: in `/home/autobuild/autobuild/instance-9/output-1/build/uacme-1.7.5': configure: error: cannot run test program while cross compiling Fixes: b7ee5f3b0e3ef703bafd007cc99da10312d99b9e - http://autobuild.buildroot.org/results/9715ade98f4894c07b640d151daa41813d2bec3a Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: reference patch in comment] Signed-off-by: Yann E. MORIN --- .../uacme/0001-Fix-cross-compilation.patch | 29 +++++++++++++++++++ package/uacme/uacme.mk | 3 ++ 2 files changed, 32 insertions(+) create mode 100644 package/uacme/0001-Fix-cross-compilation.patch diff --git a/package/uacme/0001-Fix-cross-compilation.patch b/package/uacme/0001-Fix-cross-compilation.patch new file mode 100644 index 000000000000..cc384f2c3692 --- /dev/null +++ b/package/uacme/0001-Fix-cross-compilation.patch @@ -0,0 +1,29 @@ +From cdf63e24dc475a558400c68714e32d32904e4c57 Mon Sep 17 00:00:00 2001 +From: Nicola Di Lieto +Date: Tue, 20 Feb 2024 01:05:00 +0100 +Subject: [PATCH] Fix cross compilation + +Commit fe826f4b1931ae508047d8b2693b5b6ac2cb21fd broke cross compilation + +Closes https://github.com/ndilieto/uacme/issues/79 + +Upstream: https://github.com/ndilieto/uacme/commit/cdf63e24dc475a558400c68714e32d32904e4c57 +Signed-off-by: Fabrice Fontaine +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 77d1230..3bec75b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -355,7 +355,8 @@ if test "x$OPT_UALPN" != "xno"; then + AC_DEFINE(HAVE_MAP_DEVZERO, 1, [if mmap("/dev/zero", MAP_SHARED) works]) + AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([ualpn requires MAP_ANON or mmap("/dev/zero", MAP_SHARED)])), ++ AC_MSG_ERROR([ualpn requires MAP_ANON or mmap("/dev/zero", MAP_SHARED)])) ++ ], [ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([#include + int main() {return mmap(0, 4096, PROT_READ|PROT_WRITE, + MAP_ANON|MAP_SHARED, -1, 0) == MAP_FAILED;}])], diff --git a/package/uacme/uacme.mk b/package/uacme/uacme.mk index f02e52276103..0fcb5c5c3439 100644 --- a/package/uacme/uacme.mk +++ b/package/uacme/uacme.mk @@ -13,6 +13,9 @@ UACME_LICENSE = GPL-3.0+ UACME_LICENSE_FILES = COPYING UACME_DEPENDENCIES = libcurl +# 0001-Fix-cross-compilation.patch touches configure.ac +UACME_AUTORECONF = YES + UACME_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' LIBS="$(UACME_LIBS)" ifeq ($(BR2_PACKAGE_GNUTLS),y) From 9af20d6e1e1139e59ed3dd9aaf015e72f1e2db8e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 20 Feb 2024 20:05:53 +0100 Subject: [PATCH 003/345] package/ltris: drop unrecognized option --enable-sound has been dropped since version 1.2.4 and https://sourceforge.net/p/lgames/code/432: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-static, --disable-shared, --enable-sound Fixes: 61848605cd26d29f54c16de862aedba7cf334be4 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/ltris/ltris.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/ltris/ltris.mk b/package/ltris/ltris.mk index 98902de44cca..b34ac142ce12 100644 --- a/package/ltris/ltris.mk +++ b/package/ltris/ltris.mk @@ -18,12 +18,9 @@ LTRIS_CONF_ENV = \ ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y) LTRIS_DEPENDENCIES += sdl_mixer host-pkgconf -LTRIS_CONF_OPTS += --enable-sound # configure script does NOT use pkg-config to figure out how to link # with sdl_mixer, breaking static linking as sdl_mixer can use libmad LTRIS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs SDL_mixer` -else -LTRIS_CONF_OPTS += --disable-sound endif $(eval $(autotools-package)) From 213cfb34358d86a65deecdb9f5b11a20ad0895d1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Feb 2024 19:02:23 +0100 Subject: [PATCH 004/345] package/dnsmasq: security bump version to 2.90 Changelog: https://thekelleys.org.uk/dnsmasq/CHANGELOG Release notes: https://lists.thekelleys.org.uk/pipermail/dnsmasq-discuss/2024q1/017430.html Fixes CVE 2023-50387 and CVE 2023-50868. Removed patch which is included in this release. Switched _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- ...default-maximum-dns-udp-package-size.patch | 64 ------------------- package/dnsmasq/dnsmasq.hash | 4 +- package/dnsmasq/dnsmasq.mk | 4 +- 3 files changed, 4 insertions(+), 68 deletions(-) delete mode 100644 package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch deleted file mode 100644 index 4dd17ec069be..000000000000 --- a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch +++ /dev/null @@ -1,64 +0,0 @@ -From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Tue, 7 Mar 2023 22:07:46 +0000 -Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. -Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 - -http://www.dnsflagday.net/2020/ refers. - -Thanks to Xiang Li for the prompt. - -[dalang@gmx.at: backport from upstream] -Signed-off-by: Daniel Lang ---- - CHANGELOG | 9 ++++++++ - man/dnsmasq.8 | 3 ++- - src/config.h | 2 +- - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 3af20cf..52d8678 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -1,3 +1,12 @@ version 2.90 -+version 2.90 -+ Set the default maximum DNS UDP packet sice to 1232. This -+ has been the recommended value since 2020 because it's the -+ largest value that avoid fragmentation, and fragmentation -+ is just not reliable on the modern internet, especially -+ for IPv6. It's still possible to override this with -+ --edns-packet-max for special circumstances. -+ -+ - version 2.89 - Fix bug introduced in 2.88 (commit fe91134b) which can result - in corruption of the DNS cache internal data structures and -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 41e2e04..5acb935 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. - .TP - .B \-P, --edns-packet-max= - Specify the largest EDNS.0 UDP packet which is supported by the DNS --forwarder. Defaults to 4096, which is the RFC5625-recommended size. -+forwarder. Defaults to 1232, which is the recommended size following the -+DNS flag day in 2020. Only increase if you know what you are doing. - .TP - .B \-Q, --query-port= - Send outbound DNS queries from, and listen for their replies on, the -diff --git a/src/config.h b/src/config.h -index 1e7b30f..37b374e 100644 ---- a/src/config.h -+++ b/src/config.h -@@ -19,7 +19,7 @@ - #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ - #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ - #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ --#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ -+#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ - #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ - #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ - #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ --- -2.20.1 diff --git a/package/dnsmasq/dnsmasq.hash b/package/dnsmasq/dnsmasq.hash index 02ffb2656bfe..d11e8af59086 100644 --- a/package/dnsmasq/dnsmasq.hash +++ b/package/dnsmasq/dnsmasq.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.89.tar.xz.asc -sha256 02bd230346cf0b9d5909f5e151df168b2707103785eb616b56685855adebb609 dnsmasq-2.89.tar.xz +# https://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.90.tar.xz.asc +sha256 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4 dnsmasq-2.90.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING-v3 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 9c05857f224b..9f342cb0499e 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -4,9 +4,9 @@ # ################################################################################ -DNSMASQ_VERSION = 2.89 +DNSMASQ_VERSION = 2.90 DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz -DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq +DNSMASQ_SITE = https://thekelleys.org.uk/dnsmasq DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" \ From 0dab037e14813b2f262dbde6b85b42d98b00c120 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Feb 2024 19:02:24 +0100 Subject: [PATCH 005/345] DEVELOPERS: add Bernd Kuhls to dnsmasq Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 0d12c3abcb11..f0e16af1623d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -350,6 +350,7 @@ F: package/bitcoin/ F: package/clamav/ F: package/dav1d/ F: package/dht/ +F: package/dnsmasq/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ From 9175bf264909cefa942d26deea9035553246ecad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Feb 2024 19:07:08 +0100 Subject: [PATCH 006/345] package/unbound: security bump version to 1.19.1 Release notes: https://nlnetlabs.nl/news/2024/Feb/13/unbound-1.19.1-released/ Fixes CVE-2023-50387 & CVE-2023-50868. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/unbound/unbound.hash | 4 ++-- package/unbound/unbound.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/unbound/unbound.hash b/package/unbound/unbound.hash index 91e1d82dd29f..843026abc785 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.sha256 -sha256 ee4085cecce12584e600f3d814a28fa822dfaacec1f94c84bfd67f8a5571a5f4 unbound-1.17.1.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 +sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index fa7884e9371f..5128d0e420e3 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.17.1 +UNBOUND_VERSION = 1.19.1 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl From 7ca60941b748d8d16796de22400fbe6d7e678b04 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 20 Feb 2024 19:50:30 +0100 Subject: [PATCH 007/345] package/bind: security bump version to 9.16.48 Changelog: https://ftp.isc.org/isc/bind9/9.16.48/CHANGES Version 9.16.46 fixes - CVE-2023-4408 - CVE-2023-5517 - CVE-2023-5679 - CVE-2023-6516 Version 9.16.47 fixes CVE-2023-50387. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index d500b6112849..482b046c8d1b 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.44/bind-9.16.44.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.48/bind-9.16.48.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 cfaa953c36d5ca42d9584fcf9653d07c85527b59687e7c4d4cb8071272db6754 bind-9.16.44.tar.xz +sha256 8d3814582348f90dead1ad410b1019094cd399d3d83930abebb2b3b1eb0b2bbb bind-9.16.48.tar.xz sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 03ffcbec42bb..0d81ffabd688 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.44 +BIND_VERSION = 9.16.48 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From fb4f154dad9ddc054763abcacfde120d16ca201a Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Tue, 20 Feb 2024 07:32:51 +0000 Subject: [PATCH 008/345] package/tslib: bump version to 1.23 Release notes from https://github.com/libts/tslib/releases : This release includes libts version 0.10.5 and the following changes: * new filter module: module crop * some build and security fixes * improved release procedure Signed-off-by: Martin Kepplinger Signed-off-by: Yann E. MORIN --- package/tslib/tslib.hash | 4 ++-- package/tslib/tslib.mk | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/tslib/tslib.hash b/package/tslib/tslib.hash index 762fbebb2622..6fe35633aa3f 100644 --- a/package/tslib/tslib.hash +++ b/package/tslib/tslib.hash @@ -1,5 +1,5 @@ -# https://github.com/libts/tslib/releases/download/1.22/tslib-1.22.tar.xz.sha256 -sha256 aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a tslib-1.22.tar.xz +# https://github.com/libts/tslib/releases/download/1.23/tslib-1.23.tar.xz.sha256 +sha256 9b489a54d48006201f2fe955a88c3f857535ac93b6cf8e5a16c7b166c8991dac tslib-1.23.tar.xz # Locally computed sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 COPYING diff --git a/package/tslib/tslib.mk b/package/tslib/tslib.mk index 45e29808bd25..e8eb3beeaf50 100644 --- a/package/tslib/tslib.mk +++ b/package/tslib/tslib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TSLIB_VERSION = 1.22 +TSLIB_VERSION = 1.23 TSLIB_SITE = https://github.com/libts/tslib/releases/download/$(TSLIB_VERSION) TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz TSLIB_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) @@ -29,7 +29,8 @@ TSLIB_CONF_OPTS += \ --enable-skip=static \ --enable-lowpass=static \ --enable-invert=static \ - --enable-evthres=static + --enable-evthres=static \ + --enable-crop=static endif $(eval $(autotools-package)) From 43ae599c9eeba74f4c9941435d9f8137723b86ec Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 20 Feb 2024 16:19:30 +0100 Subject: [PATCH 009/345] package/c-ares: bump to version 1.26.0 Changelog: https://c-ares.org/changelog.html#1_26_0 Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- 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 c2897f6e4441..ee097a53c92c 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 de24a314844cb157909730828560628704f4f896d167dd7da0fa2fb93ea18b10 c-ares-1.20.1.tar.gz +sha256 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz # Hash for license file sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 586fde9afbac..29da6baa4bde 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.20.1 +C_ARES_VERSION = 1.26.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From 5c86121d8865d41c40ed17d0ca6b07d36a940a2e Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Mon, 19 Feb 2024 11:19:34 -0800 Subject: [PATCH 010/345] package/dos2unix: bump to version 7.5.2 - Update hash of the COPYING.txt (update in year) Signed-off-by: Kadambini Nema Signed-off-by: Yann E. MORIN --- package/dos2unix/dos2unix.hash | 6 +++--- package/dos2unix/dos2unix.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dos2unix/dos2unix.hash b/package/dos2unix/dos2unix.hash index 032c8ea2d211..d4d682cd0cb8 100644 --- a/package/dos2unix/dos2unix.hash +++ b/package/dos2unix/dos2unix.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.0.tar.gz.asc -sha256 7a3b01d01e214d62c2b3e04c3a92e0ddc728a385566e4c0356efa66fd6eb95af dos2unix-7.5.0.tar.gz -sha256 6009a35c7aaee9888fd4844972c37b84bce22e7407893727c70f4f3560ae3eac COPYING.txt +# https://waterlan.home.xs4all.nl/dos2unix/dos2unix-7.5.2.tar.gz.asc +sha256 264742446608442eb48f96c20af6da303cb3a92b364e72cb7e24f88239c4bf3a dos2unix-7.5.2.tar.gz +sha256 03b60fa2cf28b2c6dd585a13b32377c1f87b8f016db44ce2ab6bc7eb306220e2 COPYING.txt diff --git a/package/dos2unix/dos2unix.mk b/package/dos2unix/dos2unix.mk index 6d1e70cf266b..e30fc999d474 100644 --- a/package/dos2unix/dos2unix.mk +++ b/package/dos2unix/dos2unix.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOS2UNIX_VERSION = 7.5.0 +DOS2UNIX_VERSION = 7.5.2 DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix DOS2UNIX_LICENSE = BSD-2-Clause DOS2UNIX_LICENSE_FILES = COPYING.txt From 59e2a8ed5ab9712c602fe64f0ae5f0ae48c0b6c5 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Mon, 19 Feb 2024 12:40:54 -0800 Subject: [PATCH 011/345] package/google-breakpad: fix missing include error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit src/common/module.cc: In member function ‘bool google_breakpad::Module::AddFunction(Function*)’: src/common/module.cc:194:52: error: ‘find_if’ is not a member of ‘std’; did you mean ‘find’? 194 | FunctionSet::iterator existing_function = std::find_if( | ^~~~~~~ | find Makefile:8309: recipe for target 'src/common/tools_mac_dump_syms_dump_syms_mac-module.o' failed This error is seen on gcc-14. https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-devtools/breakpad/breakpad/0001-Fixed-missing-include-for-std-find_if.patch Signed-off-by: Kadambini Nema Signed-off-by: Yann E. MORIN --- ...ixed-missing-include-for-std-find_if.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch diff --git a/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch new file mode 100644 index 000000000000..141e12b613a0 --- /dev/null +++ b/package/google-breakpad/0001-Fixed-missing-include-for-std-find_if.patch @@ -0,0 +1,26 @@ +From 898a997855168c0e6a689072fefba89246271a5d Mon Sep 17 00:00:00 2001 +From: Nathan Moinvaziri +Date: Tue, 19 Dec 2023 14:35:05 -0800 +Subject: [PATCH] Fixed missing include for std::find_if. + +Throws an error when compiling on Windows. + +Change-Id: Ieb34c00cf199aaa1b45a440086c48b8ed363b3c7 +Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/5137658 +Reviewed-by: Ivan Penkov +Upstream: https://github.com/google/breakpad/commit/898a997855168c0e6a689072fefba89246271a5d +Signed-off-by: Kadambini Nema +--- + +diff --git a/src/common/module.cc b/src/common/module.cc +index 0eb5aad..b6f5da7 100644 +--- a/src/common/module.cc ++++ b/src/common/module.cc +@@ -42,6 +42,7 @@ + #include + #include + ++#include + #include + #include + #include From a9990552eb8b88647104bbec82555b2c407aa6be Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 21 Feb 2024 17:19:09 +0100 Subject: [PATCH 012/345] support/testing: TestCheckPackage: update expected strings Commit dfed5acb56 ("utils/check-package: use https for the manual URL") replaced the default url to the Buildroot manual while it was used by TestCheckPackage test. Update TestCheckPackage with https url. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243484 Cc: Yann E. MORIN Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- support/testing/tests/utils/test_check_package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 9aa117d21121..2125b341707a 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -200,13 +200,13 @@ def test_run(self): self.WITH_UTILS_IN_PATH, abs_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(rel_file), w) w, m = call_script(["check-package", "-b", abs_file], self.WITH_UTILS_IN_PATH, infra.basepath()) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:1: should be 80 hashes (http://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) + self.assertIn("{}:1: should be 80 hashes (https://nightly.buildroot.org/#writing-rules-mk)".format(abs_file), w) # br2-external with ignore list topdir_path = infra.filepath("tests/utils/br2-external") From d4b065e35c47efa9a347abad0a8cfbf024a12e60 Mon Sep 17 00:00:00 2001 From: Frank Vanbever Date: Sat, 17 Feb 2024 10:24:13 +0100 Subject: [PATCH 013/345] package/libmodsecurity: security bump to 3.0.12 The project has been transferred from Trustwave (SpiderLabs) to OWASP, hence the change in URLs. The upstream CPE vendor ID will likely also change in the future but the upstream is still working on this [1]. - Fixes: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-1019 [1] https://github.com/owasp-modsecurity/ModSecurity/issues/3083 Signed-off-by: Frank Vanbever Signed-off-by: Yann E. MORIN --- package/libmodsecurity/Config.in | 2 +- package/libmodsecurity/libmodsecurity.hash | 5 +++-- package/libmodsecurity/libmodsecurity.mk | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/libmodsecurity/Config.in b/package/libmodsecurity/Config.in index 69bb0494ccce..da14b216690b 100644 --- a/package/libmodsecurity/Config.in +++ b/package/libmodsecurity/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBMODSECURITY SecRules format and apply them to HTTP content provided by your application via Connectors. - https://github.com/SpiderLabs/ModSecurity + https://github.com/owasp-modsecurity/ModSecurity comment "libmodsecurity needs a toolchain w/ C++, threads, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || \ diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index b0a1bf33f388..2221a8a37d77 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,5 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.11/modsecurity-v3.0.11.tar.gz.sha256 -sha256 070f46c779d30785b95eb1316b46e2e4e6f90fd94a96aaca4bd54cd94738b692 modsecurity-v3.0.11.tar.gz +# From https://github.com/owasp-modsecurity/ModSecurity/releases/download/v3.0.12/modsecurity-v3.0.12.tar.gz.sha256 +sha256 a36118401641feef376bb469bf468abf94b7948844976a188a6fccb53390b11f modsecurity-v3.0.12.tar.gz + # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index 548eeb860200..d8c10b98b288 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.11 +LIBMODSECURITY_VERSION = 3.0.12 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz -LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) +LIBMODSECURITY_SITE = https://github.com/owasp-modsecurity/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE From 5275e141259c95b03fc288035c128224a1405646 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 12 Feb 2024 16:32:18 +0200 Subject: [PATCH 014/345] package/wpewebkit: security bump to version 2.42.5 Fixes the following security issues: https://wpewebkit.org/security/WSA-2024-0001.html - CVE-2024-23222: Processing maliciously crafted web content may lead to arbitrary code execution. Apple is aware of a report that this issue may have been exploited. Description: A type confusion issue was addressed with improved checks. - CVE-2024-23206: A maliciously crafted webpage may be able to fingerprint the user. Description: An access issue was addressed with improved access restrictions. - CVE-2024-23213: Processing web content may lead to arbitrary code execution. Description: The issue was addressed with improved memory handling. Add an upstream post-2.42.5 patch to fix an issue with an invalid backport causing a build issue. Signed-off-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN --- ...velInterpreter.cpp-339-21-error-t6-w.patch | 39 +++++++++++++++++++ package/wpewebkit/wpewebkit.hash | 6 +-- package/wpewebkit/wpewebkit.mk | 3 +- 3 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch diff --git a/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch new file mode 100644 index 000000000000..a15d9e647ffc --- /dev/null +++ b/package/wpewebkit/0002-GTK-2.42.5-LowLevelInterpreter.cpp-339-21-error-t6-w.patch @@ -0,0 +1,39 @@ +From 3d5373575695b293b8559155431d0079a6153aff Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro +Date: Mon, 5 Feb 2024 11:00:49 -0600 +Subject: [PATCH] =?UTF-8?q?[GTK]=20[2.42.5]=20LowLevelInterpreter.cpp:339:?= + =?UTF-8?q?21:=20error:=20=E2=80=98t6=E2=80=99=20was=20not=20declared=20in?= + =?UTF-8?q?=20this=20scope=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid?= + =?UTF-8?q?=3D268739?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Unreviewed build fix. Seems a backport went badly, and we didn't notice +because the code is architecture-specific. + +* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp: +(JSC::CLoop::execute): + +Upstream: https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff +Signed-off-by: Adrian Perez de Castro +--- + Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +index 5064ead6cd2e..9a2e2653b121 100644 +--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp +@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm, + UNUSED_VARIABLE(t2); + UNUSED_VARIABLE(t3); + UNUSED_VARIABLE(t5); +- UNUSED_VARIABLE(t6); +- UNUSED_VARIABLE(t7); + + struct StackPointerScope { + StackPointerScope(CLoopStack& stack) +-- +2.43.1 + diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 322e494c36a7..71e41bb1dd22 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,6 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.42.4.tar.xz.sums -sha1 34da38e9554586154c83fdbb5c20e353b6d97277 wpewebkit-2.42.4.tar.xz -sha256 8836040a3687581970b47a232b713e7023c080d5613427f52db619c29fb253a4 wpewebkit-2.42.4.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.42.5.tar.xz.sums +sha1 50a18f43452520e9f34f84c04bc0166af655ffff wpewebkit-2.42.5.tar.xz +sha256 4dbab6c5e6dc0c65a3d7dffc1c2390be5f9abd423faf983fe3a55fe081df0532 wpewebkit-2.42.5.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 13143efb38bc..442709848a7b 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,8 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.42.4 +# The middle number is even for stable releases, odd for development ones. +WPEWEBKIT_VERSION = 2.42.5 WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From 9a7a7f3d1392d34a14acc7739525dc7fc13920d8 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 12 Feb 2024 16:32:19 +0200 Subject: [PATCH 015/345] package/wpewebkit: update ARM NEON patch for 2.42.x Update patch to compile correctly with newer versions of GCC, which has gotten stricter about the placement of the alignas() attribute. Signed-off-by: Adrian Perez de Castro [yann.morin.1998@free.fr: update .checkpackageignore] Signed-off-by: Yann E. MORIN --- .checkpackageignore | 1 - ...cpp-fails-to-build-NEON-fast-path-se.patch | 105 ++++++++++-------- 2 files changed, 57 insertions(+), 49 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 05a924196235..4967d749fa8c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1376,7 +1376,6 @@ package/wireshark/0001-cmake-lemon-wipe-CMAKE_-EXE_LINKER_FLAGS-SYSROOT-if-.patc package/woff2/0001-CMake-Handle-multiple-libraries-being-returned-for-B.patch Upstream package/wpa_supplicant/0001-build-re-enable-options-for-libwpa_client.so-and-.patch Upstream package/wpa_supplicant/ifupdown.sh Shellcheck -package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch Upstream package/x11r7/xapp_luit/0001-posix-openpt.patch Upstream package/x11r7/xapp_xdm/S99xdm Indent Variables package/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch Upstream diff --git a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch index ea1676abb61d..17d495765761 100644 --- a/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch +++ b/package/wpewebkit/0001-FELightningNEON.cpp-fails-to-build-NEON-fast-path-se.patch @@ -1,4 +1,4 @@ -From da159b0150cba0e5e5251e4cc6a090440f73cb7c Mon Sep 17 00:00:00 2001 +From 5ba2d275457c4fdf1efdcca8351792400bda5679 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 2 Jun 2022 11:19:06 +0300 Subject: [PATCH] FELightningNEON.cpp fails to build, NEON fast path seems @@ -33,38 +33,47 @@ left for a follow-up fix. * Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h: Signed-off-by: Adrian Perez de Castro -[Upstream status: https://bugs.webkit.org/show_bug.cgi?id=241182] +Upstream: https://bugs.webkit.org/show_bug.cgi?id=241182 --- Source/WebCore/Sources.txt | 1 + - .../cpu/arm/filters/FELightingNEON.cpp | 4 +- + .../cpu/arm/filters/FELightingNEON.cpp | 6 +-- .../graphics/cpu/arm/filters/FELightingNEON.h | 54 +++++++++---------- .../graphics/filters/DistantLightSource.h | 4 ++ .../platform/graphics/filters/FELighting.h | 7 --- .../graphics/filters/PointLightSource.h | 4 ++ .../graphics/filters/SpotLightSource.h | 4 ++ .../software/FELightingSoftwareApplier.h | 16 ++++++ - 8 files changed, 58 insertions(+), 36 deletions(-) + 8 files changed, 59 insertions(+), 37 deletions(-) diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt -index 8ce3510fe1a8..efd56bcb8746 100644 +index 9ca28a7b2bc0..ed2c7f9f41ee 100644 --- a/Source/WebCore/Sources.txt +++ b/Source/WebCore/Sources.txt -@@ -2136,6 +2136,7 @@ platform/graphics/WebMResourceClient.cpp - platform/graphics/WOFFFileFormat.cpp - platform/graphics/WidthIterator.cpp +@@ -2303,6 +2303,7 @@ platform/graphics/controls/MeterPart.cpp + platform/graphics/controls/ProgressBarPart.cpp + platform/graphics/controls/SliderTrackPart.cpp platform/graphics/cpu/arm/filters/FEBlendNeonApplier.cpp +platform/graphics/cpu/arm/filters/FELightingNEON.cpp platform/graphics/displaylists/DisplayList.cpp platform/graphics/displaylists/DisplayListDrawingContext.cpp platform/graphics/displaylists/DisplayListItems.cpp diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp -index f6ff8c20a5a8..42a97ffc5372 100644 +index f6ff8c20a5a8..dced3d55eb4e 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp +@@ -35,7 +35,7 @@ namespace WebCore { + // ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D + + +-static alignas(16) short s_FELightingConstantsForNeon[] = { ++alignas(16) static short s_FELightingConstantsForNeon[] = { + // Alpha coefficients. + -2, 1, 0, -1, 2, 1, 0, -1, + 0, -1, -2, -1, 0, 1, 2, 1, @@ -49,7 +49,7 @@ short* feLightingConstantsForNeon() return s_FELightingConstantsForNeon; } - + -void FELighting::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) +void FELightingSoftwareApplier::platformApplyNeonWorker(FELightingPaintingDataForNeon* parameters) { @@ -73,26 +82,26 @@ index f6ff8c20a5a8..42a97ffc5372 100644 @@ -464,7 +464,7 @@ TOSTRING(neonDrawLighting) ":" NL "b .lightStrengthCalculated" NL ); // NOLINT - + -int FELighting::getPowerCoefficients(float exponent) +int FELightingSoftwareApplier::getPowerCoefficients(float exponent) { // Calling a powf function from the assembly code would require to save // and reload a lot of NEON registers. Since the base is in range [0..1] diff --git a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h -index b17c603d40d3..c6d17f573eca 100644 +index b17c603d40d3..fd23e31cce29 100644 --- a/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h +++ b/Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.h @@ -24,14 +24,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + -#ifndef FELightingNEON_h -#define FELightingNEON_h +#pragma once - + #if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - + -#include "FELighting.h" +#include "FELightingSoftwareApplier.h" +#include "ImageBuffer.h" @@ -100,19 +109,19 @@ index b17c603d40d3..c6d17f573eca 100644 #include "SpotLightSource.h" +#include #include - + namespace WebCore { @@ -93,14 +94,14 @@ extern "C" { void neonDrawLighting(FELightingPaintingDataForNeon*); } - + -inline void FELighting::platformApplyNeon(const LightingData& data, const LightSource::PaintingData& paintingData) +inline void FELightingSoftwareApplier::applyPlatformNeon(const FELightingSoftwareApplier::LightingData& data, const LightSource::PaintingData& paintingData) { - alignas(16) FELightingFloatArgumentsForNeon floatArguments; - FELightingPaintingDataForNeon neonData = { - data.pixels->data(), -+ WebCore::FELightingFloatArgumentsForNeon alignas(16) floatArguments; ++ alignas(16) WebCore::FELightingFloatArgumentsForNeon floatArguments; + WebCore::FELightingPaintingDataForNeon neonData = { + data.pixels->bytes(), 1, @@ -126,15 +135,15 @@ index b17c603d40d3..c6d17f573eca 100644 @@ -111,23 +112,23 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS // Set light source arguments. floatArguments.constOne = 1; - + - auto color = m_lightingColor.toColorTypeLossy>().resolved(); + auto color = data.lightingColor.toColorTypeLossy>().resolved(); - + floatArguments.colorRed = color.red; floatArguments.colorGreen = color.green; floatArguments.colorBlue = color.blue; floatArguments.padding4 = 0; - + - if (m_lightSource->type() == LS_POINT) { + if (data.lightSource->type() == LS_POINT) { neonData.flags |= FLAG_POINT_LIGHT; @@ -181,7 +190,7 @@ index b17c603d40d3..c6d17f573eca 100644 } if (floatArguments.diffuseConstant == 1) neonData.flags |= FLAG_DIFFUSE_CONST_IS_1; - + - int optimalThreadNumber = ((data.widthDecreasedByOne - 1) * (data.heightDecreasedByOne - 1)) / s_minimalRectDimension; + static constexpr int minimalRectDimension = 100 * 100; // Empirical data limit for parallel jobs + int optimalThreadNumber = ((data.width - 2) * (data.height - 2)) / minimalRectDimension; @@ -189,7 +198,7 @@ index b17c603d40d3..c6d17f573eca 100644 // Initialize parallel jobs - ParallelJobs parallelJobs(&WebCore::FELighting::platformApplyNeonWorker, optimalThreadNumber); + ParallelJobs parallelJobs(&FELightingSoftwareApplier::platformApplyNeonWorker, optimalThreadNumber); - + // Fill the parameter array int job = parallelJobs.numberOfJobs(); if (job > 1) { @@ -213,42 +222,42 @@ index b17c603d40d3..c6d17f573eca 100644 return; @@ -199,5 +201,3 @@ inline void FELighting::platformApplyNeon(const LightingData& data, const LightS } // namespace WebCore - + #endif // CPU(ARM_NEON) && COMPILER(GCC_COMPATIBLE) - -#endif // FELightingNEON_h diff --git a/Source/WebCore/platform/graphics/filters/DistantLightSource.h b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -index 0660143fc1cf..2b1e86d99fa4 100644 +index 70f583b36e2c..7d5d27e5ccf8 100644 --- a/Source/WebCore/platform/graphics/filters/DistantLightSource.h +++ b/Source/WebCore/platform/graphics/filters/DistantLightSource.h -@@ -25,6 +25,10 @@ - #include "LightSource.h" +@@ -26,6 +26,10 @@ + #include #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class DistantLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/FELighting.h b/Source/WebCore/platform/graphics/filters/FELighting.h -index 0c073bc13f8c..e0db00545c17 100644 +index 179edf6dba24..694d712d56fd 100644 --- a/Source/WebCore/platform/graphics/filters/FELighting.h +++ b/Source/WebCore/platform/graphics/filters/FELighting.h @@ -35,8 +35,6 @@ - + namespace WebCore { - + -struct FELightingPaintingDataForNeon; - class FELighting : public FilterEffect { public: - const Color& lightingColor() const { return m_lightingColor; } -@@ -67,11 +65,6 @@ protected: - + bool operator==(const FELighting&) const; +@@ -68,11 +66,6 @@ protected: + std::unique_ptr createSoftwareApplier() const override; - + -#if CPU(ARM_NEON) && CPU(ARM_TRADITIONAL) && COMPILER(GCC_COMPATIBLE) - static int getPowerCoefficients(float exponent); - inline void platformApplyNeon(const LightingData&, const LightSource::PaintingData&); @@ -258,34 +267,34 @@ index 0c073bc13f8c..e0db00545c17 100644 float m_surfaceScale; float m_diffuseConstant; diff --git a/Source/WebCore/platform/graphics/filters/PointLightSource.h b/Source/WebCore/platform/graphics/filters/PointLightSource.h -index 126b3b2350f6..d906db21aa9c 100644 +index a8cfdab895a9..34f867bba237 100644 --- a/Source/WebCore/platform/graphics/filters/PointLightSource.h +++ b/Source/WebCore/platform/graphics/filters/PointLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class PointLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/SpotLightSource.h b/Source/WebCore/platform/graphics/filters/SpotLightSource.h -index 641b205f986d..64380d9b6eb8 100644 +index 6404467a5b6f..5cac38f22362 100644 --- a/Source/WebCore/platform/graphics/filters/SpotLightSource.h +++ b/Source/WebCore/platform/graphics/filters/SpotLightSource.h @@ -26,6 +26,10 @@ #include "LightSource.h" #include - + +namespace WTF { +class TextStream; +} // namespace WTF + namespace WebCore { - + class SpotLightSource : public LightSource { diff --git a/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h index c974d92115ff..e2896660cfbd 100644 @@ -293,14 +302,14 @@ index c974d92115ff..e2896660cfbd 100644 +++ b/Source/WebCore/platform/graphics/filters/software/FELightingSoftwareApplier.h @@ -36,6 +36,7 @@ namespace WebCore { - + class FELighting; +struct FELightingPaintingDataForNeon; - + class FELightingSoftwareApplier final : public FilterEffectConcreteApplier { WTF_MAKE_FAST_ALLOCATED; @@ -132,8 +133,23 @@ private: - + static void applyPlatformGenericPaint(const LightingData&, const LightSource::PaintingData&, int startY, int endY); static void applyPlatformGenericWorker(ApplyParameters*); + @@ -319,10 +328,10 @@ index c974d92115ff..e2896660cfbd 100644 + static void applyPlatform(const LightingData&); }; - + } // namespace WebCore + +#include "FELightingNEON.h" --- -2.37.3 +-- +2.43.1 From f42004a046313cf73ae707d43632109c36398dc0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 8 Feb 2024 09:38:04 +0100 Subject: [PATCH 016/345] boot/shim: security bump to version 15.8 Fixes the following security issues: CVE-2023-40546 mok: fix LogError() invocation CVE-2023-40547 - avoid incorrectly trusting HTTP headers CVE-2023-40548 Fix integer overflow on SBAT section size on 32-bit system CVE-2023-40549 Authenticode: verify that the signature header is in bounds. CVE-2023-40550 pe: Fix an out-of-bound read in verify_buffer_sbat() CVE-2023-40551: pe-relocate: Fix bounds check for MZ binaries https://github.com/rhboot/shim/tree/15.8 Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- boot/shim/shim.hash | 2 +- boot/shim/shim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/shim/shim.hash b/boot/shim/shim.hash index c9c489fd2f25..5aa4ca06e85c 100644 --- a/boot/shim/shim.hash +++ b/boot/shim/shim.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 eab91644a3efe91a666399f5d8eb3eed0e04d04f79d4b6c0b278ef7747a239a5 shim-15.6.tar.bz2 +sha256 a79f0a9b89f3681ab384865b1a46ab3f79d88b11b4ca59aa040ab03fffae80a9 shim-15.8.tar.bz2 sha256 15edf527919ddcb2f514ab9d16ad07ef219e4bb490e0b79560be510f0c159cc2 COPYRIGHT diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index bbef81cfc491..19b11f40860d 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHIM_VERSION = 15.6 +SHIM_VERSION = 15.8 SHIM_SITE = https://github.com/rhboot/shim/releases/download/$(SHIM_VERSION) SHIM_SOURCE = shim-$(SHIM_VERSION).tar.bz2 SHIM_LICENSE = BSD-2-Clause From 3b2bea40abd1d6092f5fd7d201ad1580e7f629d4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 21 Feb 2024 18:39:16 +0100 Subject: [PATCH 017/345] package/cegui: fix build with libxml2 >= 2.12 Fix the following build failure raised since bump of libxml2 to version 2.12.1 in commit d8ac52108c12f0fcc9641b63e7922009270f96c6: /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp: In member function 'virtual void CEGUI::LibxmlParser::parseXML(CEGUI::XMLHandler&, const CEGUI::RawDataContainer&, const CEGUI::String&, bool)': /home/buildroot/autobuild/instance-1/output-1/build/cegui-00b4e1fe174da53b7ed726ab5970ba51bd5b5ee0/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp:111:40: error: invalid conversion from 'const xmlError*' {aka 'const _xmlError*'} to 'xmlError*' {aka '_xmlError*'} [-fpermissive] 111 | xmlError* err = xmlGetLastError(); | ~~~~~~~~~~~~~~~^~ | | | const xmlError* {aka const _xmlError*} Fixes: d8ac52108c12f0fcc9641b63e7922009270f96c6 - http://autobuild.buildroot.org/results/b239b7b03542311e311e4612e9b811c154302a6e Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...-of-xmlGetLastError-for-libxml2-2-12.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch diff --git a/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch new file mode 100644 index 000000000000..9091062e2894 --- /dev/null +++ b/package/cegui/0002-Fix-return-type-of-xmlGetLastError-for-libxml2-2-12.patch @@ -0,0 +1,29 @@ +From 285ba5a2c0c435ed865c6e86afe314a822fd1e3f Mon Sep 17 00:00:00 2001 +From: oreo639 +Date: Sun, 18 Feb 2024 14:16:21 -0800 +Subject: [PATCH] Fix return type of xmlGetLastError for libxml2 2.12 + +https://gitlab.gnome.org/GNOME/libxml2/-/commit/45470611b047db78106dcb2fdbd4164163c15ab7 + +Upstream: https://github.com/cegui/cegui/commit/285ba5a2c0c435ed865c6e86afe314a822fd1e3f +Signed-off-by: Fabrice Fontaine +--- + cegui/src/XMLParserModules/Libxml2/XMLParser.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +index 74a3dbddd..a408f9305 100644 +--- a/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp ++++ b/cegui/src/XMLParserModules/Libxml2/XMLParser.cpp +@@ -109,7 +109,11 @@ void LibxmlParser::parseXML(XMLHandler& handler, + + if (!doc) + { ++#if LIBXML_VERSION >= 21200 ++ const xmlError* err = xmlGetLastError(); ++#else + xmlError* err = xmlGetLastError(); ++#endif + + throw GenericException( + String("xmlParseMemory failed in file: '") + From 1c32cdd545767337616f94d076212c6273e59f44 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 21 Feb 2024 15:30:01 +0100 Subject: [PATCH 018/345] package/libstrophe: bump to version 0.13.1 Signed-off-by: Michael Vetter Signed-off-by: Yann E. MORIN --- package/libstrophe/libstrophe.hash | 2 +- package/libstrophe/libstrophe.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libstrophe/libstrophe.hash b/package/libstrophe/libstrophe.hash index e284e8cca695..ec5a55985a5f 100644 --- a/package/libstrophe/libstrophe.hash +++ b/package/libstrophe/libstrophe.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 8d7c17c694efff7d2e2d3632684537e7ba874ce3d7f0e750a539f2299021bbaa libstrophe-0.13.0.tar.xz +sha256 86c0abd348ae66feb40b6886f2c7f04525f1d5b20a48c10d4db4ed532dc63f22 libstrophe-0.13.1.tar.xz sha256 82476f36ffd5e895a176013c0812166ba7b7d99f3d536fc7f5ed2e33e9f74a08 MIT-LICENSE.txt sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 GPL-LICENSE.txt diff --git a/package/libstrophe/libstrophe.mk b/package/libstrophe/libstrophe.mk index 257593bbeca2..42d582fe9c7f 100644 --- a/package/libstrophe/libstrophe.mk +++ b/package/libstrophe/libstrophe.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSTROPHE_VERSION = 0.13.0 +LIBSTROPHE_VERSION = 0.13.1 LIBSTROPHE_SOURCE = libstrophe-$(LIBSTROPHE_VERSION).tar.xz LIBSTROPHE_SITE = https://github.com/strophe/libstrophe/releases/download/$(LIBSTROPHE_VERSION) LIBSTROPHE_DEPENDENCIES = host-pkgconf From ec344d60134e4db8e1d54a84697ba73756bd57d2 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 20 Feb 2024 23:50:24 +0100 Subject: [PATCH 019/345] DEVELOPERS: add Romain Naour for am574x_idk_defconfig The DEVELOPERS entry was missing. Fixes: 35eb74c634 ("configs/am574x_idk_defconfig: new defconfig") Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- DEVELOPERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index f0e16af1623d..0f065bfafbe9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2668,7 +2668,9 @@ F: package/vnstat/ N: Romain Naour F: board/qemu/ +F: board/ti/am574x-idk/ F: configs/qemu_* +F: configs/am574x_idk_defconfig F: package/alure/ F: package/aubio/ F: package/binutils/ From a2e08963a2c45e6036566687788b812383e80820 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 19 Feb 2024 23:14:58 +0100 Subject: [PATCH 020/345] package/highway: bump to version 1.1.0 For release note, see [1]. This commit removes the package patch, as it is now included in this new release. LICENSE-BSD3 hash changed, due to reformatting. See [2]. [1] https://github.com/google/highway/releases/tag/1.1.0 [2] https://github.com/google/highway/commit/edc35d14c77cb24dc1163989c762d69694e0e955 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN --- ...1-add-required-RISC-V-flags-to-CMake.patch | 42 ------------------- package/highway/highway.hash | 4 +- package/highway/highway.mk | 2 +- 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/highway/0001-add-required-RISC-V-flags-to-CMake.patch diff --git a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch b/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch deleted file mode 100644 index bfcbfb055cb8..000000000000 --- a/package/highway/0001-add-required-RISC-V-flags-to-CMake.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5d58d233fbcec0c6a39df8186a877329147324b3 Mon Sep 17 00:00:00 2001 -From: Mathieu Malaterre -Date: Wed, 13 Sep 2023 08:37:54 +0200 -Subject: [PATCH] Add an option to opt-out of HWY_RISCV - -Fixes #1740 - -Upstream: https://github.com/google/highway/commit/5d58d233fbcec0c6a39df8186a877329147324b3 -Signed-off-by: Fabrice Fontaine ---- - CMakeLists.txt | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c2bf57b3f5..be639c945f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,6 +61,9 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4 - # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. - set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?") - -+# Currently this will compile the entire codebase with `-march=rv64gcv1p0`: -+set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?") -+ - # Unconditionally adding -Werror risks breaking the build when new warnings - # arise due to compiler/platform changes. Enable this in CI/tests. - set(HWY_WARNINGS_ARE_ERRORS OFF CACHE BOOL "Add -Werror flag?") -@@ -260,9 +263,11 @@ else() - # gcc(13) and recent clang both support V, but not yet runtime dispatch, so - # we add the gcv compiler flag, which then requires the CPU (now when using - # either compiler) to support V. -- list(APPEND HWY_FLAGS -march=rv64gcv1p0) -- if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -- list(APPEND HWY_FLAGS -menable-experimental-extensions) -+ if(HWY_CMAKE_RVV) -+ list(APPEND HWY_FLAGS -march=rv64gcv1p0) -+ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -+ list(APPEND HWY_FLAGS -menable-experimental-extensions) -+ endif() - endif() - endif() - diff --git a/package/highway/highway.hash b/package/highway/highway.hash index 3cb497f20a77..270131134ec8 100644 --- a/package/highway/highway.hash +++ b/package/highway/highway.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 5434488108186c170a5e2fca5e3c9b6ef59a1caa4d520b008a9b8be6b8abe6c5 highway-1.0.7.tar.gz +sha256 354a8b4539b588e70b98ec70844273e3f2741302c4c377bcc4e81b3d1866f7c9 highway-1.1.0.tar.gz sha256 43070e2d4e532684de521b885f385d0841030efa2b1a20bafb76133a5e1379c1 LICENSE -sha256 6dcc159f448e3aca73a15e355d0a6735ca3fd224abe637e0b7437dce2d24f765 LICENSE-BSD3 +sha256 d25e82e26acd42ca3ccc9993622631163425b869b9e16284226d534cff6470f2 LICENSE-BSD3 diff --git a/package/highway/highway.mk b/package/highway/highway.mk index b45fa8df74d5..3eb0d7a4aa23 100644 --- a/package/highway/highway.mk +++ b/package/highway/highway.mk @@ -4,7 +4,7 @@ # ################################################################################ -HIGHWAY_VERSION = 1.0.7 +HIGHWAY_VERSION = 1.1.0 HIGHWAY_SITE = $(call github,google,highway,$(HIGHWAY_VERSION)) HIGHWAY_LICENSE = Apache-2.0 or BSD-3-Clause HIGHWAY_LICENSE_FILES = LICENSE LICENSE-BSD3 From 5aade5ced5edc40a4ad848cd276813d273d2d04e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 17 Feb 2024 18:29:23 +0100 Subject: [PATCH 021/345] package/sudo: drop legacy, useless, and broken post-configure hook Commit b9e89b340e27 (sudo: bump version) introduced the explicit build of mksigname and mksiglist as host tools, as they were required to run on the build machine, to generate C code then used to build the target program. This is now failing to build since the bump to sudo 1.9.15p5 in commit c87746afefe7 (package/sudo: security bump to version 1.9.15p5) (lines manually wrapped and slightly elided for ease of reviewing): /usr/bin/cpp \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -I../../include \ -I../.. \ ./sys_signame.h \ | /usr/bin/sed -e '1,/^int sudo_end_of_headers;/d' -e '/^#/d' > mksigname.h In file included from /usr/include/features.h:394, from /usr/include/sys/types.h:25, from ./sys_signame.h:4: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ /usr/bin/gcc -I../../include -I../.. -I. -I. \ -D_PATH_SUDO_CONF=\"/etc/sudo.conf\" -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ -DDEFAULT_TEXT_DOMAIN=\"sudo\" \ -O2 \ -I/home/ymorin/dev/buildroot/O/master/per-package/sudo/host/include \ ./mksigname.c -o mksigname In file included from /usr/include/features.h:394, from /usr/include/bits/libc-header-start.h:33, from /usr/include/stdlib.h:26, from ./mksigname.c:27: /usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ make[2]: *** [Makefile:263: mksigname] Error 1 The core of the issue has not been really identified, but it turns out that neither mksiglist nor mksignames is used during the build. This has been tested with a minimal sudo with no option, and with a sudo with all options enabled (linux-pam, zlib, opensldap, and openssl), with the three types of C libraries (glibc, musl, and uClibc-ng). Digging in the sudo buildsystem did not reveal an obvious reason when those would be needed either. Drop the hook now it seems it is no longer used and is atually breaking the build. Fixes: http://autobuild.buildroot.org/results/72f/72ff18fb9b41394a29006f881ee1fbea67a66a09/ Note that there is a second issue in there: the call to the host cpp fails, but since it is on the LHS of a pipe, the error is lost, as the RHS of the pipe (the sed call) succeeds; a fix for that will be sent in a separate patch. Reported-by: Christian Stewart Signed-off-by: Yann E. MORIN Cc: Peter Korsgaard Reviewed-by: Christian Stewart --- package/sudo/sudo.mk | 9 --------- 1 file changed, 9 deletions(-) diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index a4e838dd9447..7961a9900248 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -58,15 +58,6 @@ else SUDO_CONF_OPTS += --disable-openssl endif -# mksigname/mksiglist needs to run on build host to generate source files -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - $(MAKE) $(HOST_CONFIGURE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ - -C $(@D)/lib/util mksigname mksiglist -endef - -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - define SUDO_PERMISSIONS /usr/bin/sudo f 4755 0 0 - - - - - endef From 900bd80e9bfde5f1bb6c2dc746a9149a467f1f09 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 21 Feb 2024 19:16:50 +0100 Subject: [PATCH 022/345] package/zlib-ng: fix arm build zlib-ng usage uses CMAKE_C_COMPILER_TARGET which is non-standard and is not supposed to be used by the CMakeLists.txt machinery of a particular package. Indeed, [1] specifies that: Some compiler drivers are inherently cross-compilers, such as clang and QNX qcc. These compiler drivers support a command-line argument to specify the target to cross-compile for. buildroot is not using clang nor QNX qcc. [2] also refers to this variable only for clang [3] and QNX [4]. Therefore, zlib-ng's usage of this variable is a bit of a hack, and it's actually why it works when passed as an argument, because they are in fact not supposed to use this variable. So set CMAKE_C_COMPILER_TARGET to BR2_ARCH to fix the following arm build failure raised since bump to version 2.0.6 in commit d2249821d3f30202ca2a35ad24918378d9a0a0e8: -- Detecting C compile features - done -- Arch not recognized, falling back to cmake arch: 'l' -- Basearch 'l' not recognized, defaulting to 'x86'. -- Basearch of 'l' has been detected as: 'x86' [...] /home/buildroot/autobuild/instance-0/output-1/build/zlib-ng-2.1.3/arch/x86/x86_features.c:17:12: fatal error: cpuid.h: No such file or directory 17 | # include | ^~~~~~~~~ [1] https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_TARGET.html [2] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html [3] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-using-clang [4] https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-qnx Fixes: d2249821d3f30202ca2a35ad24918378d9a0a0e8 - http://autobuild.buildroot.org/results/1551aa69be19239a8d8e081f033e4027d679ab8f - http://autobuild.buildroot.org/results/075d704c0f11710353bac43478e4501addcd747d Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/zlib-ng/zlib-ng.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index fbb906503ac0..33e8754c9d2d 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -13,6 +13,7 @@ ZLIB_NG_PROVIDES = zlib # Build with zlib compatible API, gzFile support and optimizations on ZLIB_NG_CONF_OPTS += \ + -DCMAKE_C_COMPILER_TARGET=$(BR2_ARCH) \ -DWITH_GZFILEOP=1 \ -DWITH_OPTIM=1 \ -DZLIB_COMPAT=1 \ From 05ca551c3b4b88c7a97cfc7a8dc3971ecd33c7de Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Feb 2024 09:23:12 +0100 Subject: [PATCH 023/345] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Signed-off-by: Bernd Kuhls 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 773cb4fbb57e..07d6b2b5ec86 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.16" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.18" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 52fb480af2a2..15c0dc8d3d53 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b21d5795a3bead4f112916423222faa8a0f519e4201df343e3eb88dc9e4aaa30 linux-6.6.16.tar.xz -sha256 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d linux-6.1.77.tar.xz +sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz +sha256 faa49ca22fb55ed4d5ca2a55e07dd10e4e171cfc3b92568a631453cd2068b39b linux-6.1.79.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c48575c97fd9f4767cbe50a13b1b2b40ee42830aba3182fabd35a03259a6e5d8 linux-5.15.148.tar.xz -sha256 44e22fad647c638726a8eae23703c4263bead612d17c89ca7ad7ab32b5ce88d5 linux-5.10.209.tar.xz -sha256 afc8aca6cb56fea489f6508bc24357df1cf8a8f3d7dcfbcccd94b7f968492620 linux-5.4.268.tar.xz +sha256 bd84809a367eb400eb04e0e70294e6ba12fc03b6bfb5a7dfaca548f8947501b0 linux-5.15.149.tar.xz +sha256 4ea63c5a90fdc3c459ab35c11ee8c93d2364a7cdbfb101100f8cab70d490ef6d linux-5.10.210.tar.xz +sha256 ff54bec6d053c7994f3bb8c45021de2858ff9f740d2ccbbcf072b87821a918cf linux-5.4.269.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 b91be40fa61ff7d42958e2154a4b7602dc071982128b9b58b6d911dec111be19 linux-4.19.306.tar.xz +sha256 83eeff613405d0045d0f717c6ac14c178678fe0a163c41d9dd8878ac0f73e352 linux-4.19.307.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 69857566e3c3..63e82c49dfd9 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.306" if BR2_KERNEL_HEADERS_4_19 - default "5.4.268" if BR2_KERNEL_HEADERS_5_4 - default "5.10.209" if BR2_KERNEL_HEADERS_5_10 - default "5.15.148" if BR2_KERNEL_HEADERS_5_15 - default "6.1.77" if BR2_KERNEL_HEADERS_6_1 - default "6.6.16" if BR2_KERNEL_HEADERS_6_6 + default "4.19.307" if BR2_KERNEL_HEADERS_4_19 + default "5.4.269" if BR2_KERNEL_HEADERS_5_4 + default "5.10.210" if BR2_KERNEL_HEADERS_5_10 + default "5.15.149" if BR2_KERNEL_HEADERS_5_15 + default "6.1.79" if BR2_KERNEL_HEADERS_6_1 + default "6.6.18" if BR2_KERNEL_HEADERS_6_6 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 bd2f99246c253739a3d44d8345f2fbb5362b3fb5 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 22 Feb 2024 14:16:27 +0100 Subject: [PATCH 024/345] package/libuv: security bump to version 1.48 Fixes: CVE-2024-24806 / GHSA-f74f-cvh7-c6q6 [1] Release Notes: https://github.com/libuv/libuv/releases/tag/v1.48.0 Full Changelog: https://github.com/libuv/libuv/blob/v1.48.0/ChangeLog [1]: https://github.com/libuv/libuv/security/advisories/GHSA-f74f-cvh7-c6q6 Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 1fd286d9e9c4..2ca8f64a8089 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 94f101111ef3209340d7f09c2aa150ddb4feabd2f9d87d47d9f5bded835b8094 libuv-v1.46.0-dist.tar.gz +sha256 c593139feb9061699fdd2f7fde47bb6c1ca77761ae9ec04f052083f1ef46c13b libuv-v1.48.0-dist.tar.gz sha256 16de0c32b265cb7d46a6d3bd614f259dd4d693a5e26b3407b04aae8d73041f0c LICENSE sha256 262c44bd2cdba037e6d2a82fba15f5800d292bc993a6f5d6b6ea487744d02836 LICENSE-extra diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 76316484e495..5f96e98a98df 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -6,7 +6,7 @@ # When bumping libuv, check if a new version of uvw is available # and bump it too. -LIBUV_VERSION = 1.46.0 +LIBUV_VERSION = 1.48.0 LIBUV_SOURCE = libuv-v$(LIBUV_VERSION)-dist.tar.gz LIBUV_SITE = https://dist.libuv.org/dist/v$(LIBUV_VERSION) LIBUV_DEPENDENCIES = host-pkgconf From fbedcfa221bc8826536a39b01eccf0626ab89bf1 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Thu, 22 Feb 2024 07:55:50 -0600 Subject: [PATCH 025/345] package/gcc: remove orphaned 10.4.0 patch Shortly before GCC 10.4.0 was dropped in d37a8f3a2, commit 4ce0dacb6 was merged and introduced a patch to 10.4.0 that was not accounted for by the patch that dropped 10.4.0 support. Fixes: d37a8f3a2 ("package/gcc: remove gcc 10.x") Signed-off-by: Vincent Fazio Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...ine-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch deleted file mode 100644 index 7e9714e9cbe8..000000000000 --- a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 -From: Stafford Horne -Date: Thu, 29 Sep 2022 15:32:39 +0100 -Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS - -This was found when testing buildroot with linuxthreads enabled. In -this case, the build passes --disable-tls to the toolchain during -configuration. After building the OpenRISC toolchain it was still -generating TLS code sequences and causing linker failures such as: - - ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl - ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' - -This patch fixes this by disabling tls for the OpenRISC target when requested -via --disable-tls. - -gcc/ChangeLog: - - * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if - HAVE_AS_TLS is defined. - -Tested-by: Yann E. MORIN - -Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 - -[Bernd: backported to 10.4.0] -Signed-off-by: Bernd Kuhls ---- - gcc/config/or1k/or1k.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c -index da2f59062ba..0ce7b234417 100644 ---- a/gcc/config/or1k/or1k.c -+++ b/gcc/config/or1k/or1k.c -@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, - #undef TARGET_LEGITIMATE_ADDRESS_P - #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p - -+#ifdef HAVE_AS_TLS - #undef TARGET_HAVE_TLS - #define TARGET_HAVE_TLS true -+#endif - - #undef TARGET_HAVE_SPECULATION_SAFE_VALUE - #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed --- -2.39.3 - From 66cfd29e97a00d5210da38fe45ea2effe23bea94 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 23 Feb 2024 18:28:50 +0100 Subject: [PATCH 026/345] package/c-ares: security bump to version 1.27.0 Fix CVE-2024-25629: Reading malformatted /etc/resolv.conf, /etc/nsswitch.conf or the HOSTALIASES file could result in a crash. https://github.com/c-ares/c-ares/security/advisories/GHSA-mg26-v6qh-x48q https://github.com/c-ares/c-ares/releases/tag/cares-1_27_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 ee097a53c92c..9a2b69c73111 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 bed58c4f02b009080ebda6c2467ba469722ac6aebbf4497dc44a83d8c6194e50 c-ares-1.26.0.tar.gz +sha256 0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b c-ares-1.27.0.tar.gz # Hash for license file sha256 80fff25340df53b0cf0c3cddbca9050b559b9cbed2ad71830327cfef54959aef LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 29da6baa4bde..c4441255a2d2 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.26.0 +C_ARES_VERSION = 1.27.0 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From 02ecb096ad874a1fecfc3a87ca7d547befb16d8f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 21 Feb 2024 23:03:43 +0100 Subject: [PATCH 027/345] package/nodejs: security bump to version 20.11.1 - Fix CVE-2024-21892, CVE-2024-22019, CVE-2024-21896, CVE-2024-22017, CVE-2023-46809, CVE-2024-21891, CVE-2024-21890 and CVE-2024-22025 - LICENSE hash changed due to two things: * c-ares vendored dependency license got updated [1]. This is unused by buildroot though anyway * base64 vendored library license updated copyright years and sorted contributor names [2], [3] - This bump will fix the following build failure raised since bump of python to version 3.12.1 in commit 36e635d2d5c0166476858aa239ccbe78e8f2af14 thanks to https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6 https://github.com/nodejs/node/commit/6557c1c9b1206a85bb7d8e7450e8c3a4cff7c84b: Traceback (most recent call last): File "/home/autobuild/autobuild/instance-2/output-1/build/host-nodejs-src-20.9.0/configure.py", line 17, in from distutils.version import StrictVersion ModuleNotFoundError: No module named 'distutils' https://github.com/nodejs/node/blob/v20.11.1/CHANGELOG.md [1] https://github.com/c-ares/c-ares/pull/556 [2] https://github.com/aklomp/base64/commit/2e8ad2aec2065f258dc1aec9402aedd3604cfbcd [3] https://github.com/aklomp/base64/commit/d7bca2bb2928de6c4fe496e6defe8b3affa35d1b Fixes: 36e635d2d5c0166476858aa239ccbe78e8f2af14 - http://autobuild.buildroot.org/results/8b38bc4b7879a0349c1305e2fcb458a0cfd04a93 Signed-off-by: Fabrice Fontaine Reviewed-By: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 14 +++++++------- package/nodejs/nodejs.mk | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 2d60437a7cde..ddab345e0a66 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.9.0/SHASUMS256.txt.asc -sha256 ced3ecece4b7c3a664bca3d9e34a0e3b9a31078525283a6fdb7ea2de8ca5683b node-v20.9.0-linux-arm64.tar.xz -sha256 64099d7e62bdbb8efd52c216a6759b3cdd77c38aa993096fdee9f875d95b2d8e node-v20.9.0-linux-armv7l.tar.xz -sha256 3c6cea5d614cfbb95d92de43fbc2f8ecd66e431502fe5efc4f3c02637897bd45 node-v20.9.0-linux-ppc64le.tar.xz -sha256 9033989810bf86220ae46b1381bdcdc6c83a0294869ba2ad39e1061f1e69217a node-v20.9.0-linux-x64.tar.xz -sha256 a23d96810abf0455426b349d47ce5310f33095b7bc0571b9cc510f481c3a4519 node-v20.9.0.tar.xz +# From https://nodejs.org/dist/v20.11.1/SHASUMS256.txt.asc +sha256 c957f29eb4e341903520caf362534f0acd1db7be79c502ae8e283994eed07fe1 node-v20.11.1-linux-arm64.tar.xz +sha256 28e0120d2d150a8f41717899d33167b8b32053778665583d49ff971bfd188d1b node-v20.11.1-linux-armv7l.tar.xz +sha256 51343cacf5cdf5c4b5e93e919d19dd373d6ef43d5f2c666eae299f26e31d08b5 node-v20.11.1-linux-ppc64le.tar.xz +sha256 d8dab549b09672b03356aa2257699f3de3b58c96e74eb26a8b495fbdc9cf6fbe node-v20.11.1-linux-x64.tar.xz +sha256 77813edbf3f7f16d2d35d3353443dee4e61d5ee84d9e3138c7538a3c0ca5209e node-v20.11.1.tar.xz # Locally calculated -sha256 93ac846282ce6c5255e00fada2fd2e7e292255239fe58d5502b0a554859e6a3e LICENSE +sha256 7b0bbdca72f925bd78b764914651244a4432a753c7325d061a565cd7eac1193d LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9806a64d38a1..858c6a86f5dd 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -5,7 +5,7 @@ ################################################################################ # _VERSION, _SOURCE and _SITE must be kept empty to avoid downloading anything -NODEJS_COMMON_VERSION = 20.9.0 +NODEJS_COMMON_VERSION = 20.11.1 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) From a4a0ecaceabb7982abb0ed0cae9d468c286ddd12 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 21 Feb 2024 21:31:53 +0100 Subject: [PATCH 028/345] package/samba4: bump version to 4.19.5 Release notes: https://www.samba.org/samba/history/samba-4.19.5.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 335322195997..4e74e07bd0ca 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.19.4.tar.asc -sha256 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c samba-4.19.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.19.5.tar.asc +sha256 0e2405b4cec29d0459621f4340a1a74af771ec7cffedff43250cad7f1f87605e samba-4.19.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 78c5db308d80..0980d03175f0 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.19.4 +SAMBA4_VERSION = 4.19.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 7bae4ea6eebda089eb0f7dc4a5a6dfefcea25573 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 24 Feb 2024 11:33:11 +0100 Subject: [PATCH 029/345] Revert "package/python3: fix install when tk is disabled" This reverts commit 687b96db4d3518eadd16f74f7defdc05b1cfb736. Python 3.12 is still causing too many build failures, so revert for 2024.02. Signed-off-by: Peter Korsgaard --- .../python3/0012-Add-an-option-to-disable-the-tk-module.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch index 08617241a6f8..7fafbedddb37 100644 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch @@ -62,7 +62,7 @@ diff --git a/configure.ac b/configure.ac index c8ae60aa6b5..7caa361138d 100644 --- a/configure.ac +++ b/configure.ac -@@ -4503,6 +4503,13 @@ AC_ARG_ENABLE(pydoc, +@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, AS_HELP_STRING([--disable-pydoc], [disable pydoc]), [ PYDOC="${enableval}" ], [ PYDOC=yes ]) @@ -70,8 +70,6 @@ index c8ae60aa6b5..7caa361138d 100644 +AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), + [ TK="${enableval}" ], [ TK=yes ]) -+AS_IF([test "$TK" = "no"], -+ [PY_STDLIB_MOD_SET_NA([_tkinter])]) + # Check for enable-ipv6 AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) From fb6274f5defc1acacd906ee6cd0b12684a866b92 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 24 Feb 2024 11:34:40 +0100 Subject: [PATCH 030/345] Revert "package/python3: bump version to 3.12.1" This reverts commit 36e635d2d5c0166476858aa239ccbe78e8f2af14. Python 3.12 is still causing too many build failures, so revert for 2024.02. Signed-off-by: Peter Korsgaard --- .checkpackageignore | 44 ++++--- ...e-the-build-of-pyc-files-conditional.patch | 32 +++--- ...taddrinfo-configure-test-when-cross-.patch | 8 +- ...re-to-disable-the-build-of-certain-e.patch | 108 ++++++++++++++++++ ...-header-paths-for-cross-compilation.patch} | 37 ++++-- ...ook-in-usr-lib-termcap-for-libraries.patch | 31 +++++ .../0006-Add-an-option-to-disable-pydoc.patch | 84 -------------- .../0006-Don-t-add-multiarch-paths.patch | 37 ++++++ .../0007-Abort-on-failed-module-build.patch | 30 +++++ ...tch => 0008-Serial-ioctl-workaround.patch} | 6 +- ...e-shebang-of-Python-scripts-for-cros.patch | 35 ++++++ ...g.sh.in-ensure-sed-invocations-only.patch} | 6 +- ...move-PY_STDLIB_MOD_SET_NA-further-up.patch | 44 ------- .../0011-Add-an-option-to-disable-pydoc.patch | 100 ++++++++++++++++ ...12-Add-an-option-to-disable-lib2to3.patch} | 94 ++++++++------- ...d-an-option-to-disable-the-tk-module.patch | 79 ------------- ...ption-to-disable-the-sqlite3-module.patch} | 35 +++--- ...d-an-option-to-disable-the-tk-module.patch | 77 +++++++++++++ ...option-to-disable-the-curses-module.patch} | 39 ++++--- ...0016-Add-an-option-to-disable-expat.patch} | 59 +++++----- ...-Add-an-option-to-disable-CJK-codecs.patch | 30 +++++ .../0018-Add-an-option-to-disable-NIS.patch | 33 ++++++ ...Add-an-option-to-disable-unicodedata.patch | 30 +++++ ... 0020-Add-an-option-to-disable-IDLE.patch} | 63 +++++----- ...021-Add-an-option-to-disable-decimal.patch | 54 +++++++++ ...on-to-disable-the-ossaudiodev-module.patch | 30 +++++ ...an-option-to-disable-openssl-support.patch | 30 +++++ ...ption-to-disable-the-readline-module.patch | 30 +++++ ...to-disable-zlib-bzip2-and-xz-modules.patch | 42 +++++++ ...hon-config.sh-don-t-reassign-prefix.patch} | 6 +- ...Add-an-option-to-disable-uuid-module.patch | 33 ++++++ ...fix-building-on-older-distributions.patch} | 16 ++- ...p-CC-print-multiarch-output-for-mus.patch} | 8 +- ...ion-to-disable-the-berkeleydb-module.patch | 30 +++++ ...ng-doesn-t-set-errno-when-encryptio.patch} | 6 +- package/python3/python3.hash | 6 +- package/python3/python3.mk | 62 ++++------ 37 files changed, 1038 insertions(+), 456 deletions(-) create mode 100644 package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch rename package/python3/{0003-Adjust-library-header-paths-for-cross-compilation.patch => 0004-Adjust-library-header-paths-for-cross-compilation.patch} (61%) create mode 100644 package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch delete mode 100644 package/python3/0006-Add-an-option-to-disable-pydoc.patch create mode 100644 package/python3/0006-Don-t-add-multiarch-paths.patch create mode 100644 package/python3/0007-Abort-on-failed-module-build.patch rename package/python3/{0004-Serial-ioctl-workaround.patch => 0008-Serial-ioctl-workaround.patch} (88%) create mode 100644 package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch rename package/python3/{0005-Misc-python-config.sh.in-ensure-sed-invocations-only.patch => 0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch} (95%) delete mode 100644 package/python3/0010-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch create mode 100644 package/python3/0011-Add-an-option-to-disable-pydoc.patch rename package/python3/{0007-Add-an-option-to-disable-lib2to3.patch => 0012-Add-an-option-to-disable-lib2to3.patch} (55%) delete mode 100644 package/python3/0012-Add-an-option-to-disable-the-tk-module.patch rename package/python3/{0011-Add-option-to-disable-the-sqlite3-module.patch => 0013-Add-option-to-disable-the-sqlite3-module.patch} (60%) create mode 100644 package/python3/0014-Add-an-option-to-disable-the-tk-module.patch rename package/python3/{0013-Add-an-option-to-disable-the-curses-module.patch => 0015-Add-an-option-to-disable-the-curses-module.patch} (58%) rename package/python3/{0014-Add-an-option-to-disable-expat.patch => 0016-Add-an-option-to-disable-expat.patch} (63%) create mode 100644 package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch create mode 100644 package/python3/0018-Add-an-option-to-disable-NIS.patch create mode 100644 package/python3/0019-Add-an-option-to-disable-unicodedata.patch rename package/python3/{0008-Add-an-option-to-disable-IDLE.patch => 0020-Add-an-option-to-disable-IDLE.patch} (51%) create mode 100644 package/python3/0021-Add-an-option-to-disable-decimal.patch create mode 100644 package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch create mode 100644 package/python3/0023-Add-an-option-to-disable-openssl-support.patch create mode 100644 package/python3/0024-Add-an-option-to-disable-the-readline-module.patch create mode 100644 package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch rename package/python3/{0009-python-config.sh-don-t-reassign-prefix.patch => 0026-python-config.sh-don-t-reassign-prefix.patch} (94%) create mode 100644 package/python3/0027-Add-an-option-to-disable-uuid-module.patch rename package/python3/{0015-fix-building-on-older-distributions.patch => 0028-fix-building-on-older-distributions.patch} (78%) rename package/python3/{0016-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch => 0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch} (91%) create mode 100644 package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch rename package/python3/{0017-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch => 0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch} (93%) diff --git a/.checkpackageignore b/.checkpackageignore index 4967d749fa8c..a6cc58c448cf 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1075,21 +1075,35 @@ package/python-web2py/S51web2py Shellcheck Variables package/python-ws4py/0001-Adjust-ws4py-for-Python-3.7-syntax.patch Upstream package/python3/0001-Make-the-build-of-pyc-files-conditional.patch Upstream package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch Upstream -package/python3/0003-Adjust-library-header-paths-for-cross-compilation.patch Upstream -package/python3/0004-Serial-ioctl-workaround.patch Upstream -package/python3/0005-Misc-python-config.sh.in-ensure-sed-invocations-only.patch Upstream -package/python3/0006-Add-an-option-to-disable-pydoc.patch Upstream -package/python3/0007-Add-an-option-to-disable-lib2to3.patch Upstream -package/python3/0008-Add-an-option-to-disable-IDLE.patch Upstream -package/python3/0009-python-config.sh-don-t-reassign-prefix.patch Upstream -package/python3/0010-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch Upstream -package/python3/0011-Add-option-to-disable-the-sqlite3-module.patch Upstream -package/python3/0012-Add-an-option-to-disable-the-tk-module.patch Upstream -package/python3/0013-Add-an-option-to-disable-the-curses-module.patch Upstream -package/python3/0014-Add-an-option-to-disable-expat.patch Upstream -package/python3/0015-fix-building-on-older-distributions.patch Upstream -package/python3/0016-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch Upstream -package/python3/0017-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch Upstream +package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch Upstream +package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch Upstream +package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch Upstream +package/python3/0006-Don-t-add-multiarch-paths.patch Upstream +package/python3/0007-Abort-on-failed-module-build.patch Upstream +package/python3/0008-Serial-ioctl-workaround.patch Upstream +package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch Upstream +package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch Upstream +package/python3/0011-Add-an-option-to-disable-pydoc.patch Upstream +package/python3/0012-Add-an-option-to-disable-lib2to3.patch Upstream +package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch Upstream +package/python3/0014-Add-an-option-to-disable-the-tk-module.patch Upstream +package/python3/0015-Add-an-option-to-disable-the-curses-module.patch Upstream +package/python3/0016-Add-an-option-to-disable-expat.patch Upstream +package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch Upstream +package/python3/0018-Add-an-option-to-disable-NIS.patch Upstream +package/python3/0019-Add-an-option-to-disable-unicodedata.patch Upstream +package/python3/0020-Add-an-option-to-disable-IDLE.patch Upstream +package/python3/0021-Add-an-option-to-disable-decimal.patch Upstream +package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch Upstream +package/python3/0023-Add-an-option-to-disable-openssl-support.patch Upstream +package/python3/0024-Add-an-option-to-disable-the-readline-module.patch Upstream +package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch Upstream +package/python3/0026-python-config.sh-don-t-reassign-prefix.patch Upstream +package/python3/0027-Add-an-option-to-disable-uuid-module.patch Upstream +package/python3/0028-fix-building-on-older-distributions.patch Upstream +package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch Upstream +package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch Upstream +package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch Upstream package/qemu/0001-tests-fp-disable-fp-bench-build-by-default.patch Upstream package/qemu/0002-softmmu-qemu-seccomp.c-add-missing-header-for-CLONE_.patch Upstream package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch Upstream diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch index f8bd6fd07c45..92aa7274ba23 100644 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch @@ -1,4 +1,4 @@ -From f0305dc99c0c723912bab7058f4b569f8c666dea Mon Sep 17 00:00:00 2001 +From 51ed7f93cc0333efa8fccd9b88db713c48993df9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 16:21:31 -0800 Subject: [PATCH] Make the build of pyc files conditional @@ -9,40 +9,38 @@ the compilation of pyc. Signed-off-by: Thomas Petazzoni [ Andrey Smrinov: ported to Python 3.6 ] Signed-off-by: Andrey Smirnov -[ Adam Duskett: ported to Python 3.12.0 ] -Signed-off-by: Adam Duskett --- Makefile.pre.in | 2 ++ configure.ac | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/Makefile.pre.in b/Makefile.pre.in -index dd5e69f7ab1..d7634f5b94a 100644 +index 8fbcd7ac17..2957c8e5a1 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2320,6 +2320,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c - $(DESTDIR)$(LIBDEST); \ - $(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt - @ # Build PYC files for the 3 optimization levels (0, 1, 2) +@@ -2078,6 +2078,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c + $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ + $(DESTDIR)$(LIBDEST)/distutils/tests ; \ + fi +ifeq (@PYC_BUILD@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ - -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST) -f \ -@@ -2329,6 +2330,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c + -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ - -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \ + -j0 -d $(LIBDEST) -f \ +@@ -2105,6 +2106,7 @@ libinstall: all $(srcdir)/Modules/xxmodule.c + $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ + -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages +endif -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ diff --git a/configure.ac b/configure.ac -index 384718db1f0..a53c6fa9e08 100644 +index ab5e1de6fa..0cf89ed641 100644 --- a/configure.ac +++ b/configure.ac -@@ -1479,6 +1479,12 @@ fi +@@ -1441,6 +1441,12 @@ fi - AC_MSG_CHECKING([LDLIBRARY]) + AC_MSG_CHECKING(LDLIBRARY) +AC_SUBST(PYC_BUILD) + @@ -54,5 +52,5 @@ index 384718db1f0..a53c6fa9e08 100644 # library that we build, but we do not want to link against it (we # will find it with a -framework option). For this reason there is an -- -2.43.0 +2.34.1 diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch index 7f8cdcedf820..5389cb5d1514 100644 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch @@ -1,4 +1,4 @@ -From 2b524755e1e66c67f37f83b60a09fe017fd50c8c Mon Sep 17 00:00:00 2001 +From b180ab302e2a82be239af334382436628b81381e Mon Sep 17 00:00:00 2001 From: Vanya Sergeev Date: Wed, 23 Dec 2015 11:30:33 +0100 Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling @@ -10,10 +10,10 @@ Signed-off-by: Vanya Sergeev 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index a53c6fa9e08..e515c2a510b 100644 +index 0cf89ed641..830885fcb3 100644 --- a/configure.ac +++ b/configure.ac -@@ -5402,7 +5402,7 @@ fi])) +@@ -5086,7 +5086,7 @@ fi])) dnl if ac_cv_func_getaddrinfo ]) @@ -23,5 +23,5 @@ index a53c6fa9e08..e515c2a510b 100644 AS_VAR_IF([ipv6], [yes], [ AC_MSG_ERROR([m4_normalize([ -- -2.43.0 +2.34.1 diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch new file mode 100644 index 000000000000..5b3911374e81 --- /dev/null +++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch @@ -0,0 +1,108 @@ +From 8e02cebdac536dfb6748da2c50656a26f70d9da7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 22 Feb 2017 16:33:22 -0800 +Subject: [PATCH] Add infrastructure to disable the build of certain extensions + +Some of the extensions part of the Python core have dependencies on +external libraries (sqlite, tk, etc.) or are relatively big and not +necessarly always useful (CJK codecs for example). By extensions, we +mean part of Python modules that are written in C and therefore +compiled to binary code. + +Therefore, we introduce a small infrastructure that allows to disable +some of those extensions. This can be done inside the configure.ac by +adding values to the DISABLED_EXTENSIONS variable (which is a +word-separated list of extensions). + +The implementation works as follow : + + * configure.ac defines a DISABLED_EXTENSIONS variable, which is + substituted (so that when Makefile.pre is generated from + Makefile.pre.in, the value of the variable is substituted). For + now, this DISABLED_EXTENSIONS variable is empty, later patches will + use it. + + * Makefile.pre.in passes the DISABLED_EXTENSIONS value down to the + variables passed in the environment when calling the setup.py + script that actually builds and installs those extensions. + + * setup.py is modified so that the existing "disabled_module_list" is + filled with those pre-disabled extensions listed in + DISABLED_EXTENSIONS. + +Patch ported to python2.7 by Maxime Ripard , and +then extended by Thomas Petazzoni +. + +Signed-off-by: Thomas Petazzoni +[ Andrey Smirnov: ported to Python 3.6 ] +Signed-off-by: Andrey Smirnov +--- + Makefile.pre.in | 6 +++++- + configure.ac | 2 ++ + setup.py | 5 ++++- + 3 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 2957c8e5a1..c1cfb96767 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -239,6 +239,8 @@ FILEMODE= 644 + # configure script arguments + CONFIG_ARGS= @CONFIG_ARGS@ + ++# disabled extensions ++DISABLED_EXTENSIONS= @DISABLED_EXTENSIONS@ + + # Subdirectories with code + SRCDIRS= @SRCDIRS@ +@@ -739,6 +741,7 @@ sharedmods: $(PYTHON_FOR_BUILD_DEPS) pybuilddir.txt @LIBMPDEC_INTERNAL@ @LIBEXPA + *) quiet="";; \ + esac; \ + echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ ++ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ + $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build +@@ -2228,7 +2231,8 @@ libainstall: all python-config + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: all +- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ ++ $(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ ++ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +diff --git a/configure.ac b/configure.ac +index 830885fcb3..5a6a1fe608 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3562,6 +3562,8 @@ LIBS="$withval $LIBS" + ], + [AC_MSG_RESULT(no)]) + ++AC_SUBST(DISABLED_EXTENSIONS) ++ + # Check for use of the system expat library + AC_MSG_CHECKING(for --with-system-expat) + AC_ARG_WITH(system_expat, +diff --git a/setup.py b/setup.py +index 15d0d4576a..e496ee34c2 100644 +--- a/setup.py ++++ b/setup.py +@@ -56,7 +56,10 @@ + + + # This global variable is used to hold the list of modules to be disabled. +-DISABLED_MODULE_LIST = [] ++try: ++ DISABLED_MODULE_LIST = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ") ++except KeyError: ++ DISABLED_MODULE_LIST = list() + + # --list-module-names option used by Tools/scripts/generate_module_names.py + LIST_MODULE_NAMES = False +-- +2.34.1 + diff --git a/package/python3/0003-Adjust-library-header-paths-for-cross-compilation.patch b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch similarity index 61% rename from package/python3/0003-Adjust-library-header-paths-for-cross-compilation.patch rename to package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch index 051e896f265f..9a55d2582d8e 100644 --- a/package/python3/0003-Adjust-library-header-paths-for-cross-compilation.patch +++ b/package/python3/0004-Adjust-library-header-paths-for-cross-compilation.patch @@ -1,4 +1,4 @@ -From 9f58bc7a648990d89258191c39651c075ce1c1c7 Mon Sep 17 00:00:00 2001 +From 132b9dca3bb4d4682f7e318648ce11e1abb31b62 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 23 Dec 2015 11:33:14 +0100 Subject: [PATCH] Adjust library/header paths for cross-compilation @@ -15,19 +15,34 @@ values, and get correct header/library paths when cross-compiling third-party Python modules. Signed-off-by: Thomas Petazzoni -[ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett -[ Adam Duskett: ported to Python 3.12.1 ] -Signed-off-by: Adam Duskett +Refresh for 3.10.0 --- - Lib/sysconfig.py | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) + Lib/distutils/command/build_ext.py | 5 ++++- + Lib/sysconfig.py | 15 +++++++++++---- + 2 files changed, 15 insertions(+), 5 deletions(-) +diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py +index f287b34998..298234d6a1 100644 +--- a/Lib/distutils/command/build_ext.py ++++ b/Lib/distutils/command/build_ext.py +@@ -234,7 +234,10 @@ def finalize_options(self): + if (sysconfig.get_config_var('Py_ENABLE_SHARED')): + if not sysconfig.python_build: + # building third party extensions +- self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) ++ libdir = sysconfig.get_config_var('LIBDIR') ++ if "_python_sysroot" in os.environ: ++ libdir = os.environ.get("_python_sysroot") + libdir ++ self.library_dirs.append(libdir) + else: + # building python standard extensions + self.library_dirs.append('.') diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 122d441bd19..a4922c429a3 100644 +index ebe3711827..6328ec41af 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -169,10 +169,17 @@ def joinuser(*args): +@@ -168,10 +168,17 @@ def joinuser(*args): _PY_VERSION = sys.version.split()[0] _PY_VERSION_SHORT = f'{sys.version_info[0]}.{sys.version_info[1]}' _PY_VERSION_SHORT_NO_DOT = f'{sys.version_info[0]}{sys.version_info[1]}' @@ -46,9 +61,9 @@ index 122d441bd19..a4922c429a3 100644 + _EXEC_PREFIX = os.path.normpath(sys.exec_prefix) + _BASE_PREFIX = os.path.normpath(sys.base_prefix) + _BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) - # Mutex guarding initialization of _CONFIG_VARS. - _CONFIG_VARS_LOCK = threading.RLock() _CONFIG_VARS = None + _USER_BASE = None + -- -2.43.0 +2.34.1 diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch new file mode 100644 index 000000000000..78b3ae596d18 --- /dev/null +++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch @@ -0,0 +1,31 @@ +From 5d13e384b30a2c0b1c7b65718590b7fb0c3ba55e Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:36:00 +0100 +Subject: [PATCH] Don't look in /usr/lib/termcap for libraries + +Signed-off-by: Thomas Petazzoni +--- + setup.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/setup.py b/setup.py +index e496ee34c2..1904898165 100644 +--- a/setup.py ++++ b/setup.py +@@ -1107,12 +1107,9 @@ def detect_readline_curses(self): + pass # Issue 7384: Already linked against curses or tinfo. + elif curses_library: + readline_libs.append(curses_library) +- elif self.compiler.find_library_file(self.lib_dirs + +- ['/usr/lib/termcap'], +- 'termcap'): ++ elif self.compiler.find_library_file(self.lib_dirs, 'termcap'): + readline_libs.append('termcap') + self.add(Extension('readline', ['readline.c'], +- library_dirs=['/usr/lib/termcap'], + libraries=readline_libs)) + else: + self.missing.append('readline') +-- +2.34.1 + diff --git a/package/python3/0006-Add-an-option-to-disable-pydoc.patch b/package/python3/0006-Add-an-option-to-disable-pydoc.patch deleted file mode 100644 index aa3db396b1fc..000000000000 --- a/package/python3/0006-Add-an-option-to-disable-pydoc.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 3439c04c1ea45c47c658c7f12042a278477a87ed Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 22 Feb 2017 17:07:56 -0800 -Subject: [PATCH] Add an option to disable pydoc - -It removes 0.5 MB of data from the target plus the pydoc script -itself. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[ Andrey Smirnov: ported to Python 3.6 ] -Signed-off-by: Andrey Smirnov -[ Adam Duskett: ported to Python 3.10.0 ] -Signed-off-by: Adam Duskett -[ Adam Duskett: ported to Python 3.12.1 ] -Signed-off-by: Adam Duskett ---- - Makefile.pre.in | 9 ++++++++- - configure.ac | 6 ++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index d7634f5b94a..ecf1b995c01 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -2048,7 +2048,9 @@ bininstall: commoninstall altbininstall - -rm -f $(DESTDIR)$(BINDIR)/idle3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) - -rm -f $(DESTDIR)$(BINDIR)/pydoc3 -+ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -+endif - -rm -f $(DESTDIR)$(BINDIR)/2to3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) - if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -2100,7 +2102,6 @@ LIBSUBDIRS= asyncio \ - lib2to3 lib2to3/fixes lib2to3/pgen2 \ - logging \ - multiprocessing multiprocessing/dummy \ -- pydoc_data \ - re \ - site-packages \ - sqlite3 \ -@@ -2248,6 +2249,10 @@ TESTSUBDIRS= idlelib/idle_test \ - - COMPILEALL_OPTS=-j0 - -+ifeq (@PYDOC@,yes) -+LIBSUBDIRS += pydoc_data -+endif -+ - TEST_MODULES=@TEST_MODULES@ - - .PHONY: libinstall -@@ -2462,7 +2467,9 @@ libainstall: all scripts - $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config - $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) - $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) -+ifeq (@PYDOC@,yes) - $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) -+endif - @if [ -s Modules/python.exp -a \ - "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ - echo; echo "Installing support files for building shared extension modules on AIX:"; \ -diff --git a/configure.ac b/configure.ac -index e515c2a510b..277a16a903e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4485,6 +4485,12 @@ AS_VAR_IF([posix_threads], [stub], [ - AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) - ]) - -+AC_SUBST(PYDOC) -+ -+AC_ARG_ENABLE(pydoc, -+ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), -+ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) --- -2.43.0 - diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch new file mode 100644 index 000000000000..749e295df1f8 --- /dev/null +++ b/package/python3/0006-Don-t-add-multiarch-paths.patch @@ -0,0 +1,37 @@ +From ad463b5d58ae79f69b011fb048861bd874d34369 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:36:27 +0100 +Subject: [PATCH] Don't add multiarch paths + +The add_multiarch_paths() function leads, in certain build +environments, to the addition of host header paths to the CFLAGS, +which is not appropriate for cross-compilation. This patch fixes that +by simply removing the call to add_multiarch_paths() when we're +cross-compiling. + +Investigation done by David . + +Signed-off-by: Thomas Petazzoni +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 1904898165..32294546b6 100644 +--- a/setup.py ++++ b/setup.py +@@ -852,10 +852,10 @@ def configure_compiler(self): + if not CROSS_COMPILING: + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ self.add_multiarch_paths() + # only change this for cross builds for 3.3, issues on Mageia + if CROSS_COMPILING: + self.add_cross_compiling_paths() +- self.add_multiarch_paths() + self.add_ldflags_cppflags() + + def init_inc_lib_dirs(self): +-- +2.34.1 + diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch new file mode 100644 index 000000000000..a47389612797 --- /dev/null +++ b/package/python3/0007-Abort-on-failed-module-build.patch @@ -0,0 +1,30 @@ +From 60b1664a7acebadb1a3d6df871145147f33b5afe Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:43:24 +0100 +Subject: [PATCH] Abort on failed module build + +When building a Python module fails, the setup.py script currently +doesn't exit with an error, and simply continues. This is not a really +nice behavior, so this patch changes setup.py to abort with an error, +so that the build issue is clearly noticeable. + +Signed-off-by: Thomas Petazzoni +--- + setup.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup.py b/setup.py +index 32294546b6..0e04944ce0 100644 +--- a/setup.py ++++ b/setup.py +@@ -579,6 +579,7 @@ def print_three_column(lst): + print("Failed to build these modules:") + print_three_column(failed) + print() ++ sys.exit(1) + + if self.failed_on_import: + failed = self.failed_on_import[:] +-- +2.34.1 + diff --git a/package/python3/0004-Serial-ioctl-workaround.patch b/package/python3/0008-Serial-ioctl-workaround.patch similarity index 88% rename from package/python3/0004-Serial-ioctl-workaround.patch rename to package/python3/0008-Serial-ioctl-workaround.patch index 5a5b2fe1a9b4..7722a04f389e 100644 --- a/package/python3/0004-Serial-ioctl-workaround.patch +++ b/package/python3/0008-Serial-ioctl-workaround.patch @@ -1,4 +1,4 @@ -From 52a85666f956ee11d5d165447dcc108e9034d78c Mon Sep 17 00:00:00 2001 +From 90f3075b629d90d942da1d22ef7563f7149f4f6c Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Wed, 23 Dec 2015 11:44:02 +0100 Subject: [PATCH] Serial ioctl() workaround @@ -15,7 +15,7 @@ Signed-off-by: Baruch Siach 1 file changed, 2 insertions(+) diff --git a/Modules/termios.c b/Modules/termios.c -index 402e6ac908a..688afd78994 100644 +index 354e5ca18d..c08957c500 100644 --- a/Modules/termios.c +++ b/Modules/termios.c @@ -15,7 +15,9 @@ @@ -29,5 +29,5 @@ index 402e6ac908a..688afd78994 100644 /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, * MDTR, MRI, and MRTS (apparently used internally by some things -- -2.43.0 +2.34.1 diff --git a/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch new file mode 100644 index 000000000000..eff8fc7694c1 --- /dev/null +++ b/package/python3/0009-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch @@ -0,0 +1,35 @@ +From 2439bd2ed5dbdd7e5fda15adefd0f6f1b047ec1b Mon Sep 17 00:00:00 2001 +From: Christophe Vu-Brugier +Date: Wed, 23 Dec 2015 11:44:30 +0100 +Subject: [PATCH] Do not adjust the shebang of Python scripts for + cross-compilation + +The copy_scripts() method in distutils copies the scripts listed in +the setup file and adjusts the first line to refer to the current +Python interpreter. When cross-compiling, this means that the adjusted +shebang refers to the host Python interpreter. + +This patch modifies copy_scripts() to preserve the shebang when +cross-compilation is detected. + +Signed-off-by: Christophe Vu-Brugier +--- + Lib/distutils/command/build_scripts.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py +index ccc70e6465..d6d54195c1 100644 +--- a/Lib/distutils/command/build_scripts.py ++++ b/Lib/distutils/command/build_scripts.py +@@ -91,7 +91,7 @@ def copy_scripts(self): + adjust = True + post_interp = match.group(1) or b'' + +- if adjust: ++ if adjust and not '_python_sysroot' in os.environ: + log.info("copying and adjusting %s -> %s", script, + self.build_dir) + updated_files.append(outfile) +-- +2.34.1 + diff --git a/package/python3/0005-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch similarity index 95% rename from package/python3/0005-Misc-python-config.sh.in-ensure-sed-invocations-only.patch rename to package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch index c0dcd630f611..f26ee85b61a8 100644 --- a/package/python3/0005-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ b/package/python3/0010-Misc-python-config.sh.in-ensure-sed-invocations-only.patch @@ -1,4 +1,4 @@ -From 600abaceba40d3f6db03d5f12f1f33b18a8f4348 Mon Sep 17 00:00:00 2001 +From 55ef5552e4ee60266e3299f253bec3b13785e585 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 20 Nov 2014 13:24:59 +0100 Subject: [PATCH] Misc/python-config.sh.in: ensure sed invocations only match @@ -25,7 +25,7 @@ Signed-off-by: Peter Korsgaard 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in -index 2602fe24c04..a1bc3cd5f7a 100644 +index 2602fe24c0..a1bc3cd5f7 100644 --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -24,18 +24,19 @@ installed_prefix () @@ -63,5 +63,5 @@ index 2602fe24c04..a1bc3cd5f7a 100644 PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" -- -2.43.0 +2.34.1 diff --git a/package/python3/0010-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch b/package/python3/0010-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch deleted file mode 100644 index 691b2732416e..000000000000 --- a/package/python3/0010-configure.ac-move-PY_STDLIB_MOD_SET_NA-further-up.patch +++ /dev/null @@ -1,44 +0,0 @@ -From fddea49ba296fa5d265ec50f407632d94cca6dcf Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 6 Feb 2024 22:46:59 +0100 -Subject: [PATCH] configure.ac: move PY_STDLIB_MOD_SET_NA further up - -We will need PY_STDLIB_MOD_SET_NA in next patches further up in the -configure.ac script. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 306127274e0..1bb63cbd5b2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -95,6 +95,11 @@ AC_DEFUN([PY_CHECK_EMSCRIPTEN_PORT], [ - AS_VAR_POPDEF([py_libs]) - ]) - -+AC_DEFUN([PY_STDLIB_MOD_SET_NA], [ -+ m4_foreach([mod], [$@], [ -+ AS_VAR_SET([py_cv_module_]mod, [n/a])]) -+]) -+ - AC_SUBST([BASECPPFLAGS]) - if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then - # If we're building out-of-tree, we need to make sure the following -@@ -7232,11 +7237,6 @@ AC_ARG_ENABLE([test-modules], - AC_MSG_RESULT([$TEST_MODULES]) - AC_SUBST([TEST_MODULES]) - --AC_DEFUN([PY_STDLIB_MOD_SET_NA], [ -- m4_foreach([mod], [$@], [ -- AS_VAR_SET([py_cv_module_]mod, [n/a])]) --]) -- - # stdlib not available - dnl Modules that are not available on some platforms - dnl AIX has shadow passwords, but access is not via getspent() --- -2.43.0 - diff --git a/package/python3/0011-Add-an-option-to-disable-pydoc.patch b/package/python3/0011-Add-an-option-to-disable-pydoc.patch new file mode 100644 index 000000000000..f7bfd437bbec --- /dev/null +++ b/package/python3/0011-Add-an-option-to-disable-pydoc.patch @@ -0,0 +1,100 @@ +From 38b7f7949258aeadf8bc45525be91340bb732a2a Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 22 Feb 2017 17:07:56 -0800 +Subject: [PATCH] Add an option to disable pydoc + +It removes 0.5 MB of data from the target plus the pydoc script +itself. + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Samuel Martin +[ Andrey Smirnov: ported to Python 3.6 ] +Signed-off-by: Andrey Smirnov +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett +--- + Makefile.pre.in | 7 ++++++- + configure.ac | 6 ++++++ + setup.py | 9 +++++++-- + 3 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index c1cfb96767..403380e181 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1864,7 +1864,9 @@ bininstall: altbininstall + -rm -f $(DESTDIR)$(BINDIR)/idle3 + (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) + -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ++ifeq (@PYDOC@,yes) + (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) ++endif + -rm -f $(DESTDIR)$(BINDIR)/2to3 + (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) + if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ +@@ -1915,7 +1917,6 @@ LIBSUBDIRS= asyncio \ + lib2to3 lib2to3/fixes lib2to3/pgen2 \ + logging \ + multiprocessing multiprocessing/dummy \ +- pydoc_data \ + re \ + site-packages \ + sqlite3 \ +@@ -2008,6 +2009,10 @@ TESTSUBDIRS= ctypes/test \ + tkinter/test/test_ttk \ + unittest/test unittest/test/testmock + ++ifeq (@PYDOC@,yes) ++LIBSUBDIRS += pydoc_data ++endif ++ + TEST_MODULES=@TEST_MODULES@ + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ +diff --git a/configure.ac b/configure.ac +index 5a6a1fe608..f68ea72321 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4171,6 +4171,12 @@ AS_VAR_IF([posix_threads], [stub], [ + AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) + ]) + ++AC_SUBST(PYDOC) ++ ++AC_ARG_ENABLE(pydoc, ++ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), ++ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) ++ + # Check for enable-ipv6 + AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) + AC_MSG_CHECKING([if --enable-ipv6 is specified]) +diff --git a/setup.py b/setup.py +index 0e04944ce0..3e55f5b2e0 100644 +--- a/setup.py ++++ b/setup.py +@@ -1593,6 +1593,12 @@ class DummyProcess: + # turn off warnings when deprecated modules are imported + import warnings + warnings.filterwarnings("ignore",category=DeprecationWarning) ++ ++ scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', ++ 'Lib/smtpd.py'] ++ if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): ++ scripts += [ 'Tools/scripts/pydoc3' ] ++ + setup(# PyPI Metadata (PEP 301) + name = "Python", + version = sys.version.split()[0], +@@ -1617,8 +1623,7 @@ class DummyProcess: + # If you change the scripts installed here, you also need to + # check the PyBuildScripts command above, and change the links + # created by the bininstall target in Makefile.pre.in +- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", +- "Tools/scripts/2to3"] ++ scripts = scripts + ) + + # --install-platlib +-- +2.34.1 + diff --git a/package/python3/0007-Add-an-option-to-disable-lib2to3.patch b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch similarity index 55% rename from package/python3/0007-Add-an-option-to-disable-lib2to3.patch rename to package/python3/0012-Add-an-option-to-disable-lib2to3.patch index 9cd3dd09b630..228b86a90baf 100644 --- a/package/python3/0007-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch @@ -1,4 +1,4 @@ -From d53e271be8952fd95a593741f91bf0ef2a7e5f02 Mon Sep 17 00:00:00 2001 +From 0e4f0a525ea0a68f6d4c5349c301da2e9b0c8ac9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:15:31 -0800 Subject: [PATCH] Add an option to disable lib2to3 @@ -14,18 +14,17 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett [ Bernd Kuhls: ported to Python 3.11.4] Signed-off-by: Bernd Kuhls -[ Adam Duskett: ported to Python 3.12.1 ] -Signed-off-by: Adam Duskett --- - Makefile.pre.in | 19 ++++++++++++++----- + Makefile.pre.in | 17 ++++++++++++----- configure.ac | 6 ++++++ - 2 files changed, 20 insertions(+), 5 deletions(-) + setup.py | 6 +++--- + 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index ecf1b995c01..a5feddcbbc3 100644 +index 403380e181..f5d0573067 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2052,7 +2052,9 @@ ifeq (@PYDOC@,yes) +@@ -1868,7 +1868,9 @@ ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) endif -rm -f $(DESTDIR)$(BINDIR)/2to3 @@ -35,7 +34,7 @@ index ecf1b995c01..a5feddcbbc3 100644 if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \ -@@ -2099,7 +2101,6 @@ LIBSUBDIRS= asyncio \ +@@ -1914,7 +1916,6 @@ LIBSUBDIRS= asyncio \ idlelib idlelib/Icons \ importlib importlib/resources importlib/metadata \ json \ @@ -43,34 +42,34 @@ index ecf1b995c01..a5feddcbbc3 100644 logging \ multiprocessing multiprocessing/dummy \ re \ -@@ -2203,10 +2204,6 @@ TESTSUBDIRS= idlelib/idle_test \ - test/test_importlib/resources/zipdata02 \ - test/test_importlib/source \ - test/test_json \ -- test/test_lib2to3 \ -- test/test_lib2to3/data \ -- test/test_lib2to3/data/fixers \ -- test/test_lib2to3/data/fixers/myfixes \ - test/test_module \ - test/test_peg_generator \ - test/test_sqlite3 \ -@@ -2253,6 +2250,14 @@ ifeq (@PYDOC@,yes) +@@ -1934,10 +1935,6 @@ LIBSUBDIRS= asyncio \ + TESTSUBDIRS= ctypes/test \ + distutils/tests \ + idlelib/idle_test \ +- lib2to3/tests \ +- lib2to3/tests/data \ +- lib2to3/tests/data/fixers \ +- lib2to3/tests/data/fixers/myfixes \ + test \ + test/audiodata \ + test/capath \ +@@ -2013,6 +2010,14 @@ ifeq (@PYDOC@,yes) LIBSUBDIRS += pydoc_data endif +ifeq (@LIB2TO3@,yes) +LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 -+TESTSUBDIRS += test/test_lib2to3 \ -+ test/test_lib2to3/data \ -+ test/test_lib2to3/data/fixers \ -+ test/test_lib2to3/data/fixers/myfixes ++TESTSUBDIRS += lib2to3/tests \ ++ lib2to3/tests/data \ ++ lib2to3/tests/data/fixers \ ++ lib2to3/tests/data/fixers/myfixes +endif + TEST_MODULES=@TEST_MODULES@ - - .PHONY: libinstall -@@ -2336,10 +2341,12 @@ ifeq (@PYC_BUILD@,yes) - -o 0 -o 1 -o 2 $(COMPILEALL_OPTS) -d $(LIBDEST)/site-packages -f \ + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ +@@ -2115,10 +2120,12 @@ ifeq (@PYC_BUILD@,yes) + -j0 -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages endif +ifeq (@LIB2TO3@,yes) @@ -82,21 +81,11 @@ index ecf1b995c01..a5feddcbbc3 100644 # bpo-21536: Misc/python-config.sh is generated in the build directory # from $(srcdir)Misc/python-config.sh.in. -@@ -2465,7 +2472,9 @@ libainstall: all scripts - $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh - $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py - $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config -+ifeq (@LIB2TO3@,yes) - $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) -+endif - $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) - ifeq (@PYDOC@,yes) - $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) diff --git a/configure.ac b/configure.ac -index 277a16a903e..654f903ef12 100644 +index f68ea72321..d8e10cf2b2 100644 --- a/configure.ac +++ b/configure.ac -@@ -7535,6 +7535,12 @@ PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_fu +@@ -7078,6 +7078,12 @@ PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_fu # substitute multiline block, must come after last PY_STDLIB_MOD() AC_SUBST([MODULE_BLOCK]) @@ -107,8 +96,27 @@ index 277a16a903e..654f903ef12 100644 + [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) + # generate output files - AC_CONFIG_FILES(m4_normalize([ - Makefile.pre + AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) + AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) +diff --git a/setup.py b/setup.py +index 3e55f5b2e0..c490b0b08f 100644 +--- a/setup.py ++++ b/setup.py +@@ -1594,11 +1594,11 @@ class DummyProcess: + import warnings + warnings.filterwarnings("ignore",category=DeprecationWarning) + +- scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', +- 'Lib/smtpd.py'] ++ scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/pydoc3' ] +- ++ if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): ++ scripts += [ 'Tools/scripts/2to3' ] + setup(# PyPI Metadata (PEP 301) + name = "Python", + version = sys.version.split()[0], -- -2.43.0 +2.34.1 diff --git a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch deleted file mode 100644 index 7fafbedddb37..000000000000 --- a/package/python3/0012-Add-an-option-to-disable-the-tk-module.patch +++ /dev/null @@ -1,79 +0,0 @@ -From e64b522e05801221a093037250579fd8a55b0baf Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 22 Feb 2017 17:23:42 -0800 -Subject: [PATCH] Add an option to disable the tk module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin -[ Andrey Smirnov: ported to Python 3.6 ] -Signed-off-by: Andrey Smirnov -[ Adam Duskett: ported to Python 3.10.0 ] -Signed-off-by: Adam Duskett -[ Bernd Kuhls: ported to Python 3.11.4] -Signed-off-by: Bernd Kuhls -[ Adam Duskett: ported to Python 3.12.1 ] -Signed-off-by: Adam Duskett ---- - Makefile.pre.in | 8 +++++--- - configure.ac | 5 +++++ - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9bbe16d4cb8..8af8a3aa40b 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -2106,7 +2106,6 @@ LIBSUBDIRS= asyncio \ - multiprocessing multiprocessing/dummy \ - re \ - site-packages \ -- tkinter \ - tomllib \ - turtledemo \ - unittest \ -@@ -2207,7 +2206,6 @@ TESTSUBDIRS= idlelib/idle_test \ - test/test_module \ - test/test_peg_generator \ - test/test_sqlite3 \ -- test/test_tkinter \ - test/test_tomllib \ - test/test_tomllib/data \ - test/test_tomllib/data/invalid \ -@@ -2227,7 +2225,6 @@ TESTSUBDIRS= idlelib/idle_test \ - test/test_tomllib/data/valid/dates-and-times \ - test/test_tomllib/data/valid/multiline-basic-str \ - test/test_tools \ -- test/test_ttk \ - test/test_unittest \ - test/test_unittest/testmock \ - test/test_warnings \ -@@ -2244,6 +2241,11 @@ TESTSUBDIRS= idlelib/idle_test \ - test/xmltestdata/c14n-20 \ - test/ziptestdata - -+ifeq (@TK@,yes) -+LIBSUBDIRS += tkinter -+TESTSUBDIRS += test/test_tkinter test/test_ttk -+endif -+ - COMPILEALL_OPTS=-j0 - - ifeq (@PYDOC@,yes) -diff --git a/configure.ac b/configure.ac -index c8ae60aa6b5..7caa361138d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4503,6 +4503,11 @@ AC_ARG_ENABLE(pydoc, - AS_HELP_STRING([--disable-pydoc], [disable pydoc]), - [ PYDOC="${enableval}" ], [ PYDOC=yes ]) - -+AC_SUBST(TK) -+AC_ARG_ENABLE(tk, -+ AS_HELP_STRING([--disable-tk], [disable tk]), -+ [ TK="${enableval}" ], [ TK=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE([ENABLE_IPV6], [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) --- -2.43.0 - diff --git a/package/python3/0011-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch similarity index 60% rename from package/python3/0011-Add-option-to-disable-the-sqlite3-module.patch rename to package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch index 9acd6c48f172..795ea3b898bf 100644 --- a/package/python3/0011-Add-option-to-disable-the-sqlite3-module.patch +++ b/package/python3/0013-Add-option-to-disable-the-sqlite3-module.patch @@ -1,6 +1,6 @@ -From 39c39b93110f702f7fd8cefb0f456b40d6ace98a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 6 Feb 2024 22:12:20 +0100 +From ef8c030e01b1be8be582e90c31298a5863094858 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 22 Feb 2017 17:20:45 -0800 Subject: [PATCH] Add option to disable the sqlite3 module Signed-off-by: Thomas Petazzoni @@ -9,17 +9,16 @@ Signed-off-by: Samuel Martin Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett -Signed-off-by: Thomas Petazzoni --- Makefile.pre.in | 5 ++++- - configure.ac | 7 +++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) + configure.ac | 9 +++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 28ba723fe83..9bbe16d4cb8 100644 +index f5d0573067..9f4cdf14cf 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2106,7 +2106,6 @@ LIBSUBDIRS= asyncio \ +@@ -1920,7 +1920,6 @@ LIBSUBDIRS= asyncio \ multiprocessing multiprocessing/dummy \ re \ site-packages \ @@ -27,8 +26,8 @@ index 28ba723fe83..9bbe16d4cb8 100644 tkinter \ tomllib \ turtledemo \ -@@ -2263,6 +2262,10 @@ ifeq (@IDLE@,yes) - LIBSUBDIRS += idlelib idlelib/Icons +@@ -2018,6 +2017,10 @@ TESTSUBDIRS += lib2to3/tests \ + lib2to3/tests/data/fixers/myfixes endif +ifeq (@SQLITE3@,yes) @@ -36,13 +35,13 @@ index 28ba723fe83..9bbe16d4cb8 100644 +endif + TEST_MODULES=@TEST_MODULES@ - - .PHONY: libinstall + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index 1bb63cbd5b2..c8ae60aa6b5 100644 +index d8e10cf2b2..4cc0951ab9 100644 --- a/configure.ac +++ b/configure.ac -@@ -4490,6 +4490,13 @@ AS_VAR_IF([posix_threads], [stub], [ +@@ -4171,6 +4171,15 @@ AS_VAR_IF([posix_threads], [stub], [ AC_DEFINE([HAVE_PTHREAD_STUBS], [1], [Define if platform requires stubbed pthreads support]) ]) @@ -50,12 +49,14 @@ index 1bb63cbd5b2..c8ae60aa6b5 100644 +AC_ARG_ENABLE(sqlite3, + AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]), + [ SQLITE3="${enableval}" ], [ SQLITE3=yes ]) -+AS_IF([test "$SQLITE3" = "no"], -+ [PY_STDLIB_MOD_SET_NA([_sqlite3])]) ++ ++if test "$SQLITE3" = "no" ; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" ++fi + AC_SUBST(PYDOC) AC_ARG_ENABLE(pydoc, -- -2.43.0 +2.34.1 diff --git a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch new file mode 100644 index 000000000000..b89e1d27bce8 --- /dev/null +++ b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch @@ -0,0 +1,77 @@ +From bbbfe699d648a5cb191203b16e1786e8cf4ea908 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 22 Feb 2017 17:23:42 -0800 +Subject: [PATCH] Add an option to disable the tk module + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Samuel Martin +[ Andrey Smirnov: ported to Python 3.6 ] +Signed-off-by: Andrey Smirnov +[ Adam Duskett: ported to Python 3.10.0 ] +Signed-off-by: Adam Duskett +[ Bernd Kuhls: ported to Python 3.11.4] +Signed-off-by: Bernd Kuhls +--- + Makefile.pre.in | 10 +++++++--- + configure.ac | 9 +++++++++ + 2 files changed, 16 insertions(+), 3 deletions(-) + +diff --git a/Makefile.pre.in b/Makefile.pre.in +index 9f4cdf14cf..4f83911200 100644 +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -1920,7 +1920,6 @@ LIBSUBDIRS= asyncio \ + multiprocessing multiprocessing/dummy \ + re \ + site-packages \ +- tkinter \ + tomllib \ + turtledemo \ + unittest \ +@@ -2038,9 +2038,6 @@ + test/xmltestdata \ + test/xmltestdata/c14n-20 \ + test/ziptestdata \ +- tkinter/test \ +- tkinter/test/test_tkinter \ +- tkinter/test/test_ttk \ + unittest/test \ + unittest/test/testmock + ifeq (@PYDOC@,yes) +@@ -2021,6 +2018,13 @@ ifeq (@SQLITE3@,yes) + LIBSUBDIRS += sqlite3 + endif + ++ifeq (@TK@,yes) ++LIBSUBDIRS += tkinter ++TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ ++ tkinter/test/test_ttk ++endif ++ ++ + TEST_MODULES=@TEST_MODULES@ + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ +diff --git a/configure.ac b/configure.ac +index 4cc0951ab9..f4ce506801 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4180,6 +4180,15 @@ if test "$SQLITE3" = "no" ; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" + fi + ++AC_SUBST(TK) ++AC_ARG_ENABLE(tk, ++ AS_HELP_STRING([--disable-tk], [disable tk]), ++ [ TK="${enableval}" ], [ TK=yes ]) ++ ++if test "$TK" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" ++fi ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.34.1 + diff --git a/package/python3/0013-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0015-Add-an-option-to-disable-the-curses-module.patch similarity index 58% rename from package/python3/0013-Add-an-option-to-disable-the-curses-module.patch rename to package/python3/0015-Add-an-option-to-disable-the-curses-module.patch index 2e0ca81d41c1..da6f891104bd 100644 --- a/package/python3/0013-Add-an-option-to-disable-the-curses-module.patch +++ b/package/python3/0015-Add-an-option-to-disable-the-curses-module.patch @@ -1,4 +1,4 @@ -From a295784d19553cc28e4d531c0f21ac2935b8bef9 Mon Sep 17 00:00:00 2001 +From 03e28cdd46dac1b7e4e9c8bbd2ea44b09e514205 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:31:51 -0800 Subject: [PATCH] Add an option to disable the curses module @@ -10,51 +10,52 @@ Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett --- - Makefile.pre.in | 5 ++++- - configure.ac | 7 +++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) + Makefile.pre.in | 4 +++- + configure.ac | 9 +++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 8af8a3aa40b..7162d9d3634 100644 +index 4f83911200..8e879b35c6 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2093,7 +2093,6 @@ LIBSUBDIRS= asyncio \ +@@ -1905,7 +1905,6 @@ LIBSUBDIRS= asyncio \ concurrent concurrent/futures \ csv \ ctypes ctypes/macholib \ - curses \ dbm \ + distutils distutils/command \ email email/mime \ - encodings \ -@@ -2246,6 +2245,10 @@ LIBSUBDIRS += tkinter - TESTSUBDIRS += test/test_tkinter test/test_ttk +@@ -2024,6 +2023,9 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ + tkinter/test/test_ttk endif +ifeq (@CURSES@,yes) +LIBSUBDIRS += curses +endif -+ - COMPILEALL_OPTS=-j0 - ifeq (@PYDOC@,yes) + TEST_MODULES=@TEST_MODULES@ + libinstall: all $(srcdir)/Modules/xxmodule.c diff --git a/configure.ac b/configure.ac -index 7caa361138d..748a16d7eab 100644 +index f4ce506801..0ae9863cd6 100644 --- a/configure.ac +++ b/configure.ac -@@ -4497,6 +4497,13 @@ AC_ARG_ENABLE(sqlite3, - AS_IF([test "$SQLITE3" = "no"], - [PY_STDLIB_MOD_SET_NA([_sqlite3])]) +@@ -4189,6 +4189,15 @@ if test "$TK" = "no"; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" + fi +AC_SUBST(CURSES) +AC_ARG_ENABLE(curses, + AS_HELP_STRING([--disable-curses], [disable curses]), + [ CURSES="${enableval}" ], [ CURSES=yes ]) -+AS_IF([test "$CURSES" = "no"], -+ [PY_STDLIB_MOD_SET_NA([_curses], [_curses_panel])]) ++ ++if test "$CURSES" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" ++fi + AC_SUBST(PYDOC) AC_ARG_ENABLE(pydoc, -- -2.43.0 +2.34.1 diff --git a/package/python3/0014-Add-an-option-to-disable-expat.patch b/package/python3/0016-Add-an-option-to-disable-expat.patch similarity index 63% rename from package/python3/0014-Add-an-option-to-disable-expat.patch rename to package/python3/0016-Add-an-option-to-disable-expat.patch index 659f211589da..c30740762a18 100644 --- a/package/python3/0014-Add-an-option-to-disable-expat.patch +++ b/package/python3/0016-Add-an-option-to-disable-expat.patch @@ -1,4 +1,4 @@ -From 1e9dacb7afa602d9e73da17966aed024298e84ba Mon Sep 17 00:00:00 2001 +From c9a2ea3edacf57746517600ccc11c254a9fd6c48 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 22 Feb 2017 17:40:45 -0800 Subject: [PATCH] Add an option to disable expat @@ -17,23 +17,23 @@ Signed-off-by: Andrey Smirnov Signed-off-by: Adam Duskett --- Makefile.pre.in | 5 ++++- - configure.ac | 24 +++++++++++++----------- - 2 files changed, 17 insertions(+), 12 deletions(-) + configure.ac | 20 ++++++++++++++------ + 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 7162d9d3634..d9fae62aa9c 100644 +index 8e879b35c6..80d617cf7f 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2111,7 +2111,6 @@ LIBSUBDIRS= asyncio \ +@@ -1925,7 +1925,6 @@ LIBSUBDIRS= asyncio \ urllib \ venv venv/scripts venv/scripts/common venv/scripts/posix \ wsgiref \ - $(XMLLIBSUBDIRS) \ xmlrpc \ - zipfile zipfile/_path \ zoneinfo \ -@@ -2271,6 +2270,10 @@ ifeq (@SQLITE3@,yes) - LIBSUBDIRS += sqlite3 + __phello__ +@@ -2027,6 +2026,10 @@ ifeq (@CURSES@,yes) + LIBSUBDIRS += curses endif +ifeq (@EXPAT@,yes) @@ -41,37 +41,36 @@ index 7162d9d3634..d9fae62aa9c 100644 +endif + TEST_MODULES=@TEST_MODULES@ - - .PHONY: libinstall + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index 748a16d7eab..1c902de8af3 100644 +index 0ae9863cd6..201cad0bfc 100644 --- a/configure.ac +++ b/configure.ac -@@ -3797,17 +3797,19 @@ LIBS="$withval $LIBS" - [AC_MSG_RESULT([no])]) +@@ -3565,15 +3565,23 @@ LIBS="$withval $LIBS" + AC_SUBST(DISABLED_EXTENSIONS) # Check for use of the system expat library --AC_MSG_CHECKING([for --with-system-expat]) --AC_ARG_WITH( -- [system_expat], -- [AS_HELP_STRING( -- [--with-system-expat], -- [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)] -- )], [], [with_system_expat="no"]) -- --AC_MSG_RESULT([$with_system_expat]) -- --AS_VAR_IF([with_system_expat], [yes], [ +-AC_MSG_CHECKING(for --with-system-expat) +-AC_ARG_WITH(system_expat, +- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library, see Doc/library/pyexpat.rst (default is no)]), +AC_MSG_CHECKING(for --with-expat) +AC_ARG_WITH(expat, + AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), -+ [], + [], +- [with_system_expat="no"]) + [with_expat="builtin"]) + +-AC_MSG_RESULT($with_system_expat) +AC_MSG_RESULT($with_expat) -+AS_IF([test "$with_expat" != "none"], -+ [EXPAT=yes], -+ [PY_STDLIB_MOD_SET_NA([pyexpat]) -+ EXPAT=no]) + +-AS_VAR_IF([with_system_expat], [yes], [ ++if test "$with_expat" != "none"; then ++ EXPAT=yes ++else ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat" ++ EXPAT=no ++fi +AC_SUBST(EXPAT) + +AS_VAR_IF([with_expat], [system], [ @@ -79,5 +78,5 @@ index 748a16d7eab..1c902de8af3 100644 LIBEXPAT_LDFLAGS=${LIBEXPAT_LDFLAGS-"-lexpat"} LIBEXPAT_INTERNAL= -- -2.43.0 +2.34.1 diff --git a/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch new file mode 100644 index 000000000000..63a07fb514fc --- /dev/null +++ b/package/python3/0017-Add-an-option-to-disable-CJK-codecs.patch @@ -0,0 +1,30 @@ +From d8ef6a7a9f2b954cf1c1e37fc3c35055b42af0f5 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:49:55 +0100 +Subject: [PATCH] Add an option to disable CJK codecs + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 201cad0bfc..ecdd7dbc07 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4188,6 +4188,12 @@ if test "$SQLITE3" = "no" ; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" + fi + ++AC_ARG_ENABLE(codecs-cjk, ++ AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0018-Add-an-option-to-disable-NIS.patch b/package/python3/0018-Add-an-option-to-disable-NIS.patch new file mode 100644 index 000000000000..977955d1cbfa --- /dev/null +++ b/package/python3/0018-Add-an-option-to-disable-NIS.patch @@ -0,0 +1,33 @@ +From 09fc9f72ebe60bb65e80732a6bd4f12a84159f6d Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:50:11 +0100 +Subject: [PATCH] Add an option to disable NIS + +NIS is not necessarily available in uClibc, so we need an option to +not compile support for it. + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index ecdd7dbc07..1bdde7f69d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4194,6 +4194,12 @@ AC_ARG_ENABLE(codecs-cjk, + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" + fi]) + ++AC_ARG_ENABLE(nis, ++ AS_HELP_STRING([--disable-nis], [disable NIS]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0019-Add-an-option-to-disable-unicodedata.patch b/package/python3/0019-Add-an-option-to-disable-unicodedata.patch new file mode 100644 index 000000000000..74702b67a50a --- /dev/null +++ b/package/python3/0019-Add-an-option-to-disable-unicodedata.patch @@ -0,0 +1,30 @@ +From 4fe7f375a3d171d294caebdd7b7ce49bbc9ad9f3 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:50:27 +0100 +Subject: [PATCH] Add an option to disable unicodedata + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 1bdde7f69d..ba4b0e0c1c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4200,6 +4200,12 @@ AC_ARG_ENABLE(nis, + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" + fi]) + ++AC_ARG_ENABLE(unicodedata, ++ AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0008-Add-an-option-to-disable-IDLE.patch b/package/python3/0020-Add-an-option-to-disable-IDLE.patch similarity index 51% rename from package/python3/0008-Add-an-option-to-disable-IDLE.patch rename to package/python3/0020-Add-an-option-to-disable-IDLE.patch index 082ee5a4633f..09b5f13cdbd8 100644 --- a/package/python3/0008-Add-an-option-to-disable-IDLE.patch +++ b/package/python3/0020-Add-an-option-to-disable-IDLE.patch @@ -1,4 +1,4 @@ -From 1bde6bbbae166b9a5ce9ddfea378a6401c56123d Mon Sep 17 00:00:00 2001 +From 2c9dbd6d49744aa8da8ebf8d0187d6b06f93c2b5 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Wed, 22 Feb 2017 17:45:14 -0800 Subject: [PATCH] Add an option to disable IDLE @@ -11,18 +11,17 @@ Signed-off-by: Maxime Ripard Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett -[ Adam Duskett: ported to Python 3.12.1 ] -Signed-off-by: Adam Duskett --- - Makefile.pre.in | 9 ++++++++- + Makefile.pre.in | 7 ++++++- configure.ac | 6 ++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) + setup.py | 5 ++++- + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index a5feddcbbc3..28ba723fe83 100644 +index 80d617cf7f..8d1ba1356c 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -2046,7 +2046,9 @@ bininstall: commoninstall altbininstall +@@ -1862,7 +1862,9 @@ bininstall: altbininstall -rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc) -rm -f $(DESTDIR)$(BINDIR)/idle3 @@ -32,7 +31,7 @@ index a5feddcbbc3..28ba723fe83 100644 -rm -f $(DESTDIR)$(BINDIR)/pydoc3 ifeq (@PYDOC@,yes) (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -2098,7 +2100,6 @@ LIBSUBDIRS= asyncio \ +@@ -1912,7 +1914,6 @@ LIBSUBDIRS= asyncio \ ensurepip ensurepip/_bundled \ html \ http \ @@ -40,8 +39,8 @@ index a5feddcbbc3..28ba723fe83 100644 importlib importlib/resources importlib/metadata \ json \ logging \ -@@ -2258,6 +2259,10 @@ TESTSUBDIRS += test/test_lib2to3 \ - test/test_lib2to3/data/fixers/myfixes +@@ -2030,6 +2031,10 @@ ifeq (@EXPAT@,yes) + LIBSUBDIRS += $(XMLLIBSUBDIRS) endif +ifeq (@IDLE@,yes) @@ -49,23 +48,13 @@ index a5feddcbbc3..28ba723fe83 100644 +endif + TEST_MODULES=@TEST_MODULES@ - - .PHONY: libinstall -@@ -2475,7 +2480,9 @@ libainstall: all scripts - ifeq (@LIB2TO3@,yes) - $(INSTALL_SCRIPT) $(SCRIPT_2TO3) $(DESTDIR)$(BINDIR)/2to3-$(VERSION) - endif -+ifeq (@IDLE@,yes) - $(INSTALL_SCRIPT) $(SCRIPT_IDLE) $(DESTDIR)$(BINDIR)/idle$(VERSION) -+endif - ifeq (@PYDOC@,yes) - $(INSTALL_SCRIPT) $(SCRIPT_PYDOC) $(DESTDIR)$(BINDIR)/pydoc$(VERSION) - endif + libinstall: all $(srcdir)/Modules/xxmodule.c + @for i in $(SCRIPTDIR) $(LIBDEST); \ diff --git a/configure.ac b/configure.ac -index 654f903ef12..306127274e0 100644 +index ba4b0e0c1c..5e6d72f7db 100644 --- a/configure.ac +++ b/configure.ac -@@ -7541,6 +7541,12 @@ AC_ARG_ENABLE(lib2to3, +@@ -7137,6 +7137,12 @@ AC_ARG_ENABLE(lib2to3, AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) @@ -76,8 +65,28 @@ index 654f903ef12..306127274e0 100644 + [ IDLE="${enableval}" ], [ IDLE=yes ]) + # generate output files - AC_CONFIG_FILES(m4_normalize([ - Makefile.pre + AC_CONFIG_FILES(Makefile.pre Misc/python.pc Misc/python-embed.pc Misc/python-config.sh) + AC_CONFIG_FILES([Modules/Setup.bootstrap Modules/Setup.stdlib]) +diff --git a/setup.py b/setup.py +index c490b0b08f..4d49a792f7 100644 +--- a/setup.py ++++ b/setup.py +@@ -1594,11 +1594,14 @@ class DummyProcess: + import warnings + warnings.filterwarnings("ignore",category=DeprecationWarning) + +- scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] ++ scripts = [ 'Lib/smtpd.py'] + if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/pydoc3' ] + if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): + scripts += [ 'Tools/scripts/2to3' ] ++ if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"): ++ scripts += [ 'Tools/scripts/idle3' ] ++ + setup(# PyPI Metadata (PEP 301) + name = "Python", + version = sys.version.split()[0], -- -2.43.0 +2.34.1 diff --git a/package/python3/0021-Add-an-option-to-disable-decimal.patch b/package/python3/0021-Add-an-option-to-disable-decimal.patch new file mode 100644 index 000000000000..d683565f94d0 --- /dev/null +++ b/package/python3/0021-Add-an-option-to-disable-decimal.patch @@ -0,0 +1,54 @@ +From 7091fdf77f612425c178a75148560f9c3514e8b8 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:51:31 +0100 +Subject: [PATCH] Add an option to disable decimal + +This patch replaces the existing --with-system-libmpdec option with a +--with-libmpdec={system,builtin,none} option, which allows to tell +Python whether we want to use the system libmpdec (already installed), +the libmpdec builtin the Python sources, or no libmpdec at all. + +Signed-off-by: Thomas Petazzoni +[aduskett@gmail.com: Update for python 3.7.0] +Signed-off-by: Adam Duskett +[james.hilliard1@gmail.com: adapt to python 3.9] +Signed-off-by: James Hilliard +--- + configure.ac | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 5e6d72f7db..e6b1f1e9de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3630,14 +3630,21 @@ fi + AC_SUBST(LIBFFI_INCLUDEDIR) + + # Check for use of the system libmpdec library +-AC_MSG_CHECKING(for --with-system-libmpdec) +-AC_ARG_WITH(system_libmpdec, +- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library, see Doc/library/decimal.rst (default is no)]), ++AC_MSG_CHECKING(for --with-libmpdec) ++AC_ARG_WITH(libmpdec, ++ AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]), + [], +- [with_system_libmpdec="no"]) +-AC_MSG_RESULT($with_system_libmpdec) ++ [with_libmpdec="builtin"]) ++AC_MSG_RESULT($with_libmpdec) ++if test "$with_libmpdec" != "none"; then ++ MPDEC=yes ++else ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _decimal" ++ MPDEC=no ++fi ++AC_SUBST(MPDEC) + +-AS_VAR_IF([with_system_libmpdec], [yes], [ ++AS_VAR_IF([with_libmpdec], [system], [ + LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""} + LIBMPDEC_LDFLAGS=${LIBMPDEC_LDFLAGS-"-lmpdec"} + LIBMPDEC_INTERNAL= +-- +2.34.1 + diff --git a/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch new file mode 100644 index 000000000000..56713a7f8fee --- /dev/null +++ b/package/python3/0022-Add-an-option-to-disable-the-ossaudiodev-module.patch @@ -0,0 +1,30 @@ +From d48d9da534cec7891ae444b4ab94a76ac67f5daa Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Wed, 23 Dec 2015 11:51:58 +0100 +Subject: [PATCH] Add an option to disable the ossaudiodev module + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index e6b1f1e9de..db33d567ad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3678,6 +3678,12 @@ fi + + AC_MSG_RESULT($with_decimal_contextvar) + ++AC_ARG_ENABLE(ossaudiodev, ++ AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev" ++ fi]) ++ + # Check for libmpdec machine flavor + AC_MSG_CHECKING(for decimal libmpdec machine) + AS_CASE([$ac_sys_system], +-- +2.34.1 + diff --git a/package/python3/0023-Add-an-option-to-disable-openssl-support.patch b/package/python3/0023-Add-an-option-to-disable-openssl-support.patch new file mode 100644 index 000000000000..d4c9fd43be36 --- /dev/null +++ b/package/python3/0023-Add-an-option-to-disable-openssl-support.patch @@ -0,0 +1,30 @@ +From 25c900e81a2fc0bbe35e7c94e2e5028cfbf6582a Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari +Date: Wed, 22 Feb 2017 17:55:59 -0800 +Subject: [PATCH] Add an option to disable openssl support. + +Signed-off-by: Nicolas Cavallari +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index db33d567ad..42fe6c8f5a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4219,6 +4219,12 @@ AC_ARG_ENABLE(unicodedata, + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" + fi]) + ++AC_ARG_ENABLE(openssl, ++ AS_HELP_STRING([--disable-openssl], [disable openssl support]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch new file mode 100644 index 000000000000..9250007daed7 --- /dev/null +++ b/package/python3/0024-Add-an-option-to-disable-the-readline-module.patch @@ -0,0 +1,30 @@ +From 9082468ca620db77b670ccf568a96bbabb865f80 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 7 Mar 2017 23:29:05 +0100 +Subject: [PATCH] Add an option to disable the readline module + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 42fe6c8f5a..19875d7d30 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4225,6 +4225,12 @@ AC_ARG_ENABLE(openssl, + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" + fi]) + ++AC_ARG_ENABLE(readline, ++ AS_HELP_STRING([--disable-readline], [disable readline]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch new file mode 100644 index 000000000000..70a0d6cd15e9 --- /dev/null +++ b/package/python3/0025-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch @@ -0,0 +1,42 @@ +From 988a335cb34b5fc25ea345ba04ff5ddffe2e946c Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 7 Mar 2017 23:31:11 +0100 +Subject: [PATCH] Add options to disable zlib, bzip2 and xz modules + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 19875d7d30..ca6c16491a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4231,6 +4231,24 @@ AC_ARG_ENABLE(readline, + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline" + fi]) + ++AC_ARG_ENABLE(bzip2, ++ AS_HELP_STRING([--disable-bzip2], [disable bzip2]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bz2" ++ fi]) ++ ++AC_ARG_ENABLE(zlib, ++ AS_HELP_STRING([--disable-zlib], [disable zlib]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib" ++ fi]) ++ ++AC_ARG_ENABLE(xz, ++ AS_HELP_STRING([--disable-xz], [disable xz]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _lzma" ++ fi]) ++ + AC_SUBST(TK) + AC_ARG_ENABLE(tk, + AS_HELP_STRING([--disable-tk], [disable tk]), +-- +2.34.1 + diff --git a/package/python3/0009-python-config.sh-don-t-reassign-prefix.patch b/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch similarity index 94% rename from package/python3/0009-python-config.sh-don-t-reassign-prefix.patch rename to package/python3/0026-python-config.sh-don-t-reassign-prefix.patch index 9e949829a9df..b6bfb010a0ac 100644 --- a/package/python3/0009-python-config.sh-don-t-reassign-prefix.patch +++ b/package/python3/0026-python-config.sh-don-t-reassign-prefix.patch @@ -1,4 +1,4 @@ -From 83eee4af197f70dd3b14e79efa044d8ef70e9e0f Mon Sep 17 00:00:00 2001 +From 755fb526a62df2a73560f42184db8aadb6899bb0 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 6 Oct 2017 09:54:15 -0500 Subject: [PATCH] python-config.sh: don't reassign ${prefix} @@ -27,7 +27,7 @@ Signed-off-by: Matthew Weber 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in -index a1bc3cd5f7a..164d2d36030 100644 +index a1bc3cd5f7..164d2d3603 100644 --- a/Misc/python-config.sh.in +++ b/Misc/python-config.sh.in @@ -31,7 +31,7 @@ prefix_real=$(installed_prefix "$0") @@ -49,5 +49,5 @@ index a1bc3cd5f7a..164d2d36030 100644 SO="@EXT_SUFFIX@" PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -- -2.43.0 +2.34.1 diff --git a/package/python3/0027-Add-an-option-to-disable-uuid-module.patch b/package/python3/0027-Add-an-option-to-disable-uuid-module.patch new file mode 100644 index 000000000000..a9501ec189d5 --- /dev/null +++ b/package/python3/0027-Add-an-option-to-disable-uuid-module.patch @@ -0,0 +1,33 @@ +From 58027d25c3cabcf654cb0b31a61d7cbd53dc68c0 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sat, 18 Aug 2018 10:54:56 +0200 +Subject: [PATCH] Add an option to disable uuid module + +Signed-off-by: Thomas Petazzoni +--- + configure.ac | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/configure.ac b/configure.ac +index ca6c16491a..ed03b27fb1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4267,6 +4267,15 @@ if test "$CURSES" = "no"; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" + fi + ++AC_SUBST(UUID) ++AC_ARG_ENABLE(uuid, ++ AS_HELP_STRING([--disable-uuid], [disable uuid]), ++ [ UUID="${enableval}" ], [ UUID=yes ]) ++ ++if test "$UUID" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" ++fi ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.34.1 + diff --git a/package/python3/0015-fix-building-on-older-distributions.patch b/package/python3/0028-fix-building-on-older-distributions.patch similarity index 78% rename from package/python3/0015-fix-building-on-older-distributions.patch rename to package/python3/0028-fix-building-on-older-distributions.patch index 9dc8ebe90d32..4541b31c5fd3 100644 --- a/package/python3/0015-fix-building-on-older-distributions.patch +++ b/package/python3/0028-fix-building-on-older-distributions.patch @@ -1,4 +1,4 @@ -From 56d4b5976a5ba57ccbb2e00c7bdfaa3a57384224 Mon Sep 17 00:00:00 2001 +From e52e2c5e3df4bc3d2ff07ecb3b8e2a9099ea1631 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 16 Aug 2018 14:52:37 -0700 Subject: [PATCH] fix building on older distributions @@ -16,16 +16,14 @@ This change fixes building on older systems such as CentOS7, that only come with python 2. Signed-off-by: Adam Duskett -[ Adam Duskett: ported to Python 3.12.1 ] -Signed-off-by: Adam Duskett --- - Tools/build/update_file.py | 4 ++-- + Tools/scripts/update_file.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/Tools/build/update_file.py b/Tools/build/update_file.py -index b4182c1d0cb..ab443cb1a60 100644 ---- a/Tools/build/update_file.py -+++ b/Tools/build/update_file.py +diff --git a/Tools/scripts/update_file.py b/Tools/scripts/update_file.py +index b4182c1d0c..ab443cb1a6 100644 +--- a/Tools/scripts/update_file.py ++++ b/Tools/scripts/update_file.py @@ -53,7 +53,7 @@ def update_file_with_tmpfile(filename, tmpfile, *, create=False): if not create: raise # re-raise @@ -45,5 +43,5 @@ index b4182c1d0cb..ab443cb1a60 100644 outcome = 'same' os.unlink(tmpfile) -- -2.43.0 +2.34.1 diff --git a/package/python3/0016-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch similarity index 91% rename from package/python3/0016-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch rename to package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch index 75267dca2ba0..5253076d9099 100644 --- a/package/python3/0016-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch +++ b/package/python3/0029-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch @@ -1,4 +1,4 @@ -From 5996962c00f263612e1b1f70654cee5f227267a5 Mon Sep 17 00:00:00 2001 +From 07b950aadd570b9f96a1f128505a959b32f40962 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 2 Aug 2019 15:53:16 +0200 Subject: [PATCH] configure.ac: fixup $CC --print-multiarch output for @@ -30,10 +30,10 @@ Signed-off-by: Peter Korsgaard 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 1c902de8af3..06df165ccc8 100644 +index ed03b27fb1..841fd6732c 100644 --- a/configure.ac +++ b/configure.ac -@@ -1128,7 +1128,11 @@ AC_MSG_CHECKING([for multiarch]) +@@ -1086,7 +1086,11 @@ AC_MSG_CHECKING([for multiarch]) AS_CASE([$ac_sys_system], [Darwin*], [MULTIARCH=""], [FreeBSD*], [MULTIARCH=""], @@ -47,5 +47,5 @@ index 1c902de8af3..06df165ccc8 100644 AC_SUBST([MULTIARCH]) AC_MSG_RESULT([$MULTIARCH]) -- -2.43.0 +2.34.1 diff --git a/package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch b/package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch new file mode 100644 index 000000000000..5fb436db59c2 --- /dev/null +++ b/package/python3/0030-Add-an-option-to-disable-the-berkeleydb-module.patch @@ -0,0 +1,30 @@ +From 67e9793d070ac5c8e83abbe95b9208533ffeadd0 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Sat, 11 Apr 2020 22:01:40 +0200 +Subject: [PATCH] Add an option to disable the berkeleydb module + +Signed-off-by: Bernd Kuhls +--- + configure.ac | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 841fd6732c..06c9a81f95 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4280,6 +4280,12 @@ if test "$UUID" = "no"; then + DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _uuid" + fi + ++AC_ARG_ENABLE(berkeleydb, ++ AS_HELP_STRING([--disable-berkeleydb], [disable berkeleydb]), ++ [ if test "$enableval" = "no"; then ++ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _dbm" ++ fi]) ++ + AC_SUBST(PYDOC) + + AC_ARG_ENABLE(pydoc, +-- +2.34.1 + diff --git a/package/python3/0017-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch b/package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch similarity index 93% rename from package/python3/0017-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch rename to package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch index 22f5937f0b0c..712fd08fb15f 100644 --- a/package/python3/0017-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch +++ b/package/python3/0031-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch @@ -1,4 +1,4 @@ -From f478c8d19d259272294f8502239dfe3fee9fb7e7 Mon Sep 17 00:00:00 2001 +From 3edeed879871a10acbe802f4a68cff3d4869dbde 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 @@ -23,7 +23,7 @@ Signed-off-by: Daniel Lang 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Lib/crypt.py b/Lib/crypt.py -index de4a14a3884..ba482487a7a 100644 +index de4a14a388..ba482487a7 100644 --- a/Lib/crypt.py +++ b/Lib/crypt.py @@ -98,7 +98,9 @@ def _add_method(name, *args, rounds=None): @@ -38,5 +38,5 @@ index de4a14a3884..ba482487a7a 100644 raise if result and len(result) == method.total_size: -- -2.43.0 +2.34.1 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 725c854050b8..39a16c1f7113 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3121/ -md5 50f827c800483776c8ef86e6a53831fa Python-3.12.1.tar.xz +# From https://www.python.org/downloads/release/python-3116/ +md5 d0c5a1a31efe879723e51addf56dd206 Python-3.11.6.tar.xz # Locally computed -sha256 8dfb8f426fcd226657f9e2bd5f1e96e53264965176fa17d32658e873591aeb21 Python-3.12.1.tar.xz +sha256 0fab78fa7f133f4f38210c6260d90d7c0d5c7198446419ce057ec7ac2e6f5f38 Python-3.11.6.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 42765abcf446..7a704d81e085 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON3_VERSION_MAJOR = 3.12 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1 +PYTHON3_VERSION_MAJOR = 3.11 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).6 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others @@ -22,8 +22,12 @@ HOST_PYTHON3_CONF_OPTS += \ --disable-sqlite3 \ --disable-tk \ --with-expat=system \ + --disable-codecs-cjk \ + --disable-nis \ + --enable-unicodedata \ --disable-test-modules \ --disable-idle3 \ + --disable-uuid \ --disable-ossaudiodev # Make sure that LD_LIBRARY_PATH overrides -rpath. @@ -33,15 +37,6 @@ HOST_PYTHON3_CONF_OPTS += \ # communicate over the network during the build. HOST_PYTHON3_CONF_ENV += \ LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ - py_cv_module_nis=n/a \ - py_cv_module_unicodedata=yes \ - py_cv_module__codecs_cn=n/a \ - py_cv_module__codecs_hk=n/a \ - py_cv_module__codecs_iso2022=n/a \ - py_cv_module__codecs_jp=n/a \ - py_cv_module__codecs_kr=n/a \ - py_cv_module__codecs_tw=n/a \ - py_cv_module__uuid=n/a \ ac_cv_prog_HAS_HG=/bin/false PYTHON3_DEPENDENCIES = host-python3 libffi @@ -56,7 +51,7 @@ HOST_PYTHON3_DEPENDENCIES = \ ifeq ($(BR2_PACKAGE_HOST_PYTHON3_BZIP2),y) HOST_PYTHON3_DEPENDENCIES += host-bzip2 else -HOST_PYTHON3_CONF_ENV += py_cv_module__bz2=n/a +HOST_PYTHON3_CONF_OPTS += --disable-bzip2 endif ifeq ($(BR2_PACKAGE_HOST_PYTHON3_CURSES),y) @@ -68,9 +63,7 @@ endif ifeq ($(BR2_PACKAGE_HOST_PYTHON3_SSL),y) HOST_PYTHON3_DEPENDENCIES += host-openssl else -HOST_PYTHON3_CONF_ENV += \ - py_cv_module__hashlib=n/a \ - py_cv_module__ssl=n/a +HOST_PYTHON3_CONF_OPTS += --disable-openssl endif PYTHON3_INSTALL_STAGING = YES @@ -84,14 +77,13 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3_BERKELEYDB),y) PYTHON3_DEPENDENCIES += berkeleydb else -PYTHON3_CONF_ENV += py_cv_module__dbm=n/a +PYTHON3_CONF_OPTS += --disable-berkeleydb endif ifeq ($(BR2_PACKAGE_PYTHON3_READLINE),y) -PYTHON3_CONF_OPTS += --with-readline PYTHON3_DEPENDENCIES += readline else -PYTHON3_CONF_OPTS += --without-readline +PYTHON3_CONF_OPTS += --disable-readline endif ifeq ($(BR2_PACKAGE_PYTHON3_CURSES),y) @@ -102,9 +94,9 @@ endif ifeq ($(BR2_PACKAGE_PYTHON3_DECIMAL),y) PYTHON3_DEPENDENCIES += mpdecimal -PYTHON3_CONF_OPTS += --with-system-libmpdec +PYTHON3_CONF_OPTS += --with-libmpdec=system else -PYTHON3_CONF_ENV += py_cv_module__decimal=n/a +PYTHON3_CONF_OPTS += --with-libmpdec=none endif ifeq ($(BR2_PACKAGE_PYTHON3_PYEXPAT),y) @@ -124,50 +116,44 @@ ifeq ($(BR2_PACKAGE_PYTHON3_SSL),y) PYTHON3_DEPENDENCIES += openssl PYTHON3_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr else -PYTHON3_CONF_ENV += \ - py_cv_module__hashlib=n/a \ - py_cv_module__ssl=n/a +PYTHON3_CONF_OPTS += --disable-openssl endif ifneq ($(BR2_PACKAGE_PYTHON3_CODECSCJK),y) -PYTHON3_CONF_ENV += \ - py_cv_module__codecs_cn=n/a \ - py_cv_module__codecs_hk=n/a \ - py_cv_module__codecs_iso2022=n/a \ - py_cv_module__codecs_jp=n/a \ - py_cv_module__codecs_kr=n/a \ - py_cv_module__codecs_tw=n/a +PYTHON3_CONF_OPTS += --disable-codecs-cjk endif ifneq ($(BR2_PACKAGE_PYTHON3_UNICODEDATA),y) -PYTHON3_CONF_ENV += py_cv_module_unicodedata=n/a +PYTHON3_CONF_OPTS += --disable-unicodedata endif # Disable auto-detection of uuid.h (util-linux) # which would add _uuid module support, instead # default to the pure python implementation -PYTHON3_CONF_ENV += py_cv_module__uuid=n/a +PYTHON3_CONF_OPTS += --disable-uuid ifeq ($(BR2_PACKAGE_PYTHON3_BZIP2),y) PYTHON3_DEPENDENCIES += bzip2 else -PYTHON3_CONF_ENV += py_cv_module__bz2=n/a +PYTHON3_CONF_OPTS += --disable-bzip2 endif ifeq ($(BR2_PACKAGE_PYTHON3_XZ),y) PYTHON3_DEPENDENCIES += xz else -PYTHON3_CONF_ENV += py_cv_module__lzma=n/a +PYTHON3_CONF_OPTS += --disable-xz endif ifeq ($(BR2_PACKAGE_PYTHON3_ZLIB),y) PYTHON3_DEPENDENCIES += zlib else -PYTHON3_CONF_ENV += py_cv_module_zlib=n/a +PYTHON3_CONF_OPTS += --disable-zlib endif -ifneq ($(BR2_PACKAGE_PYTHON3_OSSAUDIODEV),y) -PYTHON3_CONF_ENV += py_cv_module_ossaudiodev=n/a +ifeq ($(BR2_PACKAGE_PYTHON3_OSSAUDIODEV),y) +PYTHON3_CONF_OPTS += --enable-ossaudiodev +else +PYTHON3_CONF_OPTS += --disable-ossaudiodev endif # Make python believe we don't have 'hg', so that it doesn't try to @@ -177,7 +163,6 @@ PYTHON3_CONF_ENV += \ ac_cv_file__dev_ptmx=yes \ ac_cv_file__dev_ptc=yes \ ac_cv_working_tzset=yes \ - py_cv_module_nis=n/a \ ac_cv_prog_HAS_HG=/bin/false # GCC is always compliant with IEEE754 @@ -205,6 +190,7 @@ PYTHON3_CONF_OPTS += \ --disable-pydoc \ --disable-test-modules \ --disable-tk \ + --disable-nis \ --disable-idle3 \ --disable-pyc-build From 01f24d041d36c9d132a7888b7fefe8055b4ad321 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 18 Feb 2024 22:07:35 +0100 Subject: [PATCH 031/345] package/tio: needs threads tio needs threads since version 2.4 and https://github.com/tio/tio/commit/93e6efc00153e625e4ceb8a51e01b324247d312a resulting in the following build failure since bump to version 2.7 in commit 4b33d7a47dd41fed5364a398320c2b7d0687ba5e: In file included from /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/stdio.h:27, from ../src/tty.c:23: /home/autobuild/autobuild/instance-7/output-1/host/riscv64-buildroot-linux-uclibc/sysroot/usr/include/features.h:218:5: warning: #warning requested reentrant code, but thread support was disabled [-Wcpp] 218 | # warning requested reentrant code, but thread support was disabled | ^~~~~~~ ../src/tty.c:43:10: fatal error: pthread.h: No such file or directory 43 | #include | ^~~~~~~~~~~ Fixes: 4b33d7a47dd41fed5364a398320c2b7d0687ba5e - http://autobuild.buildroot.org/results/9b20ff06a0ad24b7e7f4750ebe64e2077e36164a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tio/Config.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/tio/Config.in b/package/tio/Config.in index a84daf8a2441..e4241fa5e14c 100644 --- a/package/tio/Config.in +++ b/package/tio/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_TIO bool "tio" depends on !BR2_sparc64 && !BR2_sparc + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_INIH help "tio" is a simple TTY terminal application which features a @@ -14,3 +15,7 @@ config BR2_PACKAGE_TIO # fix or workaround for now comment "tio is disabled for sparc and sparc64 architectures" depends on BR2_sparc64 || BR2_sparc + +comment "tio needs a toolchain w/ threads" + depends on !BR2_sparc64 && !BR2_sparc + depends on !BR2_TOOLCHAIN_HAS_THREADS From 120cb19056dc22b11d921714dc4e2ac94b84242f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 21 Feb 2024 19:14:39 +0100 Subject: [PATCH 032/345] package/s390-tools: disable cargo Set HAVE_CARGO=0 to avoid the following build failures raised since bump to version 2.29.0 in commit 68df20336664d4d0b1a9d8d0285d23eba631845a and https://github.com/ibm-s390-linux/s390-tools/commit/e6add997ebbcd967734391da8a8987c7926e168f: error: could not compile `pvsecret` (bin "pvsecret") due to previous error [...] ERROR: architecture for "/usr/bin/pvsecret" is "AArch64", should be "IBM S/390" Fixes: 68df20336664d4d0b1a9d8d0285d23eba631845a - http://autobuild.buildroot.org/results/22035cb4d8e251f9930a7d529b91b128919252bb - http://autobuild.buildroot.org/results/99be6d3b2bab7c952ce02853f54924c5219aecc1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/s390-tools/s390-tools.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/s390-tools/s390-tools.mk b/package/s390-tools/s390-tools.mk index bc39a9bd1970..04d193a46770 100644 --- a/package/s390-tools/s390-tools.mk +++ b/package/s390-tools/s390-tools.mk @@ -12,7 +12,8 @@ S390_TOOLS_DEPENDENCIES = zlib S390_TOOLS_MAKE_OPTS = \ ARCH=$(BR2_ARCH) \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ + HAVE_CARGO=0 ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) S390_TOOLS_DEPENDENCIES += libcurl From bd00f0072c490c49c6aadd9f0c43d210144a806e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 24 Feb 2024 14:57:17 +0100 Subject: [PATCH 033/345] package/prboom: fix build with autoconf >= 2.72 Set ac_cv_type_gid_t=yes to avoid the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: In file included from i_network.c:37: ../../config.h:207:15: error: two or more data types in declaration specifiers 207 | #define gid_t int | ^~~ Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/0d74517129130e6f26dc8c8aacae175ed8bd4b54 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/prboom/prboom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/prboom/prboom.mk b/package/prboom/prboom.mk index 36692d29a3f6..c1ba05ff7035 100644 --- a/package/prboom/prboom.mk +++ b/package/prboom/prboom.mk @@ -6,7 +6,7 @@ PRBOOM_VERSION = 2.5.0 PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION) -PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes +PRBOOM_CONF_ENV = ac_cv_type_gid_t=yes ac_cv_type_uid_t=yes PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer PRBOOM_LICENSE = GPL-2.0+ PRBOOM_LICENSE_FILES = COPYING From d8982b02b6e875d39ffb78a3200b266650e3addc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 16 Feb 2024 06:53:43 +0100 Subject: [PATCH 034/345] package/php: bump version to 8.2.16 Changelog: https://www.php.net/ChangeLog-8.php#8.2.16 Release notes: https://www.php.net/releases/8_2_16.php Updated license hash due to copyright year bump: https://github.com/php/php-src/commit/2575e6b88c3d3bbd53383fb65057c9b7b029e264 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/php/php.hash | 4 ++-- package/php/php.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 7c8736e41ce9..4ce3616de3e4 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 eca5deac02d77d806838275f8a3024b38b35ac0a5d9853dcc71c6cbe3f1f8765 php-8.2.15.tar.xz +sha256 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php-8.2.16.tar.xz # License file -sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE +sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index c69abd5f314b..4daf7f633dc5 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.15 +PHP_VERSION = 8.2.16 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 4350d485a441b31ebb1ccb5124f081fda9104132 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 16 Feb 2024 20:45:20 +0100 Subject: [PATCH 035/345] package/gdal: deflate64 needs libzlib deflate64 unconditionally uses FAR since its addition with https://github.com/OSGeo/gdal/commit/d6baebcc73ffc2ede6e9635846676b275b02bab3 resulting in the following build failure with zlib-ng since bump to version 3.8.2 in commit d2e349301b79ad3a1840083714ee396f4302b68a: In file included from /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/infback9.c:6: /home/autobuild/autobuild/instance-2/output-1/build/gdal-3.8.2/frmts/zlib/contrib/infback9/minified_zutil.h:46:17: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'uchf' 46 | typedef uch FAR uchf; | ^~~~ Fixes: d2e349301b79ad3a1840083714ee396f4302b68a - http://autobuild.buildroot.org/results/8b55108dee4faa98c234d00a1a22b62ed948e8d3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/gdal/gdal.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/gdal/gdal.mk b/package/gdal/gdal.mk index 3104332db945..247e13663cde 100644 --- a/package/gdal/gdal.mk +++ b/package/gdal/gdal.mk @@ -124,6 +124,12 @@ else GDAL_CONF_OPTS += -DGDAL_USE_LIBXML2=OFF endif +ifeq ($(BR2_PACKAGE_LIBZLIB),y) +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=ON +else +GDAL_CONF_OPTS += -DENABLE_DEFLATE64=OFF +endif + ifeq ($(BR2_PACKAGE_POSTGRESQL),y) GDAL_DEPENDENCIES += postgresql GDAL_CONF_OPTS += -DGDAL_USE_POSTGRESQL=ON From 9047058cd8addca8aedf274f2836f1f639c27eef Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 18 Feb 2024 18:25:47 +0100 Subject: [PATCH 036/345] support/testing: add sox runtime test Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_sox.py | 74 +++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 support/testing/tests/package/test_sox.py diff --git a/DEVELOPERS b/DEVELOPERS index 0f065bfafbe9..0bfe91f064a9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1849,6 +1849,7 @@ F: support/testing/tests/package/test_rdma_core.py F: support/testing/tests/package/test_rdma_core/ F: support/testing/tests/package/test_screen.py F: support/testing/tests/package/test_sed.py +F: support/testing/tests/package/test_sox.py F: support/testing/tests/package/test_sqlite.py F: support/testing/tests/package/test_strace.py F: support/testing/tests/package/test_stress_ng.py diff --git a/support/testing/tests/package/test_sox.py b/support/testing/tests/package/test_sox.py new file mode 100644 index 000000000000..74f784a36fc6 --- /dev/null +++ b/support/testing/tests/package/test_sox.py @@ -0,0 +1,74 @@ +import math +import os + +import infra.basetest + + +class TestSox(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_AUBIO=y + BR2_PACKAGE_SOX=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def note_from_freq(self, freq): + """Return a note number from the input frequency in Hertz.""" + return round((12 * math.log(freq / 440) / math.log(2)) + 69) + + def check_audio_note(self, input_file, expected_note): + """Check the input_file include the expected_note.""" + out, ret = self.emulator.run(f"aubionotes {input_file}", timeout=20) + self.assertEqual(ret, 0) + note_found = False + for line in out: + values = line.split() + if len(values) == 3: + note = round(float(values[0])) + if note == expected_note: + note_found = True + self.assertTrue(note_found, "The expected note was not found") + + def test_run(self): + cpio_file = os.path.join(self.builddir, "images", "rootfs.cpio") + self.emulator.boot(arch="armv5", + kernel="builtin", + options=["-initrd", cpio_file]) + self.emulator.login() + + # Check the program can execute. + self.assertRunOk("sox --version") + + freq = 440 # General Midi note A3 + expected_note = self.note_from_freq(freq) + wav_file = "ref.wav" + tmpwav_file = "tmp.wav" + + # Generate a sinusoidal tone. + cmd = "sox -V -r 48000 -n -b 16 -c 1" + cmd += f" {wav_file} synth 3 sin {freq} vol -10dB" + self.assertRunOk(cmd) + + # Compute statistics on the generated file. + self.assertRunOk(f"sox {wav_file} -n stat") + + # We check the generated wave file includes the expected note. + self.check_audio_note(wav_file, expected_note) + + # We resample the reference file. + cmd = f"sox -V {wav_file} -r 22050 {tmpwav_file}" + self.assertRunOk(cmd) + + # We should still detect our expected note. + self.check_audio_note(tmpwav_file, expected_note) + + # We convert the file by changing the speed by a factor. + speed_factor = 2 + cmd = f"sox -V {wav_file} {tmpwav_file} speed {speed_factor}" + self.assertRunOk(cmd) + + # We compute the new expected note from this test controller + # side, and check we detect this new note in the audio file. + new_expected_note = self.note_from_freq(freq * speed_factor) + self.check_audio_note(tmpwav_file, new_expected_note) From b89648b4d0d1c3ca985d5d97015990caf04e46ea Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Mon, 19 Feb 2024 22:06:28 +0100 Subject: [PATCH 037/345] boot/barebox: install all barebox images if none were specified When selecting barebox in menuconfig, BR2_TARGET_BAREBOX_IMAGE_FILE will be empty by default, which causes Buildroot to install whatever the barebox-flash-image symlink points at for barebox versions >= v2012.10.0. This is an outdated fallback, because barebox-flash-image is only valid when the barebox build produces a single binary. Virtually all new defconfigs added in the last couple of years are multiconfig (CONFIG_PBL_IMAGE=y) however, meaning that a single imx_v7_defconfig or multi_v8_defconfig will produce many images that support different boards or even platforms. As there is no single valid target for barebox-flash-image to point at in this case, this symlink will point at a non-existing 'multi-image-build' to alert the user to this fact. As replacement for barebox-flash-image, barebox commit 550cf79c216a ("Make list of flash images and fix link all single image cases") first released with v2015.12.0 creates a barebox-flash-images file with a list of all images built by barebox. Have buildroot use that file as a fallback before trying barebox-flash-image to have a fallback that works for any recent barebox defconfig as well. Signed-off-by: Ahmad Fatoum Signed-off-by: Peter Korsgaard --- boot/barebox/barebox-aux/Config.in | 9 +++++++-- boot/barebox/barebox.mk | 2 ++ boot/barebox/barebox/Config.in | 9 +++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/boot/barebox/barebox-aux/Config.in b/boot/barebox/barebox-aux/Config.in index d39d24f763e0..4b0201ea6758 100644 --- a/boot/barebox/barebox-aux/Config.in +++ b/boot/barebox/barebox-aux/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_AUX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_AUX_CUSTOM_ENV bool "Generate an environment image" diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index 4c9df8d6180b..fe366989b9d8 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -151,6 +151,8 @@ $(1)_IMAGE_FILES = $$(call qstrip,$$(BR2_TARGET_$(1)_IMAGE_FILE)) define $(1)_INSTALL_IMAGES_CMDS if test -n "$$($(1)_IMAGE_FILES)"; then \ cp -L $$(foreach image,$$($(1)_IMAGE_FILES),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ + elif test -e $$(@D)/barebox-flash-images ; then \ + cp -L $$(foreach image,$$(shell cat $$(@D)/barebox-flash-images),$$(@D)/$$(image)) $$(BINARIES_DIR) ; \ elif test -h $$(@D)/barebox-flash-image ; then \ cp -L $$(@D)/barebox-flash-image $$(BINARIES_DIR)/barebox.bin ; \ else \ diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in index 958e294e40b6..2fd70a84aec3 100644 --- a/boot/barebox/barebox/Config.in +++ b/boot/barebox/barebox/Config.in @@ -36,8 +36,13 @@ config BR2_TARGET_BAREBOX_IMAGE_FILE the images directory. If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. + - all images as listed in barebox-flash-images (>= v2015.12.0) + - the image pointed at by barebox-flash-image (>= v2012.10.0) + - barebox.bin for even older barebox versions + + In any case, this only influences the artifacts collected by + Buildroot. They will still need to be referenced from image + packages or flashed separately onto the hardware. config BR2_TARGET_BAREBOX_BAREBOXENV bool "bareboxenv tool in target" From 044752f5631a6fdb330ad57b8c8a5827c6b2bc86 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 24 Feb 2024 22:46:01 +0100 Subject: [PATCH 038/345] package/redis-plus-plus: needs threads redis-plus-plus unconditonally uses mutex and so needs threads since its addition in commit c46df9de21e718a9ed6a2df2bb945c386695d3bf and https://github.com/sewenew/redis-plus-plus/commit/1fa8f6bbfb24c8f328aa23ee1dd3c3f99c1b4caf: In file included from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.h:27, from /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/connection_pool.cpp:17: /home/autobuild/autobuild/instance-5/output-1/build/redis-plus-plus-1.3.10/src/sw/redis++/sentinel.h:95:10: error: 'mutex' in namespace 'std' does not name a type 95 | std::mutex _mutex; | ^~~~~ Fixes: c46df9de21e718a9ed6a2df2bb945c386695d3bf - http://autobuild.buildroot.org/results/cc4c54134e8a522b4c028aab4266f47cf862e2a9 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/redis-plus-plus/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/redis-plus-plus/Config.in b/package/redis-plus-plus/Config.in index 6a21aee2b3ba..64a84102d4a6 100644 --- a/package/redis-plus-plus/Config.in +++ b/package/redis-plus-plus/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_REDIS_PLUS_PLUS bool "redis-plus-plus" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_HIREDIS help Redis client written in C++ @@ -11,5 +12,5 @@ config BR2_PACKAGE_REDIS_PLUS_PLUS https://github.com/sewenew/redis-plus-plus -comment "redis-plus-plus needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP +comment "redis-plus-plus needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS From bedcd1cd39c7654d1243e2cb0f4a68870f67782c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 24 Feb 2024 23:06:36 +0100 Subject: [PATCH 039/345] package/libcurl: fix libpsl static build Fix the following static build failure with libpsl raised since bump to version 8.6.0 in commit 5cee6b6be6524e443012d130e09b0e6983b0ff90: configure:28830: /home/autobuild/autobuild/instance-6/output-1/host/bin/aarch64_be-buildroot-linux-musl-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O3 -g0 -static -Werror-implicit-function-declaration -Wno-system-headers -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include -static -L/home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib -L/home/autobuild/autobuild/instance-6/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/lib conftest.c -lpsl -lmbedtls -lmbedx509 -lmbedcrypto -lz -latomic >&5 /home/autobuild/autobuild/instance-6/output-1/host/lib/gcc/aarch64_be-buildroot-linux-musl/11.4.0/../../../../aarch64_be-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-6/output-1/host/bin/../aarch64_be-buildroot-linux-musl/sysroot/usr/lib/libpsl.a(psl.c.o): in function `is_public_suffix': psl.c:(.text+0x2a8): undefined reference to `idn2_lookup_u8' [...] checking for library containing psl_builtin... no configure: error: libpsl was not found Fixes: 5cee6b6be6524e443012d130e09b0e6983b0ff90 - http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...igure.ac-find-libpsl-with-pkg-config.patch | 109 ++++++++++++++++++ package/libcurl/libcurl.mk | 2 + 2 files changed, 111 insertions(+) create mode 100644 package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch diff --git a/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch new file mode 100644 index 000000000000..46df1e36a25e --- /dev/null +++ b/package/libcurl/0001-configure.ac-find-libpsl-with-pkg-config.patch @@ -0,0 +1,109 @@ +From 9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 15 Feb 2024 20:59:25 +0100 +Subject: [PATCH] configure.ac: find libpsl with pkg-config + +Find libpsl with pkg-config to avoid static build failures. + +Ref: http://autobuild.buildroot.org/results/1fb15e1a99472c403d0d3b1a688902f32e78d002 + +Signed-off-by: Fabrice Fontaine +Closes #12947 + +Upstream: https://github.com/curl/curl/commit/9b3f67e267d1fa8d7867655d133bdbf8830a0ab3 +--- + configure.ac | 79 ++++++++++++++++++++++++++++++++++++++++++++-------- + docs/TODO | 7 ----- + 2 files changed, 67 insertions(+), 19 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cd0e2d07d8d164..09d5364f4de575 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2075,19 +2075,74 @@ dnl ********************************************************************** + dnl Check for libpsl + dnl ********************************************************************** + +-AC_ARG_WITH(libpsl, +- AS_HELP_STRING([--without-libpsl], +- [disable support for libpsl]), +- with_libpsl=$withval, +- with_libpsl=yes) +-curl_psl_msg="no (libpsl disabled)" +-if test $with_libpsl != "no"; then +- AC_SEARCH_LIBS(psl_builtin, psl, +- [curl_psl_msg="enabled"; +- AC_DEFINE([USE_LIBPSL], [1], [PSL support enabled]) +- ], +- [AC_MSG_ERROR([libpsl was not found]) ] ++dnl Default to compiler & linker defaults for LIBPSL files & libraries. ++OPT_LIBPSL=off ++AC_ARG_WITH(libpsl,dnl ++AS_HELP_STRING([--with-libpsl=PATH],[Where to look for libpsl, PATH points to the LIBPSL installation; when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]) ++AS_HELP_STRING([--without-libpsl], [disable LIBPSL]), ++ OPT_LIBPSL=$withval) ++ ++if test X"$OPT_LIBPSL" != Xno; then ++ dnl backup the pre-libpsl variables ++ CLEANLDFLAGS="$LDFLAGS" ++ CLEANCPPFLAGS="$CPPFLAGS" ++ CLEANLIBS="$LIBS" ++ ++ case "$OPT_LIBPSL" in ++ yes) ++ dnl --with-libpsl (without path) used ++ CURL_CHECK_PKGCONFIG(libpsl) ++ ++ if test "$PKGCONFIG" != "no" ; then ++ LIB_PSL=`$PKGCONFIG --libs-only-l libpsl` ++ LD_PSL=`$PKGCONFIG --libs-only-L libpsl` ++ CPP_PSL=`$PKGCONFIG --cflags-only-I libpsl` ++ else ++ dnl no libpsl pkg-config found ++ LIB_PSL="-lpsl" ++ fi ++ ++ ;; ++ off) ++ dnl no --with-libpsl option given, just check default places ++ LIB_PSL="-lpsl" ++ ;; ++ *) ++ dnl use the given --with-libpsl spot ++ LIB_PSL="-lpsl" ++ PREFIX_PSL=$OPT_LIBPSL ++ ;; ++ esac ++ ++ dnl if given with a prefix, we set -L and -I based on that ++ if test -n "$PREFIX_PSL"; then ++ LD_PSL=-L${PREFIX_PSL}/lib$libsuff ++ CPP_PSL=-I${PREFIX_PSL}/include ++ fi ++ ++ LDFLAGS="$LDFLAGS $LD_PSL" ++ CPPFLAGS="$CPPFLAGS $CPP_PSL" ++ LIBS="$LIB_PSL $LIBS" ++ ++ AC_CHECK_LIB(psl, psl_builtin, ++ [ ++ AC_CHECK_HEADERS(libpsl.h, ++ curl_psl_msg="enabled" ++ LIBPSL_ENABLED=1 ++ AC_DEFINE(USE_LIBPSL, 1, [if libpsl is in use]) ++ AC_SUBST(USE_LIBPSL, [1]) ++ ) ++ ], ++ dnl not found, revert back to clean variables ++ LDFLAGS=$CLEANLDFLAGS ++ CPPFLAGS=$CLEANCPPFLAGS ++ LIBS=$CLEANLIBS + ) ++ ++ if test X"$OPT_LIBPSL" != Xoff && ++ test "$LIBPSL_ENABLED" != "1"; then ++ AC_MSG_ERROR([libpsl libs and/or directories were not found where specified!]) ++ fi + fi + AM_CONDITIONAL([USE_LIBPSL], [test "$curl_psl_msg" = "enabled"]) + diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 9dafe90c8227..4281cfabb1d4 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -14,6 +14,8 @@ LIBCURL_LICENSE = curl LIBCURL_LICENSE_FILES = COPYING LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_INSTALL_STAGING = YES +# 0001-configure.ac-find-libpsl-with-pkg-config.patch +LIBCURL_AUTORECONF = YES # We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') # support because it uses fork(), which doesn't work on non-MMU platforms. From 7a9ba7a71e49f11e2c8d28a578ddef3a1ad96064 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 25 Feb 2024 12:37:07 +0100 Subject: [PATCH 040/345] Update for 2024.02-rc1 Signed-off-by: Peter Korsgaard --- CHANGES | 59 ++++++++++++++++++++++++++++++++++++++ Makefile | 4 +-- docs/website/download.html | 22 +++++++------- docs/website/news.html | 21 ++++++++++++++ 4 files changed, 93 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index f3c38e7d036c..3abd4b228151 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,62 @@ +2024.02-rc1, released February 25th, 2024 + + Fixes all over the tree and new features. + + Toolchain: + + - GDB: Add version 14.1, default to 13.2. + + - uClibc-ng updated to 1.0.45 + + - Bootlin external toolchains updated to 2023.11-1, moving the + stable toolchains to GCC 12.3 / binutils 2.40 / GDB 13.2 / + glibc 2.38 / musl 1.2.4 / uClibc-ng 1.0.45 + + - Add support for building a bare metal toolchain suitable for + building firmware for certain (co-)processors, possibly + using a different CPU architecture than the main Buildroot + configuration. + + Default optimization level changed from optimize for size + (-Os) to optimize for speed (-O2). + + Support: Use the Fraunhofer FKIE JSON files for CVE matching + now that NVD is about to deprecate its feeds. + + New defconfigs: AMD Zynqmp kria kd240 and kr260, zcu104, Avnet + RZBoard V2L, Mangopi MQ1RDW2, NXP i.MX 93 11x11 EVK, QEMU + Riscv64 virt-efi, TI AM574x Industrial Development Kit + + Removed defconfigs: Zynq qmtech + + New packages: binutils-bare-metal, dmenu-wayland, fcft, foot, + firmware-ele-imx, ivi-homescreen, libjwt, libtraceevent, + libtracefs, libutempter, lua-ansicolors, lua-argparse, + lua-conciseserialization, lua-ubjson, minisign, + newlib-bare-metal, python-aiosqlite, python-annotated-types, + python-anyio, python-asyncssh, python-bitarray, + python-cachetools, python-contourpy, python-decouple, + python-fastapi-sessions, python-fastapi, + python-google-api-core, python-google-auth, + python-googleapis-common-protos, python-grpc-requests, + python-grpcio-reflection, python-grpcio, python-httpcore, + python-httpx, python-matplotlib-inline, python-ml-dtypes, + python-multipart, python-pydantic-core, python-pypng, + python-starlette, python-tcolorpy, python-trafaret, + python-urwid-readline, python-uvicorn, rlwrap, tllist + + Removed packages: davinci-bootcount (renamed to + uboot-bootcount), flickcurl, gmpc, libmpd, micropython-lib, + python-crossbar, python-pygame, tinymembench + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpanelr2_.. + #15889: please update meson + #15898: Unable to boot syslinux.efi produced by buildroot (EFI 64-.. + #15910: USB keyboard is not working by default "raspberrypicm4io_.. + #15952: Grub fails to load large rootfs files + 2023.11.1, released January 15th, 2024 Important / security related fixes. diff --git a/Makefile b/Makefile index ac625152c678..dc1271825e98 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02-git +export BR2_VERSION := 2024.02-rc1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1701677000 +BR2_VERSION_EPOCH = 1708860000 # 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 e13d94cc5ae8..ece22e409d9e 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -75,41 +75,41 @@

buildroot-2023.11.1.tar.xzPGP signature

- + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/. diff --git a/docs/website/news.html b/docs/website/news.html index e052c99803de..89dc74069910 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

News

    +
  • +
    +
    +
    +

    2024.02-rc1 released

    +

    25 February 2024

    +
    +
    +

    We have a new release candidate! Lots of changes all over the tree, see the + CHANGES + file for more details.

    + +

    Go to the downloads page to pick up the + 2024.02-rc1 + release, and report any problems found to the + mailing list or + bug tracker.

    +
    +
    +
    • +
  • From 4533e42622e46f2b8e0ce4d1936c6534393d3aa1 Mon Sep 17 00:00:00 2001 From: Sen Hastings Date: Tue, 13 Feb 2024 12:07:14 +0000 Subject: [PATCH 041/345] support/scripts/pkg-stats: make current version cell scrollable Currently, when the version string is "too long", it is arbitrarily truncated. This works well for commit hashes, because usually the truncation is long enough to provide a short hash that is still unique in the upstream VCS. However, there are non-hash-like versions strings that get truncated and wihch the discriminant part is toward the end. Yet, adapting the version cell to the widest versions string (most probably a git hash) is not very interesting; the table is already very large. Make the cell with the version string scrollable: we get to keep the best of both worlds: a narrow version cell, and a full-length version string that can be copy-pasted if needed. Signed-off-by: Sen Hastings [yann.morin.1998@free.fr: reword commit log] Signed-off-by: Yann E. MORIN --- support/scripts/pkg-stats | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 7835cb3d6217..9307992d29b4 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -845,6 +845,13 @@ function expandField(fieldId){ .centered { text-align: center; } + + .current_version { + overflow: scroll; + width: 21ch; + padding: 10px 2px 10px 2px; + } + .correct, .nopatches, .good_url, .version-good, .cpe-ok, .cve-ok { background: #d2ffc4; } @@ -964,10 +971,7 @@ def dump_html_pkg(f, pkg): # Current version data_field_id = f'current_version__{pkg_css_class}' - if len(pkg.current_version) > 20: - current_version = pkg.current_version[:20] + "..." - else: - current_version = pkg.current_version + current_version = pkg.current_version f.write(f'
    {current_version}
    \n') From 67f6d1dad2d4dd2af64a9eae6935e75147cd7bd2 Mon Sep 17 00:00:00 2001 From: Laurent Badel Date: Mon, 26 Feb 2024 09:19:04 +0000 Subject: [PATCH 042/345] package/micropython: update PCRE dependency to PCRE2 micropython-lib/unix-ffi/re/re.py uses libpcre2-8 since commit d8e163b. Thus, update micropython package to select the PCRE2 package instead of PCRE. Signed-off-by: Laurent Badel Signed-off-by: Peter Korsgaard --- package/micropython/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/micropython/Config.in b/package/micropython/Config.in index 26a00baab0ba..849a5452f454 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -13,7 +13,7 @@ if BR2_PACKAGE_MICROPYTHON config BR2_PACKAGE_MICROPYTHON_LIB bool "micropython-lib" - select BR2_PACKAGE_PCRE # runtime + select BR2_PACKAGE_PCRE2 # runtime help Core Python libraries ported to MicroPython. From 433c4fd38b15efcf74b410e5068e2e51eeba6e46 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 26 Feb 2024 18:32:02 +0100 Subject: [PATCH 043/345] package/poco: bump to version 1.13.2 This bump will fix the following build failure raised since bump of expat to version 2.6.0 in commit 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 thanks to https://github.com/pocoproject/poco/commit/75f7042b70092e79c6b770b18d033a061c84e2c5: src/ParserEngine.cpp: In member function 'void Poco::XML::ParserEngine::init()': src/ParserEngine.cpp:510:17: error: 'XML_SetBillionLaughsAttackProtectionMaximumAmplification' was not declared in this scope; did you mean 'setBillionLaughsAttackProtectionMaximumAmplification'? 510 | XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ https://github.com/pocoproject/poco/blob/poco-1.13.2-release/CHANGELOG Fixes: 9dad5e7d7f7bc03e648621b9be6974e7ae39a467 - http://autobuild.buildroot.org/results/7fad881f85d3b89abdee35388088965f05ead277 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/poco/poco.hash | 2 +- package/poco/poco.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/poco/poco.hash b/package/poco/poco.hash index 9a7981171a52..0a1e900b3fb1 100644 --- a/package/poco/poco.hash +++ b/package/poco/poco.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 71ef96c35fced367d6da74da294510ad2c912563f12cd716ab02b6ed10a733ef poco-1.12.4.tar.gz +sha256 c01221870aa9bccedf1de39890279699207848fe61a0cfb6aeec7c5942c4627f poco-1.13.2.tar.gz sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE diff --git a/package/poco/poco.mk b/package/poco/poco.mk index 2d0233a8cebd..f8c2a658de8b 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -4,7 +4,7 @@ # ################################################################################ -POCO_VERSION = 1.12.4 +POCO_VERSION = 1.13.2 POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release) POCO_LICENSE = BSL-1.0 POCO_LICENSE_FILES = LICENSE From 13083cf8c0edb0ac1cae4895505720658e8dd75d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 26 Feb 2024 18:36:44 +0100 Subject: [PATCH 044/345] package/erlang: fix build with autoconf 2.72 Use ERLANG_FIX_AUTOCONF_VERSION to fix the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: ERROR: autoconf of version 2.72 found in path! You need to have autoconf of version 2.71 in path. Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/c9e8df3427fca9e8e75488e32bca18e81009238c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/erlang/erlang.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/erlang/erlang.mk b/package/erlang/erlang.mk index 1600b5938166..84d2f4e898d3 100644 --- a/package/erlang/erlang.mk +++ b/package/erlang/erlang.mk @@ -17,14 +17,22 @@ ERLANG_CPE_ID_VENDOR = erlang ERLANG_CPE_ID_PRODUCT = erlang\/otp ERLANG_INSTALL_STAGING = YES +define ERLANG_FIX_AUTOCONF_VERSION + $(SED) "s/USE_AUTOCONF_VERSION=.*/USE_AUTOCONF_VERSION=$(AUTOCONF_VERSION)/" $(@D)/otp_build +endef + # Patched erts/aclocal.m4 define ERLANG_RUN_AUTOCONF cd $(@D) && PATH=$(BR_PATH) ./otp_build update_configure --no-commit endef ERLANG_DEPENDENCIES += host-autoconf -ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF HOST_ERLANG_DEPENDENCIES += host-autoconf -HOST_ERLANG_PRE_CONFIGURE_HOOKS += ERLANG_RUN_AUTOCONF +HOST_ERLANG_PRE_CONFIGURE_HOOKS += \ + ERLANG_FIX_AUTOCONF_VERSION \ + ERLANG_RUN_AUTOCONF # Return the EIV (Erlang Interface Version, EI_VSN) # $(1): base directory, i.e. either $(HOST_DIR) or $(STAGING_DIR)/usr From c20b2ae4ece10e07eeb80fcdd706a474d3be1475 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2024 10:24:21 +0100 Subject: [PATCH 045/345] package/openssh: fix dependencies with refpolicy Commit 2c5a82a29ceb (package/openssh: select linux-pam if refpolicy upstream is selected) did not account for the linux-pam dependencies before selecting it, causing unmet dependencies warnings (unfortunately, not errors), such as: $ KCONFIG_SEED=0xCF227CF4 make randconfig WARNING: unmet direct dependencies detected for BR2_PACKAGE_LINUX_PAM Depends on [n]: BR2_ENABLE_LOCALE [=n] && BR2_USE_WCHAR [=n] && !BR2_STATIC_LIBS [=n] && BR2_USE_MMU [=y] && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 [=y] Selected by [y]: - BR2_PACKAGE_OPENSSH [=y] && BR2_USE_MMU [=y] && BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION [=y] 2c5a82a29ceb made the choice of having openssl bear the responsibility to select linux-pam when the upstream refpolicy version was enabled. Semantically however, the responsibility really lies within refpolicy itself, since that's what imposes linux-pam to openssh. Move the select to refpolicy and drop it from openssh. Then, ensure that linux-pam is only selected when it is available. That means that one may get an openssh that is not linked against linux-pam, when the linux-pam dependencies are not met; refpolicy (by way of libsepol) also has a more stringent requirement on gcc version than linux-pam, so most probably the missing dependencies would be locale, wchar, or a static build. We consider that situation to be a corner case that we do not want to address. In the future, we may have more similar situations, whereby refpolicy would impose other packages be linked with otherwise optional dependencies. If (when) that were (will be) the case, then the proposed mechanism would quickly become ugly; we could then re-assess a nicer way to do that. Until then, this is good ebough. Signed-off-by: Yann E. MORIN Cc: Adam Duskett Cc: Thomas Petazzoni Cc: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openssh/Config.in | 1 - package/refpolicy/Config.in | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/openssh/Config.in b/package/openssh/Config.in index a3038ba01ffd..08d3c7d391e1 100644 --- a/package/openssh/Config.in +++ b/package/openssh/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_OPENSSH bool "openssh" depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB help diff --git a/package/refpolicy/Config.in b/package/refpolicy/Config.in index 0e72b895df43..8ae8f0448de2 100644 --- a/package/refpolicy/Config.in +++ b/package/refpolicy/Config.in @@ -36,6 +36,14 @@ choice config BR2_PACKAGE_REFPOLICY_UPSTREAM_VERSION bool "Upstream version" + # Consider reworking the following when adding new entries: + # Upstream refpolicy for openssh expects linux-pam to be used + select BR2_PACKAGE_LINUX_PAM if BR2_PACKAGE_OPENSSH \ + && BR2_USE_MMU \ + && BR2_ENABLE_LOCALE \ + && BR2_USE_WCHAR \ + && !BR2_STATIC_LIBS \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 help Use the refpolicy as provided by Buildroot. From c7b52c3ccf4828cd848b6a98206dbe712f84e49b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 28 Feb 2024 19:09:32 +0100 Subject: [PATCH 046/345] package/python3: security bump to version 3.11.8 Fixes the following security issue: gh-113659: Skip .pth files with names starting with a dot or hidden file attribute https://github.com/python/cpython/issues/113659 Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 6 +++--- package/python3/python3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index 39a16c1f7113..962d32b5d917 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3116/ -md5 d0c5a1a31efe879723e51addf56dd206 Python-3.11.6.tar.xz +# From https://www.python.org/downloads/release/python-3118/ +md5 b353b8433e560e1af2b130f56dfbd973 Python-3.11.8.tar.xz # Locally computed -sha256 0fab78fa7f133f4f38210c6260d90d7c0d5c7198446419ce057ec7ac2e6f5f38 Python-3.11.6.tar.xz +sha256 9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 Python-3.11.8.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 7a704d81e085..5d9d77af50ee 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).6 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).8 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From f71d9f49e5466f31b53bb2cdc0201182104c86c0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2024 23:05:35 +0100 Subject: [PATCH 047/345] support/scripts/pkg-stats: fix datetime deprecation warning Abide by the warning reported with python 3.12: .../support/scripts/pkg-stats:1289: DeprecationWarning: datetime.datetime.utcnow() is deprecated and scheduled for removal in a future version. Use timezone-aware objects to represent datetimes in UTC: datetime.datetime.now(datetime.UTC). Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9307992d29b4..afb746704a2e 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1290,7 +1290,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.utcnow() + date = datetime.datetime.now(datetime.UTC) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() From 54f8d97c913e3c38073d6a31ed3ff02dd71cf9cb Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2024 23:05:36 +0100 Subject: [PATCH 048/345] support/scripts/pkg-stats: adapt to NVD v2 json format Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) missed the fact that the layout of the FKIE data files are different from the original NVD ones. They are formatted according to the NVD v2 API. Most differences are relatively trivial fields renaming, and those are easily spotted in this patch. There is however one key difference in the layout of the configurations. Where the NVD had "configurations" as an object with a "nodes" key, the FKIE has a "configurations" as a list of objects with a single "nodes" key; i.e. it is one-level deeper. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index f12a8048cdb9..747ad881c9da 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -128,7 +128,7 @@ def read_nvd_dir(cls, nvd_dir): filename = CVE.download_nvd_year(nvd_dir, year) try: uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'CVE_Items.item') + content = ijson.items(uncompressed, 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise @@ -155,11 +155,11 @@ def parse_node(self, node): for parsed_node in self.parse_node(child): yield parsed_node - for cpe in node.get('cpe_match', ()): + for cpe in node.get('cpeMatch', ()): if not cpe['vulnerable']: return - product = cpe_product(cpe['cpe23Uri']) - version = cpe_version(cpe['cpe23Uri']) + product = cpe_product(cpe['criteria']) + version = cpe_version(cpe['criteria']) # ignore when product is '-', which means N/A if product == '-': return @@ -191,7 +191,7 @@ def parse_node(self, node): v_end = cpe['versionEndExcluding'] yield { - 'id': cpe['cpe23Uri'], + 'id': cpe['criteria'], 'v_start': v_start, 'op_start': op_start, 'v_end': v_end, @@ -199,14 +199,15 @@ def parse_node(self, node): } def each_cpe(self): - for node in self.nvd_cve['configurations']['nodes']: - for cpe in self.parse_node(node): - yield cpe + for nodes in self.nvd_cve.get('configurations', []): + for node in nodes['nodes']: + for cpe in self.parse_node(node): + yield cpe @property def identifier(self): """The CVE unique identifier""" - return self.nvd_cve['cve']['CVE_data_meta']['ID'] + return self.nvd_cve['id'] @property def affected_products(self): From 75a3562324bd64d4d02edbcf840809863d4c266f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 25 Feb 2024 23:05:37 +0100 Subject: [PATCH 049/345] support/scripts/pkg-stats: sort CVEs in HTML output While the old NVD JSON feed provided data files where the CVEs were sorted by ID, the new feed from FKIE does not have sorted CVEs. Add a method to sort a list of CVE IDs (i.e. CVE ID strings, not CVE objects!), and use that when emiting the HTML output. The JSON output need not be sorted, because it is supposed to be used for post-processing, and we do not care about the ordering there; a consumer interested in sorting should sort on their side. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 7 +++++++ support/scripts/pkg-stats | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 747ad881c9da..1a3c307e12be 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -117,6 +117,13 @@ def download_nvd_year(nvd_path, year): open(path_metaf, "w").write(page_meta.text) return path_jsonf_xz + @staticmethod + def sort_id(cve_ids): + def cve_key(cve_id): + year, id_ = cve_id.split('-')[1:] + return (int(year), int(id_)) + return sorted(cve_ids, key=cve_key) + @classmethod def read_nvd_dir(cls, nvd_dir): """ diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index afb746704a2e..9a4a3ccad54d 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1055,9 +1055,9 @@ def dump_html_pkg(f, pkg): f.write(f'
    see all ({cve_total}) ▾
    \n') if pkg.is_status_error("cve"): - for cve in pkg.cves: + for cve in cvecheck.CVE.sort_id(pkg.cves): f.write(f' {cve}
    \n') - for cve in pkg.unsure_cves: + for cve in cvecheck.CVE.sort_id(pkg.unsure_cves): f.write(f' {cve} (unsure)
    \n') elif pkg.is_status_na("cve"): f.write(f""" {pkg.status['cve'][1]}""") From 4983f9e73e17c162b85fa4ed55fc5ff13d491130 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 28 Feb 2024 23:44:59 +0100 Subject: [PATCH 050/345] support/scripts/pkg-stats: fix running on older python versions Commit f71d9f49e546 (support/scripts/pkg-stats: fix datetime deprecation warning) forgot to consider that the datetime.UTC suggested by python 3.12, was only introduced with python 3.11. However, we are still generating the daily report on a python 3.8 version, which fails at runtime: AttributeError: module 'datetime' has no attribute 'UTC' It turns out that datetime.UTC is just an alias for datetime.timezone.utc, which seems to have existed since before python3... Use datetime.timezone.utc instead of its alias. Signed-off-by: Yann E. MORIN Signed-off-by: Peter Korsgaard --- support/scripts/pkg-stats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats index 9a4a3ccad54d..53898a36f242 100755 --- a/support/scripts/pkg-stats +++ b/support/scripts/pkg-stats @@ -1290,7 +1290,7 @@ def __main__(): package_list = set([v["name"] for v in show_info_js.values() if 'name' in v]) else: package_list = None - date = datetime.datetime.now(datetime.UTC) + date = datetime.datetime.now(datetime.timezone.utc) commit = subprocess.check_output(['git', '-C', brpath, 'rev-parse', 'HEAD']).splitlines()[0].decode() From aa443e82513d6f094ecf89f97d34f877c49c8167 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 28 Feb 2024 21:02:16 +0100 Subject: [PATCH 051/345] package/ccache: disable building tests Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/ccache/ccache.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk index ac4bc4aba5f5..96b1b65c5c38 100644 --- a/package/ccache/ccache.mk +++ b/package/ccache/ccache.mk @@ -16,7 +16,8 @@ HOST_CCACHE_CONF_OPTS += \ -UCMAKE_C_COMPILER_LAUNCHER \ -UCMAKE_CXX_COMPILER_LAUNCHER \ -DZSTD_FROM_INTERNET=OFF \ - -DHIREDIS_FROM_INTERNET=OFF + -DHIREDIS_FROM_INTERNET=OFF \ + -DENABLE_TESTING=OFF # Patch host-ccache as follows: # - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR From bd5d1f5b6ae8d9765520728e4995897940c86b05 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 28 Feb 2024 18:47:21 +0100 Subject: [PATCH 052/345] package/libheif: fix libjpeg build libheif raises the following build failure with libjpeg since bump to version 1.17.5 in commit 5714126edac88e3adc043a482b262b319a907dd3 and https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': /home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); | ^~~~~~~~~~ | | | long unsigned int* Fixes: - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ns-encoder_jpeg.cc-fix-libjpeg-build.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch diff --git a/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch new file mode 100644 index 000000000000..5245327fe7eb --- /dev/null +++ b/package/libheif/0001-libheif-plugins-encoder_jpeg.cc-fix-libjpeg-build.patch @@ -0,0 +1,47 @@ +From 33eb948240365434c845b618854403e82a229012 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Wed, 31 Jan 2024 21:04:37 +0100 +Subject: [PATCH] libheif/plugins/encoder_jpeg.cc: fix libjpeg build + +Fix the following libjpeg build failure raised since version 1.17.0 and +https://github.com/strukturag/libheif/commit/ebd13a20b8b7f1964939642b08b662ef7e483f39 +because third argument of jpeg_mem_dest is defined as size_t* on libjpeg +instead of unsigned long* on jpeg-turbo: + +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc: In function 'heif_error jpeg_encode_image(void*, const heif_image*, heif_image_input_class)': +/home/buildroot/autobuild/instance-3/output-1/build/libheif-1.17.5/libheif/plugins/encoder_jpeg.cc:366:37: error: invalid conversion from 'long unsigned int*' to 'size_t*' {aka 'unsigned int*'} [-fpermissive] + 366 | jpeg_mem_dest(&cinfo, &outbuffer, &outlength); + | ^~~~~~~~~~ + | | + | long unsigned int* + +Fix #1008 and #1086 + +Fixes: + - http://autobuild.buildroot.org/results/8ca909564c8dabe28ad08c96ebbc04b25592e727 + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/strukturag/libheif/pull/1120 +--- + libheif/plugins/encoder_jpeg.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libheif/plugins/encoder_jpeg.cc b/libheif/plugins/encoder_jpeg.cc +index d6c7854..21a5541 100644 +--- a/libheif/plugins/encoder_jpeg.cc ++++ b/libheif/plugins/encoder_jpeg.cc +@@ -360,7 +360,11 @@ struct heif_error jpeg_encode_image(void* encoder_raw, const struct heif_image* + } + + uint8_t* outbuffer = nullptr; ++#ifdef LIBJPEG_TURBO_VERSION + unsigned long outlength = 0; ++#else ++ size_t outlength = 0; ++#endif + + jpeg_create_compress(&cinfo); + jpeg_mem_dest(&cinfo, &outbuffer, &outlength); +-- +2.43.0 + From 5f253e3e04e57d72f470eead8591a2606f98d396 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 29 Feb 2024 18:12:57 +0100 Subject: [PATCH 053/345] support/scripts/cve: fix running on older ijson versions Commit 22b69455526f (support/scripts/cve.py: switch from NVD to FKIE for the JSON files) had to change the decompressor from gz to xz, as the new location is using xz compression. That commit mentioned that it was spawning an external xz process to do the decompression, on the pretence that "there is no xz decompressor in Python stdlib." Before version 3.1, ijson.items() only accepted a file-like object as input (that file-like object could yield bytes() or str(), both were supported). Starting with version 3.1, ijson.items() also accepts that it be directly passed bytes() or str() directly. subprocess.check_output() means we are now passing bytes() to ijson.items(), so it fails on ijson versions before 3.1, with failures such as: [...] File "/usr/lib/python3/dist-packages/ijson/backends/python.py", line 25, in Lexer if type(f.read(0)) == bytetype: AttributeError: 'bytes' object has no attribute 'read' Ubuntu 20.04, on which the pkg-stats run to generate the daily report, only has ijson 2.3. More recent distros have more recent versions of ijson, like Fedora 39 that has 3.2.3, recent enough to support being fed bytes(). Commit 22b69455526f was tested on Fedora 39, so did not catch the issue. However, the reasoning in 22b69455526f is wrong: there *is* the lzma module, at least since python 3.3 (that is, aeons ago), which is able to read xz-compressed files; it also has an API similar to the gzip module, and can provide a file-like object that exposes the decompressed data. So, do just that: provide an lzma-wrapped file-like object to ijson, so that we can eventually recover our daily reports that everything is broken! :-] Note that this construct still works on recent versions! Reported-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Peter Korsgaard --- support/scripts/cve.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 1a3c307e12be..7167ecbc6a80 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -21,8 +21,8 @@ import os import requests # URL checking import distutils.version +import lzma import time -import subprocess import sys import operator @@ -134,8 +134,7 @@ def read_nvd_dir(cls, nvd_dir): for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): filename = CVE.download_nvd_year(nvd_dir, year) try: - uncompressed = subprocess.check_output(["xz", "-d", "-c", filename]) - content = ijson.items(uncompressed, 'cve_items.item') + content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') except: # noqa: E722 print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) raise From 6ee61ef95b0e9e66d2d251049ddba3696e51f5a6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 25 Feb 2024 16:23:13 +0100 Subject: [PATCH 054/345] utils/genrandconfig: fix BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH Commit b7232c51dd402afb361d7c310855e0bf5666958d added default setting for bare-metal toolchain arch but unfortunately it used configlines.add instead of configlines.append resulting in the following build failure: /bin/sh: line 8: /home/autobuild/autobuild/instance-1/output-1/per-package/host-gcc-bare-metal/host/bin/-ar: No such file or directory While at it, also append /n for consistency Fixes: b7232c51dd402afb361d7c310855e0bf5666958d - http://autobuild.buildroot.org/results/95ac565653ddb5c14ec71470c32a34ad10b048cb Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/genrandconfig b/utils/genrandconfig index eb1f8cbd4a66..5ebec415b51e 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -315,9 +315,9 @@ def fixup_config(sysinfo, configfile): 'BR2_TOOLCHAIN_BUILDROOT=y' in configlines: return False - if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y' in configlines: - configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""') - configlines.add('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"') + if 'BR2_TOOLCHAIN_BARE_METAL_BUILDROOT=y\n' in configlines: + configlines.remove('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH=""\n') + configlines.append('BR2_TOOLCHAIN_BARE_METAL_BUILDROOT_ARCH="microblazeel-xilinx-elf"\n') if 'BR2_PACKAGE_AUFS_UTIL=y\n' in configlines and \ 'BR2_PACKAGE_AUFS_UTIL_VERSION=""\n' in configlines: From 64dbf7ff6a19acec1fa3a31853291ecd739a45b3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 25 Feb 2024 14:38:18 +0100 Subject: [PATCH 055/345] package/libpthsem: fix build with autoconf >= 2.72 Move fi statement where it belongs to fix the following build failure raised since bump of autoconf to version 2.72 in commit 524f3536029dace3ce9aa154d3ca4685582e1955: checking for stack setup via makecontext... ./configure: line 15863: syntax error near unexpected token `;;' Fixes: 524f3536029dace3ce9aa154d3ca4685582e1955 - http://autobuild.buildroot.org/results/013e0d3f72582ce3675f65786c014518682d703b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...lude.m4-fix-build-with-autoconf-2.72.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch diff --git a/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch b/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch new file mode 100644 index 000000000000..0c66482c3ad2 --- /dev/null +++ b/package/libpthsem/0002-acinclude.m4-fix-build-with-autoconf-2.72.patch @@ -0,0 +1,36 @@ +From 3ec1a1c22142c547bc7f44622291bf0abdc322f1 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 25 Feb 2024 14:33:02 +0100 +Subject: [PATCH] acinclude.m4: fix build with autoconf >= 2.72 + +Move fi statement where it belongs to fix the following build failure +with autoconf >= 2.72: + +checking for stack setup via makecontext... ./configure: line 15863: syntax error near unexpected token `;;' + +Fixes: + - http://autobuild.buildroot.org/results/013e0d3f72582ce3675f65786c014518682d703b + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/linknx/pthsem/pull/1 +--- + acinclude.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 03b42de..d74889f 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1426,8 +1426,8 @@ ac_cv_stacksetup_$1='guessed:(skaddr),(sksize)' + ]) + dnl # restore original compile environment + CFLAGS="$OCFLAGS" +-])dnl + fi ++])dnl + dnl # extract result ingredients of single cached result value + type=`echo $ac_cv_stacksetup_$1 | sed -e 's;:.*$;;'` + addr=`echo $ac_cv_stacksetup_$1 | sed -e 's;^.*:;;' -e 's;,.*$;;'` +-- +2.43.0 + From 880e3ea32c9ed491d5c0fe0e6d4a97640311216d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Mar 2024 14:16:20 +0100 Subject: [PATCH 056/345] Update for 2023.11.2 Signed-off-by: Peter Korsgaard (cherry picked from commit f05246df4f864489451576a194e38a8679c7f5da) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 33 +++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3abd4b228151..c029569a8dc9 100644 --- a/CHANGES +++ b/CHANGES @@ -57,6 +57,39 @@ #15910: USB keyboard is not working by default "raspberrypicm4io_.. #15952: Grub fails to load large rootfs files +2023.11.2, released March 1st, 2024 + + Important / security related fixes. + + Added CPE identifiers for a large number of packages. + + Updated/fixed packages: bayer2rgb-neon, brltty, c-ares, cog, + containerd, cpio, crda, criu, darkhttpd, davinci-bootcount, + dbus, depot-tools, dhcpcd, domoticz, environment-setup, expat, + faad2, falcosecurity-libs, flex, flutter-engine, + flutter-gallery, flutter-pi, flutter-sdk-bin, + freeradius-server, freerdp, frr, gesftpserver, glibc, gnutls, + go, gst1-devtools, gst1-libav, gst1-python, gst1-vaapi, + gst-omx, gstreamer1, haproxy, hiredis, joe, json-c, leptonica, + libcurl, libp11, libuwsc, libvips, libzenoh-pico, + linux-firmware, linux-headers, localedef, lua-http, lvm2, + lynx, mbedtls, micropython, minizip, mpfr, netatalk, ngrep, + onevpl, opencv4, opencv4-contrib, openssh, opus, petitboot, + php, python-aiohttp, python-bitarray, python-bitstring, + python-esptool, python-gunicorn, python-hpack, + python-html5lib, python-lmdb, python-mako, python-numpy, + python-oauthlib, python-sqlparse, python-wheel, qt5base, + qt6base, redis, runc, sdl2, sqlite, syslog-ng, sysstat, + util-linux, vulkan-loader, webkitgtk, weston, wireless-regdb, + wlroots, wpewebkit, xlib_libXpm, xterm, xwayland, yasm + + New packages: python-bitarray + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpa.. + #15952: Grub fails to load large rootfs files + 2023.11.1, released January 15th, 2024 Important / security related fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 64c479b6936f..ba06c5f5fd01 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.11.1' +RELEASE='2023.11.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From 6711c8231ac6b1d9473f8074b22212a4db1b3b65 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Mar 2024 14:44:47 +0100 Subject: [PATCH 057/345] docs/website: Update for 2023.11.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 ece22e409d9e..a5285e21a45c 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -42,37 +42,37 @@

    buildroot-2023.02.9.tar.xz

    -

    Latest stable release: 2023.11.1

    +

    Latest stable release: 2023.11.2

    - +
    - +
    -

    buildroot-2023.11.1.tar.gz

    -

    PGP signature

    +

    buildroot-2023.11.2.tar.gz

    +

    PGP signature

    - +
    - +
    -

    buildroot-2023.11.1.tar.xz

    -

    PGP signature

    +

    buildroot-2023.11.2.tar.xz

    +

    PGP signature

    diff --git a/docs/website/news.html b/docs/website/news.html index 89dc74069910..c3126342bea0 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,25 @@

    News

      +
    • +
      +
      +
      +

      2023.11.2 released

      +

      1 March 2024

      +
      +
      +

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

      +
      +
      +
      • +
    • From ccf6574061ee7e247f840ee39f5a6feaeb415e38 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Mar 2024 17:45:29 +0100 Subject: [PATCH 058/345] Update for 2023.02.10 Signed-off-by: Peter Korsgaard (cherry picked from commit 10d272ec99344e3e3d95dce92734de7eee9fdef1) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/CHANGES b/CHANGES index c029569a8dc9..de69ddf54c5f 100644 --- a/CHANGES +++ b/CHANGES @@ -640,6 +640,33 @@ #15376: Libiconv config #15461: QtVirtualKeyboard segfaults +2023.02.10, released March 1st, 2024 + + Important / security related fixes. + + Added CPE identifiers for a large number of packages. + + Updated/fixed packages: bayer2rgb-neon, brltty, c-ares, + containerd, crda, darkhttpd, davinci-bootcount, dbus, + domoticz, environment-setup, expat, faad2, falcosecurity-libs, + flex, freeradius-server, freerdp, frr, gesftpserver, glibc, + gnutls, go, gst1-devtools, gst1-libav, gst1-python, + gst1-vaapi, gst-omx, gstreamer1, haproxy, joe, json-c, + leptonica, libcurl, libuwsc, libvips, linux-firmware, + linux-headers, localedef, lua-http, lvm2, lynx, mbedtls, + micropython, minizip, mpfr, netatalk, ngrep, opencv4, + opencv4-contrib, openssh, opus, php, python-aiohttp, + python-esptool, python-gunicorn, python-hpack, + python-html5lib, python-lmdb, python-mako, python-numpy, + python-oauthlib, python-sqlparse, qt5base, qt6base, redis, + runc, sdl2, sqlite, sysstat, uuu, webkitgtk, wireless-regdb, + wpewebkit, xlib_libXpm, xterm, xwayland, yasm + + Issues resolved (http://bugs.uclibc.org): + + #10096: SH4 toolchain does not build Linux kernel magicpa.. + #15952: Grub fails to load large rootfs files + 2023.02.9, released January 15th, 2024 Important / security related fixes. From 382a157dc03015abaed953362a0790e31d1b2d3f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Mar 2024 17:59:27 +0100 Subject: [PATCH 059/345] docs/website: Update for 2023.02.10 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 a5285e21a45c..52128124118c 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
      Download
      -

      Latest long term support release: 2023.02.9

      +

      Latest long term support release: 2023.02.10

      - +
      - +
      -

      buildroot-2023.02.9.tar.gz

      -

      PGP signature

      +

      buildroot-2023.02.10.tar.gz

      +

      PGP signature

      - +
      - +
      -

      buildroot-2023.02.9.tar.xz

      -

      PGP signature

      +

      buildroot-2023.02.10.tar.xz

      +

      PGP signature

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

      News

        +
      • +
        +
        +
        +

        2023.02.10 released

        +

        1 March 2024

        +
        +
        +

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

        +
        +
        +
        • +
      • From 66a202325a98a48013bad70de29d88f733ce5903 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Feb 2024 22:56:41 +0100 Subject: [PATCH 060/345] boot/shim: force arm mode instead of Thumb mode Use OPTIMIZATIONS parameter to pass -marm to fix the following build failure in Thumb mode: /tmp/ccEjPM4h.s:941: Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode CFLAGS can't be overridden as it is defined as: CFLAGS = $(FEATUREFLAGS) \ $(OPTIMIZATIONS) \ $(WARNFLAGS) \ $(if $(findstring clang,$(CC)),$(CLANG_WARNINGS)) \ $(ARCH_CFLAGS) \ $(WERRFLAGS) \ $(INCLUDES) \ $(DEFINES) Fixes: - http://autobuild.buildroot.org/results/580156f89cfd72122fef07aa2fe37b4fdd4c316b - http://autobuild.buildroot.org/results/8980c0f422516c7263d8d0c9cc6123f30c4b7ee4 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- boot/shim/shim.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/boot/shim/shim.mk b/boot/shim/shim.mk index 19b11f40860d..ae57677320f4 100644 --- a/boot/shim/shim.mk +++ b/boot/shim/shim.mk @@ -13,10 +13,19 @@ SHIM_CPE_ID_VENDOR = redhat SHIM_INSTALL_TARGET = NO SHIM_INSTALL_IMAGES = YES +SHIM_CFLAGS = $(TARGET_CFLAGS) SHIM_MAKE_OPTS = \ ARCH="$(GNU_EFI_PLATFORM)" \ CROSS_COMPILE="$(TARGET_CROSS)" \ - DASHJ="-j$(PARALLEL_JOBS)" + DASHJ="-j$(PARALLEL_JOBS)" \ + OPTIMIZATIONS="$(SHIM_CFLAGS)" + +# shim has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mrc p15,0,r2,c9,c13,0' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SHIM_CFLAGS += -marm +endif define SHIM_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(SHIM_MAKE_OPTS) From d2c99d32bf4d0c4f77377d5a8fd4fb86f22e7caa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 18:49:34 +0100 Subject: [PATCH 061/345] package/rhash: fix NLS build Fix the following NLS build failure raised since bump to version 1.4.4 in commit f9b465c66c42e936a80292f7854f605d4c88564e: ./configure: line 879: -lintl: command not found [...] /home/buildroot/autobuild/run/instance-0/output-1/host/bin/xtensa-linux-gcc calc_sums.o hash_print.o common_func.o hash_update.o file.o file_mask.o file_set.o find_file.o hash_check.o output.o parse_cmdline.o rhash_main.o win_utils.o librhash/librhash.so.1.4.4 -o rhash /home/buildroot/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/xtensa-buildroot-linux-uclibc/12.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: calc_sums.o:(.literal.rename_file_by_embeding_crc32+0x10): undefined reference to `libintl_gettext' Fixes: f9b465c66c42e936a80292f7854f605d4c88564e - http://autobuild.buildroot.org/results/f8dd8ea6c0c9cd428355e3720e679a078b8e0f8f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ct-assigment-in-the-configure-script.patch | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 package/rhash/0001-Fix-243-Incorrect-assigment-in-the-configure-script.patch diff --git a/package/rhash/0001-Fix-243-Incorrect-assigment-in-the-configure-script.patch b/package/rhash/0001-Fix-243-Incorrect-assigment-in-the-configure-script.patch new file mode 100644 index 000000000000..4a9a81dbf5e0 --- /dev/null +++ b/package/rhash/0001-Fix-243-Incorrect-assigment-in-the-configure-script.patch @@ -0,0 +1,24 @@ +From c804982d1b24c6533118b3068d2cfdca685076f3 Mon Sep 17 00:00:00 2001 +From: Aleksey Kravchenko +Date: Mon, 7 Aug 2023 01:00:37 +0300 +Subject: [PATCH] Fix #243: Incorrect assigment in the configure script + +Upstream: https://github.com/rhash/RHash/commit/c804982d1b24c6533118b3068d2cfdca685076f3 +Signed-off-by: Fabrice Fontaine +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 39ef8c1..63cbd8d 100755 +--- a/configure ++++ b/configure +@@ -877,7 +877,7 @@ if test "$OPT_STATIC" = "no"; then + RHASH_TEST_OPTIONS=--shared + test "$INSTALL_LIB_SHARED" = "auto" && INSTALL_LIB_SHARED=yes + test "$INSTALL_LIB_STATIC" = "yes" && RHASH_BUILD_TARGETS="$RHASH_BUILD_TARGETS \$(LIBRHASH_STATIC)" +- RHASH_LDFLAGS=$RHASH_LDFLAGS $GETTEXT_LDFLAGS ++ RHASH_LDFLAGS=$(join_params $RHASH_LDFLAGS $GETTEXT_LDFLAGS) + else + LIBRHASH_TYPE=static + LIBRHASH_PATH="\$(LIBRHASH_STATIC)" From 1e576592607705d397220b9a5907265f052dcb95 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 18:47:35 +0100 Subject: [PATCH 062/345] package/squid: needs C++17 C++17 is mandatory since bump to version 6.2 in commit 2a7c6816f02f45946e896577d78e3470331b2d63 and https://github.com/squid-cache/squid/commit/09835feb258c3058d028918e36d959dccb3f7496 resulting in the following build failure: configure: error: *** A compiler with support for C++17 language features is required. Fixes: 2a7c6816f02f45946e896577d78e3470331b2d63 - http://autobuild.buildroot.org/results/06755c324f0bf37e52976fce48a5ad62915193da Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/squid/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/squid/Config.in b/package/squid/Config.in index 62721407687c..89b5a377c778 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,10 +1,10 @@ -comment "squid needs a toolchain w/ C++, threads, gcc >= 4.8 not affected by bug 64735" +comment "squid needs a toolchain w/ C++, threads, gcc >= 7 not affected by bug 64735" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + !BR2_TOOLCHAIN_GCC_AT_LEAST_7 config BR2_PACKAGE_SQUID bool "squid" @@ -12,7 +12,7 @@ config BR2_PACKAGE_SQUID depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 # needs fork() depends on BR2_USE_MMU select BR2_PACKAGE_LIBCAP From 7fcb4469dbd2392c3210293d04d9776190280373 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 18:50:56 +0100 Subject: [PATCH 063/345] package/newlib-bare-metal: fix build without makeinfo Fix the following build failure without makeinfo raised since the addition of the package in commit 3b95ff658bf4859eb5cffd28cbbedd1826fad9a6: make[5]: Entering directory '/home/buildroot/autobuild/instance-2/output-1/build/newlib-bare-metal-4.4.0/microblazeel-xilinx-elf/libgloss' MAKEINFO ../.././libgloss/doc/porting.info /home/buildroot/autobuild/instance-2/output-1/build/newlib-bare-metal-4.4.0/missing: line 81: makeinfo: command not found Fixes: 3b95ff658bf4859eb5cffd28cbbedd1826fad9a6 - http://autobuild.buildroot.org/results/23e6641cbce62258310c300f8aed5d6a76973d72 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/newlib-bare-metal/newlib-bare-metal.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk index 452bc4da2564..e1b46fbc8851 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.mk +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -18,6 +18,7 @@ NEWLIB_BARE_METAL_LICENSE_FILES = \ NEWLIB_BARE_METAL_INSTALL_STAGING = YES NEWLIB_BARE_METAL_INSTALL_TARGET = NO +NEWLIB_BARE_METAL_MAKE_OPTS = MAKEINFO=true define NEWLIB_BARE_METAL_CONFIGURE_CMDS (cd $(@D) && \ @@ -34,11 +35,12 @@ define NEWLIB_BARE_METAL_CONFIGURE_CMDS endef define NEWLIB_BARE_METAL_BUILD_CMDS - PATH=$(BR_PATH) $(MAKE1) -C $(@D) + PATH=$(BR_PATH) $(MAKE1) $(NEWLIB_BARE_METAL_MAKE_OPTS) -C $(@D) endef define NEWLIB_BARE_METAL_INSTALL_STAGING_CMDS - PATH=$(BR_PATH) $(MAKE1) -C $(@D) DESTDIR=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) install + PATH=$(BR_PATH) $(MAKE1) -C $(@D) $(NEWLIB_BARE_METAL_MAKE_OPTS) \ + DESTDIR=$(TOOLCHAIN_BARE_METAL_BUILDROOT_SYSROOT) install endef define NEWLIB_BARE_METAL_FIXUP From fd3f953c7883b2a5d30cff03c92e34a2b2718953 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 28 Feb 2024 19:14:11 +0100 Subject: [PATCH 064/345] boot/syslinux: fix build with gnu-efi >= 3.0.16 Commit fa9893ad8f "package/gnu-efi: bump to version 3.0.17" updated gnu-efi. This update introduced syslinux build failure, as reported in [1]. This commit adds a package patch to fix this issue. For technical details of the issue, see the package patch commit log. Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880937 - https://gitlab.com/buildroot.org/buildroot/-/jobs/6256880949 [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html Signed-off-by: Julien Olivain Reviewed-by: Romain Naour Signed-off-by: Peter Korsgaard --- ...stddef.h-add-wchar_t-type-definition.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch diff --git a/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch new file mode 100644 index 000000000000..65d9463a6f69 --- /dev/null +++ b/boot/syslinux/0019-stddef.h-add-wchar_t-type-definition.patch @@ -0,0 +1,59 @@ +From 063dac55c45d0264671c3463e824ab659e5cbb87 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Tue, 27 Feb 2024 21:09:15 +0100 +Subject: [PATCH] stddef.h: add wchar_t type definition + +Syslinux fail to build with gnu-efi >= 3.0.16 with error: + + In file included from /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/efi.h:44, + from /build/syslinux-6.03/efi/efi.h:23, + from /build/syslinux-6.03/efi/adv.h:4, + from /build/syslinux-6.03/efi/adv.c:29: + /host/i686-buildroot-linux-gnu/sysroot/usr/include/efi/ia32/efibind.h:90:9: error: unknown type name 'wchar_t' + typedef wchar_t CHAR16; + ^~~~~~~ + +This is because gnu-efi started to use the "wchar_t" type from the +toolchain's header, in commit [1]. Before this commit, +gnu-efi was defining the type as "short". + +Syslinux is including its own minimal stddef.h file, which masks the +one provided by the toolchain. See [2]. This file does not have a type +definition for "wchar_t". + +Finally, the POSIX header is supposed to provide this +"wchar_t" type definition. See [3]. + +This commit fixes the issue by adding the "wchar_t" type definition in +the com32/include/stddef.h header. Since Syslinux has "-fshort-wchar" +in its CFLAGS (see [4]), "wchar_t" is simply defined as "short". This +also follow the previous gnu-efi < 3.0.16 behavior. + +This issue was seen in Buildroot Linux, in [5]. + +[1] https://sourceforge.net/p/gnu-efi/code/ci/189200d0b0f6fff473d302880d9569f45d4d8c4d +[2] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/com32/include/stddef.h +[3] https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html +[4] https://repo.or.cz/syslinux.git/blob/refs/tags/syslinux-6.03:/mk/efi.mk#l27 +[5] https://lists.buildroot.org/pipermail/buildroot/2024-February/685971.html + +Upstream: Proposed: https://www.syslinux.org/archives/2024-February/026903.html +Signed-off-by: Julien Olivain +--- + com32/include/stddef.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/com32/include/stddef.h b/com32/include/stddef.h +index f52d62f3..437b11f2 100644 +--- a/com32/include/stddef.h ++++ b/com32/include/stddef.h +@@ -29,4 +29,6 @@ + */ + #define container_of(p, c, m) ((c *)((char *)(p) - offsetof(c,m))) + ++typedef short wchar_t; ++ + #endif /* _STDDEF_H */ +-- +2.44.0 + From def3b9d9a8f17398f280950b35eae0cf22d67bd8 Mon Sep 17 00:00:00 2001 From: Christian Hitz Date: Wed, 28 Feb 2024 16:01:46 +0100 Subject: [PATCH 065/345] package/freetype: use correct license format for dual licensed package Signed-off-by: Christian Hitz Signed-off-by: Peter Korsgaard --- package/freetype/freetype.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 1f4bcaf341bb..5032414d63ff 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -9,7 +9,7 @@ FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" -FREETYPE_LICENSE = Dual FTL/GPL-2.0+ +FREETYPE_LICENSE = FTL or GPL-2.0+ FREETYPE_LICENSE_FILES = LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT FREETYPE_CPE_ID_VENDOR = freetype FREETYPE_DEPENDENCIES = host-pkgconf From 82afcacb620b834cef157a8c2d9ad54ff76e4e4f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 25 Feb 2024 23:57:28 +0100 Subject: [PATCH 066/345] package/dracut: fix dracut_wrapper As reported by Thierry Bultel [1], dracut doesn't work since the version bump to version 059. Further investigation by Andreas Naumann [2] reported that the issue come from this commit d010fa0 refactor(dracut-install): fork() instead of popen(), sanitise line reading [3]. The issue come from our dracut_wrapper and how DRACUT_LDD is defined. Indeed dracut expect DRACUT_LDD=ldd or a single binary (without arguments) but we are using "prelink-rtld --root='${sysroot}'". With the change introduced by [3], our DRACUT_LDD is used directly by execlp() leading to an error: execlp(ldd, ldd, fullsrcpath, (char *)NULL); Use mktemp to generate a temporary dracut-ldd script using prelink-rtld --root='${sysroot}' ${1} execute dracut.real in a subshell to cleanup the temporary file at the end of the dracut wrapper script. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243423 [tests.fs.test_cpio.TestCpioDracutGlibcMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243434 [tests.fs.test_cpio.TestCpioDracutMuslMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243567 [tests.fs.test_cpio.TestCpioDracutUclibcMergedUsr] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243559 [tests.fs.test_cpio.TestCpioDracutGlibc] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243504 [tests.fs.test_cpio.TestCpioDracutUclibc] https://gitlab.com/buildroot.org/buildroot/-/jobs/6224243498 [tests.fs.test_cpio.TestCpioDracutMusl] [1] http://lists.busybox.net/pipermail/buildroot/2024-February/684145.html [2] http://lists.busybox.net/pipermail/buildroot/2024-February/684503.html [3] https://github.com/dracutdevs/dracut/commit/d010fa0d7f8ef42ad31729d027d2e4be6dd6e588 Fixes: 145f01ded5 ("package/dracut: bump to version 059") Reported-by: Thierry Bultel Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/dracut/dracut_wrapper | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/package/dracut/dracut_wrapper b/package/dracut/dracut_wrapper index 0464db17fed4..968d65cbeba0 100644 --- a/package/dracut/dracut_wrapper +++ b/package/dracut/dracut_wrapper @@ -31,8 +31,18 @@ if [ -z "${sysroot}" ]; then fi topdir="$(dirname "$(realpath "$(dirname "${0}")")")" -export DRACUT_LDD="${topdir}/sbin/prelink-rtld --root='${sysroot}'" +DRACUT_LDD="$(mktemp /tmp/dracut-ldd.XXXXXX)" +cat >"${DRACUT_LDD}" < Date: Sun, 25 Feb 2024 12:44:13 +0100 Subject: [PATCH 067/345] configs/qemu_microblaze{be, el}: remove xilinx xemaclite patch needed for qemu < 2.2.0 We carried a patch for xilinx xemaclite that was made initially for qemu < 2.2.0 [1]. Indeed, between Qemu 0.11.0 and 2.2.0 the devicetree binary blob petalogix-s3adsp1800.dtb (bundled in Qemu sources) used a compatible string 'xlnx,xps-ethernetlite-2.00.b' that was not supported by the Linux kernel [2]. These patches could have been removed since Buildroot 2015.02 when this defconfig was tested with Qemu 2.2.0 [3]. [1] https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 [2] https://gitlab.com/qemu-project/qemu/-/commit/c21fd2c79e1fcaf45582f2dd4deb491c257aa9f2 [3] https://gitlab.com/buildroot.org/buildroot/-/commit/312990555c4d7d1cccd26e0728ad0d4ec86820a7 Cc: Waldemar Brodkorb Signed-off-by: Romain Naour [Peter: drop drom .checkpackageignore] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 2 -- ...xilinx-xemaclite-add-2.00.b-revision.patch | 34 ------------------- ...xilinx-xemaclite-add-2.00.b-revision.patch | 34 ------------------- configs/qemu_microblazebe_mmu_defconfig | 1 - configs/qemu_microblazeel_mmu_defconfig | 1 - 5 files changed, 72 deletions(-) delete mode 100644 board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch delete mode 100644 board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch diff --git a/.checkpackageignore b/.checkpackageignore index a6cc58c448cf..c18cc4d4171a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -71,8 +71,6 @@ board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-p board/pine64/rock64/post-build.sh Shellcheck board/pine64/rockpro64/post-build.sh Shellcheck board/qemu/aarch64-sbsa/assemble-flash-images Shellcheck -board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream -board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream board/qemu/x86/post-build.sh Shellcheck board/qemu/x86_64/post-build.sh Shellcheck board/radxa/rockpi-n8/post-build.sh Shellcheck diff --git a/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f85833..000000000000 --- a/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f85833..000000000000 --- a/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index e02b8dae2f7d..a93ef3564d86 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 146bbb67de35..0b00b58b4ef5 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y From dee6974d729da81f80d310df262436a6136164a0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 19:33:49 +0100 Subject: [PATCH 068/345] package/redis: disable -Werror Disable -Werror to avoid the following build failure raised since bump to version 7.2.1 in commit d49f53f8aaf0bff9c8d04c16485c844fef2832d0 and https://github.com/redis/redis/commit/8e138ba44fc3eb676c0f31faac19d1acc6a4c7ed: In function 'hi_sdsll2str', inlined from 'hi_sdsfromlonglong' at sds.c:500:15: sds.c:457:12: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] 457 | *s = *p; | ~~~^~~~ Fixes: d49f53f8aaf0bff9c8d04c16485c844fef2832d0 - http://autobuild.buildroot.org/results/fdc9f940b348430cb4da8efecc5cc047b21df281 - http://autobuild.buildroot.org/results/e5747674d52b065203a0442f7cab13e8be5f426b Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/redis/redis.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/redis/redis.mk b/package/redis/redis.mk index 09a3b9448b7d..2680b11b74b4 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -30,7 +30,7 @@ endif # https://github.com/antirez/redis/pull/609). We set PREFIX # instead. REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ - PREFIX=$(TARGET_DIR)/usr MALLOC=libc + PREFIX=$(TARGET_DIR)/usr MALLOC=libc WARNINGS= ifeq ($(BR2_PACKAGE_SYSTEMD),y) REDIS_DEPENDENCIES += systemd From 31f4bf275da4ba349eed0fe2581ba8bdeae59daa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 19:36:29 +0100 Subject: [PATCH 069/345] package/newlib-bare-metal: fix legal-info Hash of COPYING.NEWLIB is wrong since the addition of the package in commit 3b95ff658bf4859eb5cffd28cbbedd1826fad9a6: ERROR: COPYING.NEWLIB has wrong sha256 hash: ERROR: expected: 422aa40293093fb54fc66e692a0d68fd0b24ed5602e5d1d33ad05ba3909057e9 ERROR: got : 9a59b4ee3af067045fe0ea78786201c42d54756fe48cbccf44f3dfc398474717 Fixes: 3b95ff658bf4859eb5cffd28cbbedd1826fad9a6 - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/newlib-bare-metal/newlib-bare-metal.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/newlib-bare-metal/newlib-bare-metal.hash b/package/newlib-bare-metal/newlib-bare-metal.hash index f8c553cf8649..827925373e54 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.hash +++ b/package/newlib-bare-metal/newlib-bare-metal.hash @@ -5,4 +5,4 @@ sha256 0c166a39e1bf0951dfafcd68949fe0e4b6d3658081d6282f39aeefc6310f2f13 newlib sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB sha256 f3b7f3e4426b1fa6f60198dae7adfedd94b77b28db2d108adc0253575011e0ff COPYING.LIBGLOSS -sha256 422aa40293093fb54fc66e692a0d68fd0b24ed5602e5d1d33ad05ba3909057e9 COPYING.NEWLIB +sha256 9a59b4ee3af067045fe0ea78786201c42d54756fe48cbccf44f3dfc398474717 COPYING.NEWLIB From 3a8a87f107b916a65e0328ddd5d7f14386de11f9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 19:37:56 +0100 Subject: [PATCH 070/345] package/newlib-bare-metal: update NEWLIB_BARE_METAL_VERSION Update NEWLIB_BARE_METAL_VERSION to match version retrieved on https://release-monitoring.org/project/13816 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/newlib-bare-metal/newlib-bare-metal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk index e1b46fbc8851..f27da4284b27 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.mk +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -4,9 +4,9 @@ # ################################################################################ -NEWLIB_BARE_METAL_VERSION = 4.4.0 +NEWLIB_BARE_METAL_VERSION = 4.4.0.20231231 NEWLIB_BARE_METAL_SITE = ftp://sourceware.org/pub/newlib -NEWLIB_BARE_METAL_SOURCE = newlib-$(NEWLIB_BARE_METAL_VERSION).20231231.tar.gz +NEWLIB_BARE_METAL_SOURCE = newlib-$(NEWLIB_BARE_METAL_VERSION).tar.gz NEWLIB_BARE_METAL_DEPENDENCIES = host-gcc-bare-metal NEWLIB_BARE_METAL_ADD_TOOLCHAIN_DEPENDENCY = NO NEWLIB_BARE_METAL_LICENSE = GPL-2.0, GPL-3.0, LGPL-2.1, LGPL-3.0 From e1e292c0449e7d56de60ccd4b670f02cbe64c0c8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 1 Mar 2024 19:51:57 +0100 Subject: [PATCH 071/345] Update for 2024.02-rc2 Signed-off-by: Peter Korsgaard --- CHANGES | 11 +++++++++++ Makefile | 4 ++-- docs/website/download.html | 18 +++++++++--------- docs/website/news.html | 21 +++++++++++++++++++++ 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index de69ddf54c5f..d5f1bf579499 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,14 @@ +2024.02-rc2, released March 1st, 2024 + + Fixes all over the tree. + + Infrastructure: Various fixes for pkg-stats after moving to + the FKIE CVE feed and support for older python/ijson versions. + + Updated/fixed packages: ccache, dracut, erlang, freetype, + libheif, libpthsem, micropython, newlib-bare-metal, openssh, + poco, python3, redis, rhash, shim, squid, syslinux + 2024.02-rc1, released February 25th, 2024 Fixes all over the tree and new features. diff --git a/Makefile b/Makefile index dc1271825e98..3389da2852c8 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02-rc1 +export BR2_VERSION := 2024.02-rc2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1708860000 +BR2_VERSION_EPOCH = 1709318000 # 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 52128124118c..70a1de5b6d2d 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -76,37 +76,37 @@

        buildroot-2023.11.2.tar.xz

        -

        Latest release candidate: 2024.02-rc1

        +

        Latest release candidate: 2024.02-rc2

        - +
        - +
        -

        buildroot-2024.02-rc1.tar.gz

        -

        PGP signature

        +

        buildroot-2024.02-rc2.tar.gz

        +

        PGP signature

        - +
        - +
        -

        buildroot-2024.02-rc1.tar.xz

        -

        PGP signature

        +

        buildroot-2024.02-rc2.tar.xz

        +

        PGP signature

        diff --git a/docs/website/news.html b/docs/website/news.html index df5669bd193f..f142515889f9 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

        News

          +
        • +
          +
          +
          +

          2024.02-rc2 released

          +

          1 March 2024

          +
          +
          +

          Another week, another release candidate with more cleanups and build fixes. See the + CHANGES + file for more details.

          + +

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

          +
          +
          +
          • +
        • From 0073b3631f1b18a050506326061365e62756324c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 20:40:51 +0100 Subject: [PATCH 072/345] package/newlib-bare-metal: add CPE variables cpe:2.3:a:newlib_project:newlib is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/detail/822D4AAB-314B-4148-BE10-FCC59D1649BD Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/newlib-bare-metal/newlib-bare-metal.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/newlib-bare-metal/newlib-bare-metal.mk b/package/newlib-bare-metal/newlib-bare-metal.mk index f27da4284b27..9f5d76575178 100644 --- a/package/newlib-bare-metal/newlib-bare-metal.mk +++ b/package/newlib-bare-metal/newlib-bare-metal.mk @@ -15,6 +15,8 @@ NEWLIB_BARE_METAL_LICENSE_FILES = \ COPYING.LIB \ COPYING.LIBGLOSS \ COPYING.NEWLIB +NEWLIB_BARE_METAL_CPE_ID_VENDOR = newlib_project +NEWLIB_BARE_METAL_CPE_ID_PRODUCT = newlib NEWLIB_BARE_METAL_INSTALL_STAGING = YES NEWLIB_BARE_METAL_INSTALL_TARGET = NO From 2d5e2a87760467595f7086d89671563f61fd3acb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 20:56:18 +0100 Subject: [PATCH 073/345] package/libxml2: security bump to version 2.12.5 Fix CVE-2024-25062: An issue was discovered in libxml2 before 2.11.7 and 2.12.x before 2.12.5. When using the XML Reader interface with DTD validation and XInclude expansion enabled, processing crafted XML documents can lead to an xmlValidatePopElement use-after-free. https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.12.5/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 670ff80a4183..959887ab0e61 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.3.sha256sum -sha256 8c8f1092340a89ff32bc44ad5c9693aff9bc8a7a3e161bb239666e5d15ac9aaa libxml2-2.12.3.tar.xz +# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.5.sha256sum +sha256 a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21 libxml2-2.12.5.tar.xz # License files, locally calculated sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 1893206ccbf3..6070c07b031f 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.12 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).3 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).5 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From ef65c4f90b3be448c50d210c39baf07fefc1d282 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 21:05:22 +0100 Subject: [PATCH 074/345] package/vim: security bump to version 9.1.0145 Fix CVE-2024-22667: Vim before 9.0.2142 has a stack-based buffer overflow because did_set_langmap in map.c calls sprintf to write to the error buffer that is passed down to the option callback functions. Update hash of README.txt (version number updated with https://github.com/vim/vim/commit/b4ddc6c11e95cef4b372e239871fae1c8d4f72b6) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 4 ++-- package/vim/vim.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 4ff64bada2ec..194bcb4378d5 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 d826682fb839c0b99f80b9189af549d46dc087ef2cfc617ce161609ba5da4dc7 vim-9.0.2136.tar.gz +sha256 0056537cb57190aa41c12ba6c2ad04ce10e7f714cde4c1fe7193a37e1c44db46 vim-9.1.0145.tar.gz sha256 0b3f1f330cb1b179bb17c7c687d4cec601e0aa3462bc7f890ad4c3888d37d720 LICENSE -sha256 b475d5d3f8c855dc1a84813bbe45c44054d7f7aee20c800950bf89d5958873de README.txt +sha256 7a2f621c8496396dae5eecdcc4dccff9d534dff4627193d3ebf7fa6d2cb27042 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index b0b4ffe344db..fb8062e1fa90 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.2136 +VIM_VERSION = 9.1.0145 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From b1b4923d18bc6e8a40e990e172cd9f12087fcdb6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 21:15:43 +0100 Subject: [PATCH 075/345] package/python-aiohttp: security bump to version 3.9.3 Fix CVE-2024-23334 and CVE-2024-23829 https://github.com/aio-libs/aiohttp/security/advisories/GHSA-5h86-8mv2-jq9f https://github.com/aio-libs/aiohttp/security/advisories/GHSA-8qpw-xqxj-h4r2 https://github.com/aio-libs/aiohttp/blob/v3.9.3/CHANGES.rst Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-aiohttp/python-aiohttp.hash | 4 ++-- package/python-aiohttp/python-aiohttp.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiohttp/python-aiohttp.hash b/package/python-aiohttp/python-aiohttp.hash index 374e66ae8d53..542a46f032bb 100644 --- a/package/python-aiohttp/python-aiohttp.hash +++ b/package/python-aiohttp/python-aiohttp.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiohttp/json -md5 264e1b4fbe9f09050523c03f4d9b5ee2 aiohttp-3.9.1.tar.gz -sha256 8fc49a87ac269d4529da45871e2ffb6874e87779c3d0e2ccd813c0899221239d aiohttp-3.9.1.tar.gz +md5 f237bcac4ade112b9e7c4b1098197244 aiohttp-3.9.3.tar.gz +sha256 90842933e5d1ff760fae6caca4b2b3edba53ba8f4b71e95dacf2818a2aca06f7 aiohttp-3.9.3.tar.gz # Locally computed sha256 checksums sha256 9f80d0db7d755a941db4572172c270ecbd8f082ba215ddd095985942ed94a9eb LICENSE.txt diff --git a/package/python-aiohttp/python-aiohttp.mk b/package/python-aiohttp/python-aiohttp.mk index 3dc822e832a6..315d68cb2ed8 100644 --- a/package/python-aiohttp/python-aiohttp.mk +++ b/package/python-aiohttp/python-aiohttp.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIOHTTP_VERSION = 3.9.1 +PYTHON_AIOHTTP_VERSION = 3.9.3 PYTHON_AIOHTTP_SOURCE = aiohttp-$(PYTHON_AIOHTTP_VERSION).tar.gz -PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/54/07/9467d3f8dae29b14f423b414d9e67512a76743c5bb7686fb05fe10c9cc3e +PYTHON_AIOHTTP_SITE = https://files.pythonhosted.org/packages/18/93/1f005bbe044471a0444a82cdd7356f5120b9cf94fe2c50c0cdbf28f1258b PYTHON_AIOHTTP_SETUP_TYPE = setuptools PYTHON_AIOHTTP_LICENSE = Apache-2.0 PYTHON_AIOHTTP_LICENSE_FILES = LICENSE.txt From 9002b818be9128a6751766a180af7cd284aa7704 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 21:22:57 +0100 Subject: [PATCH 076/345] package/libcoap: fix CVE-2024-0962 A vulnerability was found in obgm libcoap 4.3.4. It has been rated as critical. Affected by this issue is the function get_split_entry of the file src/coap_oscore.c of the component Configuration File Handler. The manipulation leads to stack-based buffer overflow. The attack may be launched remotely. The exploit has been disclosed to the public and may be used. It is recommended to apply a patch to fix this issue. VDB-252206 is the identifier assigned to this vulnerability. Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...ing-OSCORE-configuration-information.patch | 38 +++++++++++++++++++ package/libcoap/libcoap.mk | 3 ++ 2 files changed, 41 insertions(+) create mode 100644 package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch diff --git a/package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch b/package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch new file mode 100644 index 000000000000..e75250d613e7 --- /dev/null +++ b/package/libcoap/0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch @@ -0,0 +1,38 @@ +From 2b28d8b0e9607e71a145345b4fe49517e052b7d9 Mon Sep 17 00:00:00 2001 +From: Jon Shallow +Date: Thu, 25 Jan 2024 18:03:17 +0000 +Subject: [PATCH] coap_oscore.c: Fix parsing OSCORE configuration information + +Upstream: https://github.com/obgm/libcoap/commit/2b28d8b0e9607e71a145345b4fe49517e052b7d9 +Signed-off-by: Fabrice Fontaine +--- + src/coap_oscore.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/coap_oscore.c b/src/coap_oscore.c +index 83f785c92..e0fb22947 100644 +--- a/src/coap_oscore.c ++++ b/src/coap_oscore.c +@@ -1678,11 +1678,12 @@ get_split_entry(const char **start, + oscore_value_t *value) { + const char *begin = *start; + const char *end; ++ const char *kend; + const char *split; + size_t i; + + retry: +- end = memchr(begin, '\n', size); ++ kend = end = memchr(begin, '\n', size); + if (end == NULL) + return 0; + +@@ -1693,7 +1694,7 @@ get_split_entry(const char **start, + + if (begin[0] == '#' || (end - begin) == 0) { + /* Skip comment / blank line */ +- size -= end - begin + 1; ++ size -= kend - begin + 1; + begin = *start; + goto retry; + } diff --git a/package/libcoap/libcoap.mk b/package/libcoap/libcoap.mk index 62f08a20e939..29161142f655 100644 --- a/package/libcoap/libcoap.mk +++ b/package/libcoap/libcoap.mk @@ -15,6 +15,9 @@ LIBCOAP_CONF_OPTS = \ --disable-examples --disable-examples-source --without-tinydtls LIBCOAP_AUTORECONF = YES +# 0001-coap_oscore-c-Fix-parsing-OSCORE-configuration-information.patch +LIBCOAP_IGNORE_CVES += CVE-2024-0962 + ifeq ($(BR2_PACKAGE_GNUTLS),y) LIBCOAP_DEPENDENCIES += gnutls LIBCOAP_CONF_OPTS += \ From 2bfad952c374258e37ffdf46a2c450d860640e11 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 21:50:37 +0100 Subject: [PATCH 077/345] package/python-grpcio: add BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS Fix the following build failure raised since the addition of the package in commit ea45b95c0e54866134c63e88e60489a012b3d134: In file included from third_party/boringssl-with-bazel/src/include/openssl/base.h:78, from third_party/boringssl-with-bazel/src/include/openssl/ssl.h:145, from ./src/core/tsi/ssl/key_logging/ssl_key_logging.h:23, from ./src/core/lib/security/security_connector/ssl_utils.h:42, from ./src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h:36, from ./src/core/ext/xds/certificate_provider_store.h:44, from src/core/ext/xds/certificate_provider_store.cc:21: third_party/boringssl-with-bazel/src/include/openssl/target.h:62:2: error: #error "Unknown target CPU" 62 | #error "Unknown target CPU" | ^~~~~ Fixes: ea45b95c0e54866134c63e88e60489a012b3d134 - http://autobuild.buildroot.org/results/36686aca1b45f0bf692a60e67a48424b561930a3 - http://autobuild.buildroot.org/results/4f79c7b1b2fc3306f300ae3ec0aa4439725814c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/python-grpc-requests/Config.in | 3 +++ package/python-grpcio-reflection/Config.in | 2 ++ package/python-grpcio/Config.in | 11 +++++++++++ 3 files changed, 16 insertions(+) diff --git a/package/python-grpc-requests/Config.in b/package/python-grpc-requests/Config.in index 3a2740f0f798..1cdd0d3f67f8 100644 --- a/package/python-grpc-requests/Config.in +++ b/package/python-grpc-requests/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_GRPC_REQUESTS bool "python-grpc-requests" depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS # python-cryptography + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS # python-grpcio depends on BR2_INSTALL_LIBSTDCPP # python-grpcio select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime select BR2_PACKAGE_PYTHON_GOOGLE_API_CORE # runtime @@ -12,4 +13,6 @@ config BR2_PACKAGE_PYTHON_GRPC_REQUESTS https://github.com/wesky93/grpc_requests comment "python-grpcio-requests needs a toolchain w/ C++" + depends on BR2_PACKAGE_HOST_RUSTC_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-grpcio-reflection/Config.in b/package/python-grpcio-reflection/Config.in index afe898816579..a0ca35c286ee 100644 --- a/package/python-grpcio-reflection/Config.in +++ b/package/python-grpcio-reflection/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_GRPCIO_REFLECTION bool "python-grpcio-reflection" + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS # python-grpcio depends on BR2_INSTALL_LIBSTDCPP # python-grpcio select BR2_PACKAGE_PYTHON_GRPCIO # runtime select BR2_PACKAGE_PYTHON_PROTOBUF # runtime @@ -9,4 +10,5 @@ config BR2_PACKAGE_PYTHON_GRPCIO_REFLECTION https://grpc.io comment "python-grpcio-reflection needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/python-grpcio/Config.in b/package/python-grpcio/Config.in index 5242eb461e39..9657ccb6eded 100644 --- a/package/python-grpcio/Config.in +++ b/package/python-grpcio/Config.in @@ -1,5 +1,15 @@ +config BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS + bool + # see third_party/boringssl-with-bazel/src/include/openssl/target.h + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_riscv + config BR2_PACKAGE_PYTHON_GRPCIO bool "python-grpcio" + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP help HTTP/2-based RPC framework. @@ -7,4 +17,5 @@ config BR2_PACKAGE_PYTHON_GRPCIO https://grpc.io comment "python-grpcio needs a toolchain w/ C++" + depends on BR2_PACKAGE_PYTHON_GRPCIO_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP From 86e244b1a5695a570d00755beeaae068dcb30c2d Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 13 Feb 2024 11:58:40 +0100 Subject: [PATCH 078/345] package/rauc: bump to 1.11.1 This fixes an incompatibility with openssl 3.2 when using codesign certificate purpose [1]. [1] https://github.com/rauc/rauc/releases/tag/v1.11.1 Signed-off-by: Marcus Hoffmann Signed-off-by: Yann E. MORIN --- package/rauc/rauc.hash | 2 +- package/rauc/rauc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 8de309f8c79d..63aa4715e02c 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a28f415c580390dd9e65016a5d90a63ee1cfd7e1b3e864cbb13cb3ac3513391f rauc-1.11.tar.xz +sha256 391d13d709abb630c459e79e62e474e68224c5d07c816355784bba75a86a2507 rauc-1.11.1.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index aff5ead2818d..fbdea4e23539 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.11 +RAUC_VERSION = 1.11.1 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From a8b33cb87b6de28e33ac46a20526ebe77c7591f1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 11:58:02 +0100 Subject: [PATCH 079/345] package/openvmtools: needs dynamic library openvmtools can't be built statically since at least bump to version 10.3.5 in commit 5f0f0f7e4f3362a3695d5876d0f41125a2544285: libtool: link: /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/i586-buildroot-linux-musl-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Ofast -g0 -static -Wall -Wno-pointer-sign -Wno-unused-value -fno-strict-aliasing -Wno-unknown-pragmas -Wno-uninitialized -Wno-deprecated-declarations -Wno-unused-const-variable -Wno-unused-but-set-variable -static -o vmtoolsd vmtoolsd-cmdLine.o vmtoolsd-mainLoop.o vmtoolsd-mainPosix.o vmtoolsd-pluginMgr.o vmtoolsd-serviceObj.o vmtoolsd-threadPool.o vmtoolsd-toolsRpc.o vmtoolsd-svcSignals.o vmtoolsd-toolsHangDetector.o -pthread -Wl,--export-dynamic -pthread -pthread -pthread /home/autobuild/autobuild/instance-9/output-1/build/openvmtools-11.3.5-18557794/libvmtools/.libs/libvmtools.a -L/home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/../i586-buildroot-linux-musl/sysroot/usr/lib /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-li nux-musl/sysroot/usr/lib/libdnet.a /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libtirpc.a -lrt -lcrypt -lpthread -lgmodule-2.0 -lgobject-2.0 /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libffi.a -lgthread-2.0 -lglib-2.0 -lm /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/i586-buildroot-linux-musl/sysroot/usr/lib/libpcre.a ../../lib/globalConfig/.libs/libGlobalConfig.a -pthread /home/autobuild/autobuild/instance-9/output-1/per-package/openvmtools/host/bin/../lib/gcc/i586-buildroot-linux-musl/10.4.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/autobuild/autobuild/instance-9/output-1/build/openvmtools-11.3.5-18557794/libvmtools/.libs/libvmtools.a(libvmtools_la-vmtools.o):(.modinfo+0x0): multiple definition of `vm_version'; vmtoolsd-mainPosix.o:(.modinfo+0x0): first defined here Fixes: - http://autobuild.buildroot.org/results/61b03301bc36247c75e797fb294ec7f96bce6e22 - http://autobuild.buildroot.org/results/eea487eb0de911f4e4bce7a557d4c93d732181cf Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/openvmtools/Config.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in index 066a7a47365d..b62e5d03614c 100644 --- a/package/openvmtools/Config.in +++ b/package/openvmtools/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_OPENVMTOOLS depends on BR2_USE_WCHAR # libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_ENABLE_LOCALE + depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_USES_UCLIBC select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBDNET @@ -30,16 +31,15 @@ if BR2_PACKAGE_OPENVMTOOLS config BR2_PACKAGE_OPENVMTOOLS_PAM bool "PAM support" - # linux-pam needs locale and wchar, but we already have this - # dependency on the main symbol, above. + # linux-pam needs locale, dynamic library and wchar, but we + # already have these dependencies on the main symbol, above. depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # linux-pam - depends on !BR2_STATIC_LIBS select BR2_PACKAGE_LINUX_PAM help Support for PAM in openvmtools -comment "PAM support needs a toolchain w/ dynamic library, gcc >= 4.9" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +comment "PAM support needs a toolchain w/ gcc >= 4.9" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_PACKAGE_OPENVMTOOLS_RESOLUTIONKMS bool "resolutionkms support" @@ -57,9 +57,9 @@ comment "resolutionkms needs udev, a toolchain w/ threads" endif -comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale" +comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, locale, dynamic library" depends on BR2_PACKAGE_OPENVMTOOLS_ARCH_SUPPORTS depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_ENABLE_LOCALE || \ + !BR2_ENABLE_LOCALE || BR2_STATIC_LIBS || \ BR2_TOOLCHAIN_USES_UCLIBC From 44dc77af0ed77cefd80985d6bd8380acdbdf1940 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 1 Mar 2024 23:03:23 +0100 Subject: [PATCH 080/345] package/expat: bump to version 2.6.1 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 6 +++--- package/expat/expat.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 043501378bcd..980a9ab6a79d 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.6.0/ -md5 bd169cb11f4b9bdfddadf9e88a5c4d4b expat-2.6.0.tar.xz -sha1 d87e8ab2a3c1deb858c6b22e5ade9d5673086004 expat-2.6.0.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.1/ +md5 84d0ee1c554212dc8f068e538de5b823 expat-2.6.1.tar.xz +sha1 1a1804b7c565a8b21abbd3433ef67ed8a4476960 expat-2.6.1.tar.xz # Locally calculated sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz diff --git a/package/expat/expat.mk b/package/expat/expat.mk index 5f4016e0d14c..e09fcc673fa5 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.6.0 +EXPAT_VERSION = 2.6.1 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From 73c83dbe3e8e212b4b3d563b5ddf86354d6a6b29 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2024 23:00:16 +0100 Subject: [PATCH 081/345] package/nginx-naxsi: needs pcre2 Commit 722b84eafa5e3d9540e0a80bae0c971a3a778358 forgot to update nginx-naxsi resulting in the following build failure: In file included from ../nginx-naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834/naxsi_src/naxsi_runtime.c:7: ../nginx-naxsi-d714f1636ea49a9a9f4f06dba14aee003e970834/naxsi_src/naxsi.h:147:3: error: unknown type name 'ngx_regex_compile_t' 147 | ngx_regex_compile_t* target_rx; | ^~~~~~~~~~~~~~~~~~~ Fixes: 722b84eafa5e3d9540e0a80bae0c971a3a778358 - http://autobuild.buildroot.org/results/87bbcf946ccbd8e3bf1ca9f39464f4bb198c8d42 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/nginx-naxsi/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx-naxsi/Config.in b/package/nginx-naxsi/Config.in index fc2ba9bfe35c..d30d653df34c 100644 --- a/package/nginx-naxsi/Config.in +++ b/package/nginx-naxsi/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_NGINX_NAXSI bool "nginx-naxsi" depends on BR2_PACKAGE_NGINX_HTTP - # uses pcre, so nginx needs to be built with pcre support - select BR2_PACKAGE_PCRE + # uses pcre2, so nginx needs to be built with pcre2 support + select BR2_PACKAGE_PCRE2 help NAXSI means Nginx Anti XSS & SQL Injection. From b6d96266a174024c5f6f8647cf19617056aef56c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 09:56:26 +0100 Subject: [PATCH 082/345] package/spirv-tools: needs gcc >= 8 spirv-tools unconditionally includes filesystem since its addition in commit 0a01085abeb7d8a097cb68b9f7f4faec7711543c resulting in the following build failure: /home/buildroot/autobuild/run/instance-1/output-1/build/spirv-tools-1.3.261.1/tools/objdump/objdump.cpp:15:10: fatal error: filesystem: No such file or directory #include ^~~~~~~~~~~~ Fixes: 0a01085abeb7d8a097cb68b9f7f4faec7711543c - http://autobuild.buildroot.org/results/aaeb0ca8773842768f9311fc804bb7529d9e3bfa Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/spirv-tools/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/spirv-tools/Config.in b/package/spirv-tools/Config.in index 39fdb80b865c..fa9b615c5651 100644 --- a/package/spirv-tools/Config.in +++ b/package/spirv-tools/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_SPIRV_TOOLS bool "spirv-tools" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem select BR2_PACKAGE_SPIRV_HEADERS help The SPIR-V Tools project provides an API and commands for @@ -9,6 +9,6 @@ config BR2_PACKAGE_SPIRV_TOOLS https://github.com/KhronosGroup/SPIRV-Tools -comment "spirv-tools needs a toolchain w/ C++, gcc >= 7" +comment "spirv-tools needs a toolchain w/ C++, gcc >= 8" depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 From 3c73f6ed3e04eefdc6c224ad1bbd3730400e1e11 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 24 Feb 2024 22:41:13 +0100 Subject: [PATCH 083/345] package/mongoose: bump to version 7.13 https://github.com/cesanta/mongoose/releases/tag/7.13 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- package/mongoose/mongoose.hash | 2 +- package/mongoose/mongoose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mongoose/mongoose.hash b/package/mongoose/mongoose.hash index ed5db5ebf68f..716833eeed06 100644 --- a/package/mongoose/mongoose.hash +++ b/package/mongoose/mongoose.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 91e719e164816b349be3cb71293927f3f6abbe3fb02187e2d9b5e56f542c2063 mongoose-7.12.tar.gz +sha256 5c9dc8d1d1762ef483b6d2fbf5234e421ca944b722225bb533d2d0507b118a0f mongoose-7.13.tar.gz sha256 4ba646f5a7012d8b52f3a74398e446f56960dde0572f7241a2215430da5dd5a2 LICENSE diff --git a/package/mongoose/mongoose.mk b/package/mongoose/mongoose.mk index 74594ff48cb9..e2e3be790aab 100644 --- a/package/mongoose/mongoose.mk +++ b/package/mongoose/mongoose.mk @@ -4,7 +4,7 @@ # ################################################################################ -MONGOOSE_VERSION = 7.12 +MONGOOSE_VERSION = 7.13 MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) MONGOOSE_LICENSE = GPL-2.0 MONGOOSE_LICENSE_FILES = LICENSE From 2934a4692c4f1f3649b7781263ae655fcb3d780a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 10:27:32 +0100 Subject: [PATCH 084/345] package/parted: needs gcc >= 5 Fix the following build failure raised since bump to version 3.5 in commit 57817fe05a4250a260a08201812c6652b306a0e5 and https://git.savannah.gnu.org/cgit/parted.git/commit/?id=15c49ec04f7eaff014d2e1eddd0aecf4150db63d: gpt.c:181:5: error: initializer element is not constant { PED_PARTITION_APPLE_TV_RECOVERY, PARTITION_APPLE_TV_RECOVERY_GUID }, ^ gpt.c:181:5: error: (near initialization for 'flag_uuid_mapping[0].type_uuid') Fixes: 57817fe05a4250a260a08201812c6652b306a0e5 - http://autobuild.buildroot.org/results/1f0af75ec55da9052fbfb195a0699f84619eac81 - http://autobuild.buildroot.org/results/438b5f40e8b393801f36c691d239e298998cb9d2 Note that udisks also select parted, but it already has a more stringent dependency on GCC >= 7. Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/libblockdev/Config.in | 15 +++++++++------ package/parted/Config.in | 6 ++++-- package/python-pyparted/Config.in | 6 ++++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/package/libblockdev/Config.in b/package/libblockdev/Config.in index e0449628b49a..7494b0f6b774 100644 --- a/package/libblockdev/Config.in +++ b/package/libblockdev/Config.in @@ -32,12 +32,13 @@ config BR2_PACKAGE_LIBBLOCKDEV_CRYPTO config BR2_PACKAGE_LIBBLOCKDEV_FS bool "filesystem" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_PARTED select BR2_PACKAGE_E2FSPROGS -comment "filesystem plugin needs a toolchain w/ locale" - depends on !BR2_ENABLE_LOCALE +comment "filesystem plugin needs a toolchain w/ locale, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_LIBBLOCKDEV_LOOP bool "loop" @@ -45,11 +46,12 @@ config BR2_PACKAGE_LIBBLOCKDEV_LOOP config BR2_PACKAGE_LIBBLOCKDEV_LVM2 bool "lvm2" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted select BR2_PACKAGE_PARTED select BR2_PACKAGE_LVM2 -comment "lvm2 support needs a toolchain w/ locale" - depends on !BR2_ENABLE_LOCALE +comment "lvm2 support needs a toolchain w/ locale, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_LIBBLOCKDEV_MDRAID bool "mdraid" @@ -62,11 +64,12 @@ config BR2_PACKAGE_LIBBLOCKDEV_NVME config BR2_PACKAGE_LIBBLOCKDEV_PART bool "part" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted select BR2_PACKAGE_PARTED select BR2_PACKAGE_UTIL_LINUX_LIBFDISK -comment "part plugin needs a toolchain w/ locale" - depends on !BR2_ENABLE_LOCALE +comment "part plugin needs a toolchain w/ locale, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 config BR2_PACKAGE_LIBBLOCKDEV_SWAP bool "swap" diff --git a/package/parted/Config.in b/package/parted/Config.in index f48b365a2d7a..ea6c3db2bf7b 100644 --- a/package/parted/Config.in +++ b/package/parted/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PARTED bool "parted" depends on BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBUUID help @@ -9,5 +10,6 @@ config BR2_PACKAGE_PARTED http://www.gnu.org/software/parted/ -comment "parted needs a toolchain w/ locale, wchar" - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR +comment "parted needs a toolchain w/ locale, wchar, gcc >=5" + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 diff --git a/package/python-pyparted/Config.in b/package/python-pyparted/Config.in index 60f54a5484db..430bf204a18a 100644 --- a/package/python-pyparted/Config.in +++ b/package/python-pyparted/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_PYPARTED bool "python-pyparted" depends on BR2_ENABLE_LOCALE # parted + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # parted depends on BR2_USE_WCHAR select BR2_PACKAGE_PARTED help @@ -8,5 +9,6 @@ config BR2_PACKAGE_PYTHON_PYPARTED https://github.com/rhinstaller/pyparted -comment "pyparted needs a toolchain w/ locale, wchar" - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR +comment "pyparted needs a toolchain w/ locale, wchar, gcc >= 5" + depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 From 814f9f17d5c345f4c20ed3cca4873f7411db96d5 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 2 Mar 2024 12:16:55 +0100 Subject: [PATCH 085/345] package/quickjs: bump to version 2024-01-13 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/quickjs/quickjs.hash | 2 +- package/quickjs/quickjs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/quickjs/quickjs.hash b/package/quickjs/quickjs.hash index 916fb6e3a279..30613b982adb 100644 --- a/package/quickjs/quickjs.hash +++ b/package/quickjs/quickjs.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e8afe386f875d0e52310ea91aa48e2b0e04182e821f19147794e3e272f4c8d8c quickjs-2023-12-09.tar.xz +sha256 3c4bf8f895bfa54beb486c8d1218112771ecfc5ac3be1036851ef41568212e03 quickjs-2024-01-13.tar.xz sha256 f41baf09eef895d468d18c23055d74f711e4b8b2641cef279b5d71285c07bfe8 LICENSE diff --git a/package/quickjs/quickjs.mk b/package/quickjs/quickjs.mk index 186397f9aa3d..e745923b87bf 100644 --- a/package/quickjs/quickjs.mk +++ b/package/quickjs/quickjs.mk @@ -4,7 +4,7 @@ # ################################################################################ -QUICKJS_VERSION = 2023-12-09 +QUICKJS_VERSION = 2024-01-13 QUICKJS_SOURCE = quickjs-$(QUICKJS_VERSION).tar.xz QUICKJS_SITE = https://bellard.org/quickjs QUICKJS_LICENSE = MIT From fa9e575776ee3d3d47a31fee3c09a94753c77cc7 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 1 Mar 2024 23:03:36 +0100 Subject: [PATCH 086/345] package/pcre2: bump to version 10.43 diff LICENCE: update copyright dates Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/pcre2/pcre2.hash | 6 +++--- package/pcre2/pcre2.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pcre2/pcre2.hash b/package/pcre2/pcre2.hash index f609bdaee294..f2e17df7535c 100644 --- a/package/pcre2/pcre2.hash +++ b/package/pcre2/pcre2.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature: -# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2.sig -sha256 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840 pcre2-10.42.tar.bz2 +# https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.43/pcre2-10.43.tar.bz2.sig +sha256 e2a53984ff0b07dfdb5ae4486bbb9b21cca8e7df2434096cc9bf1b728c350bcb pcre2-10.43.tar.bz2 # Locally computed -sha256 87d884eceb7fc54611470ce9f74280d28612b0c877adfc767e9676892a638987 LICENCE +sha256 030087e2e8dd7c1bdd26057d25d4ded8f45bbf01ad458d68665ad04b8b0fbedf LICENCE diff --git a/package/pcre2/pcre2.mk b/package/pcre2/pcre2.mk index c35056f8a263..9641f22e8148 100644 --- a/package/pcre2/pcre2.mk +++ b/package/pcre2/pcre2.mk @@ -4,7 +4,7 @@ # ################################################################################ -PCRE2_VERSION = 10.42 +PCRE2_VERSION = 10.43 PCRE2_SITE = https://github.com/PCRE2Project/pcre2/releases/download/pcre2-$(PCRE2_VERSION) PCRE2_SOURCE = pcre2-$(PCRE2_VERSION).tar.bz2 PCRE2_LICENSE = BSD-3-Clause From 64b8cbc13cfd5f9d4863531ab768bf0afbc1f340 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 1 Mar 2024 23:03:31 +0100 Subject: [PATCH 087/345] package/mc: bump to version 4.8.31 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/mc/mc.hash | 4 ++-- package/mc/mc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/mc/mc.hash b/package/mc/mc.hash index 93462afa60e8..84ea4b2ac7a5 100644 --- a/package/mc/mc.hash +++ b/package/mc/mc.hash @@ -1,4 +1,4 @@ -# Hash from http://ftp.midnight-commander.org/mc-4.8.30.sha256 -sha256 5ebc3cb2144b970c5149fda556c4ad50b78780494696cdf2d14a53204c95c7df mc-4.8.30.tar.xz +# Hash from http://ftp.midnight-commander.org/mc-4.8.31.sha256 +sha256 24191cf8667675b8e31fc4a9d18a0a65bdc0598c2c5c4ea092494cd13ab4ab1a mc-4.8.31.tar.xz # sha256 locally computed: sha256 5576bbec76296e1c8e081f7037ebd01bdada388635f58d844a2f20d37bbe4284 COPYING diff --git a/package/mc/mc.mk b/package/mc/mc.mk index 2b4279c308ca..a6c3e0bc845e 100644 --- a/package/mc/mc.mk +++ b/package/mc/mc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MC_VERSION = 4.8.30 +MC_VERSION = 4.8.31 MC_SOURCE = mc-$(MC_VERSION).tar.xz MC_SITE = http://ftp.midnight-commander.org MC_LICENSE = GPL-3.0+ From 953230e176ef4357d5cc28039eb913951b79f513 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 29 Feb 2024 23:41:20 +0100 Subject: [PATCH 088/345] package/rust/rust.mk: add missing host-zlib dependency Several rust tools are linking against zlib, so add the depedency explicitly in HOST_RUST_DEPENDENCIES. For now, host-rust build system is not able to find zlib provided by Buildroot in HOST_DIR due to at least two issues that will be fixed in followup commits. Note that host-zlib is already in the dependency chain, by way of host-openssl, but since rust needs for itself, we need to add it as an explicit dependency. Signed-off-by: Romain Naour [yann.morin.1998@free.fr: add not about transitive dependency] Signed-off-by: Yann E. MORIN --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index f7a5c0fcd5b3..16a397407fd9 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -20,6 +20,7 @@ HOST_RUST_DEPENDENCIES = \ host-python3 \ host-rust-bin \ host-openssl \ + host-zlib \ $(BR2_CMAKE_HOST_DEPENDENCY) HOST_RUST_VERBOSITY = $(if $(VERBOSE),2,0) From 83a4c6f4fbedefb7aa12a887c2c073d9ade20c6e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 29 Feb 2024 23:41:21 +0100 Subject: [PATCH 089/345] package/rust: use host libraries from HOST_DIR host-rust package depends on several host packages to provide tools and libraries but it doesn't take into account out host libraries in HOST_DIR while building rustc compiler. Indeed, rustc needs zlib and fails to link if zlib is not installed on the host. error: could not compile `rustc_driver` (lib) due to previous error If zlib is installed on the host, we can notice it with ldd tool (while it should be linked with the one provided by Buildroot host-zlib): ldd [...]TestRust/host/bin/rustc libz.so.1 => /lib64/libz.so.1 Provide HOST_LDFLAGS using llvm.ldflags in config.toml. (HOST_LDFLAGS provides -L$(HOST_DIR)/lib -Wl,-rpath,$(HOST_DIR)/lib) With that fixed, rustc_driver link with libz from HOST_DIR but the host-rust build still fail later due to another issue. error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6256881545 http://autobuild.buildroot.org/results/a6b/a6b28783f29e6b729824bf42679a62f72ad5bee0 Signed-off-by: Romain Naour [yann.morin.1998@free.fr: slight rewording in commit log] Signed-off-by: Yann E. MORIN --- package/rust/rust.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 16a397407fd9..4903060368d3 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -65,6 +65,7 @@ define HOST_RUST_CONFIGURE_CMDS echo 'cc = "$(TARGET_CROSS)gcc"'; \ echo '[llvm]'; \ echo 'ninja = false'; \ + echo 'ldflags = "$(HOST_LDFLAGS)"'; \ ) > $(@D)/config.toml endef From 6849d17cf4d65f3c8dcc986a7a68ce51619f8508 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 22:28:52 +0100 Subject: [PATCH 090/345] package/powertop: fix gettext build Fix gettext build raised since bump to version 2.15 in commit d65b960859046be486ced6c490d3671bd1392661: *** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version 0.18 but the autoconf macros are from gettext version 0.20 Fixes: d65b960859046be486ced6c490d3671bd1392661 - http://autobuild.buildroot.org/results/bb80a7842d18651e5069f3a91f06a9c23218d260 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/powertop/powertop.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/powertop/powertop.mk b/package/powertop/powertop.mk index 0481caee07f8..a7a57939e0f9 100644 --- a/package/powertop/powertop.mk +++ b/package/powertop/powertop.mk @@ -20,6 +20,7 @@ POWERTOP_DEPENDENCIES = \ POWERTOP_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) # 0001-add-disable-stack-protector-option.patch POWERTOP_AUTORECONF = YES +POWERTOP_AUTOPOINT = YES POWERTOP_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive POWERTOP_CONF_OPTS = --disable-stack-protector From edde351cb8c13ffd54a369916da5f3f372edd4a2 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 2 Mar 2024 23:20:49 +0100 Subject: [PATCH 091/345] package/powertop: reorder variables in a more logical manner Group _CONF_{ENV,OPTS} together after the autreconf ones. Keep AUTORECONF=YES close to AUTORECONF_OPTS Signed-off-by: Yann E. MORIN --- package/powertop/powertop.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/powertop/powertop.mk b/package/powertop/powertop.mk index a7a57939e0f9..aa7d251b9004 100644 --- a/package/powertop/powertop.mk +++ b/package/powertop/powertop.mk @@ -17,11 +17,12 @@ POWERTOP_DEPENDENCIES = \ $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \ $(TARGET_NLS_DEPENDENCIES) -POWERTOP_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) # 0001-add-disable-stack-protector-option.patch -POWERTOP_AUTORECONF = YES POWERTOP_AUTOPOINT = YES +POWERTOP_AUTORECONF = YES POWERTOP_AUTORECONF_OPTS = --include=$(HOST_DIR)/share/autoconf-archive + +POWERTOP_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) POWERTOP_CONF_OPTS = --disable-stack-protector # fix missing config.rpath (needed for autoreconf) in the codebase From b8707cee5e7e4af8fc2addd317b294e081db994f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 17:31:37 +0100 Subject: [PATCH 092/345] package/python-cheroot: drop host-python-setuptools-scm-git-archive Drop host-python-setuptools-scm-git-archive dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- ...ptools-scm-v7-for-building-the-dists.patch | 101 ++++++++++++++++++ package/python-cheroot/python-cheroot.mk | 2 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch diff --git a/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch b/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch new file mode 100644 index 000000000000..837f2804d2c9 --- /dev/null +++ b/package/python-cheroot/0001-Use-setuptools-scm-v7-for-building-the-dists.patch @@ -0,0 +1,101 @@ +From f0c51af263e20f332c6f675aa90ec6705ae4f5d1 Mon Sep 17 00:00:00 2001 +From: Serhii Abarovskyi +Date: Tue, 9 May 2023 18:33:54 +0300 +Subject: [PATCH] Use setuptools-scm v7+ for building the dists + +Since version 7, setuptools-scm has native support for git archive, +so the setuptools-scm-git-archive project is obsolete +and this patch removes it from the build dependencies. +Close #515 + +Upstream: https://github.com/cherrypy/cheroot/commit/f0c51af263e20f332c6f675aa90ec6705ae4f5d1 +Signed-off-by: Fabrice Fontaine +--- + .git_archival.txt | 3 +++ + pyproject.toml | 3 +-- + requirements/dist-build-constraints.in | 3 +-- + requirements/dist-build-constraints.txt | 16 +++++++--------- + setup.cfg | 3 +-- + 5 files changed, 13 insertions(+), 15 deletions(-) + +diff --git a/.git_archival.txt b/.git_archival.txt +index 95cb3eea4e..3994ec0a83 100644 +--- a/.git_archival.txt ++++ b/.git_archival.txt +@@ -1 +1,4 @@ ++node: $Format:%H$ ++node-date: $Format:%cI$ ++describe-name: $Format:%(describe:tags=true)$ + ref-names: $Format:%D$ +diff --git a/pyproject.toml b/pyproject.toml +index b1e5f60a80..88df57dcc1 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -6,8 +6,7 @@ requires = [ + "setuptools>=34.4", + + # Plugins +- "setuptools_scm[toml]>=3.5", +- "setuptools_scm_git_archive>=1.1", ++ "setuptools-scm >= 7.0.0", + ] + build-backend = "setuptools.build_meta" + +diff --git a/requirements/dist-build-constraints.in b/requirements/dist-build-constraints.in +index 26b57228a9..a37baef1a9 100644 +--- a/requirements/dist-build-constraints.in ++++ b/requirements/dist-build-constraints.in +@@ -5,8 +5,7 @@ + setuptools >= 34.4 + + # Plugins +-setuptools_scm[toml] >= 3.5 +-setuptools_scm_git_archive >= 1.1 ++setuptools-scm[toml] >= 7.0.0 + + # Dynamic (coming from setuptools' PEP 517 build backend) + wheel +diff --git a/requirements/dist-build-constraints.txt b/requirements/dist-build-constraints.txt +index 525f2be30f..8bd4343ff6 100644 +--- a/requirements/dist-build-constraints.txt ++++ b/requirements/dist-build-constraints.txt +@@ -1,18 +1,16 @@ + # +-# This file is autogenerated by pip-compile with python 3.10 +-# To update, run: ++# This file is autogenerated by pip-compile with Python 3.10 ++# by the following command: + # + # pip-compile --allow-unsafe --output-file=requirements/dist-build-constraints.txt --strip-extras requirements/dist-build-constraints.in + # +-packaging==21.3 ++packaging==23.1 + # via setuptools-scm +-pyparsing==3.0.6 +- # via packaging +-setuptools-scm==6.3.2 ++setuptools-scm==7.1.0 + # via -r requirements/dist-build-constraints.in +-setuptools-scm-git-archive==1.1 +- # via -r requirements/dist-build-constraints.in +-tomli==2.0.0 ++tomli==2.0.1 ++ # via setuptools-scm ++typing-extensions==4.6.3 + # via setuptools-scm + wheel==0.37.1 + # via -r requirements/dist-build-constraints.in +diff --git a/setup.cfg b/setup.cfg +index 1f2b08f4c3..900c7b4feb 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -64,8 +64,7 @@ include_package_data = True + packages = find: + include_package_data = True + setup_requires = +- setuptools_scm>=1.15.0 +- setuptools_scm_git_archive>=1.0 ++ setuptools_scm >= 7.0.0 + install_requires = + importlib_metadata; python_version < '3.8' + more_itertools >= 2.6 diff --git a/package/python-cheroot/python-cheroot.mk b/package/python-cheroot/python-cheroot.mk index 86e16f7db2d6..19aa7ae19386 100644 --- a/package/python-cheroot/python-cheroot.mk +++ b/package/python-cheroot/python-cheroot.mk @@ -10,6 +10,6 @@ PYTHON_CHEROOT_SITE = https://files.pythonhosted.org/packages/08/7c/95c154177b16 PYTHON_CHEROOT_LICENSE = BSD-3-Clause PYTHON_CHEROOT_LICENSE_FILES = LICENSE.md PYTHON_CHEROOT_SETUP_TYPE = setuptools -PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm host-python-setuptools-scm-git-archive +PYTHON_CHEROOT_DEPENDENCIES = host-python-setuptools-scm $(eval $(python-package)) From 4a71f029085f8eda64aeee0edb80b7be8ca58022 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 17:31:38 +0100 Subject: [PATCH 093/345] package/python-setuptools-scm-git-archive: drop package python-setuptools-scm-git-archive is obsolete as python-setuptools-scm >= 7.0.0 supports Git archives by itself. Moreover, it raises the following build failure without pip since its addition in commit 9359325c6081df89ff57667cb49e0d12cd553b97: /nvmedata/autobuild/instance-3/output-1/per-package/host-python-setuptools-scm-git-archive/host/bin/python: No module named pip Traceback (most recent call last): File "/nvmedata/autobuild/instance-3/output-1/per-package/host-python-setuptools-scm-git-archive/host/lib/python3.10/site-packages/setuptools/installer.py", line 82, in fetch_build_egg subprocess.check_call(cmd) File "/nvmedata/autobuild/instance-3/output-1/per-package/host-python-setuptools-scm-git-archive/host/lib/python3.10/subprocess.py", line 369, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['/nvmedata/autobuild/instance-3/output-1/per-package/host-python-setuptools-scm-git-archive/host/bin/python', '-m', 'pip', '--disable-pip-version-check', 'wheel', '--no-deps', '-w', '/tmp/tmpaxobatcs', '--quiet', 'typing-extensions']' returned non-zero exit status 1. Fixes: - http://autobuild.buildroot.org/results/d05e412170c427e4f210da164c783b3527f15892 - http://autobuild.buildroot.org/results/50f80cfabccbe5c75cd889ce6af2b418e376d4e5 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../python-setuptools-scm-git-archive.hash | 5 ----- .../python-setuptools-scm-git-archive.mk | 15 --------------- 2 files changed, 20 deletions(-) delete mode 100644 package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash delete mode 100644 package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash deleted file mode 100644 index ce790a3d5968..000000000000 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.hash +++ /dev/null @@ -1,5 +0,0 @@ -# md5, sha256 from https://pypi.org/pypi/setuptools-scm-git-archive/json -md5 cfcdab6edbe6b710ab24ad355e7cf7a3 setuptools_scm_git_archive-1.4.1.tar.gz -sha256 c418bc77b3974d3ac65f268f058f23e01dc5f991f2233128b0e16a69de227b09 setuptools_scm_git_archive-1.4.1.tar.gz -# Locally computed sha256 checksums -sha256 89807acf2309bd285f033404ee78581602f3cd9b819a16ac2f0e5f60ff4a473e LICENSE diff --git a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk b/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk deleted file mode 100644 index 153343788b18..000000000000 --- a/package/python-setuptools-scm-git-archive/python-setuptools-scm-git-archive.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-setuptools-scm-git-archive -# -################################################################################ - -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION = 1.4.1 -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SOURCE = setuptools_scm_git_archive-$(PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SITE = https://files.pythonhosted.org/packages/47/d6/c9a8d1ea95613f79b9b914cf9a5e8e420b7625fc54137c1d7c9cbbda5adf -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_SETUP_TYPE = setuptools -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE = MIT -PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_SCM_GIT_ARCHIVE_DEPENDENCIES = host-python-setuptools-scm - -$(eval $(host-python-package)) From f7f03445cf320adbbc41270a806b38c911d3454a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:41:21 +0100 Subject: [PATCH 094/345] package/musl: bump to version 1.2.5 This release adds two new ports: loongarch64 and riscv32. The former is not supported in Buildroot, but the latter is, so it gets enabled in this commit. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/musl/Config.in | 2 +- package/musl/musl.hash | 4 ++-- package/musl/musl.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/musl/Config.in b/package/musl/Config.in index 89f41d2ff10d..7fba85bcd943 100644 --- a/package/musl/Config.in +++ b/package/musl/Config.in @@ -15,7 +15,7 @@ config BR2_PACKAGE_MUSL_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_powerpc64 default y if BR2_powerpc64le - default y if BR2_RISCV_64 + default y if BR2_riscv default y if BR2_sh default y if BR2_x86_64 depends on !BR2_POWERPC_CPU_HAS_SPE # not supported, build breaks diff --git a/package/musl/musl.hash b/package/musl/musl.hash index 3b5fccc9e282..b105320bacec 100644 --- a/package/musl/musl.hash +++ b/package/musl/musl.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# http://musl.libc.org/releases/musl-1.2.4.tar.gz.asc -sha256 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039 musl-1.2.4.tar.gz +# http://musl.libc.org/releases/musl-1.2.5.tar.gz.asc +sha256 a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4 musl-1.2.5.tar.gz sha256 f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af COPYRIGHT diff --git a/package/musl/musl.mk b/package/musl/musl.mk index 08706c139ff4..783a103fcd16 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -4,7 +4,7 @@ # ################################################################################ -MUSL_VERSION = 1.2.4 +MUSL_VERSION = 1.2.5 MUSL_SITE = http://musl.libc.org/releases MUSL_LICENSE = MIT MUSL_LICENSE_FILES = COPYRIGHT From ae910aac6298fb1d39c40ae8aa5a5b5fc52c97c4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:40:09 +0100 Subject: [PATCH 095/345] package/binutils: add support for 2.42 Note that the hash of the tarball does not need to be added, as it was already added as part of commit 11b439ce1bd28506051fff14646f8bbdbbbe58d8 ("package/binutils-bare-metal: new package"). Our existing 2 patches are simply rebased, with minor conflict resolution required. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: keep version list in strict version order] Signed-off-by: Yann E. MORIN --- package/binutils/2.42/0001-sh-conf.patch | 50 +++ .../2.42/0002-poison-system-directories.patch | 309 ++++++++++++++++++ package/binutils/Config.in.host | 4 + 3 files changed, 363 insertions(+) create mode 100644 package/binutils/2.42/0001-sh-conf.patch create mode 100644 package/binutils/2.42/0002-poison-system-directories.patch diff --git a/package/binutils/2.42/0001-sh-conf.patch b/package/binutils/2.42/0001-sh-conf.patch new file mode 100644 index 000000000000..c3810178500e --- /dev/null +++ b/package/binutils/2.42/0001-sh-conf.patch @@ -0,0 +1,50 @@ +From d71fb5a9999ee7c8963342caa0d5cbb16872ab07 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +Upstream: N/A [Buildroot specific] + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 670684d83d1..967c6708a0c 100755 +--- a/configure ++++ b/configure +@@ -4042,7 +4042,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 88b4800e298..2c8d08ff6ec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1269,7 +1269,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.43.0 + diff --git a/package/binutils/2.42/0002-poison-system-directories.patch b/package/binutils/2.42/0002-poison-system-directories.patch new file mode 100644 index 000000000000..5c790999d4eb --- /dev/null +++ b/package/binutils/2.42/0002-poison-system-directories.patch @@ -0,0 +1,309 @@ +From 00f6b0a7d31085831429834b2bc8f511b8fab6ce Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Waldemar: rebase on top of 2.39] +Signed-off-by: Waldemar Brodkorb +[Romain: rebase on top of 2.33.1] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] +Upstream: N/A [Buildroot specific] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index 52d62f06ff0..b5944e7ba55 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -70,6 +70,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index ba1e5e2a215..2220d7afe2a 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -844,6 +844,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1534,6 +1535,8 @@ Optional Features: + --enable-checking enable run-time checks + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15587,7 +15590,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index 4a11787ae71..104a531fb0f 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -103,6 +103,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index 54d9079678c..9f0163b2911 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -166,6 +166,14 @@ typedef struct + in the linker script. */ + bool force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bool poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bool error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index 4fda259a552..11fd8f7547b 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -3108,6 +3108,18 @@ string identifying the original linked file does not change. + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. + ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. ++ + @kindex --package-metadata=@var{JSON} + @item --package-metadata=@var{JSON} + Request the creation of a @code{.note.package} ELF note section. The +diff --git a/ld/ldfile.c b/ld/ldfile.c +index dc9875d8813..49d899ee49d 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -327,6 +327,23 @@ ldfile_add_library_path (const char *name, bool cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 161a9d4d8dc..4ca50b9c299 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -168,6 +168,8 @@ enum option_values + OPTION_CTF_VARIABLES, + OPTION_NO_CTF_VARIABLES, + OPTION_CTF_SHARE_TYPES, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + OPTION_ERROR_EXECSTACK, + OPTION_NO_ERROR_EXECSTACK, + OPTION_WARN_EXECSTACK_OBJECTS, +diff --git a/ld/ldmain.c b/ld/ldmain.c +index e90c2021b33..43fe888eba8 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -325,6 +325,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = true; + command_line.warn_search_mismatch = true; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = true; ++ command_line.error_poison_system_directories = false; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 099dff8ecde..01626712c77 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -642,6 +642,14 @@ static const struct ld_option ld_options[] = + " is: share-unconflicted (default),\n" + " share-duplicated"), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -654,6 +662,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1769,6 +1778,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = false; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = true; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1922,6 +1939,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = true; ++ + while (ingroup) + { + einfo (_("%P: missing --end-group; added as last command line option\n")); +-- +2.43.0 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 2f1ddf4bdc3a..cc8dfa31d806 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -29,6 +29,9 @@ config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.41)" depends on BR2_arc +config BR2_BINUTILS_VERSION_2_42_X + bool "binutils 2.42" + endchoice config BR2_BINUTILS_VERSION @@ -37,6 +40,7 @@ config BR2_BINUTILS_VERSION default "2.39" if BR2_BINUTILS_VERSION_2_39_X default "2.40" if BR2_BINUTILS_VERSION_2_40_X default "2.41" if BR2_BINUTILS_VERSION_2_41_X + default "2.42" if BR2_BINUTILS_VERSION_2_42_X config BR2_BINUTILS_GPROFNG bool "gprofng support" From e88225ed8820881970ec33de7a15a1e0d50443da Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:40:10 +0100 Subject: [PATCH 096/345] package/binutils: make 2.41 the default version Now that 2.42 has been introduced, let's make 2.41 the latest version, following the traditional Buildroot policy. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/binutils/Config.in.host | 2 +- package/binutils/binutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index cc8dfa31d806..b6a2a2cd6cf7 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -10,7 +10,7 @@ config BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_40_X if !BR2_arc + default BR2_BINUTILS_VERSION_2_41_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 6846933646d9..5209da0252bd 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2023.09-release else -BINUTILS_VERSION = 2.40 +BINUTILS_VERSION = 2.41 endif endif # BINUTILS_VERSION From 3b33b26633833f506c009082b604dad36a42fae3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Mar 2024 11:30:08 +0100 Subject: [PATCH 097/345] support/config-fragments/autobuild/br-arm-internal-glibc: update to bleeding edge components As Thomas stated in 3bb260cf3860: The br-arm-internal-glibc.config is generally used as a configuration to test the bleeding edge versions of components. However, it has been lagging behind somewhat, so let's bring it up-to-date: - Binutils 2.42.x - GCC 13.x Let the fun begin in the autobuilders! Signed-off-by: Yann E. MORIN --- .../config-fragments/autobuild/br-arm-internal-glibc.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/config-fragments/autobuild/br-arm-internal-glibc.config b/support/config-fragments/autobuild/br-arm-internal-glibc.config index cd148f32e63b..4986d4091287 100644 --- a/support/config-fragments/autobuild/br-arm-internal-glibc.config +++ b/support/config-fragments/autobuild/br-arm-internal-glibc.config @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a8=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_BINUTILS_VERSION_2_39_X=y -BR2_GCC_VERSION_12_X=y +BR2_BINUTILS_VERSION_2_42_X=y +BR2_GCC_VERSION_13_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y From f4187bd1ee99cb5561271bf8ebcd591ece1ef0a9 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:40:11 +0100 Subject: [PATCH 098/345] package/binutils: drop support for binutils 2.39 Now that we have integrated support for binutils 2.42, and made binutils 2.41 the default, following our tradition, we can drop support for binutils 2.39. In addition to the usual things, there is an additional minor change in elf2flt.mk, which had a special condition applicable to binutils 2.39 or 2.40, which can be simplified to only apply to binutils 2.40 now. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- .checkpackageignore | 3 - Config.in.legacy | 6 + package/binutils/2.39/0001-sh-conf.patch | 48 --- .../2.39/0002-poison-system-directories.patch | 298 ------------------ ...or1k-fix-building-with-gcc-version-5.patch | 50 --- package/binutils/Config.in.host | 5 - package/binutils/binutils.hash | 1 - package/elf2flt/elf2flt.mk | 2 +- 8 files changed, 7 insertions(+), 406 deletions(-) delete mode 100644 package/binutils/2.39/0001-sh-conf.patch delete mode 100644 package/binutils/2.39/0002-poison-system-directories.patch delete mode 100644 package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch diff --git a/.checkpackageignore b/.checkpackageignore index a6cc58c448cf..f5668c1992ff 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -195,9 +195,6 @@ package/berkeleydb/0001-cwd-db_config.patch Upstream package/berkeleydb/0002-atomic_compare_exchange.patch Upstream package/bind/0001-cross.patch Upstream package/bind/S81named Indent Shellcheck Variables -package/binutils/2.39/0001-sh-conf.patch Upstream -package/binutils/2.39/0002-poison-system-directories.patch Upstream -package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch Upstream package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch Upstream package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch Upstream package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch Upstream diff --git a/Config.in.legacy b/Config.in.legacy index a869279af781..94756a70ff43 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_BINUTILS_VERSION_2_39_X + bool "binutils 2.39 has been removed" + select BR2_LEGACY + help + binutils 2.39 has been removed, use a newer version. + config BR2_PACKAGE_TINYMEMBENCH bool "tinymembench removed" select BR2_LEGACY diff --git a/package/binutils/2.39/0001-sh-conf.patch b/package/binutils/2.39/0001-sh-conf.patch deleted file mode 100644 index fcc597e4d947..000000000000 --- a/package/binutils/2.39/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 33f3c1f804efc2e4f97849081589efb70cda31e5 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.32] -Signed-off-by: Romain Naour -[Thomas: rebase on top of 2.29, in which sh64 support was removed.] -Signed-off-by: Thomas Petazzoni ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 3dd206525a7..6881ce632f5 100755 ---- a/configure -+++ b/configure -@@ -3892,7 +3892,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index 797a624621e..1f9256bbf18 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1175,7 +1175,7 @@ case "${target}" in - nvptx*-*-*) - noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.31.1 - diff --git a/package/binutils/2.39/0002-poison-system-directories.patch b/package/binutils/2.39/0002-poison-system-directories.patch deleted file mode 100644 index 1d9447b5c26b..000000000000 --- a/package/binutils/2.39/0002-poison-system-directories.patch +++ /dev/null @@ -1,298 +0,0 @@ -From 4d8705ddb55897e8a74b617ab95736d520d9e1ea Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Waldemar: rebase on top of 2.39] -Signed-off-by: Waldemar Brodkorb -[Romain: rebase on top of 2.33.1] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texi | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff -Nur binutils-2.39.orig/ld/config.in binutils-2.39/ld/config.in ---- binutils-2.39.orig/ld/config.in 2022-08-05 11:56:56.000000000 +0200 -+++ binutils-2.39/ld/config.in 2022-08-11 13:00:55.310472243 +0200 -@@ -55,6 +55,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff -Nur binutils-2.39.orig/ld/configure binutils-2.39/ld/configure ---- binutils-2.39.orig/ld/configure 2022-08-05 11:56:54.000000000 +0200 -+++ binutils-2.39/ld/configure 2022-08-11 13:00:55.370470806 +0200 -@@ -836,6 +836,7 @@ - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1514,6 +1515,8 @@ - --enable-checking enable run-time checks - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15370,7 +15373,18 @@ - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff -Nur binutils-2.39.orig/ld/configure.ac binutils-2.39/ld/configure.ac ---- binutils-2.39.orig/ld/configure.ac 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/configure.ac 2022-08-11 13:00:55.370470806 +0200 -@@ -102,6 +102,16 @@ - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff -Nur binutils-2.39.orig/ld/ldfile.c binutils-2.39/ld/ldfile.c ---- binutils-2.39.orig/ld/ldfile.c 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/ldfile.c 2022-08-11 13:00:55.394470231 +0200 -@@ -117,6 +117,23 @@ - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff -Nur binutils-2.39.orig/ld/ld.h binutils-2.39/ld/ld.h ---- binutils-2.39.orig/ld/ld.h 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/ld.h 2022-08-11 13:00:55.382470519 +0200 -@@ -162,6 +162,14 @@ - in the linker script. */ - bool force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bool poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bool error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff -Nur binutils-2.39.orig/ld/ldlex.h binutils-2.39/ld/ldlex.h ---- binutils-2.39.orig/ld/ldlex.h 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/ldlex.h 2022-08-11 13:03:35.462636396 +0200 -@@ -164,6 +164,8 @@ - OPTION_CTF_VARIABLES, - OPTION_NO_CTF_VARIABLES, - OPTION_CTF_SHARE_TYPES, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - OPTION_WARN_EXECSTACK, - OPTION_NO_WARN_EXECSTACK, - OPTION_WARN_RWX_SEGMENTS, -diff -Nur binutils-2.39.orig/ld/ldmain.c binutils-2.39/ld/ldmain.c ---- binutils-2.39.orig/ld/ldmain.c 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/ldmain.c 2022-08-11 13:00:55.402470040 +0200 -@@ -321,6 +321,8 @@ - command_line.warn_mismatch = true; - command_line.warn_search_mismatch = true; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = true; -+ command_line.error_poison_system_directories = false; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff -Nur binutils-2.39.orig/ld/ld.texi binutils-2.39/ld/ld.texi ---- binutils-2.39.orig/ld/ld.texi 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/ld.texi 2022-08-11 13:02:44.627853889 +0200 -@@ -2936,6 +2936,18 @@ - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. - -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. -+ - @kindex --package-metadata=@var{JSON} - @item --package-metadata=@var{JSON} - Request the creation of a @code{.note.package} ELF note section. The -diff -Nur binutils-2.39.orig/ld/lexsup.c binutils-2.39/ld/lexsup.c ---- binutils-2.39.orig/ld/lexsup.c 2022-07-08 11:46:48.000000000 +0200 -+++ binutils-2.39/ld/lexsup.c 2022-08-11 13:00:55.434469274 +0200 -@@ -608,6 +608,14 @@ - " is: share-unconflicted (default),\n" - " share-duplicated"), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -620,6 +628,7 @@ - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1679,6 +1688,14 @@ - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = false; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = true; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1824,6 +1841,10 @@ - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = true; -+ - while (ingroup) - { - einfo (_("%P: missing --end-group; added as last command line option\n")); --- -2.31.1 diff --git a/package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch b/package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch deleted file mode 100644 index bfd531b81859..000000000000 --- a/package/binutils/2.39/0003-bfd-elf32-or1k-fix-building-with-gcc-version-5.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 9 Jun 2021 17:28:27 +0200 -Subject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 - -Gcc version >= 5 has standard C mode not set to -std=gnu11, so if we use -an old compiler(i.e. gcc 4.9) build fails on: -``` -elf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in -C99 or C11 mode - for (size_t i = 0; i < insn_count; i++) - ^ -``` - -So let's declare `size_t i` at the top of the function instead of inside -for loop. - -Signed-off-by: Giulio Benetti ---- - bfd/elf32-or1k.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c -index 4ae7f324d33..32063ab0289 100644 ---- a/bfd/elf32-or1k.c -+++ b/bfd/elf32-or1k.c -@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - { - unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; - unsigned output_insns[PLT_MAX_INSN_COUNT]; -+ size_t i; - - /* Copy instructions into the output buffer. */ -- for (size_t i = 0; i < insn_count; i++) -+ for (i = 0; i < insn_count; i++) - output_insns[i] = insns[i]; - - /* Honor the no-delay-slot setting. */ -@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, - } - - /* Write out the output buffer. */ -- for (size_t i = 0; i < (insn_count+1); i++) -+ for (i = 0; i < (insn_count+1); i++) - bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); - } - --- -2.31.1 - diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index b6a2a2cd6cf7..b6b1c56b5f15 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -15,10 +15,6 @@ choice help Select the version of binutils you wish to use. -config BR2_BINUTILS_VERSION_2_39_X - bool "binutils 2.39" - select BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME - config BR2_BINUTILS_VERSION_2_40_X bool "binutils 2.40" @@ -37,7 +33,6 @@ endchoice config BR2_BINUTILS_VERSION string default "arc-2023.09-release" if BR2_BINUTILS_VERSION_ARC - default "2.39" if BR2_BINUTILS_VERSION_2_39_X default "2.40" if BR2_BINUTILS_VERSION_2_40_X default "2.41" if BR2_BINUTILS_VERSION_2_41_X default "2.42" if BR2_BINUTILS_VERSION_2_42_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index e4c6a0b0b66e..ac724d5c1582 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,5 +1,4 @@ # From https://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz sha512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925 binutils-2.40.tar.xz sha512 5df45d0bd6ddabdce4f35878c041e46a92deef01e7dea5facc97fd65cc06b59abc6fba0eb454b68e571c7e14038dc823fe7f2263843e6e627b7444eaf0fe9374 binutils-2.41.tar.xz sha512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6 binutils-2.42.tar.xz diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index 0def282c0254..aa5595843ff6 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -23,7 +23,7 @@ HOST_ELF2FLT_AUTORECONF = YES # considered because Buildroot only supports ARC CPUs with a MMU and # therefore host-elf2flt is never used on ARC. libiberty.a has # remained at the same location. -ifeq ($(BR2_BINUTILS_VERSION_2_39_X)$(BR2_BINUTILS_VERSION_2_40_X),y) +ifeq ($(BR2_BINUTILS_VERSION_2_40_X),y) HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/libbfd.a else HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/.libs/libbfd.a From e1f9c988080097de02762e53ad57a9376e68066c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 09:40:12 +0100 Subject: [PATCH 099/345] package/binutils: drop BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME Now that binutils 2.39 is gone, we can drop BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME, which was only used for binutils 2.39. This was a blind option, so Config.in.legacy handling is not needed. Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/binutils/Config.in.host | 3 --- package/binutils/binutils.mk | 8 +------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index b6b1c56b5f15..cb65f5f5e4c6 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -5,9 +5,6 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI default y depends on !BR2_microblaze -config BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME - bool - choice prompt "Binutils Version" default BR2_BINUTILS_VERSION_2_41_X if !BR2_arc diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 5209da0252bd..d98dd7b83095 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -105,19 +105,13 @@ endif # our TARGET_CONFIGURE_ARGS are taken into consideration for those BINUTILS_MAKE_ENV = $(TARGET_CONFIGURE_ARGS) -ifeq ($(BR2_PACKAGE_BINUTILS_HAS_NO_LIBSFRAME),) -define BINUTILS_INSTALL_STAGING_LIBSFRAME - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libsframe DESTDIR=$(STAGING_DIR) install -endef -endif - # We just want libbfd, libiberty and libopcodes, # not the full-blown binutils in staging define BINUTILS_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install - $(BINUTILS_INSTALL_STAGING_LIBSFRAME) + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libsframe DESTDIR=$(STAGING_DIR) install endef # If we don't want full binutils on target From e2e8e655feb7f1162e554a40ea5c7a2db0987ffa Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Mar 2024 13:59:38 +0100 Subject: [PATCH 100/345] package/strace: musl on aarch64 needs headers >= 5.0 strace needs headers >= 5.0 and https://github.com/torvalds/linux/commit/9966a05c7b80f075f2bc7e48dbb108d3f2927234 to avoid the following build failure on musl and aarch64 due to headers conflict raised at least since bump to version 6.0 in commit 544806bfd8052d05dee671c23c354e5f73f954f9: In file included from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/signal.h:48, from strace.c:17: /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/bits/signal.h:18:16: error: redefinition of 'struct sigcontext' 18 | typedef struct sigcontext { | ^~~~~~~~~~ In file included from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/asm/ptrace.h:26, from /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/linux/ptrace.h:107, from ptrace.h:33, from strace.c:16: /home/autobuild/autobuild/instance-7/output-1/host/aarch64_be-buildroot-linux-musl/sysroot/usr/include/asm/sigcontext.h:28:8: note: originally defined here 28 | struct sigcontext { | ^~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/74a480aa76970b36dcd890d9bd7a9df1d49e8e16 - http://autobuild.buildroot.org/results/79ee8ae5fb9712fd874b56e836eca1b997c50cd9 Signed-off-by: Fabrice Fontaine [Peter: fix architecture conditional] Signed-off-by: Peter Korsgaard --- package/strace/Config.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package/strace/Config.in b/package/strace/Config.in index dc245c7297bc..e0551f386134 100644 --- a/package/strace/Config.in +++ b/package/strace/Config.in @@ -4,6 +4,10 @@ config BR2_PACKAGE_STRACE depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_0 || !BR2_nios2 # needs at least kernel headers 5.0 on xtensa depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || !BR2_xtensa + # needs at least kernel headers 5.0 on musl aarch64 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 || \ + !(BR2_aarch64 || BR2_aarch64_be) || \ + !BR2_TOOLCHAIN_USES_MUSL depends on !BR2_RISCV_32 help A useful diagnostic, instructional, and debugging tool. @@ -22,3 +26,8 @@ comment "strace needs a toolchain w/ headers >= 4.0 on nios2" comment "strace needs a toolchain w/ headers >= 5.0 on xtensa" depends on BR2_xtensa depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 + +comment "strace needs a musl toolchain w/ headers >= 5.0 on aarch64" + depends on BR2_aarch64 || BR2_aarch64_be + depends on BR2_TOOLCHAIN_USES_MUSL + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0 From 1692f2514a48ee369e09753007e9c67ff90daaf3 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 1 Mar 2024 13:17:56 +0100 Subject: [PATCH 101/345] package/sdl2: drop video-x11-{xinerama, vm} Support has been dropped since the major release 2.24.0: https://github.com/libsdl-org/SDL/commit/7d7ec9c95146c44d4b4643ed552796bf07937057 Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 42b4a433e850..eb5042e3cdbb 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -112,13 +112,6 @@ else SDL2_CONF_OPTS += --disable-video-x11-xcursor endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -SDL2_DEPENDENCIES += xlib_libXinerama -SDL2_CONF_OPTS += --enable-video-x11-xinerama -else -SDL2_CONF_OPTS += --disable-video-x11-xinerama -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) SDL2_DEPENDENCIES += xlib_libXi SDL2_CONF_OPTS += --enable-video-x11-xinput @@ -140,13 +133,6 @@ else SDL2_CONF_OPTS += --disable-video-x11-scrnsaver endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -SDL2_DEPENDENCIES += xlib_libXxf86vm -SDL2_CONF_OPTS += --enable-video-x11-vm -else -SDL2_CONF_OPTS += --disable-video-x11-vm -endif - else SDL2_CONF_OPTS += --disable-video-x11 --without-x endif From fe1b0818364be4742815f69a102ac2e676784136 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 11:50:34 +0100 Subject: [PATCH 102/345] support/dependencies/dependencies.sh: libopenssl needs perl bigint on s390x Commit 7ea38660e01a87ab70c02e38c78a49202e8e5c21 confused bigint [1] with Math::BigInt [2]: Can't locate bigint.pm in @INC (you may need to install the bigint module) (@INC contains: /home/buildroot/autobuild/instance-1/output-1/build/libopenssl-3.2.1/crypto/chacha/asm/../.. /home/buildroot/autobuild/instance-1/output-1/host/lib/perl /usr/local/lib64/perl5/5.36 /usr/local/share/perl5/5.36 /usr/lib64/perl5/vendor_perl /usr/share/perl5/vendor_perl /usr/lib64/perl5 /usr/share/perl5) at /home/buildroot/autobuild/instance-1/output-1/build/libopenssl-3.2.1/crypto/chacha/asm/../../perlasm/s390x.pm line 16. BEGIN failed--compilation aborted at /home/buildroot/autobuild/instance-1/output-1/build/libopenssl-3.2.1/crypto/chacha/asm/../../perlasm/s390x.pm line 16. [1] https://perldoc.perl.org/bigint [2] https://perldoc.perl.org/Math::BigInt Fixes: 7ea38660e01a87ab70c02e38c78a49202e8e5c21 - http://autobuild.buildroot.org/results/777d86a1e53dc3d6a16c829348673f1c33245a6c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- support/dependencies/dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index 3d83cb328585..6d5fc3603767 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -283,7 +283,7 @@ required_perl_modules="$required_perl_modules FindBin" # Used by (host-)libopens required_perl_modules="$required_perl_modules IPC::Cmd" # Used by (host-)libopenssl if grep -q ^BR2_PACKAGE_LIBOPENSSL=y $BR2_CONFIG && grep -q ^BR2_s390x=y $BR2_CONFIG ; then - required_perl_modules="$required_perl_modules Math::BigInt" + required_perl_modules="$required_perl_modules bigint" fi if grep -q ^BR2_PACKAGE_MOSH=y $BR2_CONFIG ; then From 8077efb83769d43f976f7159f2c861e20163c96e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 11:06:26 +0100 Subject: [PATCH 103/345] package/conmon: fix build with gcc 4.8 Fix the following build failure with gcc 4.8 raised since the addition of the package in commit 06f50ff1bf066feb6cf6ed512113773f87c884fb: src/conmon.c:5:2: error: #error conmon.c requires C99 or later #error conmon.c requires C99 or later ^ Fixes: 06f50ff1bf066feb6cf6ed512113773f87c884fb - http://autobuild.buildroot.org/results/b573aceefde04435ea13dfd2a48f9c2372bde4d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/conmon/conmon.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/conmon/conmon.mk b/package/conmon/conmon.mk index 214cb460a545..1e577866862d 100644 --- a/package/conmon/conmon.mk +++ b/package/conmon/conmon.mk @@ -25,7 +25,8 @@ define CONMON_CONFIGURE_CMDS endef define CONMON_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS) -std=c99" \ LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) bin/conmon endef From 5dd267200925fbce0de9da026aa5d4c001972855 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2024 15:10:02 +0100 Subject: [PATCH 104/345] package/gcc: fix BR2_GCC_VERSION_ARC definition for gcc 13.x Since the ARC-special GCC version was bumped from gcc 10.x to gcc 13.x in commit 045ab73702b8bc09f94ca1f3b8e5bf3acb0b0843 ("toolchain: bump ARC toolchain components to arc-2023.09-release"), the BR2_GCC_VERSION_ARC option definition is not entirely correct: it selects BR2_TOOLCHAIN_GCC_AT_LEAST_10, while it should select BR2_TOOLCHAIN_GCC_AT_LEAST_13. This commit fixes this. Cc: Alexey Brodkin Signed-off-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN --- package/gcc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index fabc6173f5c2..d294e8da30fa 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -13,7 +13,7 @@ config BR2_GCC_VERSION_ARC bool "gcc arc (13.1)" # Only supported architecture depends on BR2_arc - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 config BR2_GCC_VERSION_POWERPC_SPE bool "gcc powerpc spe" From 9d74e5af7189a50d891b5ffc3acc55ff795abdf1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 14 Feb 2024 20:58:58 +0100 Subject: [PATCH 105/345] package/gstreamer1/gst1-vaapi: fix wayland build wayland-protocols is a mandatory dependency with wayland since bump to version 1.22.0 in commit 33d4c226e582f6c0086431c4d9154e462cb3cf34 and https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/3c713cc16ee1d374213cb2b47a3127e14e5ff8a5: Run-time dependency wayland-protocols found: NO (tried pkgconfig and cmake) ../output-1/build/gst1-vaapi-1.22.0/meson.build:111:0: ERROR: Dependency "wayland-protocols" not found, tried pkgconfig and cmake Fixes: 33d4c226e582f6c0086431c4d9154e462cb3cf34 - http://autobuild.buildroot.org/results/b5e79d4e10fdf24c3fd43ab742d9d14a5d07824b - http://autobuild.buildroot.org/results/ad624cd11d5a1b3346974000ae2b61f4261af02c Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/gstreamer1/gst1-vaapi/Config.in | 1 + package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index a1062097ed7e..d6a1542ad315 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_GST1_VAAPI select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 4b04d1bb72b8..d934bab2333b 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -39,6 +39,7 @@ endif ifeq ($(BR2_PACKAGE_WAYLAND),y) GST1_VAAPI_CONF_OPTS += -Dwayland=enabled +GST1_VAAPI_DEPENDENCIES += wayland wayland-protocols else GST1_VAAPI_CONF_OPTS += -Dwayland=disabled endif From 02df2834155aec4c74149b1aacc4d56babcc9325 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 6 Jan 2024 14:10:26 +0100 Subject: [PATCH 106/345] package/octave: add libreadline search prefix GNU Octave changed its detection of readline library in [1]. This commit was first included in version 8.1.0. GNU Octave was updated to 8.1.0 in Buildroot in commit b36e4b10f3 "package/octave: bump to version 8.1.0". Since this commit, Octave can fail to find readline automatically in some specific situations. For example, when host system is Fedora 39 and the host "readline-devel" package is installed (see detailed explanation below). Octave is now using a m4 macro from gnulib to detect readline. See [2]. This macro is calling AC_LIB_LINKFLAGS_BODY([readline]). Note that this macro will look into $libdir and $includedir by default. See [3]. Buildroot is calling target autotools configure command with --prefix=/usr and --exec-prefix=/usr arguments. See [4]. Autotools derives libdir='${exec_prefix}/lib' and includedir='${prefix}/include'. Finally, gnulib will also search automatically into alternate library directories (i.e. lib32, lib64). See [5]. All of this will make the configure script searching the readline library by default (i.e. if the library prefix is not provided) into the host "/usr/lib", "/usr/lib32" and "/usr/lib64", when configuring for target. This issue is not happening on the Buildroot docker reference image, because the package "libreadline-dev" is not present in this image. Even if the package "libreadline-dev" is installed on a Debian based host systems, the issue is still not happening because libraries are installed in the path "/usr/lib/x86_64-linux-gnu", which is not searched by gnulib macros. On host systems which installs libraries into one of the "/usr/lib{,32,64}" directories, the Octave configuration script will fail, because it will detect the host library and try to link against it with target architecture and compilation flags and will fail. Since the --enable-readline configure option is present, the configuration script will fail because it cannot find a working readline library. This can be seen in the octave configuration log, in file: output/build/octave-8.4.0/config.log configure:73671: checking for readline configure:73705: /buildroot/output/host/bin/aarch64-none-linux-gnu-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=1 -pthread -fopenmp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 conftest.c -lpthread -lm /usr/lib64/libreadline.so >&5 /buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-none-linux-gnu/13.2.1/../../../../aarch64-none-linux-gnu/bin/ld: /usr/lib64/libreadline.so: error adding symbols: file in wrong format collect2: error: ld returned 1 exit status This situation can be reproduced on a Fedora 39 x86_64 host system, with the "readline-devel" package installed. Note: uninstalling the "readline-devel" will work around the issue. The issue can be reproduced with a Buildroot configuration such as: cat > .config < Signed-off-by: Arnout Vandecappelle --- package/octave/octave.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/octave/octave.mk b/package/octave/octave.mk index cae0de7620b9..f240a5057c07 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -20,7 +20,9 @@ OCTAVE_DEPENDENCIES = \ pcre2 ifeq ($(BR2_PACKAGE_READLINE),y) -OCTAVE_CONF_OPTS += --enable-readline +OCTAVE_CONF_OPTS += \ + --enable-readline \ + --with-libreadline-prefix=$(STAGING_DIR)/usr OCTAVE_DEPENDENCIES += readline else OCTAVE_CONF_OPTS += --disable-readline From eaeba56aa2d21f1d264c7e361731808e3f072d9d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 14 Jan 2024 13:54:48 +0100 Subject: [PATCH 107/345] toolchain/Config.in: update ucontext handling As suggested by Thomas Petazzoni in [1], add a comment on BR2_TOOLCHAIN_HAS_UCONTEXT to specify that this boolean will be set to true only when a toolchain provides a full featured ucontext implementation with ucontext_t and {get,make,set}context. As a result, drop its selection from BR2_TOOLCHAIN_USES_MUSL to fix the following musl build failure on php: /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/m68k-buildroot-linux-musl/12.3.0/../../../../m68k-buildroot-linux-musl/bin/ld: Zend/zend_fibers.o: in function `zend_fiber_init_context': zend_fibers.c:(.text+0x946): undefined reference to `getcontext' [1]: https://patchwork.ozlabs.org/project/buildroot/patch/20230516193307.1543455-1-bernd.kuhls@t-online.de/ Fixes: - http://autobuild.buildroot.org/results/271f9fb8bfa5ba2f74feef81e6b375b54e21cece Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- toolchain/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/toolchain/Config.in b/toolchain/Config.in index 407a03c42e2d..3dd6e83d3542 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -34,7 +34,6 @@ config BR2_TOOLCHAIN_USES_MUSL select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_HAS_UCONTEXT select BR2_TOOLCHAIN_SUPPORTS_PIE if !BR2_STATIC_LIBS choice @@ -302,6 +301,8 @@ config BR2_TOOLCHAIN_HAS_SSP_STRONG bool default y if BR2_TOOLCHAIN_HAS_SSP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +# This boolean is true if the toolchain provides a full featured +# ucontext implementation with ucontext_t and {get,make,set}context config BR2_TOOLCHAIN_HAS_UCONTEXT bool From e97cd704c58c133a226f109337ae4d83b124b780 Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Wed, 31 Jan 2024 18:07:11 +0300 Subject: [PATCH 108/345] package/rtl8822cs bump driver version to latest - Update driver for kernel 6.7+ - Fix warning/errors on build Fixes: http://autobuild.buildroot.net/results/e4f/e4f1dd9d6e3ac305fd54221e04e4bafeb480ccf7 Signed-off-by: Viacheslav Bocharov Reviewed-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/rtl8822cs/rtl8822cs.hash | 2 +- package/rtl8822cs/rtl8822cs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8822cs/rtl8822cs.hash b/package/rtl8822cs/rtl8822cs.hash index 4b445129138a..34bcc412ce3e 100644 --- a/package/rtl8822cs/rtl8822cs.hash +++ b/package/rtl8822cs/rtl8822cs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b3b8543ff6d6d602ffaf60342969830edc8205917b96d004f84ed79524894dc7 rtl8822cs-2e4e99ae1502b173a938357dc1087e49475b26ed.tar.gz +sha256 d61fff0ee8b4219a6441791ff26be1b8c49ef8b2ca78345bf12b7a0541f498e9 rtl8822cs-fda6cd263e89567272060e6182a39aee20b894c4.tar.gz diff --git a/package/rtl8822cs/rtl8822cs.mk b/package/rtl8822cs/rtl8822cs.mk index 6036acb864a9..dbdc7d84bf43 100644 --- a/package/rtl8822cs/rtl8822cs.mk +++ b/package/rtl8822cs/rtl8822cs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8822CS_VERSION = 2e4e99ae1502b173a938357dc1087e49475b26ed +RTL8822CS_VERSION = fda6cd263e89567272060e6182a39aee20b894c4 RTL8822CS_SITE = $(call github,jethome-ru,rtl88x2cs,$(RTL8822CS_VERSION)) RTL8822CS_LICENSE = GPL-2.0 From 7781cdca3163035f3f89df90605cde7c5b7cd3c5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 11 Feb 2024 22:47:51 +0100 Subject: [PATCH 109/345] package/shadow: drop BR2_PACKAGE_SHADOW_UTMPX utmpx is not available since bump to version 4.14.3 in commit 8a01774d9897310c00a0945865f5a6d5167dfca3 and https://github.com/shadow-maint/shadow/commit/3be7b9d75a6b73fe24394d7ac1e315d60d45b5ee: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --enable-utmpx Fixes: 8a01774d9897310c00a0945865f5a6d5167dfca3 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 6 ++++++ package/shadow/Config.in | 5 ----- package/shadow/shadow.mk | 6 ------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index a869279af781..576148c4af63 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,12 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_SHADOW_UTMPX + bool "shadow utmpx removed" + select BR2_LEGACY + help + UTMPX has been dropped by upstream. + config BR2_PACKAGE_TINYMEMBENCH bool "tinymembench removed" select BR2_LEGACY diff --git a/package/shadow/Config.in b/package/shadow/Config.in index e85e5884d207..230271af7d78 100644 --- a/package/shadow/Config.in +++ b/package/shadow/Config.in @@ -31,11 +31,6 @@ comment "account-tools-setuid needs a toolchain w/ dynamic library, wchar, local depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || \ !BR2_ENABLE_LOCALE || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 -config BR2_PACKAGE_SHADOW_UTMPX - bool "utmpx" - help - Enable loggin in utmpx / wtmpx. - config BR2_PACKAGE_SHADOW_SUBORDINATE_IDS bool "subordinate-ids" help diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 03eb16a3f40a..1e7ada614835 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -43,12 +43,6 @@ else SHADOW_CONF_OPTS += --disable-account-tools-setuid endif -ifeq ($(BR2_PACKAGE_SHADOW_UTMPX),y) -SHADOW_CONF_OPTS += --enable-utmpx -else -SHADOW_CONF_OPTS += --disable-utmpx -endif - ifeq ($(BR2_PACKAGE_SHADOW_SUBORDINATE_IDS),y) SHADOW_CONF_OPTS += --enable-subordinate-ids define SHADOW_SUBORDINATE_IDS_PERMISSIONS From 1140bfd950f3d211306f10b6e40deabd91d55b16 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 11 Feb 2024 23:30:46 +0100 Subject: [PATCH 110/345] support/testing: mdadm: improve test robustness on slow runners As expected by Peter in [1], the hardcoded 3 seconds for waiting the RAID array to rebuild are not enough on slow test host runners. This test already failed at least once for that reason, in [2]. In order to fix those failures, this commit adds extra logic to allow several attempts, before failing. The timeout is currently set at 10 attempts, waiting 3 seconds between each attempts. To help even more, those 3 seconds are also scaled with the timeout_multiplier. Fixes: [2] [1] https://lists.buildroot.org/pipermail/buildroot/2024-February/685034.html [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/6137469690 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- support/testing/tests/package/test_mdadm.py | 22 ++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/support/testing/tests/package/test_mdadm.py b/support/testing/tests/package/test_mdadm.py index 75385309a6db..d5abdb0706c8 100644 --- a/support/testing/tests/package/test_mdadm.py +++ b/support/testing/tests/package/test_mdadm.py @@ -122,13 +122,21 @@ def test_run(self): # We add back this blank drive to the array. self.assertRunOk(f"mdadm {md_dev} --add {failing_dev}") - # We wait few seconds to let the device rebuild. - time.sleep(3) - - # The array should no longer be marked as degraded. - out, ret = self.emulator.run(monitor_cmd) - self.assertEqual(ret, 0) - self.assertNotIn("DegradedArray", "\n".join(out)) + # Device rebuild can take a variable amount of time, depending + # on the load of the test controller host. So we will allow + # several attempts, before failing. + for attempt in range(10): + # We wait few seconds to let the device rebuild. + time.sleep(3 * self.timeout_multiplier) + + # Once rebuilt, the array should no longer be marked as + # degraded. + out, ret = self.emulator.run(monitor_cmd) + self.assertEqual(ret, 0) + if "DegradedArray" not in "\n".join(out): + break + else: + self.fail("Timeout while waiting for the array to rebuild.") # With all those array manipulations, the data file should not # be corrupted. We should be able to recompute the same hash From c2d218eb7266ddf7fe157bb7b58da58429ef4f8e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 13 Feb 2024 22:00:51 +0100 Subject: [PATCH 111/345] package/botan: fix uclibc build getentropy is enabled by default since version 3.0 and https://github.com/randombit/botan/commit/8642f2a99deefc85cdb512ee50d9f62c5e0ae4b8 and explicit_bzero is also enabled since version 3.0 and https://github.com/randombit/botan/commit/e6819a380fb67c1be546dc618248b62d93266423 resulting in the following build failure since bump to version 3.2.0 in commit 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813: src/lib/entropy/getentropy/getentropy.cpp:26:9: error: '::getentropy' has not been declared; did you mean 'Getentropy'? 26 | if(::getentropy(buf.data(), buf.size()) == 0) { | ^~~~~~~~~~ | Getentropy Fixes: 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 - http://autobuild.buildroot.org/results/d58c4730c770467b42af426545dd917ecc5fed17 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/botan/botan.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 7c290f04ad6f..88dbfa580727 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -49,7 +49,7 @@ BOTAN_CONF_OPTS += --without-stack-protector endif ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -BOTAN_CONF_OPTS += --without-os-feature=getauxval +BOTAN_CONF_OPTS += --without-os-feature=explicit_bzero,getauxval,getentropy endif ifeq ($(BR2_PACKAGE_BOOST_FILESYSTEM)$(BR2_PACKAGE_BOOST_SYSTEM),yy) From 57008d384bc1f2e42d6add6cd73203e11a75d6c9 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Sun, 3 Mar 2024 11:19:13 -0400 Subject: [PATCH 112/345] package/iozone: bump to version 3.506 - Upstream archive moved back to tar from tgz - For change log, see end of file: https://www.iozone.org/src/current/Changes.txt Signed-off-by: Gilles Talis Reviewed-by: Julien Olivain Signed-off-by: Yann E. MORIN --- package/iozone/iozone.hash | 3 ++- package/iozone/iozone.mk | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/iozone/iozone.hash b/package/iozone/iozone.hash index 9ecf1d1af850..936ab5a6469d 100644 --- a/package/iozone/iozone.hash +++ b/package/iozone/iozone.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 5a52f5017e022e737f5b55f320cc6ada0f2a8c831a5f996cce2a44e03e91c038 iozone3_493.tgz +sha256 114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7 iozone3_506.tar +sha256 bff7909fd698708d15613a4fb977a193cff98f44ef170c2dc1dd502974df75b2 docs/License.txt diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 2df4a2aa84db..b1b29d1098f6 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -4,12 +4,11 @@ # ################################################################################ -IOZONE_VERSION = 3.493 -IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tgz +IOZONE_VERSION = 3.506 +IOZONE_SOURCE = iozone$(subst .,_,$(IOZONE_VERSION)).tar IOZONE_SITE = http://www.iozone.org/src/current IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) -# IOzone license details can be found at: -# http://www.iozone.org/docs/Iozone_License.txt +IOZONE_LICENSE_FILES = docs/License.txt # AIO support not available on uClibc, use the linux (non-aio) target. ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) From c9de634b082e9d5a8f52f7c983a481105696d347 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 16 Feb 2024 19:14:15 +0100 Subject: [PATCH 113/345] package/dash: fix static build Drop -Wl,--fatal-warnings with --enable-static to avoid the following static build failure: configure:4778: checking for strtod configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c >&5 /home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions collect2: error: ld returned 1 exit status [...] In file included from arith_yylex.c:44: system.h:74:22: error: static declaration of 'strtod' follows non-static declaration static inline double strtod(const char *nptr, char **endptr) ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c - http://autobuild.buildroot.org/results/a4287b86186bf0a1d5370cf53123b324ae65c1da Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...-configure.ac-drop-Wl-fatal-warnings.patch | 45 +++++++++++++++++++ package/dash/dash.mk | 2 + 2 files changed, 47 insertions(+) create mode 100644 package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch diff --git a/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch b/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch new file mode 100644 index 000000000000..eaa5d6cc6082 --- /dev/null +++ b/package/dash/0001-configure.ac-drop-Wl-fatal-warnings.patch @@ -0,0 +1,45 @@ +From 7d07f683b83ef9fbdf258ce61b022b32f06f253a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Feb 2024 17:26:28 +0100 +Subject: [PATCH] configure.ac: drop -Wl,--fatal-warnings + +Drop -Wl,--fatal-warnings with --enable-static to avoid the following +static build failure: + +configure:4778: checking for strtod +configure:4778: /home/autobuild/autobuild/instance-8/output-1/host/bin/powerpc-buildroot-linux-uclibcspe-gcc -o conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -mabi=spe -mfloat-gprs=single -Wa,-me500 -Os -g0 -static -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -static -Wl,--fatal-warnings conftest.c >&5 +/home/autobuild/autobuild/instance-8/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: warning: conftest has a LOAD segment with RWX permissions +collect2: error: ld returned 1 exit status + +[...] + +In file included from arith_yylex.c:44: +system.h:74:22: error: static declaration of 'strtod' follows non-static declaration + static inline double strtod(const char *nptr, char **endptr) + ^~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/a54fdc7d1b94beb47203373ae35b08d9cea8d42c + +Signed-off-by: Fabrice Fontaine +Upstream: https://lore.kernel.org/dash/20240216163319.860768-1-fontaine.fabrice@gmail.com +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 5524650..6993364 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -34,7 +34,7 @@ fi + AC_ARG_ENABLE(static, AS_HELP_STRING(--enable-static, \ + [Build statical linked program])) + if test "$enable_static" = "yes"; then +- export LDFLAGS="-static -Wl,--fatal-warnings" ++ export LDFLAGS="-static" + fi + + AC_ARG_ENABLE(fnmatch, AS_HELP_STRING(--disable-fnmatch, \ +-- +2.43.0 + diff --git a/package/dash/dash.mk b/package/dash/dash.mk index 6efc71e5684e..aebfd28be81e 100644 --- a/package/dash/dash.mk +++ b/package/dash/dash.mk @@ -8,6 +8,8 @@ DASH_VERSION = 0.5.11.5 DASH_SITE = http://gondor.apana.org.au/~herbert/dash/files DASH_LICENSE = BSD-3-Clause, GPL-2.0+ (mksignames.c) DASH_LICENSE_FILES = COPYING +# We're patching configure.ac +DASH_AUTORECONF = YES # dash does not build in parallel DASH_MAKE = $(MAKE1) From 607507dfa91102c42b6b531e8f3a1a133e46e33f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 16 Feb 2024 22:18:13 +0100 Subject: [PATCH 114/345] package/liburing: fix uclibc build Fix the following build failure with uclibc-ng raised since bump to version 2.4 in commit 3cc1b539e7e9fd49f571441e395e7daa8597dbec and https://github.com/axboe/liburing/commit/c6bc86e2125bcd6fa10ff2b128cd86486acadff6: In file included from lib.h:12, from setup.c:4: arch/aarch64/lib.h:7:10: fatal error: sys/auxv.h: No such file or directory 7 | #include | ^~~~~~~~~~~~ Fixes: 3cc1b539e7e9fd49f571441e395e7daa8597dbec - http://autobuild.buildroot.org/results/cc44d714c9267dd7a98debeb8c81c4ee1efe4ebb Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...01-src-arch-aarch64-fix-uclibc-build.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch diff --git a/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch b/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch new file mode 100644 index 000000000000..4468105e4fa9 --- /dev/null +++ b/package/liburing/0001-src-arch-aarch64-fix-uclibc-build.patch @@ -0,0 +1,39 @@ +From f03f8da34fe96ac35a916ca3058b0f41971eae3b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 16 Feb 2024 18:59:42 +0100 +Subject: [PATCH] src/arch/aarch64: fix uclibc build + +Fix the following build failure with uclibc-ng raised since version 2.3 +and +https://github.com/axboe/liburing/commit/c6bc86e2125bcd6fa10ff2b128cd86486acadff6: + +In file included from lib.h:12, + from setup.c:4: +arch/aarch64/lib.h:7:10: fatal error: sys/auxv.h: No such file or directory + 7 | #include + | ^~~~~~~~~~~~ + +Fixes: + - http://autobuild.buildroot.org/results/cc44d714c9267dd7a98debeb8c81c4ee1efe4ebb + +Signed-off-by: Fabrice Fontaine +Upstream: https://github.com/axboe/liburing/commit/32f9c27a76c43627f79bb77469d2da8583e4d3df +--- + src/arch/aarch64/lib.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/arch/aarch64/lib.h b/src/arch/aarch64/lib.h +index 3b701b1..41bcfc9 100644 +--- a/src/arch/aarch64/lib.h ++++ b/src/arch/aarch64/lib.h +@@ -4,7 +4,6 @@ + #define LIBURING_ARCH_AARCH64_LIB_H + + #include +-#include + #include "../../syscall.h" + + static inline long __get_page_size(void) +-- +2.43.0 + From ed2090717f657c1f19bb7bd62c97e17a7bf3ff50 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 18:26:22 +0100 Subject: [PATCH 115/345] package/strongswan: drop BR2_PACKAGE_STRONGSWAN_SCEP scepclient is unrecognized since bump to version 5.9.8 in commit b79d735139282ecf052dc89d4c221bbd16447112 and https://github.com/strongswan/strongswan/commit/8716f7c03c6193b1cb53837243177f36280ff4f7: configure: WARNING: unrecognized options: --disable-gtk-doc, --disable-gtk-doc-html, --disable-doc, --disable-docs, --disable-documentation, --with-xmlto, --with-fop, --enable-ipv6, --disable-nls, --enable-scepclient Fixes: b79d735139282ecf052dc89d4c221bbd16447112 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- Config.in.legacy | 10 ++++++++++ package/strongswan/Config.in | 3 --- package/strongswan/strongswan.mk | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 576148c4af63..5956ffcca5d0 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,16 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_STRONGSWAN_SCEP + bool "strongswan SCEP client tool removed" + select BR2_LEGACY + help + "ipsec scepclient" tool has been removed and replaced by the + pki subcommands "pki --scep" and "pki --scepca" which + implement the new SCEP RFC 8894 standard that was released in + September 2020 and which supports trusted "certificate + renewal" based on the existing client certificate. + config BR2_PACKAGE_SHADOW_UTMPX bool "shadow utmpx removed" select BR2_LEGACY diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index f2e597e0163a..5231e69ca824 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -204,9 +204,6 @@ config BR2_PACKAGE_STRONGSWAN_PKI bool "Enable pki certificate utility" default y -config BR2_PACKAGE_STRONGSWAN_SCEP - bool "Enable SCEP client tool" - config BR2_PACKAGE_STRONGSWAN_SCRIPTS bool "Enable additional utilities (found in scripts directory)" default y diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 36cb72f6be40..5521fb7dd45e 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -33,7 +33,6 @@ STRONGSWAN_CONF_OPTS += \ --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \ --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \ --enable-pki=$(if $(BR2_PACKAGE_STRONGSWAN_PKI),yes,no) \ - --enable-scepclient=$(if $(BR2_PACKAGE_STRONGSWAN_SCEP),yes,no) \ --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no) \ --enable-vici=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ --enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ From 8895cae09b7f364fdd8eb55ad487a9bad55e2faf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 30 Oct 2023 14:38:33 +0100 Subject: [PATCH 116/345] package/tar: fix NLS build Fix the following build failure raised since bump to version 1.35 in commit d4d483451f0a305781b94b96c15a6cf4b489cd84: /home/thomas/autobuild/instance-1/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/12.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: buffer.o: in function `bufmap_reset': buffer.c:(.text+0xe8): undefined reference to `libintl_gettext' Fixes: - http://autobuild.buildroot.org/results/99b05d4b495b6337c6a48ea5a551a3a84c6d2e6b Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/tar/tar.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/tar/tar.mk b/package/tar/tar.mk index dc17647b2c92..d57d63970d1e 100644 --- a/package/tar/tar.mk +++ b/package/tar/tar.mk @@ -13,6 +13,8 @@ TAR_CONF_OPTS = --exec-prefix=/ TAR_LICENSE = GPL-3.0+ TAR_LICENSE_FILES = COPYING TAR_CPE_ID_VENDOR = gnu +TAR_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +TAR_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) # 0002-Fix-boundary-checking-in-base-256-decoder.patch TAR_IGNORE_CVES += CVE-2022-48303 From c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 30 Nov 2023 20:13:05 +0100 Subject: [PATCH 117/345] package/libselinux: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/autobuild/autobuild/instance-9/output-1/per-package/libselinux/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/autobuild/autobuild/instance-9/output-1/per-package/libselinux/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, from /home/autobuild/autobuild/instance-9/output-1/per-package/libselinux/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/stdint.h:26, from /home/autobuild/autobuild/instance-9/output-1/per-package/libselinux/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/include/stdint.h:9, from ../include/selinux/avc.h:9, from avc.c:10: /home/autobuild/autobuild/instance-9/output-1/per-package/libselinux/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ This LFS workaround for glibc < 2.23 was added in 2016 by commit ebcca24c953d8df4b16bc52c5ba31feae4ed8ad0 and is probably not needed anymore as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23 Fixes: - http://autobuild.buildroot.org/results/d85c81f87adf3a5945fa369bcec233e6def2ed12 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libselinux/libselinux.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk index 601038e46f76..734084ba5098 100644 --- a/package/libselinux/libselinux.mk +++ b/package/libselinux/libselinux.mk @@ -52,14 +52,6 @@ define LIBSELINUX_BUILD_PYTHON_BINDINGS endef endif # python3 -# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc 2.22. We -# set CFLAGS, CPPFLAGS and LDFLAGS here because we want to win over the -# CFLAGS/CPPFLAGS/LDFLAGS definitions passed by $(PKG_PYTHON_SETUPTOOLS_ENV) -# when the python binding is enabled. -LIBSELINUX_MAKE_OPTS += \ - CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ - CPPFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" - define LIBSELINUX_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ $(LIBSELINUX_MAKE_OPTS) all From e8545ee43923242c74a5ebbb7ef1b8857ae90550 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 10:58:03 +0100 Subject: [PATCH 118/345] package/python-uvicorn: bump to 0.27.1 Changelog: https://github.com/encode/uvicorn/blob/master/CHANGELOG.md#0271---2024-02-10 Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle --- package/python-uvicorn/python-uvicorn.hash | 4 ++-- package/python-uvicorn/python-uvicorn.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-uvicorn/python-uvicorn.hash b/package/python-uvicorn/python-uvicorn.hash index c7feaf3bfe6b..773995ab9deb 100644 --- a/package/python-uvicorn/python-uvicorn.hash +++ b/package/python-uvicorn/python-uvicorn.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/uvicorn/json -md5 a98f96c2578d9e6d454e271d0eae3ba3 uvicorn-0.27.0.post1.tar.gz -sha256 54898fcd80c13ff1cd28bf77b04ec9dbd8ff60c5259b499b4b12bb0917f22907 uvicorn-0.27.0.post1.tar.gz +md5 98f40515e34fb49e9d2842b6a147acec uvicorn-0.27.1.tar.gz +sha256 3d9a267296243532db80c83a959a3400502165ade2c1338dea4e67915fd4745a uvicorn-0.27.1.tar.gz # Locally computed sha256 checksums sha256 efe1acf3e62fb99c288b0ec73e5a773b7268ef4320fe757ea994214e4b63c371 LICENSE.md diff --git a/package/python-uvicorn/python-uvicorn.mk b/package/python-uvicorn/python-uvicorn.mk index 502cc06ad872..899b9660f666 100644 --- a/package/python-uvicorn/python-uvicorn.mk +++ b/package/python-uvicorn/python-uvicorn.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_UVICORN_VERSION = 0.27.0.post1 +PYTHON_UVICORN_VERSION = 0.27.1 PYTHON_UVICORN_SOURCE = uvicorn-$(PYTHON_UVICORN_VERSION).tar.gz -PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/38/56/7bc5cf1d693d0c8e5d9dd66c29808691c17260b31346e4ddfbee26ba9bc2 +PYTHON_UVICORN_SITE = https://files.pythonhosted.org/packages/09/d8/8aa69c76585035ca81851d99c3b00fd6be050aefd478a5376ff9fc5feb69 PYTHON_UVICORN_SETUP_TYPE = pep517 PYTHON_UVICORN_LICENSE = BSD-3-Clause PYTHON_UVICORN_LICENSE_FILES = LICENSE.md From bd172e52e7f4d1a0fab860478bd8aba47cf1befd Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Mon, 12 Feb 2024 18:04:20 -0800 Subject: [PATCH 119/345] package/xz: bump version to 5.4.6 Change Log - https://github.com/tukaani-project/xz/commit/0ef8192e8d5af4e6200d5d4aee22d1f177f7a2df COPYING is updated with the new URL (tukaani.org -> github). Signed-off-by: Kadambini Nema Signed-off-by: Arnout Vandecappelle --- package/xz/xz.hash | 6 +++--- package/xz/xz.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/xz/xz.hash b/package/xz/xz.hash index 3d93ad6b5ee5..e8025a80650a 100644 --- a/package/xz/xz.hash +++ b/package/xz/xz.hash @@ -1,9 +1,9 @@ # Locally calculated after checking pgp signature -# https://tukaani.org/xz/xz-5.4.5.tar.bz2.sig -sha256 8ccf5fff868c006f29522e386fb4c6a1b66463fbca65a4cfc3c4bd596e895e79 xz-5.4.5.tar.bz2 +# https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.bz2.sig +sha256 913851b274e8e1d31781ec949f1c23e8dbcf0ecf6e73a2436dc21769dd3e6f49 xz-5.4.6.tar.bz2 # Hash for license files -sha256 72d7ef9c98be319fd34ce88b45203b36d5936f9c49e82bf3198ffee5e0c7d87e COPYING +sha256 29a1e305b2e34eefe5d4602d00cde1d528b71c5d9f2eec5106972cf6ddb6f73f COPYING sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING.GPLv3 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPLv2.1 diff --git a/package/xz/xz.mk b/package/xz/xz.mk index 547959c743d4..40fa59ca7c67 100644 --- a/package/xz/xz.mk +++ b/package/xz/xz.mk @@ -4,9 +4,9 @@ # ################################################################################ -XZ_VERSION = 5.4.5 +XZ_VERSION = 5.4.6 XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 -XZ_SITE = https://tukaani.org/xz +XZ_SITE = https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION) XZ_INSTALL_STAGING = YES XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' XZ_LICENSE = Public Domain, GPL-2.0+, GPL-3.0+, LGPL-2.1+ From 47b6737e841baf8b666ea9f37edc5f169652e88d Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Mon, 12 Feb 2024 18:17:44 -0800 Subject: [PATCH 120/345] package/zlib-ng: bump version to 2.1.6 Signed-off-by: Kadambini Nema Signed-off-by: Arnout Vandecappelle --- package/zlib-ng/zlib-ng.hash | 2 +- package/zlib-ng/zlib-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zlib-ng/zlib-ng.hash b/package/zlib-ng/zlib-ng.hash index a2fe98435c90..908164aa60fe 100644 --- a/package/zlib-ng/zlib-ng.hash +++ b/package/zlib-ng/zlib-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d20e55f89d71991c59f1c5ad1ef944815e5850526c0d9cd8e504eaed5b24491a zlib-ng-2.1.3.tar.gz +sha256 a5d504c0d52e2e2721e7e7d86988dec2e290d723ced2307145dedd06aeb6fef2 zlib-ng-2.1.6.tar.gz sha256 d3c80be055d94d798eaa786116e84fa0b010bc11420b5d2060d978ea77845436 LICENSE.md diff --git a/package/zlib-ng/zlib-ng.mk b/package/zlib-ng/zlib-ng.mk index 33e8754c9d2d..c9d022da3ef7 100644 --- a/package/zlib-ng/zlib-ng.mk +++ b/package/zlib-ng/zlib-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLIB_NG_VERSION = 2.1.3 +ZLIB_NG_VERSION = 2.1.6 ZLIB_NG_SITE = $(call github,zlib-ng,zlib-ng,$(ZLIB_NG_VERSION)) ZLIB_NG_LICENSE = Zlib ZLIB_NG_LICENSE_FILES = LICENSE.md From 4308c270a7ee4300e29e39d9d7f1de91179679ba Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Mon, 12 Feb 2024 20:42:19 -0800 Subject: [PATCH 121/345] package/hwdata: bump version to 0.379 Signed-off-by: Kadambini Nema Signed-off-by: Arnout Vandecappelle --- package/hwdata/hwdata.hash | 2 +- package/hwdata/hwdata.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index 6915e04e46d5..92b7eaab6d88 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 0db28dc635d5059ad23d068d2e56ef5dc540f95bc813ea5a3c0f5d63b03d20d6 hwdata-0.373.tar.gz +sha256 b98ef646d530d5fd3afa3180efbf7c8e22d3da0088f5836f41ee25380d87b092 hwdata-0.379.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 025f5b496915..555fb58f1431 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.373 +HWDATA_VERSION = 0.379 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE From 2ce680b991d390a75990e7cb1a55acc9ace7ae81 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 13 Feb 2024 10:40:15 +0100 Subject: [PATCH 122/345] package/python-jc: new package All dependencies are optional, and thus only mentioned in the package help text. Signed-off-by: Marcus Hoffmann [Arnout: - add to DEVELOPERS; - add BSD-3-Clause license for vendored pbPlist. ] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-jc/Config.in | 12 ++++++++++ package/python-jc/python-jc.hash | 5 +++++ package/python-jc/python-jc.mk | 14 ++++++++++++ .../testing/tests/package/test_python_jc.py | 22 +++++++++++++++++++ 6 files changed, 55 insertions(+) create mode 100644 package/python-jc/Config.in create mode 100644 package/python-jc/python-jc.hash create mode 100644 package/python-jc/python-jc.mk create mode 100644 support/testing/tests/package/test_python_jc.py diff --git a/DEVELOPERS b/DEVELOPERS index 0bfe91f064a9..a6364cdd441c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2092,6 +2092,7 @@ F: utils/config F: utils/diffconfig N: Marcus Hoffmann +F: package/python-jc/ F: support/testing/tests/package/test_python_fastapi.py F: support/testing/tests/package/sample_python_fastapi.py diff --git a/package/Config.in b/package/Config.in index bf0fe078b955..bbcc5b577492 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1150,6 +1150,7 @@ menu "External python modules" source "package/python-janus/Config.in" source "package/python-jaraco-classes/Config.in" source "package/python-jaraco-functools/Config.in" + source "package/python-jc/Config.in" source "package/python-jedi/Config.in" source "package/python-jeepney/Config.in" source "package/python-jinja2/Config.in" diff --git a/package/python-jc/Config.in b/package/python-jc/Config.in new file mode 100644 index 000000000000..b88150e06919 --- /dev/null +++ b/package/python-jc/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_PYTHON_JC + bool "python-jc" + help + Converts the output of popular command-line tools and file- + types to JSON. + + Optionally requires python-pygments for syntax highlighting, + python-ruamel-yaml for yaml parsing and output and + python-xmltodict for xml parsing. PYTHON3_PYEXPAT is required + for xml and plist parsers. + + https://github.com/kellyjonbrazil/jc diff --git a/package/python-jc/python-jc.hash b/package/python-jc/python-jc.hash new file mode 100644 index 000000000000..f54e69eaebac --- /dev/null +++ b/package/python-jc/python-jc.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/jc/json +md5 80e4c7d46ec856255577c6b364e7f931 jc-1.25.1.tar.gz +sha256 683352e903ece9a86eae0c3232188e40178139e710c740a466ef91ed87c4cc7e jc-1.25.1.tar.gz +# Locally computed sha256 checksums +sha256 6493f2db400f4166ca0956cf192a41aa092bd1396ff463e7fdaf51f257c10497 LICENSE.md diff --git a/package/python-jc/python-jc.mk b/package/python-jc/python-jc.mk new file mode 100644 index 000000000000..ec8826d1c20d --- /dev/null +++ b/package/python-jc/python-jc.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-jc +# +################################################################################ + +PYTHON_JC_VERSION = 1.25.1 +PYTHON_JC_SOURCE = jc-$(PYTHON_JC_VERSION).tar.gz +PYTHON_JC_SITE = https://files.pythonhosted.org/packages/53/a6/065f0796a0a21bc040bc88c8a33410c12729a2a6f4c269d0349f685796da +PYTHON_JC_SETUP_TYPE = setuptools +PYTHON_JC_LICENSE = MIT, BSD-3-Clause (bundled pbPlist) +PYTHON_JC_LICENSE_FILES = LICENSE.md + +$(eval $(python-package)) diff --git a/support/testing/tests/package/test_python_jc.py b/support/testing/tests/package/test_python_jc.py new file mode 100644 index 000000000000..974ce0c4b08a --- /dev/null +++ b/support/testing/tests/package/test_python_jc.py @@ -0,0 +1,22 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Jc(TestPythonPackageBase): + __test__ = True + # We deliberately run the test without the optional dependencies, + # as this configuration is less tested upstream. + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_JC=y + """ + timeout = 60 + + def test_run(self): + self.login() + cmd = "jc -h > /dev/null 2>&1" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc id | grep -q root" + self.assertRunOk(cmd, timeout=self.timeout) + cmd = "jc env | grep -q PATH" + self.assertRunOk(cmd, self.timeout) From 077741623fcd5372a43dd78719f859c479815901 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 3 Mar 2024 18:11:15 +0100 Subject: [PATCH 123/345] package/efivar: bump to version 39 to fix build failures For release note since version 38, see [1]. This commit introduces changes in package patches: - 0001: Patch dropped. An similar change is included in this release. See [2]. - 0002: Patch no longer needed since the package build recipe sets CFLAGS without -Werror, and the package makefile sets -Werror only by default. See [3], included since version 38. - 0003: Rebased on version 39 and renamed to 0001. The patch is also flagged as "Upstream: Not applicable". - 0004: Patch dropped. Included in this release. See [4]. This commit also removes all patch entries in ".checkpackageignore" (since the remaining patch has its "Upstream:" tag). This version 39 also fixes few build failures. Those can be seen by running the command "utils/test-pkg -a -p efivar". The first group of build failures is: br-arm-basic [28/45]: FAILED br-i386-pentium4-full [31/45]: FAILED br-mips64-n64-full [33/45]: FAILED br-mips64r6-el-hf-glibc [34/45]: FAILED linaro-aarch64 [38/45]: FAILED linaro-arm [39/45]: FAILED Fixes: /buildroot/host/opt/ext-toolchain/bin/../lib/gcc/aarch64-linux-gnu/7.3.1/../../../../aarch64-linux-gnu/bin/ld: .data not found for insert collect2: error: ld returned 1 exit status efivar 38 was using linker scripts, which was not working in all cases. Those issues are fixed by the upstream commit [5] which removes the use of this linker script (included in this release). The "test-pkg -a -p efivar" also caught another kind of build failures: br-i386-pentium-mmx-musl [32/45]: FAILED Fixes: In file included from efivar.h:18, from efisec.h:24, from secdb-dump.c:7: list.h: In function 'list_sort': list.h:152:2: warning: implicit declaration of function 'qsort_r'; did you mean 'qsort'? [-Wimplicit-function-declaration] 152 | qsort_r(array, nmemb, sizeof(*array), cmp, state); | ^~~~~~~ | qsort Those failures were introduced in commit f24029b561 "package/efivar: bump to version 38". This is because efivar introduced a usage of the qsort_r() libc function, in upstream commit [6], first included in version 38. Musl libc added the qsort_r() function in upstream commit [7], included in version v1.2.3 (2022-04-07). So external toolchains including a Musl older than this version will fail. But given how old this issue is (musql 1.2.3 is included in Buildroot since 2022.05), this issue is ignored. uClibc-ng external toolchains are also not affected, since it added the qsort_r() function in commit [8] included since its first version v1.0.0 (2015-02-02). So there is no need to exclude external uclibc toolchains. [1] https://github.com/rhboot/efivar/releases/tag/39 [2] https://github.com/rhboot/efivar/commit/4f3da3dc351d7743d91327e74fcaaa13299eeb39 [3] https://github.com/rhboot/efivar/commit/998f617cec92d526e1fadb745673ceef63fa1483 [4] https://github.com/rhboot/efivar/commit/cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 [5] https://github.com/rhboot/efivar/commit/cfd686de51494d3e34be896a91835657ccab37d4 [6] https://github.com/rhboot/efivar/commit/62afa2aa588fb0a6ff56acdd268b9f3c557028b8 [7] https://git.musl-libc.org/cgit/musl/commit/?id=b76f37fd5625d038141b52184956fb4b7838e9a5 [8] https://gogs.waldemar-brodkorb.de/oss/uclibc-ng/commit/515d54433138596e81267237542bd9168b8cc787 Signed-off-by: Julien Olivain [Peter: drop dependency on !external musl] Signed-off-by: Peter Korsgaard --- .checkpackageignore | 4 - .../efivar/0001-Allow-build-with-uClibc.patch | 39 ---- ...r-isolate-makeguids-host-tool-build.patch} | 19 +- .../efivar/0002-gcc.specs-drop-Werror.patch | 46 ----- ...04-efisecdb-fix-build-with-musl-libc.patch | 185 ------------------ package/efivar/efivar.hash | 2 +- package/efivar/efivar.mk | 2 +- 7 files changed, 13 insertions(+), 284 deletions(-) delete mode 100644 package/efivar/0001-Allow-build-with-uClibc.patch rename package/efivar/{0003-efivar-isolate-makeguids-host-tool-build.patch => 0001-efivar-isolate-makeguids-host-tool-build.patch} (70%) delete mode 100644 package/efivar/0002-gcc.specs-drop-Werror.patch delete mode 100644 package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch diff --git a/.checkpackageignore b/.checkpackageignore index c18cc4d4171a..1303db52c6c3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -338,10 +338,6 @@ package/ebtables/0003-configure.ac-add-option-enable-kernel-64-userland-32.patch package/ecryptfs-utils/0001-musl.patch Upstream package/ecryptfs-utils/0002-openssl110.patch Upstream package/ecryptfs-utils/0003-fix-parallel-build-issue.patch Upstream -package/efivar/0001-Allow-build-with-uClibc.patch Upstream -package/efivar/0002-gcc.specs-drop-Werror.patch Upstream -package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch Upstream -package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch Upstream package/efl/0001-ecore_evas-engines-drm-meson.build-use-gl_deps-as-en.patch Upstream package/efl/0002-ecore_evas-engines-drm-meson.build-fix-gl_drm-includ.patch Upstream package/efl/0003-ecore_fb-fix-build-with-tslib.patch Upstream diff --git a/package/efivar/0001-Allow-build-with-uClibc.patch b/package/efivar/0001-Allow-build-with-uClibc.patch deleted file mode 100644 index 0da80f26d2ec..000000000000 --- a/package/efivar/0001-Allow-build-with-uClibc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bfd9cd9e603ef0d0e593d4432048bffc2acfeb7c Mon Sep 17 00:00:00 2001 -From: Andy Shevchenko -Date: Fri, 25 Nov 2016 19:42:27 +0200 -Subject: [PATCH] Allow build with uClibc - -Basically this replaces type definitions in . - -Signed-off-by: Andy Shevchenko -[Erico: rebase to 38] -Signed-off-by: Erico Nunes ---- - src/export.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/export.c b/src/export.c -index db5e637..21c5617 100644 ---- a/src/export.c -+++ b/src/export.c -@@ -9,10 +9,16 @@ - #include - #include - #include --#include - - #include "efivar.h" - -+#ifdef __UCLIBC__ -+typedef int_least16_t char16_t; -+typedef int_least32_t char32_t; -+#else -+#include -+#endif -+ - #define EFIVAR_MAGIC 0xf3df1597u - - #define ATTRS_UNSET 0xa5a5a5a5a5a5a5a5 --- -2.37.3 - diff --git a/package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch b/package/efivar/0001-efivar-isolate-makeguids-host-tool-build.patch similarity index 70% rename from package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch rename to package/efivar/0001-efivar-isolate-makeguids-host-tool-build.patch index f136bf2cd3ac..aad207d834c0 100644 --- a/package/efivar/0003-efivar-isolate-makeguids-host-tool-build.patch +++ b/package/efivar/0001-efivar-isolate-makeguids-host-tool-build.patch @@ -1,4 +1,4 @@ -From b069a48abd62a669851b9c3b501d579748dab0fd Mon Sep 17 00:00:00 2001 +From e1c3734bab27fd850b4ac6681d219ceaf0637616 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Mon, 3 Oct 2022 18:16:55 +0200 Subject: [PATCH] efivar: isolate makeguids host tool build @@ -14,16 +14,19 @@ target and remove target build dependencies from it. This way, Buildroot can build the tool separately in a host build step and the target build step can then be straightforward. +Upstream: Not applicable (does not support cross compilation) +Signed-off-by: Julien Olivain +[Julien: rebased patch to version 39] Signed-off-by: Erico Nunes --- src/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile -index 0e423c4..82c59c2 100644 +index 6fc2a62..7fa63c6 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -68,7 +68,6 @@ makeguids : LDFLAGS=$(HOST_LDFLAGS) +@@ -70,7 +70,6 @@ makeguids : LDFLAGS=$(HOST_LDFLAGS) makeguids : CCLDFLAGS=$(HOST_CCLDFLAGS) makeguids : $(MAKEGUIDS_OBJECTS) @@ -31,18 +34,18 @@ index 0e423c4..82c59c2 100644 $(MAKEGUIDS_OUTPUT) : guids.txt @set -e ; \ missing=no ; \ -@@ -81,9 +80,9 @@ $(MAKEGUIDS_OUTPUT) : guids.txt +@@ -83,9 +82,9 @@ $(MAKEGUIDS_OUTPUT) : guids.txt if [ "$${missing}" != "no" ]; then \ exit 1 ; \ fi -- ./makeguids $(LD_DASH_T) guids.txt guid-symbols.c include/efivar/efivar-guids.h guids.lds -+ makeguids $(LD_DASH_T) guids.txt guid-symbols.c include/efivar/efivar-guids.h guids.lds +- ./makeguids guids.txt guid-symbols.c include/efivar/efivar-guids.h ++ makeguids guids.txt guid-symbols.c include/efivar/efivar-guids.h -prep : makeguids $(GENERATED_SOURCES) +prep : $(GENERATED_SOURCES) - $(LIBEFIVAR_OBJECTS) $(LIBEFIBOOT_OBJECTS) : prep + $(LIBEFIVAR_OBJECTS) $(LIBEFIBOOT_OBJECTS) : include/efivar/efivar-guids.h -- -2.37.3 +2.44.0 diff --git a/package/efivar/0002-gcc.specs-drop-Werror.patch b/package/efivar/0002-gcc.specs-drop-Werror.patch deleted file mode 100644 index a25b84490657..000000000000 --- a/package/efivar/0002-gcc.specs-drop-Werror.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a1d469753528a98aec971377a526619da5054b20 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 22 Mar 2021 07:52:34 +0100 -Subject: [PATCH] gcc.specs: drop -Werror - -Build with -Werror raises the following build failure with gcc 10: - -/home/buildroot/autobuild/run/instance-1/output-1/host/bin/aarch64-none-linux-gnu-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O2 -I/home/buildroot/autobuild/run/instance-1/output-1/build/efivar-37/src/include/ -specs=/home/buildroot/autobuild/run/instance-1/output-1/build/efivar-37/gcc.specs -L. -fPIC -Wl,-z,muldefs -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o efivar efivar.c -lefivar -ldl -In file included from efivar.h:28, - from efivar.c:40: -In function 'text_to_guid', - inlined from 'parse_name.constprop' at efivar.c:157:8: -guid.h:106:2: error: 'strncpy' output may be truncated copying 8 bytes from a string of length 38 [-Werror=stringop-truncation] - 106 | strncpy(eightbytes, text, 8); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ -cc1: all warnings being treated as errors - -Fixes: - - http://autobuild.buildroot.org/results/fcba72d359f4128515560e9105384cd4deff5043 - -Signed-off-by: Fabrice Fontaine -[Upstream status: not upstreamable as Makefiles were reworked and a new -ERRORS parameter was added: -https://github.com/rhboot/efivar/commit/998f617cec92d526e1fadb745673ceef63fa1483] -[Erico: rebase to 38] -Signed-off-by: Erico Nunes ---- - src/include/defaults.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/include/defaults.mk b/src/include/defaults.mk -index 632b155..2a9537a 100644 ---- a/src/include/defaults.mk -+++ b/src/include/defaults.mk -@@ -29,7 +29,7 @@ WARNINGS_GCC ?= - WARNINGS_CCC_ANALYZER ?= $(WARNINGS_GCC) - WARNINGS ?= -Wall -Wextra $(call family,WARNINGS) - ERRORS_GCC ?= --ERRORS ?= -Werror $(call family,ERRORS) -+ERRORS ?= $(call family,ERRORS) - CPPFLAGS ?= - override _CPPFLAGS := $(CPPFLAGS) - override CPPFLAGS = $(_CPPFLAGS) -DLIBEFIVAR_VERSION=$(VERSION) \ --- -2.37.3 - diff --git a/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch b/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch deleted file mode 100644 index 9815a9d0cfbd..000000000000 --- a/package/efivar/0004-efisecdb-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,185 +0,0 @@ -From cece3ffd5be2f8641eb694513f2b73e5eb97ffd3 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Fri, 28 Jan 2022 12:13:30 +0100 -Subject: [PATCH] efisecdb: fix build with musl libc - -Refactor code to use POSIX atexit(3) instead of the GNU specific -on_exit(3). - -Resolves: #197 -Resolves: #202 -Signed-off-by: Natanael Copa -[Erico: backport from upstream commit -cece3ffd5be2f8641eb694513f2b73e5eb97ffd3] -Signed-off-by: Erico Nunes ---- - src/compiler.h | 2 -- - src/efisecdb.c | 68 +++++++++++++++++++------------------------------- - 2 files changed, 26 insertions(+), 44 deletions(-) - -diff --git a/src/compiler.h b/src/compiler.h -index e2f18f0..d95fb01 100644 ---- a/src/compiler.h -+++ b/src/compiler.h -@@ -7,8 +7,6 @@ - #ifndef COMPILER_H_ - #define COMPILER_H_ - --#include -- - /* GCC version checking borrowed from glibc. */ - #if defined(__GNUC__) && defined(__GNUC_MINOR__) - # define GNUC_PREREQ(maj,min) \ -diff --git a/src/efisecdb.c b/src/efisecdb.c -index f882373..6bd5ad9 100644 ---- a/src/efisecdb.c -+++ b/src/efisecdb.c -@@ -25,6 +25,10 @@ - extern char *optarg; - extern int optind, opterr, optopt; - -+static efi_secdb_t *secdb = NULL; -+static list_t infiles; -+static list_t actions; -+ - struct hash_param { - char *name; - efi_secdb_type_t algorithm; -@@ -187,12 +191,11 @@ add_action(list_t *list, action_type_t action_type, const efi_guid_t *owner, - } - - static void --free_actions(int status UNUSED, void *actionsp) -+free_actions(void) - { -- list_t *actions = (list_t *)actionsp; - list_t *pos, *tmp; - -- for_each_action_safe(pos, tmp, actions) { -+ for_each_action_safe(pos, tmp, &actions) { - action_t *action = list_entry(pos, action_t, list); - - list_del(&action->list); -@@ -202,12 +205,11 @@ free_actions(int status UNUSED, void *actionsp) - } - - static void --free_infiles(int status UNUSED, void *infilesp) -+free_infiles(void) - { -- list_t *infiles = (list_t *)infilesp; - list_t *pos, *tmp; - -- for_each_ptr_safe(pos, tmp, infiles) { -+ for_each_ptr_safe(pos, tmp, &infiles) { - ptrlist_t *entry = list_entry(pos, ptrlist_t, list); - - list_del(&entry->list); -@@ -216,27 +218,12 @@ free_infiles(int status UNUSED, void *infilesp) - } - - static void --maybe_free_secdb(int status UNUSED, void *voidp) -+maybe_free_secdb(void) - { -- efi_secdb_t **secdbp = (efi_secdb_t **)voidp; -- -- if (secdbp == NULL || *secdbp == NULL) -+ if (secdb == NULL) - return; - -- efi_secdb_free(*secdbp); --} -- --static void --maybe_do_unlink(int status, void *filep) --{ -- char **file = (char **)filep; -- -- if (status == 0) -- return; -- if (file == NULL || *file == NULL) -- return; -- -- unlink(*file); -+ efi_secdb_free(secdb); - } - - static void -@@ -323,15 +310,6 @@ parse_input_files(list_t *infiles, char **outfile, efi_secdb_t **secdb, - return status; - } - --/* -- * These need to be static globals so that they're not on main's stack when -- * on_exit() fires. -- */ --static efi_secdb_t *secdb = NULL; --static list_t infiles; --static list_t actions; --static char *outfile = NULL; -- - int - main(int argc, char *argv[]) - { -@@ -351,6 +329,7 @@ main(int argc, char *argv[]) - bool do_sort_data = false; - bool sort_descending = false; - int status = 0; -+ char *outfile = NULL; - - const char sopts[] = ":aAc:dfg:h:i:Lo:rs:t:v?"; - const struct option lopts[] = { -@@ -376,10 +355,9 @@ main(int argc, char *argv[]) - INIT_LIST_HEAD(&infiles); - INIT_LIST_HEAD(&actions); - -- on_exit(free_actions, &actions); -- on_exit(free_infiles, &infiles); -- on_exit(maybe_free_secdb, &secdb); -- on_exit(maybe_do_unlink, &outfile); -+ atexit(free_actions); -+ atexit(free_infiles); -+ atexit(maybe_free_secdb); - - /* - * parse the command line. -@@ -587,24 +565,30 @@ sort_err: - outfd = open(outfile, flags, 0600); - if (outfd < 0) { - char *tmpoutfile = outfile; -- if (errno == EEXIST) -- outfile = NULL; -+ if (errno != EEXIST) -+ unlink(outfile); - err(1, "could not open \"%s\"", tmpoutfile); - } - - rc = ftruncate(outfd, 0); -- if (rc < 0) -+ if (rc < 0) { -+ unlink(outfile); - err(1, "could not truncate output file \"%s\"", outfile); -+ } - - void *output; - size_t size = 0; - rc = efi_secdb_realize(secdb, &output, &size); -- if (rc < 0) -+ if (rc < 0) { -+ unlink(outfile); - secdb_err(1, "could not realize signature list"); -+ } - - rc = write(outfd, output, size); -- if (rc < 0) -+ if (rc < 0) { -+ unlink(outfile); - err(1, "could not write signature list"); -+ } - - close(outfd); - xfree(output); --- -2.37.3 - diff --git a/package/efivar/efivar.hash b/package/efivar/efivar.hash index 827b46baa4f4..bef096bda64c 100644 --- a/package/efivar/efivar.hash +++ b/package/efivar/efivar.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 e3bbde37238bd47af1fcf270dc0ef1f4be030d86364c917b93669222ec52bbea efivar-38.tar.gz +sha256 c9edd15f2eeeea63232f3e669a48e992c7be9aff57ee22672ac31f5eca1609a6 efivar-39.tar.gz sha256 91df770634adc2755e78cae33a0d01e702ce2f69046408ae93d0d934ff29691b COPYING diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index ee6d7302df4e..6c3b57837a9b 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -4,7 +4,7 @@ # ################################################################################ -EFIVAR_VERSION = 38 +EFIVAR_VERSION = 39 EFIVAR_SITE = $(call github,rhboot,efivar,$(EFIVAR_VERSION)) EFIVAR_LICENSE = LGPL-2.1 EFIVAR_LICENSE_FILES = COPYING From 8035ea0a712eaa16d2ac96cd29db0e8726b0f685 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 19:18:59 +0100 Subject: [PATCH 124/345] package/shadow: disable on uclibc shadow unconditionally uses reallocarray and explicit_bzero since bump to version 4.14.3 in commit 8a01774d9897310c00a0945865f5a6d5167dfca3 and https://github.com/shadow-maint/shadow/commit/1aa22c14674e14e84efa171614dea2b515d5a223 https://github.com/shadow-maint/shadow/commit/0e0a310acf5111251589116343897a63ebc88e7a resulting in the following uclibc build failure: /home/autobuild/autobuild/instance-9/output-1/host/lib/gcc/arc-buildroot-linux-uclibc/13.1.1/../../../../arc-buildroot-linux-uclibc/bin/ld: groups.o: in function `main': groups.c:(.text.startup+0x20): undefined reference to `reallocarray' Fixes: - http://autobuild.buildroot.org/results/98be07d299aa383a447a1f1dd2924a00c1a29a34 Signed-off-by: Fabrice Fontaine [Peter: add a comment about what functions are missing, reallocf reference] Signed-off-by: Peter Korsgaard --- package/shadow/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/shadow/Config.in b/package/shadow/Config.in index 230271af7d78..b08b06457ba8 100644 --- a/package/shadow/Config.in +++ b/package/shadow/Config.in @@ -2,6 +2,7 @@ menuconfig BR2_PACKAGE_SHADOW bool "shadow" depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 + depends on !BR2_TOOLCHAIN_USES_UCLIBC # reallocarray, explicit_bzero help Utilities to deal with user accounts. @@ -55,5 +56,6 @@ config BR2_PACKAGE_SHADOW_YESCRYPT endif # BR2_PACKAGE_SHADOW -comment "shadow needs a toolchain w/ headers >= 4.14, dynamic library" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || BR2_STATIC_LIBS +comment "shadow needs a glibc or musl toolchain w/ headers >= 4.14, dynamic library" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || \ + BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC From f64f82f78ffd9c4b530a7a7f17e1a66feaa23c80 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 22:58:32 +0100 Subject: [PATCH 125/345] package/fluent-bit: force libopenssl libressl dropped engine support since version 3.8.1 resulting in the following build failure since bump of libressl to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-gnueabi/12.3.0/../../../../armeb-buildroot-linux-gnueabi/bin/ld: ../library/librdkafka.a(rdkafka_admin.c.o): in function `rd_kafka_UserScramCredentialUpsertion_new': /home/autobuild/autobuild/instance-0/output-1/build/fluent-bit-2.2.2/lib/librdkafka-2.3.0/src/rdkafka_admin.c:5909: undefined reference to `RAND_priv_bytes' /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/armeb-buildroot-linux-gnueabi/12.3.0/../../../../armeb-buildroot-linux-gnueabi/bin/ld: ../library/librdkafka.a(rdkafka_ssl.c.o): in function `rd_kafka_ssl_set_certs': /home/autobuild/autobuild/instance-0/output-1/build/fluent-bit-2.2.2/lib/librdkafka-2.3.0/src/rdkafka_ssl.c:1384: undefined reference to `ENGINE_load_ssl_client_cert' Fixes: - http://autobuild.buildroot.org/results/dd74eb4e31e0e4d23e7638cff47c6876fda59952 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fluent-bit/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/fluent-bit/Config.in b/package/fluent-bit/Config.in index dec40c43710c..53284ee17d88 100644 --- a/package/fluent-bit/Config.in +++ b/package/fluent-bit/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_FLUENT_BIT depends on !BR2_STATIC_LIBS # dlfcn.h select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_LIBYAML help Fast and Lightweight Logs and Metrics processor. From 34d473b5cca2a0e01ba7a60ced275f94a0e40540 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 11:30:00 +0100 Subject: [PATCH 126/345] package/luvi: fix build with aarch64_be Fix the following build failure with aarch64_be raised since the addition of aarch64_be support to luajit in commit 28e5c2f2bdd147dbb9aefbc040fc618f46ee0663: luajit: unknown architecture Fixes: 28e5c2f2bdd147dbb9aefbc040fc618f46ee0663 - http://autobuild.buildroot.org/results/9b89eff7d90173b8c74b8f676650709cc4418e65 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/luvi/luvi.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/luvi/luvi.mk b/package/luvi/luvi.mk index a8e645fab36b..ebd1066c5c2d 100644 --- a/package/luvi/luvi.mk +++ b/package/luvi/luvi.mk @@ -22,6 +22,8 @@ else ifeq ($(BR2_arm)$(BR2_armeb),y) LUVI_TARGET_ARCH = arm else ifeq ($(BR2_aarch64),y) LUVI_TARGET_ARCH = arm64 +else ifeq ($(BR2_aarch64_be),y) +LUVI_TARGET_ARCH = arm64be else ifeq ($(BR2_mips),y) LUVI_TARGET_ARCH = mips else ifeq ($(BR2_mipsel),y) From c39259aa35ff1376910e402e3b7f2449e1e133d3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2024 14:04:14 +0100 Subject: [PATCH 127/345] package/spirv-tools: needs dynamic library Fix the following static build failure raised since the addition of the package in commit 0a01085abeb7d8a097cb68b9f7f4faec7711543c: [ 26%] Linking CXX shared library libSPIRV-Tools-shared.so /home/autobuild/autobuild/instance-11/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/12.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-11/output-1/host/xtensa-buildroot-linux-uclibc/sysroot/usr/lib/libc.a(__uClibc_main.os): in function `__uClibc_init': __uClibc_main.c:(.text+0x98): undefined reference to `__fini_array_start' Fixes: 0a01085abeb7d8a097cb68b9f7f4faec7711543c - http://autobuild.buildroot.org/results/f953d500830e8124c6e85c57887106f9352cb4c2 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/spirv-tools/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/spirv-tools/Config.in b/package/spirv-tools/Config.in index fa9b615c5651..98b0c46525e2 100644 --- a/package/spirv-tools/Config.in +++ b/package/spirv-tools/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SPIRV_TOOLS bool "spirv-tools" depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 filesystem select BR2_PACKAGE_SPIRV_HEADERS help @@ -9,6 +10,6 @@ config BR2_PACKAGE_SPIRV_TOOLS https://github.com/KhronosGroup/SPIRV-Tools -comment "spirv-tools needs a toolchain w/ C++, gcc >= 8" - depends on !BR2_INSTALL_LIBSTDCPP || \ +comment "spirv-tools needs a toolchain w/ C++, dynamic library, gcc >= 8" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_8 From 7cc49fc692c4b8e5ba9ab30ed1ed67d48b89c445 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 3 Mar 2024 21:46:40 +0100 Subject: [PATCH 128/345] package/oracle-mysql: drop package The package has not seen any updates for ~10 years, E.G. latest version bump was in commit 42c56751fc55 (mysql: bump to version 5.1.73) and the version contains multiple known vulnerabilities, so drop the package. Signed-off-by: Peter Korsgaard --- .checkpackageignore | 12 - Config.in.legacy | 7 + package/mysql/Config.in | 20 - .../oracle-mysql/0000-ac_cache_check.patch | 156 - .../0001-configure-ps-cache-check.patch | 39 - .../0002-use-new-readline-iface.patch | 21 - .../0003-ac_stack_direction-is-unset.patch | 15 - .../0004-Fix-gen_lex_hash-execution.patch | 32 - ...05-bison_3_breaks_mysql_server_build.patch | 3310 ----------------- .../0006-no-force-static-build.patch | 18 - ...0007-dont-install-in-mysql-directory.patch | 182 - .../0008-fix-type-conversion.patch | 22 - package/oracle-mysql/0009-gcc7.patch | 45 - .../0010-fix-build-without-zlib.patch | 52 - ...-alloca.m4-Remove-obsolete-Cray-supp.patch | 51 - package/oracle-mysql/S97mysqld | 39 - package/oracle-mysql/mysqld.service | 13 - package/oracle-mysql/oracle-mysql.hash | 6 - package/oracle-mysql/oracle-mysql.mk | 140 - 19 files changed, 7 insertions(+), 4173 deletions(-) delete mode 100644 package/oracle-mysql/0000-ac_cache_check.patch delete mode 100644 package/oracle-mysql/0001-configure-ps-cache-check.patch delete mode 100644 package/oracle-mysql/0002-use-new-readline-iface.patch delete mode 100644 package/oracle-mysql/0003-ac_stack_direction-is-unset.patch delete mode 100644 package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch delete mode 100644 package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch delete mode 100644 package/oracle-mysql/0006-no-force-static-build.patch delete mode 100644 package/oracle-mysql/0007-dont-install-in-mysql-directory.patch delete mode 100644 package/oracle-mysql/0008-fix-type-conversion.patch delete mode 100644 package/oracle-mysql/0009-gcc7.patch delete mode 100644 package/oracle-mysql/0010-fix-build-without-zlib.patch delete mode 100644 package/oracle-mysql/0011-config-ac-macros-alloca.m4-Remove-obsolete-Cray-supp.patch delete mode 100644 package/oracle-mysql/S97mysqld delete mode 100644 package/oracle-mysql/mysqld.service delete mode 100644 package/oracle-mysql/oracle-mysql.hash delete mode 100644 package/oracle-mysql/oracle-mysql.mk diff --git a/.checkpackageignore b/.checkpackageignore index 1303db52c6c3..f4bfa12e1e83 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -967,18 +967,6 @@ package/openvmtools/shutdown Shellcheck package/openvpn/S60openvpn Indent Shellcheck Variables package/oprofile/0001-musl.patch Upstream package/opusfile/0001-Propagate-allocation-failure-from-ogg_sync_buffer.patch Upstream -package/oracle-mysql/0000-ac_cache_check.patch Upstream -package/oracle-mysql/0001-configure-ps-cache-check.patch Upstream -package/oracle-mysql/0002-use-new-readline-iface.patch Upstream -package/oracle-mysql/0003-ac_stack_direction-is-unset.patch Upstream -package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch Upstream -package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch Upstream -package/oracle-mysql/0006-no-force-static-build.patch Upstream -package/oracle-mysql/0007-dont-install-in-mysql-directory.patch Upstream -package/oracle-mysql/0008-fix-type-conversion.patch Upstream -package/oracle-mysql/0009-gcc7.patch Upstream -package/oracle-mysql/0010-fix-build-without-zlib.patch Upstream -package/oracle-mysql/S97mysqld Shellcheck Variables package/owfs/S55owserver Shellcheck Variables package/owfs/S60owfs Shellcheck Variables package/owl-linux/0001-fix-for-linux-3.3.x.patch Upstream diff --git a/Config.in.legacy b/Config.in.legacy index 5956ffcca5d0..918f5075af65 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_ORACLE_MYSQL + bool "oracle mysql removed" + select BR2_LEGACY + help + Oracle mysql has been removed as the package was + unmaintained. Consider using mariadb instead. + config BR2_PACKAGE_STRONGSWAN_SCEP bool "strongswan SCEP client tool removed" select BR2_LEGACY diff --git a/package/mysql/Config.in b/package/mysql/Config.in index 8942e55a455e..3257253166b2 100644 --- a/package/mysql/Config.in +++ b/package/mysql/Config.in @@ -10,7 +10,6 @@ if BR2_PACKAGE_MYSQL choice prompt "mysql variant" - default BR2_PACKAGE_ORACLE_MYSQL help Select either the oracle mysql server or the mariadb server @@ -39,15 +38,6 @@ comment "mariadb needs a toolchain w/ dynamic library, C++, wchar" || !BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 -config BR2_PACKAGE_ORACLE_MYSQL - bool "oracle mysql" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_HAS_MYSQL - help - The MySQL Open Source Database System - - http://www.mysql.com/ - endchoice if BR2_PACKAGE_MARIADB @@ -65,22 +55,12 @@ config BR2_PACKAGE_MARIADB_SERVER_EMBEDDED endif -if BR2_PACKAGE_ORACLE_MYSQL - -config BR2_PACKAGE_ORACLE_MYSQL_SERVER - bool "oracle mysql server" - help - Install the MySQL server on the target. - -endif - config BR2_PACKAGE_HAS_MYSQL bool config BR2_PACKAGE_PROVIDES_MYSQL string default "mariadb" if BR2_PACKAGE_MARIADB - default "oracle-mysql" if BR2_PACKAGE_ORACLE_MYSQL endif diff --git a/package/oracle-mysql/0000-ac_cache_check.patch b/package/oracle-mysql/0000-ac_cache_check.patch deleted file mode 100644 index c3b55ba8d39d..000000000000 --- a/package/oracle-mysql/0000-ac_cache_check.patch +++ /dev/null @@ -1,156 +0,0 @@ -Patch borrowed from -http://code.google.com/p/minimyth/source/browse/trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.47-ac_cache_check.patch?r=6493. - -It allows to override through ac_cv_* variables various checks that -cannot be performed when cross-compiling. - -Signed-off-by: Thomas Petazzoni - ---- - storage/innodb_plugin/plug.in | 59 ++++++++++++++++++++++++++++-------------- - 1 file changed, 40 insertions(+), 19 deletions(-) - -Index: mysql-5.1.53/storage/innodb_plugin/plug.in -=================================================================== ---- mysql-5.1.53.orig/storage/innodb_plugin/plug.in -+++ mysql-5.1.53/storage/innodb_plugin/plug.in -@@ -53,9 +53,10 @@ - esac - AC_SUBST(INNODB_DYNAMIC_CFLAGS) - -- AC_MSG_CHECKING(whether GCC atomic builtins are available) -+ AC_CACHE_CHECK([whether GCC atomic builtins are available], -+ [ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS], - # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - int main() - { -@@ -95,18 +96,23 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1], -- [GCC atomic builtins are available]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1], -+ [GCC atomic builtins are available]) -+ fi - -- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins) -+ AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins], -+ [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC], - # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - #include - #include -@@ -126,14 +132,18 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1], -- [pthread_t can be used by GCC atomic builtins]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1], -+ [pthread_t can be used by GCC atomic builtins]) -+ fi - - AC_MSG_CHECKING(whether Solaris libc atomic functions are available) - # either define HAVE_IB_SOLARIS_ATOMICS or not -@@ -148,9 +158,10 @@ - are available]) - ) - -- AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions) -+ AC_CACHE_CHECK([whether pthread_t can be used by Solaris libc atomic functions], -+ [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], - # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - #include - #include -@@ -181,28 +192,33 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1], -- [pthread_t can be used by solaris atomics]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1], -+ [pthread_t can be used by solaris atomics]) -+ fi - - # this is needed to know which one of atomic_cas_32() or atomic_cas_64() - # to use in the source - AC_CHECK_SIZEOF([pthread_t], [], [#include ]) - - # Check for x86 PAUSE instruction -- AC_MSG_CHECKING(for x86 PAUSE instruction) -+ AC_CACHE_CHECK([for x86 PAUSE instruction], -+ [ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION], - # We have to actually try running the test program, because of a bug - # in Solaris on x86_64, where it wrongly reports that PAUSE is not - # supported when trying to run an application. See - # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684 - # We use ib_ prefix to avoid collisoins if this code is added to - # mysql's configure.in. -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - int main() { - __asm__ __volatile__ ("pause"); -@@ -210,16 +226,21 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist]) -+ fi - ]) - - # vim: set ft=config: diff --git a/package/oracle-mysql/0001-configure-ps-cache-check.patch b/package/oracle-mysql/0001-configure-ps-cache-check.patch deleted file mode 100644 index 336e80e0b759..000000000000 --- a/package/oracle-mysql/0001-configure-ps-cache-check.patch +++ /dev/null @@ -1,39 +0,0 @@ -Patch borrowed from -http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/mysql/files/configure-ps-cache-check.patch - -It allows to specify through ac_cv_FIND_PROC how ps should be used on -the target to find the PID of a program. - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -Index: mysql-5.1.53/configure.in -=================================================================== ---- mysql-5.1.53.orig/configure.in -+++ mysql-5.1.53/configure.in -@@ -462,8 +462,8 @@ - # then Make, then shell. The autoconf substitution uses single quotes, so - # no unprotected single quotes should appear in the expression. - AC_PATH_PROG(PS, ps, ps) --AC_MSG_CHECKING("how to check if pid exists") --PS=$ac_cv_path_PS -+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC], -+[ - # Linux style - if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null - then -@@ -502,8 +502,9 @@ - AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual.]) - esac - fi --AC_SUBST(FIND_PROC) --AC_MSG_RESULT("$FIND_PROC") -+ac_cv_FIND_PROC="$FIND_PROC" -+]) -+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC]) - - # Check if a pid is valid - AC_PATH_PROG(KILL, kill, kill) diff --git a/package/oracle-mysql/0002-use-new-readline-iface.patch b/package/oracle-mysql/0002-use-new-readline-iface.patch deleted file mode 100644 index c5906563cee5..000000000000 --- a/package/oracle-mysql/0002-use-new-readline-iface.patch +++ /dev/null @@ -1,21 +0,0 @@ -Tell MySQL to use the new readline interface even when an external -readline is being used. - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 1 + - 1 file changed, 1 insertion(+) - -Index: mysql-5.1.53/configure.in -=================================================================== ---- mysql-5.1.53.orig/configure.in -+++ mysql-5.1.53/configure.in -@@ -2689,6 +2689,7 @@ - # this way we avoid linking commercial source with GPL readline - readline_link="-lreadline" - want_to_use_readline="yes" -+ AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1) - elif [test "$mysql_cv_libedit_interface" = "yes"] - then - # Use libedit diff --git a/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch b/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch deleted file mode 100644 index 6fef0a9acf8f..000000000000 --- a/package/oracle-mysql/0003-ac_stack_direction-is-unset.patch +++ /dev/null @@ -1,15 +0,0 @@ -misc.m4: ac_cv_c_stack_direction is unset. - -Signed-off-by: Marcelo Gutierrez (UTN/FRH) - ---- mysql-5.1.70.orig/config/ac-macros/misc.m4 -+++ mysql-5.1.70/config/ac-macros/misc.m4 -@@ -477,7 +477,7 @@ - exit(ptr_f(&a) < 0); - } - ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1, -- ac_cv_c_stack_direction=)]) -+ ac_cv_c_stack_direction=0)]) - AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) - ])dnl - diff --git a/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch b/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch deleted file mode 100644 index b91ed4fef907..000000000000 --- a/package/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch +++ /dev/null @@ -1,32 +0,0 @@ -Makefile: fix cross-compiling the server - -MySQL Makefile believes it can run code it just compiled, to -generate a header. This does not work for cross-compilation. - -Instead, use a pre-installed host-version of the required tool. - -Signed-off-by: Marcelo Gutierrez (UTN/FRH) - ---- mysql-5.1.70/sql/Makefile.am -+++ mysql-5.1.70.patch/sql/Makefile.am -@@ -177,7 +177,7 @@ - # this avoid the rebuild of the built files in a source dist - lex_hash.h: gen_lex_hash.cc lex.h - $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT) -- ./gen_lex_hash$(EXEEXT) > $@-t -+ gen_lex_hash$(EXEEXT) > $@-t - $(MV) $@-t $@ - - # For testing of udf_example.so - ---- mysql-5.1.70/sql/Makefile.in -+++ mysql-5.1.70.patch/sql/Makefile.in -@@ -1310,7 +1310,7 @@ - # this avoid the rebuild of the built files in a source dist - lex_hash.h: gen_lex_hash.cc lex.h - $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT) -- ./gen_lex_hash$(EXEEXT) > $@-t -+ gen_lex_hash$(EXEEXT) > $@-t - $(MV) $@-t $@ - - # We might have some stuff not built in this build, but that we want to install diff --git a/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch b/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch deleted file mode 100644 index 918fe2456a4a..000000000000 --- a/package/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch +++ /dev/null @@ -1,3310 +0,0 @@ -fix the yacc code in mysql - -Signed-off-by: Marcelo Gutierrez (UTN/FRH) ---- -diff -uNr mysql-5.1.73.orig/sql/sql_lex.cc mysql-5.1.73/sql/sql_lex.cc ---- mysql-5.1.73.orig/sql/sql_lex.cc 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_lex.cc 2014-02-12 14:12:04.244111625 +0000 -@@ -775,14 +775,13 @@ - (which can't be followed by a signed number) - */ - --int MYSQLlex(void *arg, void *yythd) -+int MYSQLlex(void *arg, THD *thd) - { - reg1 uchar c= 0; - bool comment_closed; - int tokval, result_state; - uint length; - enum my_lex_states state; -- THD *thd= (THD *)yythd; - Lex_input_stream *lip= & thd->m_parser_state->m_lip; - LEX *lex= thd->lex; - YYSTYPE *yylval=(YYSTYPE*) arg; -diff -uNr mysql-5.1.73.orig/sql/sql_lex.h mysql-5.1.73/sql/sql_lex.h ---- mysql-5.1.73.orig/sql/sql_lex.h 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_lex.h 2014-02-12 14:17:19.424106423 +0000 -@@ -2072,7 +2072,7 @@ - extern void lex_free(void); - extern void lex_start(THD *thd); - extern void lex_end(LEX *lex); --extern int MYSQLlex(void *arg, void *yythd); -+extern int MYSQLlex(void *arg, THD *thd); - - extern void trim_whitespace(CHARSET_INFO *cs, LEX_STRING *str); - -diff -uNr mysql-5.1.73.orig/sql/sql_parse.cc mysql-5.1.73/sql/sql_parse.cc ---- mysql-5.1.73.orig/sql/sql_parse.cc 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_parse.cc 2014-02-12 14:19:20.424104427 +0000 -@@ -8012,7 +8012,7 @@ - } - - --extern int MYSQLparse(void *thd); // from sql_yacc.cc -+extern int MYSQLparse(THD *thd); // from sql_yacc.cc - - - /** -diff -uNr mysql-5.1.73.orig/sql/sql_yacc.yy mysql-5.1.73/sql/sql_yacc.yy ---- mysql-5.1.73.orig/sql/sql_yacc.yy 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_yacc.yy 2014-02-12 20:17:06.707750140 +0000 -@@ -23,19 +23,13 @@ - */ - - %{ --/* thd is passed as an argument to yyparse(), and subsequently to yylex(). --** The type will be void*, so it must be cast to (THD*) when used. --** Use the YYTHD macro for this. --*/ --#define YYPARSE_PARAM yythd --#define YYLEX_PARAM yythd --#define YYTHD ((THD *)yythd) --#define YYLIP (& YYTHD->m_parser_state->m_lip) -+ -+#define YYLIP (& thd->m_parser_state->m_lip) - - #define MYSQL_YACC - #define YYINITDEPTH 100 - #define YYMAXDEPTH 3200 /* Because of 64K stack */ --#define Lex (YYTHD->lex) -+#define Lex (thd->lex) - #define Select Lex->current_select - #include "mysql_priv.h" - #include "slave.h" -@@ -55,7 +49,7 @@ - #pragma warning (disable : 4065) - #endif - --int yylex(void *yylval, void *yythd); -+int yylex(void *yylval, THD *thd); - - const LEX_STRING null_lex_str= {0,0}; - -@@ -64,7 +58,7 @@ - ulong val= *(F); \ - if (my_yyoverflow((B), (D), &val)) \ - { \ -- yyerror((char*) (A)); \ -+ yyerror(current_thd, (char*) (A)); \ - return 2; \ - } \ - else \ -@@ -76,7 +70,7 @@ - #define MYSQL_YYABORT \ - do \ - { \ -- LEX::cleanup_lex_after_parse_error(YYTHD);\ -+ LEX::cleanup_lex_after_parse_error(thd);\ - YYABORT; \ - } while (0) - -@@ -159,9 +153,8 @@ - to abort from the parser. - */ - --void MYSQLerror(const char *s) -+void MYSQLerror(THD *thd, const char *s) - { -- THD *thd= current_thd; - - /* - Restore the original LEX if it was replaced when parsing -@@ -675,7 +668,10 @@ - bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); - %} - --%pure_parser /* We have threads */ -+/* We have threads */ -+%define api.pure -+%parse-param { THD *thd } -+%lex-param { THD *thd } - /* - Currently there are 169 shift/reduce conflicts. - We should not introduce new conflicts any more. -@@ -1516,7 +1512,6 @@ - query: - END_OF_INPUT - { -- THD *thd= YYTHD; - if (!thd->bootstrap && - (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT))) - { -@@ -1530,7 +1525,7 @@ - { - Lex_input_stream *lip = YYLIP; - -- if ((YYTHD->client_capabilities & CLIENT_MULTI_QUERIES) && -+ if ((thd->client_capabilities & CLIENT_MULTI_QUERIES) && - ! lip->stmt_prepare_mode && - ! lip->eof()) - { -@@ -1626,7 +1621,6 @@ - deallocate: - deallocate_or_drop PREPARE_SYM ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_DEALLOCATE_PREPARE; - lex->prepared_stmt_name= $3; -@@ -1641,7 +1635,6 @@ - prepare: - PREPARE_SYM ident FROM prepare_src - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_PREPARE; - lex->prepared_stmt_name= $2; -@@ -1651,14 +1644,12 @@ - prepare_src: - TEXT_STRING_sys - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->prepared_stmt_code= $1; - lex->prepared_stmt_code_is_varref= FALSE; - } - | '@' ident_or_text - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->prepared_stmt_code= $2; - lex->prepared_stmt_code_is_varref= TRUE; -@@ -1668,7 +1659,6 @@ - execute: - EXECUTE_SYM ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_EXECUTE; - lex->prepared_stmt_name= $2; -@@ -1826,7 +1816,6 @@ - create: - CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_CREATE_TABLE; - if (!lex->select_lex.add_table_to_list(thd, $5, NULL, -@@ -1844,13 +1833,13 @@ - } - create2 - { -- LEX *lex= YYTHD->lex; -+ LEX *lex= thd->lex; - lex->current_select= &lex->select_lex; - if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) && - !lex->create_info.db_type) - { -- lex->create_info.db_type= ha_default_handlerton(YYTHD); -- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, -+ lex->create_info.db_type= ha_default_handlerton(thd); -+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_USING_OTHER_HANDLER, - ER(ER_WARN_USING_OTHER_HANDLER), - ha_resolve_storage_engine_name(lex->create_info.db_type), -@@ -1979,7 +1968,7 @@ - event_tail: - remember_name EVENT_SYM opt_if_not_exists sp_name - { -- THD *thd= YYTHD; -+ THD *thd= thd; - LEX *lex=Lex; - - lex->stmt_definition_begin= $1; -@@ -2046,7 +2035,7 @@ - ev_starts: - /* empty */ - { -- Item *item= new (YYTHD->mem_root) Item_func_now_local(); -+ Item *item= new (thd->mem_root) Item_func_now_local(); - if (item == NULL) - MYSQL_YYABORT; - Lex->event_parse_data->item_starts= item; -@@ -2096,7 +2085,6 @@ - - ev_sql_stmt: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -2139,7 +2127,6 @@ - } - ev_sql_stmt_inner - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - /* return back to the original memory root ASAP */ -@@ -2198,11 +2185,10 @@ - $$= new sp_name($1, $3, true); - if ($$ == NULL) - MYSQL_YYABORT; -- $$->init_qname(YYTHD); -+ $$->init_qname(thd); - } - | ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - LEX_STRING db; - if (check_routine_name(&$1)) -@@ -2272,7 +2258,7 @@ - lex->sql_command= SQLCOM_CALL; - lex->spname= $2; - lex->value_list.empty(); -- sp_add_used_routine(lex, YYTHD, $2, TYPE_ENUM_PROCEDURE); -+ sp_add_used_routine(lex, thd, $2, TYPE_ENUM_PROCEDURE); - } - opt_sp_cparam_list {} - ; -@@ -2345,7 +2331,7 @@ - (enum enum_field_types)$3, - sp_param_in); - -- if (lex->sphead->fill_field_definition(YYTHD, lex, -+ if (lex->sphead->fill_field_definition(thd, lex, - (enum enum_field_types) $3, - &spvar->field_def)) - { -@@ -2382,7 +2368,7 @@ - (enum enum_field_types)$4, - (sp_param_mode_t)$1); - -- if (lex->sphead->fill_field_definition(YYTHD, lex, -+ if (lex->sphead->fill_field_definition(thd, lex, - (enum enum_field_types) $4, - &spvar->field_def)) - { -@@ -2445,13 +2431,12 @@ - { - LEX *lex= Lex; - -- lex->sphead->reset_lex(YYTHD); -+ lex->sphead->reset_lex(thd); - lex->spcont->declare_var_boundary($2); - } - type - sp_opt_default - { -- THD *thd= YYTHD; - LEX *lex= Lex; - sp_pcontext *pctx= lex->spcont; - uint num_vars= pctx->context_var_count(); -@@ -2477,7 +2462,7 @@ - spvar->type= var_type; - spvar->dflt= dflt_value_item; - -- if (lex->sphead->fill_field_definition(YYTHD, lex, var_type, -+ if (lex->sphead->fill_field_definition(thd, lex, var_type, - &spvar->field_def)) - { - MYSQL_YYABORT; -@@ -2501,7 +2486,7 @@ - } - - pctx->declare_var_boundary(0); -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - $$.vars= $2; - $$.conds= $$.hndlrs= $$.curs= 0; -@@ -2516,7 +2501,7 @@ - my_error(ER_SP_DUP_COND, MYF(0), $2.str); - MYSQL_YYABORT; - } -- if(YYTHD->lex->spcont->push_cond(&$2, $5)) -+ if(thd->lex->spcont->push_cond(&$2, $5)) - MYSQL_YYABORT; - $$.vars= $$.hndlrs= $$.curs= 0; - $$.conds= 1; -@@ -2602,7 +2587,7 @@ - - sp_cursor_stmt: - { -- Lex->sphead->reset_lex(YYTHD); -+ Lex->sphead->reset_lex(thd); - } - select - { -@@ -2618,7 +2603,7 @@ - } - lex->sp_lex_in_use= TRUE; - $$= lex; -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - ; -@@ -2662,7 +2647,7 @@ - sp_cond: - ulong_num - { /* mysql errno */ -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::number; -@@ -2675,7 +2660,7 @@ - my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str); - MYSQL_YYABORT; - } -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::state; -@@ -2705,21 +2690,21 @@ - } - | SQLWARNING_SYM /* SQLSTATEs 01??? */ - { -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::warning; - } - | not FOUND_SYM /* SQLSTATEs 02??? */ - { -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::notfound; - } - | SQLEXCEPTION_SYM /* All other SQLSTATEs */ - { -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::exception; -@@ -2789,7 +2774,6 @@ - - sp_proc_stmt_statement: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -2798,7 +2782,6 @@ - } - statement - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_head *sp= lex->sphead; -@@ -2845,7 +2828,7 @@ - - sp_proc_stmt_return: - RETURN_SYM -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr - { - LEX *lex= Lex; -@@ -2867,7 +2850,7 @@ - MYSQL_YYABORT; - sp->m_flags|= sp_head::HAS_RETURN; - } -- if (sp->restore_lex(YYTHD)) -+ if (sp->restore_lex(thd)) - MYSQL_YYABORT; - } - ; -@@ -3094,7 +3077,7 @@ - ; - - sp_if: -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr THEN_SYM - { - LEX *lex= Lex; -@@ -3108,7 +3091,7 @@ - sp->add_cont_backpatch(i) || - sp->add_instr(i)) - MYSQL_YYABORT; -- if (sp->restore_lex(YYTHD)) -+ if (sp->restore_lex(thd)) - MYSQL_YYABORT; - } - sp_proc_stmts1 -@@ -3147,7 +3130,7 @@ - { - LEX *lex= Lex; - case_stmt_action_case(lex); -- lex->sphead->reset_lex(YYTHD); /* For expr $3 */ -+ lex->sphead->reset_lex(thd); /* For expr $3 */ - } - expr - { -@@ -3156,7 +3139,7 @@ - MYSQL_YYABORT; - - /* For expr $3 */ -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - simple_when_clause_list -@@ -3198,7 +3181,7 @@ - simple_when_clause: - WHEN_SYM - { -- Lex->sphead->reset_lex(YYTHD); /* For expr $3 */ -+ Lex->sphead->reset_lex(thd); /* For expr $3 */ - } - expr - { -@@ -3208,7 +3191,7 @@ - if (case_stmt_action_when(lex, $3, true)) - MYSQL_YYABORT; - /* For expr $3 */ -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - THEN_SYM -@@ -3223,7 +3206,7 @@ - searched_when_clause: - WHEN_SYM - { -- Lex->sphead->reset_lex(YYTHD); /* For expr $3 */ -+ Lex->sphead->reset_lex(thd); /* For expr $3 */ - } - expr - { -@@ -3231,7 +3214,7 @@ - if (case_stmt_action_when(lex, $3, false)) - MYSQL_YYABORT; - /* For expr $3 */ -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - THEN_SYM -@@ -3395,7 +3378,7 @@ - MYSQL_YYABORT; - } - | WHILE_SYM -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr DO_SYM - { - LEX *lex= Lex; -@@ -3409,7 +3392,7 @@ - sp->new_cont_backpatch(i) || - sp->add_instr(i)) - MYSQL_YYABORT; -- if (sp->restore_lex(YYTHD)) -+ if (sp->restore_lex(thd)) - MYSQL_YYABORT; - } - sp_proc_stmts1 END WHILE_SYM -@@ -3424,7 +3407,7 @@ - lex->sphead->do_cont_backpatch(); - } - | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr END REPEAT_SYM - { - LEX *lex= Lex; -@@ -3436,7 +3419,7 @@ - if (i == NULL || - lex->sphead->add_instr(i)) - MYSQL_YYABORT; -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - /* We can shortcut the cont_backpatch here */ - i->m_cont_dest= ip+1; -@@ -3859,7 +3842,6 @@ - create3 {} - | LIKE table_ident - { -- THD *thd= YYTHD; - TABLE_LIST *src_table; - LEX *lex= thd->lex; - -@@ -3873,7 +3855,6 @@ - } - | '(' LIKE table_ident ')' - { -- THD *thd= YYTHD; - TABLE_LIST *src_table; - LEX *lex= thd->lex; - -@@ -4342,7 +4323,6 @@ - bit_expr - { - Item *part_expr= $1; -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Name_resolution_context *context= &lex->current_select->context; - TABLE_LIST *save_list= context->table_list; -@@ -4364,7 +4344,7 @@ - my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0)); - MYSQL_YYABORT; - } -- if (part_expr->fix_fields(YYTHD, (Item**)0) || -+ if (part_expr->fix_fields(thd, (Item**)0) || - ((context->table_list= save_list), FALSE) || - (!part_expr->const_item()) || - (!lex->safe_to_cache_query)) -@@ -4629,7 +4609,7 @@ - | TYPE_SYM opt_equal storage_engines - { - Lex->create_info.db_type= $3; -- WARN_DEPRECATED(yythd, "6.0", "TYPE=storage_engine", -+ WARN_DEPRECATED(thd, "6.0", "TYPE=storage_engine", - "'ENGINE=storage_engine'"); - Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE; - } -@@ -4791,19 +4771,19 @@ - storage_engines: - ident_or_text - { -- plugin_ref plugin= ha_resolve_by_name(YYTHD, &$1); -+ plugin_ref plugin= ha_resolve_by_name(thd, &$1); - - if (plugin) - $$= plugin_data(plugin, handlerton*); - else - { -- if (YYTHD->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) -+ if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) - { - my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str); - MYSQL_YYABORT; - } - $$= 0; -- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, -+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_UNKNOWN_STORAGE_ENGINE, - ER(ER_UNKNOWN_STORAGE_ENGINE), - $1.str); -@@ -4815,7 +4795,7 @@ - ident_or_text - { - plugin_ref plugin; -- if ((plugin= ha_resolve_by_name(YYTHD, &$1))) -+ if ((plugin= ha_resolve_by_name(thd, &$1))) - $$= plugin_data(plugin, handlerton*); - else - { -@@ -5043,7 +5023,7 @@ - { - char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1]; - my_snprintf(buff, sizeof(buff), "YEAR(%lu)", length); -- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_NOTE, -+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, - ER_WARN_DEPRECATED_SYNTAX, - ER(ER_WARN_DEPRECATED_SYNTAX), - buff, "YEAR(4)"); -@@ -5057,7 +5037,7 @@ - { $$=MYSQL_TYPE_TIME; } - | TIMESTAMP opt_field_length - { -- if (YYTHD->variables.sql_mode & MODE_MAXDB) -+ if (thd->variables.sql_mode & MODE_MAXDB) - $$=MYSQL_TYPE_DATETIME; - else - { -@@ -5189,7 +5169,7 @@ - real_type: - REAL - { -- $$= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ? -+ $$= thd->variables.sql_mode & MODE_REAL_AS_FLOAT ? - MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE; - } - | DOUBLE_SYM -@@ -5263,7 +5243,7 @@ - | DEFAULT now_or_signed_literal { Lex->default_value=$2; } - | ON UPDATE_SYM NOW_SYM optional_braces - { -- Item *item= new (YYTHD->mem_root) Item_func_now_local(); -+ Item *item= new (thd->mem_root) Item_func_now_local(); - if (item == NULL) - MYSQL_YYABORT; - Lex->on_update_value= item; -@@ -5312,7 +5292,7 @@ - now_or_signed_literal: - NOW_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_now_local(); -+ $$= new (thd->mem_root) Item_func_now_local(); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -5673,7 +5653,6 @@ - alter: - ALTER opt_ignore TABLE_SYM table_ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->name.str= 0; - lex->name.length= 0; -@@ -5799,7 +5778,7 @@ - Event_parse_data. - */ - -- if (!(Lex->event_parse_data= Event_parse_data::new_instance(YYTHD))) -+ if (!(Lex->event_parse_data= Event_parse_data::new_instance(thd))) - MYSQL_YYABORT; - Lex->event_parse_data->identifier= $4; - -@@ -6192,7 +6171,6 @@ - { - if (!$4) - { -- THD *thd= YYTHD; - $4= thd->variables.collation_database; - } - $5= $5 ? $5 : $4; -@@ -6556,7 +6534,7 @@ - assign_to_keycache: - table_ident cache_keys_spec - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, 0, TL_READ, -+ if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ, - Select->pop_index_hints())) - MYSQL_YYABORT; - } -@@ -6585,7 +6563,7 @@ - preload_keys: - table_ident cache_keys_spec opt_ignore_leaves - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, $3, TL_READ, -+ if (!Select->add_table_to_list(thd, $1, NULL, $3, TL_READ, - Select->pop_index_hints())) - MYSQL_YYABORT; - } -@@ -6593,7 +6571,7 @@ - - cache_keys_spec: - { -- Lex->select_lex.alloc_index_hints(YYTHD); -+ Lex->select_lex.alloc_index_hints(thd); - Select->set_index_hint_type(INDEX_HINT_USE, - global_system_variables.old_mode ? - INDEX_HINT_MASK_JOIN : -@@ -6813,7 +6791,6 @@ - | select_item - | '*' - { -- THD *thd= YYTHD; - Item *item= new (thd->mem_root) - Item_field(&thd->lex->current_select->context, - NULL, NULL, "*"); -@@ -6828,7 +6805,6 @@ - select_item: - remember_name select_item2 remember_end select_alias - { -- THD *thd= YYTHD; - DBUG_ASSERT($1 < $3); - - if (add_item_to_list(thd, $2)) -@@ -6929,7 +6905,7 @@ - else - { - /* X OR Y */ -- $$ = new (YYTHD->mem_root) Item_cond_or($1, $3); -+ $$ = new (thd->mem_root) Item_cond_or($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -6937,7 +6913,7 @@ - | expr XOR expr %prec XOR - { - /* XOR is a proprietary extension */ -- $$ = new (YYTHD->mem_root) Item_cond_xor($1, $3); -+ $$ = new (thd->mem_root) Item_cond_xor($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -6979,50 +6955,50 @@ - else - { - /* X AND Y */ -- $$ = new (YYTHD->mem_root) Item_cond_and($1, $3); -+ $$ = new (thd->mem_root) Item_cond_and($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } - } - | NOT_SYM expr %prec NOT_SYM - { -- $$= negate_expression(YYTHD, $2); -+ $$= negate_expression(thd, $2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS TRUE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_istrue($1); -+ $$= new (thd->mem_root) Item_func_istrue($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not TRUE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnottrue($1); -+ $$= new (thd->mem_root) Item_func_isnottrue($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS FALSE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isfalse($1); -+ $$= new (thd->mem_root) Item_func_isfalse($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not FALSE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnotfalse($1); -+ $$= new (thd->mem_root) Item_func_isnotfalse($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS UNKNOWN_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnull($1); -+ $$= new (thd->mem_root) Item_func_isnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not UNKNOWN_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnotnull($1); -+ $$= new (thd->mem_root) Item_func_isnotnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7032,19 +7008,19 @@ - bool_pri: - bool_pri IS NULL_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnull($1); -+ $$= new (thd->mem_root) Item_func_isnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not NULL_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnotnull($1); -+ $$= new (thd->mem_root) Item_func_isnotnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri EQUAL_SYM predicate %prec EQUAL_SYM - { -- $$= new (YYTHD->mem_root) Item_func_equal($1,$3); -+ $$= new (thd->mem_root) Item_func_equal($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7066,13 +7042,12 @@ - predicate: - bit_expr IN_SYM '(' subselect ')' - { -- $$= new (YYTHD->mem_root) Item_in_subselect($1, $4); -+ $$= new (thd->mem_root) Item_in_subselect($1, $4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not IN_SYM '(' subselect ')' - { -- THD *thd= YYTHD; - Item *item= new (thd->mem_root) Item_in_subselect($1, $5); - if (item == NULL) - MYSQL_YYABORT; -@@ -7082,7 +7057,7 @@ - } - | bit_expr IN_SYM '(' expr ')' - { -- $$= handle_sql2003_note184_exception(YYTHD, $1, true, $4); -+ $$= handle_sql2003_note184_exception(thd, $1, true, $4); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7090,13 +7065,13 @@ - { - $6->push_front($4); - $6->push_front($1); -- $$= new (YYTHD->mem_root) Item_func_in(*$6); -+ $$= new (thd->mem_root) Item_func_in(*$6); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not IN_SYM '(' expr ')' - { -- $$= handle_sql2003_note184_exception(YYTHD, $1, false, $5); -+ $$= handle_sql2003_note184_exception(thd, $1, false, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7104,7 +7079,7 @@ - { - $7->push_front($5); - $7->push_front($1); -- Item_func_in *item = new (YYTHD->mem_root) Item_func_in(*$7); -+ Item_func_in *item = new (thd->mem_root) Item_func_in(*$7); - if (item == NULL) - MYSQL_YYABORT; - item->negate(); -@@ -7112,14 +7087,14 @@ - } - | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate - { -- $$= new (YYTHD->mem_root) Item_func_between($1,$3,$5); -+ $$= new (thd->mem_root) Item_func_between($1,$3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate - { - Item_func_between *item; -- item= new (YYTHD->mem_root) Item_func_between($1,$4,$6); -+ item= new (thd->mem_root) Item_func_between($1,$4,$6); - if (item == NULL) - MYSQL_YYABORT; - item->negate(); -@@ -7127,42 +7102,42 @@ - } - | bit_expr SOUNDS_SYM LIKE bit_expr - { -- Item *item1= new (YYTHD->mem_root) Item_func_soundex($1); -- Item *item4= new (YYTHD->mem_root) Item_func_soundex($4); -+ Item *item1= new (thd->mem_root) Item_func_soundex($1); -+ Item *item4= new (thd->mem_root) Item_func_soundex($4); - if ((item1 == NULL) || (item4 == NULL)) - MYSQL_YYABORT; -- $$= new (YYTHD->mem_root) Item_func_eq(item1, item4); -+ $$= new (thd->mem_root) Item_func_eq(item1, item4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr LIKE simple_expr opt_escape - { -- $$= new (YYTHD->mem_root) Item_func_like($1,$3,$4,Lex->escape_used); -+ $$= new (thd->mem_root) Item_func_like($1,$3,$4,Lex->escape_used); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not LIKE simple_expr opt_escape - { -- Item *item= new (YYTHD->mem_root) Item_func_like($1,$4,$5, -+ Item *item= new (thd->mem_root) Item_func_like($1,$4,$5, - Lex->escape_used); - if (item == NULL) - MYSQL_YYABORT; -- $$= new (YYTHD->mem_root) Item_func_not(item); -+ $$= new (thd->mem_root) Item_func_not(item); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr REGEXP bit_expr - { -- $$= new (YYTHD->mem_root) Item_func_regex($1,$3); -+ $$= new (thd->mem_root) Item_func_regex($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not REGEXP bit_expr - { -- Item *item= new (YYTHD->mem_root) Item_func_regex($1,$4); -+ Item *item= new (thd->mem_root) Item_func_regex($1,$4); - if (item == NULL) - MYSQL_YYABORT; -- $$= negate_expression(YYTHD, item); -+ $$= negate_expression(thd, item); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7172,85 +7147,85 @@ - bit_expr: - bit_expr '|' bit_expr %prec '|' - { -- $$= new (YYTHD->mem_root) Item_func_bit_or($1,$3); -+ $$= new (thd->mem_root) Item_func_bit_or($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '&' bit_expr %prec '&' - { -- $$= new (YYTHD->mem_root) Item_func_bit_and($1,$3); -+ $$= new (thd->mem_root) Item_func_bit_and($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr SHIFT_LEFT bit_expr %prec SHIFT_LEFT - { -- $$= new (YYTHD->mem_root) Item_func_shift_left($1,$3); -+ $$= new (thd->mem_root) Item_func_shift_left($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr SHIFT_RIGHT bit_expr %prec SHIFT_RIGHT - { -- $$= new (YYTHD->mem_root) Item_func_shift_right($1,$3); -+ $$= new (thd->mem_root) Item_func_shift_right($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '+' bit_expr %prec '+' - { -- $$= new (YYTHD->mem_root) Item_func_plus($1,$3); -+ $$= new (thd->mem_root) Item_func_plus($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '-' bit_expr %prec '-' - { -- $$= new (YYTHD->mem_root) Item_func_minus($1,$3); -+ $$= new (thd->mem_root) Item_func_minus($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '+' INTERVAL_SYM expr interval %prec '+' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,0); -+ $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '-' INTERVAL_SYM expr interval %prec '-' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,1); -+ $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '*' bit_expr %prec '*' - { -- $$= new (YYTHD->mem_root) Item_func_mul($1,$3); -+ $$= new (thd->mem_root) Item_func_mul($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '/' bit_expr %prec '/' - { -- $$= new (YYTHD->mem_root) Item_func_div($1,$3); -+ $$= new (thd->mem_root) Item_func_div($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '%' bit_expr %prec '%' - { -- $$= new (YYTHD->mem_root) Item_func_mod($1,$3); -+ $$= new (thd->mem_root) Item_func_mod($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr DIV_SYM bit_expr %prec DIV_SYM - { -- $$= new (YYTHD->mem_root) Item_func_int_div($1,$3); -+ $$= new (thd->mem_root) Item_func_int_div($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr MOD_SYM bit_expr %prec MOD_SYM - { -- $$= new (YYTHD->mem_root) Item_func_mod($1,$3); -+ $$= new (thd->mem_root) Item_func_mod($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '^' bit_expr - { -- $$= new (YYTHD->mem_root) Item_func_bit_xor($1,$3); -+ $$= new (thd->mem_root) Item_func_bit_xor($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7299,7 +7274,6 @@ - | function_call_conflict - | simple_expr COLLATE_SYM ident_or_text %prec NEG - { -- THD *thd= YYTHD; - Item *i1= new (thd->mem_root) Item_string($3.str, - $3.length, - thd->charset()); -@@ -7315,7 +7289,7 @@ - | sum_expr - | simple_expr OR_OR_SYM simple_expr - { -- $$= new (YYTHD->mem_root) Item_func_concat($1, $3); -+ $$= new (thd->mem_root) Item_func_concat($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7325,25 +7299,25 @@ - } - | '-' simple_expr %prec NEG - { -- $$= new (YYTHD->mem_root) Item_func_neg($2); -+ $$= new (thd->mem_root) Item_func_neg($2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | '~' simple_expr %prec NEG - { -- $$= new (YYTHD->mem_root) Item_func_bit_neg($2); -+ $$= new (thd->mem_root) Item_func_bit_neg($2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | not2 simple_expr %prec NEG - { -- $$= negate_expression(YYTHD, $2); -+ $$= negate_expression(thd, $2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | '(' subselect ')' - { -- $$= new (YYTHD->mem_root) Item_singlerow_subselect($2); -+ $$= new (thd->mem_root) Item_singlerow_subselect($2); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7352,20 +7326,20 @@ - | '(' expr ',' expr_list ')' - { - $4->push_front($2); -- $$= new (YYTHD->mem_root) Item_row(*$4); -+ $$= new (thd->mem_root) Item_row(*$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | ROW_SYM '(' expr ',' expr_list ')' - { - $5->push_front($3); -- $$= new (YYTHD->mem_root) Item_row(*$5); -+ $$= new (thd->mem_root) Item_row(*$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | EXISTS '(' subselect ')' - { -- $$= new (YYTHD->mem_root) Item_exists_subselect($3); -+ $$= new (thd->mem_root) Item_exists_subselect($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7374,7 +7348,7 @@ - | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')' - { - $2->push_front($5); -- Item_func_match *i1= new (YYTHD->mem_root) Item_func_match(*$2, $6); -+ Item_func_match *i1= new (thd->mem_root) Item_func_match(*$2, $6); - if (i1 == NULL) - MYSQL_YYABORT; - Select->add_ftfunc_to_list(i1); -@@ -7382,7 +7356,7 @@ - } - | BINARY simple_expr %prec NEG - { -- $$= create_func_cast(YYTHD, $2, ITEM_CAST_CHAR, NULL, NULL, -+ $$= create_func_cast(thd, $2, ITEM_CAST_CHAR, NULL, NULL, - &my_charset_bin); - if ($$ == NULL) - MYSQL_YYABORT; -@@ -7390,27 +7364,27 @@ - | CAST_SYM '(' expr AS cast_type ')' - { - LEX *lex= Lex; -- $$= create_func_cast(YYTHD, $3, $5, lex->length, lex->dec, -+ $$= create_func_cast(thd, $3, $5, lex->length, lex->dec, - lex->charset); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CASE_SYM opt_expr when_list opt_else END - { -- $$= new (YYTHD->mem_root) Item_func_case(* $3, $2, $4 ); -+ $$= new (thd->mem_root) Item_func_case(* $3, $2, $4 ); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CONVERT_SYM '(' expr ',' cast_type ')' - { -- $$= create_func_cast(YYTHD, $3, $5, Lex->length, Lex->dec, -+ $$= create_func_cast(thd, $3, $5, Lex->length, Lex->dec, - Lex->charset); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CONVERT_SYM '(' expr USING charset_name ')' - { -- $$= new (YYTHD->mem_root) Item_func_conv_charset($3,$5); -+ $$= new (thd->mem_root) Item_func_conv_charset($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7423,14 +7397,14 @@ - my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->my_name()->str); - MYSQL_YYABORT; - } -- $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context(), -+ $$= new (thd->mem_root) Item_default_value(Lex->current_context(), - $3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | VALUES '(' simple_ident_nospvar ')' - { -- $$= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(), -+ $$= new (thd->mem_root) Item_insert_value(Lex->current_context(), - $3); - if ($$ == NULL) - MYSQL_YYABORT; -@@ -7438,7 +7412,7 @@ - | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM - /* we cannot put interval before - */ - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($5,$2,$3,0); -+ $$= new (thd->mem_root) Item_date_add_interval($5,$2,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7453,19 +7427,19 @@ - function_call_keyword: - CHAR_SYM '(' expr_list ')' - { -- $$= new (YYTHD->mem_root) Item_func_char(*$3); -+ $$= new (thd->mem_root) Item_func_char(*$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CHAR_SYM '(' expr_list USING charset_name ')' - { -- $$= new (YYTHD->mem_root) Item_func_char(*$3, $5); -+ $$= new (thd->mem_root) Item_func_char(*$3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CURRENT_USER optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context()); -+ $$= new (thd->mem_root) Item_func_current_user(Lex->current_context()); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->set_stmt_unsafe(); -@@ -7473,31 +7447,30 @@ - } - | DATE_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_typecast($3); -+ $$= new (thd->mem_root) Item_date_typecast($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DAY_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_dayofmonth($3); -+ $$= new (thd->mem_root) Item_func_dayofmonth($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | HOUR_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_hour($3); -+ $$= new (thd->mem_root) Item_func_hour($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | INSERT '(' expr ',' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_insert($3,$5,$7,$9); -+ $$= new (thd->mem_root) Item_func_insert($3,$5,$7,$9); - if ($$ == NULL) - MYSQL_YYABORT; - } - | INTERVAL_SYM '(' expr ',' expr ')' %prec INTERVAL_SYM - { -- THD *thd= YYTHD; - List *list= new (thd->mem_root) List; - if (list == NULL) - MYSQL_YYABORT; -@@ -7512,7 +7485,6 @@ - } - | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM - { -- THD *thd= YYTHD; - $7->push_front($5); - $7->push_front($3); - Item_row *item= new (thd->mem_root) Item_row(*$7); -@@ -7524,103 +7496,103 @@ - } - | LEFT '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_left($3,$5); -+ $$= new (thd->mem_root) Item_func_left($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MINUTE_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_minute($3); -+ $$= new (thd->mem_root) Item_func_minute($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MONTH_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_month($3); -+ $$= new (thd->mem_root) Item_func_month($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | RIGHT '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_right($3,$5); -+ $$= new (thd->mem_root) Item_func_right($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SECOND_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_second($3); -+ $$= new (thd->mem_root) Item_func_second($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIME_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_time_typecast($3); -+ $$= new (thd->mem_root) Item_time_typecast($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIMESTAMP '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_datetime_typecast($3); -+ $$= new (thd->mem_root) Item_datetime_typecast($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIMESTAMP '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_add_time($3, $5, 1, 0); -+ $$= new (thd->mem_root) Item_func_add_time($3, $5, 1, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($3); -+ $$= new (thd->mem_root) Item_func_trim($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' LEADING expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_ltrim($6,$4); -+ $$= new (thd->mem_root) Item_func_ltrim($6,$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' TRAILING expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_rtrim($6,$4); -+ $$= new (thd->mem_root) Item_func_rtrim($6,$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' BOTH expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($6,$4); -+ $$= new (thd->mem_root) Item_func_trim($6,$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' LEADING FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_ltrim($5); -+ $$= new (thd->mem_root) Item_func_ltrim($5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' TRAILING FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_rtrim($5); -+ $$= new (thd->mem_root) Item_func_rtrim($5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' BOTH FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($5); -+ $$= new (thd->mem_root) Item_func_trim($5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($5,$3); -+ $$= new (thd->mem_root) Item_func_trim($5,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | USER '(' ')' - { -- $$= new (YYTHD->mem_root) Item_func_user(); -+ $$= new (thd->mem_root) Item_func_user(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->set_stmt_unsafe(); -@@ -7628,7 +7600,7 @@ - } - | YEAR_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_year($3); -+ $$= new (thd->mem_root) Item_func_year($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7649,34 +7621,34 @@ - function_call_nonkeyword: - ADDDATE_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5, -+ $$= new (thd->mem_root) Item_date_add_interval($3, $5, - INTERVAL_DAY, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | ADDDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 0); -+ $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CURDATE optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curdate_local(); -+ $$= new (thd->mem_root) Item_func_curdate_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | CURTIME optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curtime_local(); -+ $$= new (thd->mem_root) Item_func_curtime_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | CURTIME '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_curtime_local($3); -+ $$= new (thd->mem_root) Item_func_curtime_local($3); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; -@@ -7684,83 +7656,83 @@ - | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')' - %prec INTERVAL_SYM - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,0); -+ $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DATE_SUB_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')' - %prec INTERVAL_SYM - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,1); -+ $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | EXTRACT_SYM '(' interval FROM expr ')' - { -- $$=new (YYTHD->mem_root) Item_extract( $3, $5); -+ $$=new (thd->mem_root) Item_extract( $3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | GET_FORMAT '(' date_time_type ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_get_format($3, $5); -+ $$= new (thd->mem_root) Item_func_get_format($3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | NOW_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_now_local(); -+ $$= new (thd->mem_root) Item_func_now_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | NOW_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_now_local($3); -+ $$= new (thd->mem_root) Item_func_now_local($3); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | POSITION_SYM '(' bit_expr IN_SYM expr ')' - { -- $$ = new (YYTHD->mem_root) Item_func_locate($5,$3); -+ $$ = new (thd->mem_root) Item_func_locate($5,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBDATE_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5, -+ $$= new (thd->mem_root) Item_date_add_interval($3, $5, - INTERVAL_DAY, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 1); -+ $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_substr($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5); -+ $$= new (thd->mem_root) Item_func_substr($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr FROM expr FOR_SYM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_substr($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5); -+ $$= new (thd->mem_root) Item_func_substr($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7775,9 +7747,9 @@ - */ - Lex->set_stmt_unsafe(); - if (global_system_variables.sysdate_is_now == 0) -- $$= new (YYTHD->mem_root) Item_func_sysdate_local(); -+ $$= new (thd->mem_root) Item_func_sysdate_local(); - else -- $$= new (YYTHD->mem_root) Item_func_now_local(); -+ $$= new (thd->mem_root) Item_func_now_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; -@@ -7785,42 +7757,42 @@ - | SYSDATE '(' expr ')' - { - if (global_system_variables.sysdate_is_now == 0) -- $$= new (YYTHD->mem_root) Item_func_sysdate_local($3); -+ $$= new (thd->mem_root) Item_func_sysdate_local($3); - else -- $$= new (YYTHD->mem_root) Item_func_now_local($3); -+ $$= new (thd->mem_root) Item_func_now_local($3); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | TIMESTAMP_ADD '(' interval_time_stamp ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($7,$5,$3,0); -+ $$= new (thd->mem_root) Item_date_add_interval($7,$5,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIMESTAMP_DIFF '(' interval_time_stamp ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_timestamp_diff($5,$7,$3); -+ $$= new (thd->mem_root) Item_func_timestamp_diff($5,$7,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | UTC_DATE_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curdate_utc(); -+ $$= new (thd->mem_root) Item_func_curdate_utc(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | UTC_TIME_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curtime_utc(); -+ $$= new (thd->mem_root) Item_func_curtime_utc(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | UTC_TIMESTAMP_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_now_utc(); -+ $$= new (thd->mem_root) Item_func_now_utc(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; -@@ -7835,62 +7807,61 @@ - function_call_conflict: - ASCII_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_ascii($3); -+ $$= new (thd->mem_root) Item_func_ascii($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CHARSET '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_charset($3); -+ $$= new (thd->mem_root) Item_func_charset($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COALESCE '(' expr_list ')' - { -- $$= new (YYTHD->mem_root) Item_func_coalesce(* $3); -+ $$= new (thd->mem_root) Item_func_coalesce(* $3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COLLATION_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_collation($3); -+ $$= new (thd->mem_root) Item_func_collation($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DATABASE '(' ')' - { -- $$= new (YYTHD->mem_root) Item_func_database(); -+ $$= new (thd->mem_root) Item_func_database(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | IF '(' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_if($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_if($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MICROSECOND_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_microsecond($3); -+ $$= new (thd->mem_root) Item_func_microsecond($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MOD_SYM '(' expr ',' expr ')' - { -- $$ = new (YYTHD->mem_root) Item_func_mod($3, $5); -+ $$ = new (thd->mem_root) Item_func_mod($3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | OLD_PASSWORD '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_old_password($3); -+ $$= new (thd->mem_root) Item_func_old_password($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | PASSWORD '(' expr ')' - { -- THD *thd= YYTHD; - Item* i1; - if (thd->variables.old_passwords) - i1= new (thd->mem_root) Item_func_old_password($3); -@@ -7902,31 +7873,30 @@ - } - | QUARTER_SYM '(' expr ')' - { -- $$ = new (YYTHD->mem_root) Item_func_quarter($3); -+ $$ = new (thd->mem_root) Item_func_quarter($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | REPEAT_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_repeat($3,$5); -+ $$= new (thd->mem_root) Item_func_repeat($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | REPLACE '(' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_replace($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_replace($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRUNCATE_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_round($3,$5,1); -+ $$= new (thd->mem_root) Item_func_round($3,$5,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | WEEK_SYM '(' expr ')' - { -- THD *thd= YYTHD; - Item *i1= new (thd->mem_root) Item_int((char*) "0", - thd->variables.default_week_format, - 1); -@@ -7938,7 +7908,7 @@ - } - | WEEK_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_week($3,$5); -+ $$= new (thd->mem_root) Item_func_week($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7960,52 +7930,52 @@ - geometry_function: - CONTAINS_SYM '(' expr ',' expr ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_rel($3, $5, - Item_func::SP_CONTAINS_FUNC)); - } - | GEOMETRYCOLLECTION '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_geometrycollection, - Geometry::wkb_point)); - } - | LINESTRING '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_linestring, - Geometry::wkb_point)); - } - | MULTILINESTRING '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_multilinestring, - Geometry::wkb_linestring)); - } - | MULTIPOINT '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_multipoint, - Geometry::wkb_point)); - } - | MULTIPOLYGON '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_multipolygon, - Geometry::wkb_polygon)); - } - | POINT_SYM '(' expr ',' expr ')' - { -- $$= GEOM_NEW(YYTHD, Item_func_point($3,$5)); -+ $$= GEOM_NEW(thd, Item_func_point($3,$5)); - } - | POLYGON '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_polygon, - Geometry::wkb_linestring)); -@@ -8043,7 +8013,6 @@ - } - opt_udf_expr_list ')' - { -- THD *thd= YYTHD; - Create_func *builder; - Item *item= NULL; - -@@ -8097,7 +8066,6 @@ - } - | ident '.' ident '(' opt_expr_list ')' - { -- THD *thd= YYTHD; - Create_qfunc *builder; - Item *item= NULL; - -@@ -8161,7 +8129,7 @@ - udf_expr_list: - udf_expr - { -- $$= new (YYTHD->mem_root) List; -+ $$= new (thd->mem_root) List; - if ($$ == NULL) - MYSQL_YYABORT; - $$->push_back($1); -@@ -8194,7 +8162,7 @@ - remember_name we may get quoted or escaped names. - */ - else if ($2->type() != Item::FIELD_ITEM) -- $2->set_name($1, (uint) ($3 - $1), YYTHD->charset()); -+ $2->set_name($1, (uint) ($3 - $1), thd->charset()); - $$= $2; - } - ; -@@ -8202,46 +8170,46 @@ - sum_expr: - AVG_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_avg($3); -+ $$= new (thd->mem_root) Item_sum_avg($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | AVG_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_avg_distinct($4); -+ $$= new (thd->mem_root) Item_sum_avg_distinct($4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIT_AND '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_and($3); -+ $$= new (thd->mem_root) Item_sum_and($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIT_OR '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_or($3); -+ $$= new (thd->mem_root) Item_sum_or($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIT_XOR '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_xor($3); -+ $$= new (thd->mem_root) Item_sum_xor($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COUNT_SYM '(' opt_all '*' ')' - { -- Item *item= new (YYTHD->mem_root) Item_int((int32) 0L,1); -+ Item *item= new (thd->mem_root) Item_int((int32) 0L,1); - if (item == NULL) - MYSQL_YYABORT; -- $$= new (YYTHD->mem_root) Item_sum_count(item); -+ $$= new (thd->mem_root) Item_sum_count(item); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COUNT_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_count($3); -+ $$= new (thd->mem_root) Item_sum_count($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8251,13 +8219,13 @@ - { Select->in_sum_expr--; } - ')' - { -- $$= new (YYTHD->mem_root) Item_sum_count_distinct(* $5); -+ $$= new (thd->mem_root) Item_sum_count_distinct(* $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MIN_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_min($3); -+ $$= new (thd->mem_root) Item_sum_min($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8268,55 +8236,55 @@ - */ - | MIN_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_min($4); -+ $$= new (thd->mem_root) Item_sum_min($4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MAX_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_max($3); -+ $$= new (thd->mem_root) Item_sum_max($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MAX_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_max($4); -+ $$= new (thd->mem_root) Item_sum_max($4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | STD_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_std($3, 0); -+ $$= new (thd->mem_root) Item_sum_std($3, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | VARIANCE_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_variance($3, 0); -+ $$= new (thd->mem_root) Item_sum_variance($3, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | STDDEV_SAMP_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_std($3, 1); -+ $$= new (thd->mem_root) Item_sum_std($3, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | VAR_SAMP_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_variance($3, 1); -+ $$= new (thd->mem_root) Item_sum_variance($3, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUM_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_sum($3); -+ $$= new (thd->mem_root) Item_sum_sum($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUM_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_sum_distinct($4); -+ $$= new (thd->mem_root) Item_sum_sum_distinct($4); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8328,7 +8296,7 @@ - { - SELECT_LEX *sel= Select; - sel->in_sum_expr--; -- $$= new (YYTHD->mem_root) -+ $$= new (thd->mem_root) - Item_func_group_concat(Lex->current_context(), $3, $5, - sel->gorder_list, $7); - if ($$ == NULL) -@@ -8357,7 +8325,7 @@ - ident_or_text SET_VAR expr - { - Item_func_set_user_var *item; -- $$= item= new (YYTHD->mem_root) Item_func_set_user_var($1, $3); -+ $$= item= new (thd->mem_root) Item_func_set_user_var($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - LEX *lex= Lex; -@@ -8366,7 +8334,7 @@ - } - | ident_or_text - { -- $$= new (YYTHD->mem_root) Item_func_get_user_var($1); -+ $$= new (thd->mem_root) Item_func_get_user_var($1); - if ($$ == NULL) - MYSQL_YYABORT; - LEX *lex= Lex; -@@ -8380,7 +8348,7 @@ - my_parse_error(ER(ER_SYNTAX_ERROR)); - MYSQL_YYABORT; - } -- if (!($$= get_system_var(YYTHD, $2, $3, $4))) -+ if (!($$= get_system_var(thd, $2, $3, $4))) - MYSQL_YYABORT; - if (!((Item_func_get_system_var*) $$)->is_written_to_binlog()) - Lex->set_stmt_unsafe(); -@@ -8395,7 +8363,7 @@ - opt_gconcat_separator: - /* empty */ - { -- $$= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1); -+ $$= new (thd->mem_root) String(",", 1, &my_charset_latin1); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8422,9 +8390,9 @@ - - gorder_list: - gorder_list ',' order_ident order_dir -- { if (add_gorder_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } -+ { if (add_gorder_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } - | order_ident order_dir -- { if (add_gorder_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } -+ { if (add_gorder_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } - ; - - in_sum_expr: -@@ -8477,7 +8445,7 @@ - expr_list: - expr - { -- $$= new (YYTHD->mem_root) List; -+ $$= new (thd->mem_root) List; - if ($$ == NULL) - MYSQL_YYABORT; - $$->push_back($1); -@@ -8497,7 +8465,7 @@ - ident_list: - simple_ident - { -- $$= new (YYTHD->mem_root) List; -+ $$= new (thd->mem_root) List; - if ($$ == NULL) - MYSQL_YYABORT; - $$->push_back($1); -@@ -8595,7 +8563,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $3); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $3)) -+ if (push_new_name_resolution_context(thd, $1, $3)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8610,7 +8578,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $3); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $3)) -+ if (push_new_name_resolution_context(thd, $1, $3)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8640,7 +8608,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $5); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $5)) -+ if (push_new_name_resolution_context(thd, $1, $5)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8676,7 +8644,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $5); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $5)) -+ if (push_new_name_resolution_context(thd, $1, $5)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8724,7 +8692,7 @@ - } - table_ident opt_table_alias opt_key_definition - { -- if (!($$= Select->add_table_to_list(YYTHD, $2, $3, -+ if (!($$= Select->add_table_to_list(thd, $2, $3, - Select->get_table_join_options(), - Lex->lock_option, - Select->pop_index_hints()))) -@@ -8922,7 +8890,7 @@ - - opt_index_hints_list: - /* empty */ -- | { Select->alloc_index_hints(YYTHD); } index_hints_list -+ | { Select->alloc_index_hints(thd); } index_hints_list - ; - - opt_key_definition: -@@ -8931,15 +8899,15 @@ - ; - - opt_key_usage_list: -- /* empty */ { Select->add_index_hint(YYTHD, NULL, 0); } -+ /* empty */ { Select->add_index_hint(thd, NULL, 0); } - | key_usage_list {} - ; - - key_usage_element: - ident -- { Select->add_index_hint(YYTHD, $1.str, $1.length); } -+ { Select->add_index_hint(thd, $1.str, $1.length); } - | PRIMARY_SYM -- { Select->add_index_hint(YYTHD, (char *)"PRIMARY", 7); } -+ { Select->add_index_hint(thd, (char *)"PRIMARY", 7); } - ; - - key_usage_list: -@@ -8952,7 +8920,7 @@ - { - if (!($$= new List)) - MYSQL_YYABORT; -- String *s= new (YYTHD->mem_root) String((const char *) $1.str, -+ String *s= new (thd->mem_root) String((const char *) $1.str, - $1.length, - system_charset_info); - if (s == NULL) -@@ -8961,7 +8929,7 @@ - } - | using_list ',' ident - { -- String *s= new (YYTHD->mem_root) String((const char *) $3.str, -+ String *s= new (thd->mem_root) String((const char *) $3.str, - $3.length, - system_charset_info); - if (s == NULL) -@@ -9002,7 +8970,7 @@ - implementation without changing its - resolution. - */ -- WARN_DEPRECATED(yythd, VER_CELOSIA, "FRAC_SECOND", "MICROSECOND"); -+ WARN_DEPRECATED(thd, VER_CELOSIA, "FRAC_SECOND", "MICROSECOND"); - } - ; - -@@ -9086,7 +9054,6 @@ - } - | /* empty */ - { -- THD *thd= YYTHD; - Lex->escape_used= FALSE; - $$= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ? - new (thd->mem_root) Item_string("", 0, &my_charset_latin1) : -@@ -9107,9 +9074,9 @@ - - group_list: - group_list ',' order_ident order_dir -- { if (add_group_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } -+ { if (add_group_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } - | order_ident order_dir -- { if (add_group_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } -+ { if (add_group_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } - ; - - olap_opt: -@@ -9156,7 +9123,6 @@ - alter_order_item: - simple_ident_nospvar order_dir - { -- THD *thd= YYTHD; - bool ascending= ($2 == 1) ? true : false; - if (add_order_to_list(thd, $1, ascending)) - MYSQL_YYABORT; -@@ -9209,9 +9175,9 @@ - - order_list: - order_list ',' order_ident order_dir -- { if (add_order_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } -+ { if (add_order_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } - | order_ident order_dir -- { if (add_order_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } -+ { if (add_order_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } - ; - - order_dir: -@@ -9271,19 +9237,19 @@ - } - | ULONGLONG_NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | LONG_NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -9365,7 +9331,7 @@ - lex->proc_list.elements=0; - lex->proc_list.first=0; - lex->proc_list.next= &lex->proc_list.first; -- Item_field *item= new (YYTHD->mem_root) -+ Item_field *item= new (thd->mem_root) - Item_field(&lex->current_select->context, - NULL, NULL, $2.str); - if (item == NULL) -@@ -9390,8 +9356,7 @@ - procedure_item: - remember_name expr remember_end - { -- THD *thd= YYTHD; -- -+ - if (add_proc_to_list(thd, $2)) - MYSQL_YYABORT; - if (!$2->name) -@@ -9560,7 +9525,6 @@ - } - | DROP FUNCTION_SYM if_exists ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - sp_name *spname; - if ($4.str && check_db_name(&$4)) -@@ -9583,7 +9547,6 @@ - } - | DROP FUNCTION_SYM if_exists ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - LEX_STRING db= {0, 0}; - sp_name *spname; -@@ -9664,7 +9627,7 @@ - table_name: - table_ident - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, TL_OPTION_UPDATING)) -+ if (!Select->add_table_to_list(thd, $1, NULL, TL_OPTION_UPDATING)) - MYSQL_YYABORT; - } - ; -@@ -9677,7 +9640,7 @@ - table_alias_ref: - table_ident_opt_wild - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, -+ if (!Select->add_table_to_list(thd, $1, NULL, - TL_OPTION_UPDATING | TL_OPTION_ALIAS, - Lex->lock_option )) - MYSQL_YYABORT; -@@ -9868,7 +9831,7 @@ - expr { $$= $1;} - | DEFAULT - { -- $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context()); -+ $$= new (thd->mem_root) Item_default_value(Lex->current_context()); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -9922,7 +9885,7 @@ - update_elem: - simple_ident_nospvar equal expr_or_default - { -- if (add_item_to_list(YYTHD, $1) || add_value_to_list(YYTHD, $3)) -+ if (add_item_to_list(thd, $1) || add_value_to_list(thd, $3)) - MYSQL_YYABORT; - } - ; -@@ -9965,7 +9928,7 @@ - single_multi: - FROM table_ident - { -- if (!Select->add_table_to_list(YYTHD, $2, NULL, TL_OPTION_UPDATING, -+ if (!Select->add_table_to_list(thd, $2, NULL, TL_OPTION_UPDATING, - Lex->lock_option)) - MYSQL_YYABORT; - } -@@ -9998,7 +9961,7 @@ - Table_ident *ti= new Table_ident($1); - if (ti == NULL) - MYSQL_YYABORT; -- if (!Select->add_table_to_list(YYTHD, -+ if (!Select->add_table_to_list(thd, - ti, - $3, - TL_OPTION_UPDATING | TL_OPTION_ALIAS, -@@ -10007,10 +9970,10 @@ - } - | ident '.' ident opt_wild opt_table_alias - { -- Table_ident *ti= new Table_ident(YYTHD, $1, $3, 0); -+ Table_ident *ti= new Table_ident(thd, $1, $3, 0); - if (ti == NULL) - MYSQL_YYABORT; -- if (!Select->add_table_to_list(YYTHD, -+ if (!Select->add_table_to_list(thd, - ti, - $5, - TL_OPTION_UPDATING | TL_OPTION_ALIAS, -@@ -10130,7 +10093,7 @@ - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_DATABASES; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_SCHEMATA)) -+ if (prepare_schema_table(thd, lex, 0, SCH_SCHEMATA)) - MYSQL_YYABORT; - } - | opt_full TABLES opt_db wild_and_where -@@ -10138,7 +10101,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_TABLES; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLE_NAMES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_TABLE_NAMES)) - MYSQL_YYABORT; - } - | opt_full TRIGGERS_SYM opt_db wild_and_where -@@ -10146,7 +10109,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_TRIGGERS; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_TRIGGERS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_TRIGGERS)) - MYSQL_YYABORT; - } - | EVENTS_SYM opt_db wild_and_where -@@ -10154,7 +10117,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_EVENTS; - lex->select_lex.db= $2; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_EVENTS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_EVENTS)) - MYSQL_YYABORT; - } - | TABLE_SYM STATUS_SYM opt_db wild_and_where -@@ -10162,7 +10125,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_TABLE_STATUS; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_TABLES)) - MYSQL_YYABORT; - } - | OPEN_SYM TABLES opt_db wild_and_where -@@ -10170,22 +10133,22 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_OPEN_TABLES; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_OPEN_TABLES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_OPEN_TABLES)) - MYSQL_YYABORT; - } - | opt_full PLUGIN_SYM - { - LEX *lex= Lex; -- WARN_DEPRECATED(yythd, "6.0", "SHOW PLUGIN", "'SHOW PLUGINS'"); -+ WARN_DEPRECATED(thd, "6.0", "SHOW PLUGIN", "'SHOW PLUGINS'"); - lex->sql_command= SQLCOM_SHOW_PLUGINS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS)) - MYSQL_YYABORT; - } - | PLUGINS_SYM - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_PLUGINS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS)) - MYSQL_YYABORT; - } - | ENGINE_SYM known_storage_engines show_engine_param -@@ -10198,7 +10161,7 @@ - lex->sql_command= SQLCOM_SHOW_FIELDS; - if ($5) - $4->change_db($5); -- if (prepare_schema_table(YYTHD, lex, $4, SCH_COLUMNS)) -+ if (prepare_schema_table(thd, lex, $4, SCH_COLUMNS)) - MYSQL_YYABORT; - } - | NEW_SYM MASTER_SYM FOR_SYM SLAVE -@@ -10233,7 +10196,7 @@ - lex->sql_command= SQLCOM_SHOW_KEYS; - if ($4) - $3->change_db($4); -- if (prepare_schema_table(YYTHD, lex, $3, SCH_STATISTICS)) -+ if (prepare_schema_table(thd, lex, $3, SCH_STATISTICS)) - MYSQL_YYABORT; - } - | COLUMN_SYM TYPES_SYM -@@ -10245,15 +10208,15 @@ - { - LEX *lex=Lex; - lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES; -- WARN_DEPRECATED(yythd, "6.0", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'"); -- if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES)) -+ WARN_DEPRECATED(thd, "6.0", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'"); -+ if (prepare_schema_table(thd, lex, 0, SCH_ENGINES)) - MYSQL_YYABORT; - } - | opt_storage ENGINES_SYM - { - LEX *lex=Lex; - lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_ENGINES)) - MYSQL_YYABORT; - } - | AUTHORS_SYM -@@ -10285,7 +10248,7 @@ - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_PROFILE; -- if (prepare_schema_table(YYTHD, lex, NULL, SCH_PROFILES) != 0) -+ if (prepare_schema_table(thd, lex, NULL, SCH_PROFILES) != 0) - YYABORT; - } - | opt_var_type STATUS_SYM wild_and_where -@@ -10293,7 +10256,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_STATUS; - lex->option_type= $1; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_STATUS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_STATUS)) - MYSQL_YYABORT; - } - | INNOBASE_SYM STATUS_SYM -@@ -10301,24 +10264,24 @@ - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_ENGINE_STATUS; - if (!(lex->create_info.db_type= -- ha_resolve_by_legacy_type(YYTHD, DB_TYPE_INNODB))) -+ ha_resolve_by_legacy_type(thd, DB_TYPE_INNODB))) - { - my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB"); - MYSQL_YYABORT; - } -- WARN_DEPRECATED(yythd, "6.0", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'"); -+ WARN_DEPRECATED(thd, "6.0", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'"); - } - | MUTEX_SYM STATUS_SYM - { - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_ENGINE_MUTEX; - if (!(lex->create_info.db_type= -- ha_resolve_by_legacy_type(YYTHD, DB_TYPE_INNODB))) -+ ha_resolve_by_legacy_type(thd, DB_TYPE_INNODB))) - { - my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB"); - MYSQL_YYABORT; - } -- WARN_DEPRECATED(yythd, "6.0", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'"); -+ WARN_DEPRECATED(thd, "6.0", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'"); - } - | opt_full PROCESSLIST_SYM - { Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;} -@@ -10327,21 +10290,21 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_VARIABLES; - lex->option_type= $1; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_VARIABLES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_VARIABLES)) - MYSQL_YYABORT; - } - | charset wild_and_where - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_CHARSETS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_CHARSETS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_CHARSETS)) - MYSQL_YYABORT; - } - | COLLATION_SYM wild_and_where - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_COLLATIONS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_COLLATIONS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_COLLATIONS)) - MYSQL_YYABORT; - } - | GRANTS -@@ -10371,7 +10334,7 @@ - { - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_CREATE; -- if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL,0)) -+ if (!lex->select_lex.add_table_to_list(thd, $3, NULL,0)) - MYSQL_YYABORT; - lex->only_view= 0; - lex->create_info.storage_media= HA_SM_DEFAULT; -@@ -10380,7 +10343,7 @@ - { - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_CREATE; -- if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL, 0)) -+ if (!lex->select_lex.add_table_to_list(thd, $3, NULL, 0)) - MYSQL_YYABORT; - lex->only_view= 1; - } -@@ -10416,14 +10379,14 @@ - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_STATUS_PROC; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES)) - MYSQL_YYABORT; - } - | FUNCTION_SYM STATUS_SYM wild_and_where - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_STATUS_FUNC; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES)) - MYSQL_YYABORT; - } - | PROCEDURE CODE_SYM sp_name -@@ -10501,7 +10464,7 @@ - /* empty */ - | LIKE TEXT_STRING_sys - { -- Lex->wild= new (YYTHD->mem_root) String($2.str, $2.length, -+ Lex->wild= new (thd->mem_root) String($2.str, $2.length, - system_charset_info); - if (Lex->wild == NULL) - MYSQL_YYABORT; -@@ -10525,7 +10488,7 @@ - lex->sql_command= SQLCOM_SHOW_FIELDS; - lex->select_lex.db= 0; - lex->verbose= 0; -- if (prepare_schema_table(YYTHD, lex, $2, SCH_COLUMNS)) -+ if (prepare_schema_table(thd, lex, $2, SCH_COLUMNS)) - MYSQL_YYABORT; - } - opt_describe_column {} -@@ -10554,7 +10517,7 @@ - | text_string { Lex->wild= $1; } - | ident - { -- Lex->wild= new (YYTHD->mem_root) String((const char*) $1.str, -+ Lex->wild= new (thd->mem_root) String((const char*) $1.str, - $1.length, - system_charset_info); - if (Lex->wild == NULL) -@@ -10697,7 +10660,6 @@ - load: - LOAD DATA_SYM - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - if (lex->sphead) -@@ -10711,7 +10673,7 @@ - | LOAD TABLE_SYM table_ident FROM MASTER_SYM - { - LEX *lex=Lex; -- WARN_DEPRECATED(yythd, "6.0", "LOAD TABLE FROM MASTER", -+ WARN_DEPRECATED(thd, "6.0", "LOAD TABLE FROM MASTER", - "MySQL Administrator (mysqldump, mysql)"); - if (lex->sphead) - { -@@ -10719,7 +10681,7 @@ - MYSQL_YYABORT; - } - lex->sql_command = SQLCOM_LOAD_MASTER_TABLE; -- if (!Select->add_table_to_list(YYTHD, $3, NULL, TL_OPTION_UPDATING)) -+ if (!Select->add_table_to_list(thd, $3, NULL, TL_OPTION_UPDATING)) - MYSQL_YYABORT; - } - ; -@@ -10739,7 +10701,7 @@ - opt_duplicate INTO TABLE_SYM table_ident - { - LEX *lex=Lex; -- if (!Select->add_table_to_list(YYTHD, $9, NULL, TL_OPTION_UPDATING, -+ if (!Select->add_table_to_list(thd, $9, NULL, TL_OPTION_UPDATING, - lex->lock_option)) - MYSQL_YYABORT; - lex->field_list.empty(); -@@ -10754,7 +10716,7 @@ - | FROM MASTER_SYM - { - Lex->sql_command = SQLCOM_LOAD_MASTER_DATA; -- WARN_DEPRECATED(yythd, "6.0", "LOAD DATA FROM MASTER", -+ WARN_DEPRECATED(thd, "6.0", "LOAD DATA FROM MASTER", - "mysqldump or future " - "BACKUP/RESTORE DATABASE facility"); - } -@@ -10872,7 +10834,7 @@ - simple_ident_nospvar {$$= $1;} - | '@' ident_or_text - { -- $$= new (YYTHD->mem_root) Item_user_var_as_out_param($2); -+ $$= new (thd->mem_root) Item_user_var_as_out_param($2); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -10889,7 +10851,6 @@ - TEXT_STRING - { - LEX_STRING tmp; -- THD *thd= YYTHD; - CHARSET_INFO *cs_con= thd->variables.collation_connection; - CHARSET_INFO *cs_cli= thd->variables.character_set_client; - uint repertoire= thd->lex->text_string_is_7bit && -@@ -10915,7 +10876,7 @@ - uint repertoire= Lex->text_string_is_7bit ? - MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30; - DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info)); -- $$= new (YYTHD->mem_root) Item_string($1.str, $1.length, -+ $$= new (thd->mem_root) Item_string($1.str, $1.length, - national_charset_info, - DERIVATION_COERCIBLE, - repertoire); -@@ -10924,7 +10885,7 @@ - } - | UNDERSCORE_CHARSET TEXT_STRING - { -- Item_string *str= new (YYTHD->mem_root) Item_string($2.str, -+ Item_string *str= new (thd->mem_root) Item_string($2.str, - $2.length, $1); - if (str == NULL) - MYSQL_YYABORT; -@@ -10943,7 +10904,7 @@ - If the string has been pure ASCII so far, - check the new part. - */ -- CHARSET_INFO *cs= YYTHD->variables.collation_connection; -+ CHARSET_INFO *cs= thd->variables.collation_connection; - item->collation.repertoire|= my_string_repertoire(cs, - $2.str, - $2.length); -@@ -10954,15 +10915,15 @@ - text_string: - TEXT_STRING_literal - { -- $$= new (YYTHD->mem_root) String($1.str, -+ $$= new (thd->mem_root) String($1.str, - $1.length, -- YYTHD->variables.collation_connection); -+ thd->variables.collation_connection); - if ($$ == NULL) - MYSQL_YYABORT; - } - | HEX_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_hex_string($1.str, $1.length); -+ Item *tmp= new (thd->mem_root) Item_hex_string($1.str, $1.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -10974,7 +10935,7 @@ - } - | BIN_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length); -+ Item *tmp= new (thd->mem_root) Item_bin_string($1.str, $1.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -10989,7 +10950,6 @@ - param_marker: - PARAM_MARKER - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - Item_param *item; -@@ -11022,38 +10982,38 @@ - | NUM_literal { $$ = $1; } - | NULL_SYM - { -- $$ = new (YYTHD->mem_root) Item_null(); -+ $$ = new (thd->mem_root) Item_null(); - if ($$ == NULL) - MYSQL_YYABORT; - YYLIP->next_state= MY_LEX_OPERATOR_OR_IDENT; - } - | FALSE_SYM - { -- $$= new (YYTHD->mem_root) Item_int((char*) "FALSE",0,1); -+ $$= new (thd->mem_root) Item_int((char*) "FALSE",0,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRUE_SYM - { -- $$= new (YYTHD->mem_root) Item_int((char*) "TRUE",1,1); -+ $$= new (thd->mem_root) Item_int((char*) "TRUE",1,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | HEX_NUM - { -- $$ = new (YYTHD->mem_root) Item_hex_string($1.str, $1.length); -+ $$ = new (thd->mem_root) Item_hex_string($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIN_NUM - { -- $$= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length); -+ $$= new (thd->mem_root) Item_bin_string($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | UNDERSCORE_CHARSET HEX_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_hex_string($2.str, $2.length); -+ Item *tmp= new (thd->mem_root) Item_hex_string($2.str, $2.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -11064,7 +11024,7 @@ - String *str= tmp->val_str((String*) 0); - - Item_string *item_str; -- item_str= new (YYTHD->mem_root) -+ item_str= new (thd->mem_root) - Item_string(NULL, /* name will be set in select_item */ - str ? str->ptr() : "", - str ? str->length() : 0, -@@ -11082,7 +11042,7 @@ - } - | UNDERSCORE_CHARSET BIN_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_bin_string($2.str, $2.length); -+ Item *tmp= new (thd->mem_root) Item_bin_string($2.str, $2.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -11093,7 +11053,7 @@ - String *str= tmp->val_str((String*) 0); - - Item_string *item_str; -- item_str= new (YYTHD->mem_root) -+ item_str= new (thd->mem_root) - Item_string(NULL, /* name will be set in select_item */ - str ? str->ptr() : "", - str ? str->length() : 0, -@@ -11117,7 +11077,7 @@ - NUM - { - int error; -- $$= new (YYTHD->mem_root) -+ $$= new (thd->mem_root) - Item_int($1.str, - (longlong) my_strtoll10($1.str, NULL, &error), - $1.length); -@@ -11127,7 +11087,7 @@ - | LONG_NUM - { - int error; -- $$= new (YYTHD->mem_root) -+ $$= new (thd->mem_root) - Item_int($1.str, - (longlong) my_strtoll10($1.str, NULL, &error), - $1.length); -@@ -11136,23 +11096,23 @@ - } - | ULONGLONG_NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DECIMAL_NUM - { -- $$= new (YYTHD->mem_root) Item_decimal($1.str, $1.length, -- YYTHD->charset()); -- if (($$ == NULL) || (YYTHD->is_error())) -+ $$= new (thd->mem_root) Item_decimal($1.str, $1.length, -+ thd->charset()); -+ if (($$ == NULL) || (thd->is_error())) - { - MYSQL_YYABORT; - } - } - | FLOAT_NUM - { -- $$= new (YYTHD->mem_root) Item_float($1.str, $1.length); -- if (($$ == NULL) || (YYTHD->is_error())) -+ $$= new (thd->mem_root) Item_float($1.str, $1.length); -+ if (($$ == NULL) || (thd->is_error())) - { - MYSQL_YYABORT; - } -@@ -11172,7 +11132,7 @@ - ident '.' '*' - { - SELECT_LEX *sel= Select; -- $$= new (YYTHD->mem_root) Item_field(Lex->current_context(), -+ $$= new (thd->mem_root) Item_field(Lex->current_context(), - NullS, $1.str, "*"); - if ($$ == NULL) - MYSQL_YYABORT; -@@ -11180,7 +11140,6 @@ - } - | ident '.' ident '.' '*' - { -- THD *thd= YYTHD; - SELECT_LEX *sel= Select; - const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ? - NullS : $1.str; -@@ -11200,7 +11159,6 @@ - simple_ident: - ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_variable_t *spv; -@@ -11251,7 +11209,6 @@ - simple_ident_nospvar: - ident - { -- THD *thd= YYTHD; - SELECT_LEX *sel=Select; - if ((sel->parsing_place != IN_HAVING) || - (sel->get_in_sum_expr() > 0)) -@@ -11273,7 +11230,6 @@ - simple_ident_q: - ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - /* -@@ -11352,7 +11308,6 @@ - } - | '.' ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - SELECT_LEX *sel= lex->current_select; - if (sel->no_table_names_allowed) -@@ -11377,7 +11332,6 @@ - } - | ident '.' ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - SELECT_LEX *sel= lex->current_select; - const char* schema= (thd->client_capabilities & CLIENT_NO_SCHEMA ? -@@ -11445,7 +11399,7 @@ - } - | ident '.' ident - { -- $$= new Table_ident(YYTHD, $1,$3,0); -+ $$= new Table_ident(thd, $1,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -11467,7 +11421,7 @@ - } - | ident '.' ident opt_wild - { -- $$= new Table_ident(YYTHD, $1,$3,0); -+ $$= new Table_ident(thd, $1,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -11477,7 +11431,7 @@ - ident - { - LEX_STRING db={(char*) any_db,3}; -- $$= new Table_ident(YYTHD, db,$1,0); -+ $$= new Table_ident(thd, db,$1,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -11487,8 +11441,7 @@ - IDENT { $$= $1; } - | IDENT_QUOTED - { -- THD *thd= YYTHD; -- -+ - if (thd->charset_is_system_charset) - { - CHARSET_INFO *cs= system_charset_info; -@@ -11516,8 +11469,6 @@ - TEXT_STRING_sys: - TEXT_STRING - { -- THD *thd= YYTHD; -- - if (thd->charset_is_system_charset) - $$= $1; - else -@@ -11532,8 +11483,6 @@ - TEXT_STRING_literal: - TEXT_STRING - { -- THD *thd= YYTHD; -- - if (thd->charset_is_collation_connection) - $$= $1; - else -@@ -11548,8 +11497,6 @@ - TEXT_STRING_filesystem: - TEXT_STRING - { -- THD *thd= YYTHD; -- - if (thd->charset_is_character_set_filesystem) - $$= $1; - else -@@ -11566,7 +11513,6 @@ - IDENT_sys { $$=$1; } - | keyword - { -- THD *thd= YYTHD; - $$.str= thd->strmake($1.str, $1.length); - if ($$.str == NULL) - MYSQL_YYABORT; -@@ -11578,7 +11524,6 @@ - IDENT_sys { $$=$1; } - | keyword_sp - { -- THD *thd= YYTHD; - $$.str= thd->strmake($1.str, $1.length); - if ($$.str == NULL) - MYSQL_YYABORT; -@@ -11595,7 +11540,6 @@ - user: - ident_or_text - { -- THD *thd= YYTHD; - if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) - MYSQL_YYABORT; - $$->user = $1; -@@ -11609,7 +11553,6 @@ - } - | ident_or_text '@' ident_or_text - { -- THD *thd= YYTHD; - if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) - MYSQL_YYABORT; - $$->user = $1; $$->host=$3; -@@ -11628,7 +11571,7 @@ - } - | CURRENT_USER optional_braces - { -- if (!($$=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user)))) -+ if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) - MYSQL_YYABORT; - /* - empty LEX_USER means current_user and -@@ -11991,7 +11934,6 @@ - - option_type_value: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -12022,7 +11964,6 @@ - } - ext_option_value - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -12105,7 +12046,6 @@ - sys_option_value: - option_type internal_variable_name equal set_expr_or_default - { -- THD *thd= YYTHD; - LEX *lex= Lex; - LEX_STRING *name= &$2.base_name; - -@@ -12117,7 +12057,7 @@ - my_parse_error(ER(ER_SYNTAX_ERROR)); - MYSQL_YYABORT; - } -- if (set_trigger_new_row(YYTHD, name, $4)) -+ if (set_trigger_new_row(thd, name, $4)) - MYSQL_YYABORT; - } - else if ($2.var) -@@ -12147,7 +12087,6 @@ - } - | option_type TRANSACTION_SYM ISOLATION LEVEL_SYM isolation_types - { -- THD *thd= YYTHD; - LEX *lex=Lex; - lex->option_type= $1; - Item *item= new (thd->mem_root) Item_int((int32) $5); -@@ -12167,7 +12106,7 @@ - '@' ident_or_text equal expr - { - Item_func_set_user_var *item; -- item= new (YYTHD->mem_root) Item_func_set_user_var($2, $4); -+ item= new (thd->mem_root) Item_func_set_user_var($2, $4); - if (item == NULL) - MYSQL_YYABORT; - set_var_user *var= new set_var_user(item); -@@ -12177,7 +12116,6 @@ - } - | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default - { -- THD *thd= YYTHD; - struct sys_var_with_base tmp= $4; - /* Lookup if necessary: must be a system variable. */ - if (tmp.var == NULL) -@@ -12190,7 +12128,6 @@ - } - | charset old_or_new_charset_name_or_default - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - CHARSET_INFO *cs2; - cs2= $2 ? $2: global_system_variables.character_set_client; -@@ -12238,7 +12175,6 @@ - } - | PASSWORD equal text_or_password - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - LEX_USER *user; - sp_pcontext *spc= lex->spcont; -@@ -12278,7 +12214,6 @@ - internal_variable_name: - ident - { -- THD *thd= YYTHD; - sp_pcontext *spc= thd->lex->spcont; - sp_variable_t *spv; - -@@ -12337,7 +12272,7 @@ - } - else - { -- sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length); -+ sys_var *tmp=find_sys_var(thd, $3.str, $3.length); - if (!tmp) - MYSQL_YYABORT; - if (!tmp->is_struct()) -@@ -12348,7 +12283,7 @@ - } - | DEFAULT '.' ident - { -- sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length); -+ sys_var *tmp=find_sys_var(thd, $3.str, $3.length); - if (!tmp) - MYSQL_YYABORT; - if (!tmp->is_struct()) -@@ -12370,16 +12305,16 @@ - TEXT_STRING { $$=$1.str;} - | PASSWORD '(' TEXT_STRING ')' - { -- $$= $3.length ? YYTHD->variables.old_passwords ? -- Item_func_old_password::alloc(YYTHD, $3.str, $3.length) : -- Item_func_password::alloc(YYTHD, $3.str, $3.length) : -+ $$= $3.length ? thd->variables.old_passwords ? -+ Item_func_old_password::alloc(thd, $3.str, $3.length) : -+ Item_func_password::alloc(thd, $3.str, $3.length) : - $3.str; - if ($$ == NULL) - MYSQL_YYABORT; - } - | OLD_PASSWORD '(' TEXT_STRING ')' - { -- $$= $3.length ? Item_func_old_password::alloc(YYTHD, $3.str, -+ $$= $3.length ? Item_func_old_password::alloc(thd, $3.str, - $3.length) : - $3.str; - if ($$ == NULL) -@@ -12393,19 +12328,19 @@ - | DEFAULT { $$=0; } - | ON - { -- $$=new (YYTHD->mem_root) Item_string("ON", 2, system_charset_info); -+ $$=new (thd->mem_root) Item_string("ON", 2, system_charset_info); - if ($$ == NULL) - MYSQL_YYABORT; - } - | ALL - { -- $$=new (YYTHD->mem_root) Item_string("ALL", 3, system_charset_info); -+ $$=new (thd->mem_root) Item_string("ALL", 3, system_charset_info); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BINARY - { -- $$=new (YYTHD->mem_root) Item_string("binary", 6, system_charset_info); -+ $$=new (thd->mem_root) Item_string("binary", 6, system_charset_info); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -12443,7 +12378,7 @@ - table_ident opt_table_alias lock_option - { - thr_lock_type lock_type= (thr_lock_type) $3; -- if (!Select->add_table_to_list(YYTHD, $1, $2, 0, lock_type)) -+ if (!Select->add_table_to_list(thd, $1, $2, 0, lock_type)) - MYSQL_YYABORT; - /* If table is to be write locked, protect from a impending GRL. */ - if (lock_type >= TL_WRITE_ALLOW_WRITE) -@@ -12514,7 +12449,7 @@ - lex->expr_allows_subselect= FALSE; - lex->sql_command = SQLCOM_HA_READ; - lex->ha_rkey_mode= HA_READ_KEY_EXACT; /* Avoid purify warnings */ -- Item *one= new (YYTHD->mem_root) Item_int((int32) 1); -+ Item *one= new (thd->mem_root) Item_int((int32) 1); - if (one == NULL) - MYSQL_YYABORT; - lex->current_select->select_limit= one; -@@ -12836,10 +12771,10 @@ - $$=$1; $1->password=$4; - if ($4.length) - { -- if (YYTHD->variables.old_passwords) -+ if (thd->variables.old_passwords) - { - char *buff= -- (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1); -+ (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1); - if (buff == NULL) - MYSQL_YYABORT; - my_make_scrambled_password_323(buff, $4.str, $4.length); -@@ -12849,7 +12784,7 @@ - else - { - char *buff= -- (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1); -+ (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1); - if (buff == NULL) - MYSQL_YYABORT; - my_make_scrambled_password(buff, $4.str, $4.length); -@@ -12881,7 +12816,7 @@ - column_list_id: - ident - { -- String *new_str = new (YYTHD->mem_root) String((const char*) $1.str,$1.length,system_charset_info); -+ String *new_str = new (thd->mem_root) String((const char*) $1.str,$1.length,system_charset_info); - if (new_str == NULL) - MYSQL_YYABORT; - List_iterator iter(Lex->columns); -@@ -12981,14 +12916,14 @@ - - opt_chain: - /* empty */ -- { $$= (YYTHD->variables.completion_type == 1); } -+ { $$= (thd->variables.completion_type == 1); } - | AND_SYM NO_SYM CHAIN_SYM { $$=0; } - | AND_SYM CHAIN_SYM { $$=1; } - ; - - opt_release: - /* empty */ -- { $$= (YYTHD->variables.completion_type == 2); } -+ { $$= (thd->variables.completion_type == 2); } - | RELEASE_SYM { $$=1; } - | NO_SYM RELEASE_SYM { $$=0; } - ; -@@ -13102,7 +13037,6 @@ - - union_order_or_limit: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE); - SELECT_LEX *sel= lex->current_select; -@@ -13118,7 +13052,6 @@ - } - order_or_limit - { -- THD *thd= YYTHD; - thd->lex->current_select->no_table_names_allowed= 0; - thd->where= ""; - } -@@ -13255,14 +13188,14 @@ - from older master servers (i.e. to create non-suid trigger in this - case). - */ -- YYTHD->lex->definer= 0; -+ thd->lex->definer= 0; - } - ; - - definer: - DEFINER_SYM EQ user - { -- YYTHD->lex->definer= get_current_user(YYTHD, $3); -+ thd->lex->definer= get_current_user(thd, $3); - } - ; - -@@ -13307,7 +13240,6 @@ - view_tail: - view_suid VIEW_SYM table_ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_CREATE_VIEW; - /* first table in list is target VIEW name */ -@@ -13347,7 +13279,6 @@ - } - view_select_aux view_check_option - { -- THD *thd= YYTHD; - LEX *lex= Lex; - uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str; - void *create_view_select= thd->memdup(lex->create_view_select.str, len); -@@ -13403,7 +13334,6 @@ - EACH_SYM - ROW_SYM - { /* $15 */ -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_head *sp; -@@ -13437,8 +13367,8 @@ - sp_head *sp= lex->sphead; - - lex->sql_command= SQLCOM_CREATE_TRIGGER; -- sp->set_stmt_end(YYTHD); -- sp->restore_thd_mem_root(YYTHD); -+ sp->set_stmt_end(thd); -+ sp->restore_thd_mem_root(thd); - - if (sp->is_not_allowed_in_function("trigger")) - MYSQL_YYABORT; -@@ -13448,7 +13378,7 @@ - sp_proc_stmt alternatives are not saving/restoring LEX, so - lex->query_tables can be wiped out. - */ -- if (!lex->select_lex.add_table_to_list(YYTHD, $9, -+ if (!lex->select_lex.add_table_to_list(thd, $9, - (LEX_STRING*) 0, - TL_OPTION_UPDATING, - TL_IGNORE)) -@@ -13466,7 +13396,6 @@ - AGGREGATE_SYM remember_name FUNCTION_SYM ident - RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - if (is_native_function(thd, & $4)) - { -@@ -13484,7 +13413,6 @@ - | remember_name FUNCTION_SYM ident - RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - if (is_native_function(thd, & $3)) - { -@@ -13507,7 +13435,6 @@ - sp_name /* $3 */ - '(' /* $4 */ - { /* $5 */ -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_head *sp; -@@ -13565,7 +13492,7 @@ - MYSQL_YYABORT; - } - -- if (sp->fill_field_definition(YYTHD, lex, -+ if (sp->fill_field_definition(thd, lex, - (enum enum_field_types) $11, - &sp->m_return_field_def)) - MYSQL_YYABORT; -@@ -13574,7 +13501,6 @@ - } - sp_c_chistics /* $13 */ - { /* $14 */ -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -13583,7 +13509,6 @@ - } - sp_proc_stmt /* $15 */ - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - sp_head *sp= lex->sphead; - -@@ -13654,10 +13579,10 @@ - sp= new sp_head(); - if (sp == NULL) - MYSQL_YYABORT; -- sp->reset_thd_mem_root(YYTHD); -+ sp->reset_thd_mem_root(thd); - sp->init(lex); - sp->m_type= TYPE_ENUM_PROCEDURE; -- sp->init_sp_name(YYTHD, $3); -+ sp->init_sp_name(thd, $3); - - lex->sphead= sp; - } -@@ -13672,7 +13597,6 @@ - sp_pdparam_list - ')' - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - lex->sphead->m_param_end= YYLIP->get_cpp_tok_start(); -@@ -13680,7 +13604,6 @@ - } - sp_c_chistics - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - lex->sphead->m_chistics= &lex->sp_chistics; -@@ -13691,9 +13614,9 @@ - LEX *lex= Lex; - sp_head *sp= lex->sphead; - -- sp->set_stmt_end(YYTHD); -+ sp->set_stmt_end(thd); - lex->sql_command= SQLCOM_CREATE_PROCEDURE; -- sp->restore_thd_mem_root(YYTHD); -+ sp->restore_thd_mem_root(thd); - } - ; - -@@ -13730,21 +13653,21 @@ - text_string - { - MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE); -- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) -+ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) - MYSQL_YYABORT; - Lex->xid->set(1L, $1->ptr(), $1->length(), 0, 0); - } - | text_string ',' text_string - { - MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE); -- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) -+ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) - MYSQL_YYABORT; - Lex->xid->set(1L, $1->ptr(), $1->length(), $3->ptr(), $3->length()); - } - | text_string ',' text_string ',' ulong_num - { - MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE); -- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) -+ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) - MYSQL_YYABORT; - Lex->xid->set($5, $1->ptr(), $1->length(), $3->ptr(), $3->length()); - } diff --git a/package/oracle-mysql/0006-no-force-static-build.patch b/package/oracle-mysql/0006-no-force-static-build.patch deleted file mode 100644 index 8172a9848e7b..000000000000 --- a/package/oracle-mysql/0006-no-force-static-build.patch +++ /dev/null @@ -1,18 +0,0 @@ -configure: do not force a static link for non-installed programs - -Otherwise, it tries to link against a static libz, which may not exist -in a shared-only system. - -Signed-off-by: "Yann E. MORIN" - -diff -durN mysql-5.1.73.orig/configure.in mysql-5.1.73/configure.in ---- mysql-5.1.73.orig/configure.in 2014-12-22 00:04:46.550508208 +0100 -+++ mysql-5.1.73/configure.in 2014-12-22 00:05:56.415307480 +0100 -@@ -562,7 +562,6 @@ - AC_MSG_ERROR([MySQL requires an ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.]) - fi - --NOINST_LDFLAGS="-static" - - static_nss="" - STATIC_NSS_FLAGS="" diff --git a/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch b/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch deleted file mode 100644 index 971b9ceeb51a..000000000000 --- a/package/oracle-mysql/0007-dont-install-in-mysql-directory.patch +++ /dev/null @@ -1,182 +0,0 @@ -Don't install in mysql directory - -Installing libraries in a subdirectory of /usr/lib leads to no end of -trouble. It requires either setting a RUN_PATH in the ELF files linked -with it or adding the path to ld.so.conf and calling ldconfig on the -target. - -So to simplify things, put everything in /usr/lib instead of -/usr/lib/mysql - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) - -diff -Nrup mysql-5.1.73.orig/dbug/Makefile.am mysql-5.1.73/dbug/Makefile.am ---- mysql-5.1.73.orig/dbug/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/dbug/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -17,7 +17,7 @@ - - INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include - LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a --pkglib_LIBRARIES = libdbug.a -+lib_LIBRARIES = libdbug.a - noinst_HEADERS = dbug_long.h - libdbug_a_SOURCES = dbug.c sanity.c - EXTRA_DIST = CMakeLists.txt example1.c example2.c example3.c \ -diff -Nrup mysql-5.1.73.orig/libmysql/Makefile.shared mysql-5.1.73/libmysql/Makefile.shared ---- mysql-5.1.73.orig/libmysql/Makefile.shared 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/libmysql/Makefile.shared 2015-12-14 00:34:58.567937603 +0100 -@@ -25,7 +25,7 @@ MYSQLBASEdir= $(prefix) - ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded - ## until someone complains that they need separate options. - LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) --pkglib_LTLIBRARIES = $(target) -+lib_LTLIBRARIES = $(target) - - noinst_PROGRAMS = conf_to_src - -diff -Nrup mysql-5.1.73.orig/libmysqld/Makefile.am mysql-5.1.73/libmysqld/Makefile.am ---- mysql-5.1.73.orig/libmysqld/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/libmysqld/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -38,7 +38,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - @condition_dependent_plugin_includes@ - - noinst_LIBRARIES = libmysqld_int.a --pkglib_LIBRARIES = libmysqld.a -+lib_LIBRARIES = libmysqld.a - SUBDIRS = . examples - libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc - libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ -diff -Nrup mysql-5.1.73.orig/mysys/Makefile.am mysql-5.1.73/mysys/Makefile.am ---- mysql-5.1.73.orig/mysys/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/mysys/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -18,7 +18,7 @@ MYSQLSHAREdir = $(pkgdatadir) - MYSQLBASEdir= $(prefix) - INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ - -I$(top_srcdir)/include -I$(srcdir) --pkglib_LIBRARIES = libmysys.a -+lib_LIBRARIES = libmysys.a - LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a - noinst_HEADERS = mysys_priv.h my_static.h my_handler_errors.h - libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ -diff -Nrup mysql-5.1.73.orig/storage/csv/Makefile.am mysql-5.1.73/storage/csv/Makefile.am ---- mysql-5.1.73.orig/storage/csv/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/csv/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -30,7 +30,7 @@ DEFS = @DEFS@ - noinst_HEADERS = ha_tina.h transparent_file.h - - EXTRA_LTLIBRARIES = ha_csv.la --pkglib_LTLIBRARIES = @plugin_csv_shared_target@ -+lib_LTLIBRARIES = @plugin_csv_shared_target@ - ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) - ha_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_PLUGIN - ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc -diff -Nrup mysql-5.1.73.orig/storage/heap/Makefile.am mysql-5.1.73/storage/heap/Makefile.am ---- mysql-5.1.73.orig/storage/heap/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/heap/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -26,7 +26,7 @@ WRAPLIBS= - LDADD = - - DEFS = @DEFS@ --pkglib_LIBRARIES = libheap.a -+lib_LIBRARIES = libheap.a - noinst_PROGRAMS = hp_test1 hp_test2 - noinst_LIBRARIES = libheap.a - hp_test1_LDFLAGS = @NOINST_LDFLAGS@ -diff -Nrup mysql-5.1.73.orig/storage/myisam/Makefile.am mysql-5.1.73/storage/myisam/Makefile.am ---- mysql-5.1.73.orig/storage/myisam/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/myisam/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -30,7 +30,7 @@ DEFS = @DEFS@ - EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in - pkgdata_DATA = mi_test_all mi_test_all.res - --pkglib_LIBRARIES = libmyisam.a -+lib_LIBRARIES = libmyisam.a - bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump - myisamchk_DEPENDENCIES= $(LIBRARIES) - myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ -diff -Nrup mysql-5.1.73.orig/storage/myisammrg/Makefile.am mysql-5.1.73/storage/myisammrg/Makefile.am ---- mysql-5.1.73.orig/storage/myisammrg/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/myisammrg/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -26,7 +26,7 @@ WRAPLIBS= - LDADD = - - DEFS = @DEFS@ --pkglib_LIBRARIES = libmyisammrg.a -+lib_LIBRARIES = libmyisammrg.a - noinst_HEADERS = myrg_def.h ha_myisammrg.h - noinst_LIBRARIES = libmyisammrg.a - libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \ -diff -Nrup mysql-5.1.73.orig/strings/Makefile.am mysql-5.1.73/strings/Makefile.am ---- mysql-5.1.73.orig/strings/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/strings/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -16,7 +16,7 @@ - # This file is public domain and comes with NO WARRANTY of any kind - - INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include --pkglib_LIBRARIES = libmystrings.a -+lib_LIBRARIES = libmystrings.a - - # Exact one of ASSEMBLER_X - if ASSEMBLER_x86 -@@ -69,15 +69,15 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ - - FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ - --str_test: str_test.c $(pkglib_LIBRARIES) -- $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES) -+str_test: str_test.c $(lib_LIBRARIES) -+ $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(lib_LIBRARIES) - - uctypedump: uctypedump.c - $(LINK) $(INCLUDES) $(srcdir)/uctypedump.c - --test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES) -+test_decimal$(EXEEXT): decimal.c $(lib_LIBRARIES) - $(CP) $(srcdir)/decimal.c ./test_decimal.c -- $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES) -+ $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(lib_LIBRARIES) - $(RM) -f ./test_decimal.c - - # Don't update the files from bitkeeper -diff -Nrup mysql-5.1.73.orig/tests/Makefile.am mysql-5.1.73/tests/Makefile.am ---- mysql-5.1.73.orig/tests/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/tests/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -51,11 +51,11 @@ mysql_client_test.o: mysql_client_fw.c - - insert_test_SOURCES= insert_test.c - select_test_SOURCES= select_test.c --insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) --select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -+insert_test_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) -+select_test_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) - - bug25714_SOURCES= bug25714.c --bug25714_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -+bug25714_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) - - # Fix for mit-threads - DEFS = -DMYSQL_CLIENT_NO_THREADS -diff -Nrup mysql-5.1.73.orig/vio/Makefile.am mysql-5.1.73/vio/Makefile.am ---- mysql-5.1.73.orig/vio/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/vio/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -16,7 +16,7 @@ - INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ - $(openssl_includes) - LDADD = @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs) --pkglib_LIBRARIES = libvio.a -+lib_LIBRARIES = libvio.a - - noinst_HEADERS = vio_priv.h - -diff -Nrup mysql-5.1.73.orig/zlib/Makefile.am mysql-5.1.73/zlib/Makefile.am ---- mysql-5.1.73.orig/zlib/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/zlib/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -19,7 +19,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - - LIBS= $(NON_THREADED_LIBS) - --pkglib_LTLIBRARIES = libz.la -+lib_LTLIBRARIES = libz.la - noinst_LTLIBRARIES = libzlt.la - - libz_la_LDFLAGS = -static diff --git a/package/oracle-mysql/0008-fix-type-conversion.patch b/package/oracle-mysql/0008-fix-type-conversion.patch deleted file mode 100644 index 65babf4f2020..000000000000 --- a/package/oracle-mysql/0008-fix-type-conversion.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix type conversion - -Fixes the following build error with gcc 6.x: - -protocol.cc:27:40: error: narrowing conversion of ''\37777777776'' from 'char' to 'uchar {aka unsigned char}' inside { } [-Wnarrowing] - static uchar eof_buff[1]= { (char) 254 }; /* Marker for end of fields */ - -Signed-off-by: Thomas Petazzoni - -Index: b/server-tools/instance-manager/protocol.cc -=================================================================== ---- a/server-tools/instance-manager/protocol.cc -+++ b/server-tools/instance-manager/protocol.cc -@@ -24,7 +24,7 @@ - #include - - --static uchar eof_buff[1]= { (char) 254 }; /* Marker for end of fields */ -+static uchar eof_buff[1]= { (uchar) 254 }; /* Marker for end of fields */ - static const char ERROR_PACKET_CODE= (char) 255; - - diff --git a/package/oracle-mysql/0009-gcc7.patch b/package/oracle-mysql/0009-gcc7.patch deleted file mode 100644 index 321112d63585..000000000000 --- a/package/oracle-mysql/0009-gcc7.patch +++ /dev/null @@ -1,45 +0,0 @@ -Fix gcc7 compile - -mysql.cc: In function 'void build_completion_hash(bool, bool)': -mysql.cc:2687:37: error: invalid conversion from 'char' to 'char*' [-fpermissive] - field_names[i][num_fields*2]= '\0'; - ^~~~ -Patch was partly backported from upstream commit: -https://github.com/mysql/mysql-server/commit/ae21683d980d5fe9e39bd0193827ea3604256eb9 - -Signed-off-by: Bernd Kuhls -[Thomas: add more gcc 7.x fixes in instance_map.cc.] -Signed-off-by: Thomas Petazzoni - -Index: b/client/mysql.cc -=================================================================== ---- a/client/mysql.cc -+++ b/client/mysql.cc -@@ -2684,7 +2684,7 @@ - mysql_free_result(fields); - break; - } -- field_names[i][num_fields*2]= '\0'; -+ field_names[i][num_fields*2]= NULL; - j=0; - while ((sql_field=mysql_fetch_field(fields))) - { -Index: b/server-tools/instance-manager/instance_map.cc -=================================================================== ---- a/server-tools/instance-manager/instance_map.cc -+++ b/server-tools/instance-manager/instance_map.cc -@@ -526,12 +526,12 @@ - Options::Main::config_file); - - argv_options[1]= defaults_file_arg; -- argv_options[2]= '\0'; -+ argv_options[2]= NULL; - - argc= 2; - } - else -- argv_options[1]= '\0'; -+ argv_options[1]= NULL; - - /* - If the routine failed, we'll simply fallback to defaults in diff --git a/package/oracle-mysql/0010-fix-build-without-zlib.patch b/package/oracle-mysql/0010-fix-build-without-zlib.patch deleted file mode 100644 index b6e64e6bdd0f..000000000000 --- a/package/oracle-mysql/0010-fix-build-without-zlib.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix build without zlib - -Don't include unconditionally zlib.h, and compile out code that -requires zlib support. - -Signed-off-by: Fabrice Fontaine - -diff -durN mysql-5.1.73.orig/mysys/checksum.c mysql-5.1.73/mysys/checksum.c ---- mysql-5.1.73.orig/mysys/checksum.c 2020-07-14 17:34:38.212304432 +0200 -+++ mysql-5.1.73/mysys/checksum.c 2020-07-14 18:06:45.076342493 +0200 -@@ -16,7 +16,9 @@ - - #include - #include -+#ifdef HAVE_COMPRESS - #include -+#endif - - /* - Calculate a long checksum for a memoryblock. -diff -durN mysql-5.1.73.orig/sql/item_strfunc.cc mysql-5.1.73/sql/item_strfunc.cc ---- mysql-5.1.73.orig/sql/item_strfunc.cc 2020-07-14 17:34:38.160304431 +0200 -+++ mysql-5.1.73/sql/item_strfunc.cc 2020-07-14 18:04:36.956339962 +0200 -@@ -35,7 +35,9 @@ - #include "my_md5.h" - #include "sha1.h" - #include "my_aes.h" -+#ifdef HAVE_COMPRESS - #include -+#endif - C_MODE_START - #include "../mysys/my_static.h" // For soundex_map - C_MODE_END -diff -durN mysql-5.1.73.orig/sql/sql_table.cc mysql-5.1.73/sql/sql_table.cc ---- mysql-5.1.73.orig/sql/sql_table.cc 2020-07-14 17:34:38.156304431 +0200 -+++ mysql-5.1.73/sql/sql_table.cc 2020-07-14 18:14:48.628352044 +0200 -@@ -1681,6 +1681,7 @@ - goto end; - } - } -+#ifdef HAVE_COMPRESS - if (flags & WFRM_PACK_FRM) - { - /* -@@ -1702,6 +1703,7 @@ - } - error= my_delete(shadow_frm_name, MYF(MY_WME)); - } -+#endif - if (flags & WFRM_INSTALL_SHADOW) - { - #ifdef WITH_PARTITION_STORAGE_ENGINE diff --git a/package/oracle-mysql/0011-config-ac-macros-alloca.m4-Remove-obsolete-Cray-supp.patch b/package/oracle-mysql/0011-config-ac-macros-alloca.m4-Remove-obsolete-Cray-supp.patch deleted file mode 100644 index 492e01bffe38..000000000000 --- a/package/oracle-mysql/0011-config-ac-macros-alloca.m4-Remove-obsolete-Cray-supp.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0d8ab9b020870c62c216fca77e7f8bd3eeb710c3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Oct 2021 19:23:46 +0200 -Subject: [PATCH] config/ac-macros/alloca.m4: Remove obsolete Cray support - -Remove obsolete Cray support to avoid the following build failure since -autoconf >= 2.70 and -http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=15edf7fd8094fd14a89d9891dd72a9624762597a: - -autoheader: warning: missing template: CRAY_STACKSEG_END -autoheader: warning: Use AC_DEFINE([CRAY_STACKSEG_END], [], [Description]) -autoreconf: error: /home/buildroot/autobuild/instance-2/output-1/host/bin/autoheader failed with exit status: 1 -package/pkg-generic.mk:273: recipe for target '/home/buildroot/autobuild/instance-2/output-1/build/oracle-mysql-5.1.73/.stamp_configured' failed - -Fixes: - - http://autobuild.buildroot.org/results/e5329bcf166d46b2eb17f2bc727c0307bef5ed02 - -Upstream: switched to CMake a very long time ago, so not sent upstream -Signed-off-by: Fabrice Fontaine ---- - config/ac-macros/alloca.m4 | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/config/ac-macros/alloca.m4 b/config/ac-macros/alloca.m4 -index 8c730dd671f..eecb8249573 100644 ---- a/config/ac-macros/alloca.m4 -+++ b/config/ac-macros/alloca.m4 -@@ -46,20 +46,6 @@ then - ALLOCA=alloca.o - AC_DEFINE(C_ALLOCA, 1) - -- AC_CACHE_CHECK(whether alloca needs Cray hooks, ac_cv_os_cray, -- [AC_EGREP_CPP(webecray, -- [#if defined(CRAY) && ! defined(CRAY2) -- webecray -- #else -- wenotbecray -- #endif -- ], ac_cv_os_cray=yes, ac_cv_os_cray=no)]) -- if test "$ac_cv_os_cray" = "yes"; then -- for ac_func in _getb67 GETB67 getb67; do -- AC_CHECK_FUNC($ac_func, [AC_DEFINE_UNQUOTED(CRAY_STACKSEG_END, $ac_func) -- break]) -- done -- fi - fi - AC_SUBST(ALLOCA)dnl - else --- -2.33.0 - diff --git a/package/oracle-mysql/S97mysqld b/package/oracle-mysql/S97mysqld deleted file mode 100644 index 110ca2cd12d7..000000000000 --- a/package/oracle-mysql/S97mysqld +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -MYSQL_DIR="/var/mysql" -MYSQL_USER="mysql" - -[ -r /etc/default/mysql ] && . /etc/default/mysql - -case "$1" in - start) - if [ ! -d $MYSQL_DIR/mysql ] ; then - echo "Creating MySQL system tables..." - mysql_install_db --user=$MYSQL_USER --ldata=$MYSQL_DIR - fi - - # mysqld runs as user mysql, but /run is only writable by root - # so create a subdirectory for mysql. - install -d -o mysql -g root -m 0755 /run/mysql - - # We don't use start-stop-daemon because mysqld has - # its own wrapper script. - printf "Starting mysql..." - /usr/bin/mysqld_safe --pid-file=/run/mysql/mysqld.pid & - echo "done." - ;; - stop) - printf "Stopping mysql..." - if test -f /run/mysql/mysqld.pid ; then - kill `cat /run/mysql/mysqld.pid` - fi - echo "done." - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/mysqld {start|stop|restart}" - ;; -esac diff --git a/package/oracle-mysql/mysqld.service b/package/oracle-mysql/mysqld.service deleted file mode 100644 index c9e5e42f7153..000000000000 --- a/package/oracle-mysql/mysqld.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=MySQL database server - -[Service] -ExecStartPre=/bin/sh -c 'test -d /var/mysql/mysql || mysql_install_db --user=mysql --ldata=/var/mysql' -ExecStart=/usr/bin/mysqld_safe -Restart=always -User=mysql -RuntimeDirectory=mysql -RuntimeDirectoryMode=0755 - -[Install] -WantedBy=multi-user.target diff --git a/package/oracle-mysql/oracle-mysql.hash b/package/oracle-mysql/oracle-mysql.hash deleted file mode 100644 index c4ce39437e6e..000000000000 --- a/package/oracle-mysql/oracle-mysql.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From https://downloads.mariadb.com/archives/mysql-5.1/mysql-5.1.73.tar.gz.md5 -md5 887f869bcc757957067b9198f707f32f mysql-5.1.73.tar.gz -# Locally computed -sha256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 mysql-5.1.73.tar.gz -sha256 cbf0dbf56528a629f4358a1339f981202f1a9a0d9542c092b03f486064ced2db README -sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/oracle-mysql/oracle-mysql.mk b/package/oracle-mysql/oracle-mysql.mk deleted file mode 100644 index 1086e4125f29..000000000000 --- a/package/oracle-mysql/oracle-mysql.mk +++ /dev/null @@ -1,140 +0,0 @@ -################################################################################ -# -# oracle-mysql -# -################################################################################ - -ORACLE_MYSQL_VERSION_MAJOR = 5.1 -ORACLE_MYSQL_VERSION = $(ORACLE_MYSQL_VERSION_MAJOR).73 -ORACLE_MYSQL_SOURCE = mysql-$(ORACLE_MYSQL_VERSION).tar.gz -ORACLE_MYSQL_SITE = http://dev.mysql.com/get/Downloads/MySQL-$(ORACLE_MYSQL_VERSION_MAJOR) -ORACLE_MYSQL_INSTALL_STAGING = YES -ORACLE_MYSQL_DEPENDENCIES = ncurses -ORACLE_MYSQL_AUTORECONF = YES -ORACLE_MYSQL_LICENSE = GPL-2.0 -ORACLE_MYSQL_LICENSE_FILES = README COPYING -ORACLE_MYSQL_CPE_ID_VENDOR = oracle -ORACLE_MYSQL_CPE_ID_PRODUCT = mysql -ORACLE_MYSQL_SELINUX_MODULES = mysql -ORACLE_MYSQL_PROVIDES = mysql -ORACLE_MYSQL_CONFIG_SCRIPTS = mysql_config - -# Unix socket. This variable can also be consulted by other buildroot packages -MYSQL_SOCKET = /run/mysql/mysql.sock - -ORACLE_MYSQL_CONF_ENV = \ - ac_cv_sys_restartable_syscalls=yes \ - ac_cv_path_PS=/bin/ps \ - ac_cv_path_HOSTNAME=/bin/hostname \ - ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \ - ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes \ - ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no \ - ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \ - mysql_cv_new_rl_interface=yes - -ORACLE_MYSQL_CONF_OPTS = \ - --without-ndb-binlog \ - --without-docs \ - --without-man \ - --without-libedit \ - --with-readline \ - --with-low-memory \ - --enable-thread-safe-client \ - --with-unix-socket-path=$(MYSQL_SOCKET) \ - --disable-mysql-maintainer-mode - -# host-oracle-mysql only installs what is needed to build mysql, i.e. the -# gen_lex_hash tool, and it only builds the parts that are needed to -# create this tool -HOST_ORACLE_MYSQL_DEPENDENCIES = host-zlib host-ncurses - -HOST_ORACLE_MYSQL_CONF_OPTS = \ - --with-embedded-server \ - --disable-mysql-maintainer-mode - -define HOST_ORACLE_MYSQL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/include my_config.h - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/mysys libmysys.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/strings libmystrings.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/vio libvio.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/dbug libdbug.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/regex libregex.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sql gen_lex_hash -endef - -define HOST_ORACLE_MYSQL_INSTALL_CMDS - $(INSTALL) -m 0755 $(@D)/sql/gen_lex_hash $(HOST_DIR)/bin/ -endef - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -ORACLE_MYSQL_DEPENDENCIES += openssl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -ORACLE_MYSQL_DEPENDENCIES += zlib -ORACLE_MYSQL_CONF_OPTS += --with-zlib-dir=$(STAGING_DIR)/usr -else -ORACLE_MYSQL_CONF_OPTS += --without-zlib-dir -endif - -ifeq ($(BR2_PACKAGE_ORACLE_MYSQL_SERVER),y) -ORACLE_MYSQL_DEPENDENCIES += host-oracle-mysql host-bison - -ORACLE_MYSQL_CONF_OPTS += \ - --localstatedir=/var/mysql \ - --with-atomic-ops=up \ - --with-embedded-server \ - --without-query-cache \ - --without-plugin-partition \ - --without-plugin-daemon_example \ - --without-plugin-ftexample \ - --without-plugin-archive \ - --without-plugin-blackhole \ - --without-plugin-example \ - --without-plugin-federated \ - --without-plugin-ibmdb2i \ - --without-plugin-innobase \ - --without-plugin-innodb_plugin \ - --without-plugin-ndbcluster - -# Debugging is only available for the server, so no need for -# this if-block outside of the server if-block -ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),y) -ORACLE_MYSQL_CONF_OPTS += --with-debug=full -else -ORACLE_MYSQL_CONF_OPTS += --without-debug -endif - -define ORACLE_MYSQL_USERS - mysql -1 nobody -1 * /var/mysql - - MySQL daemon -endef - -define ORACLE_MYSQL_ADD_FOLDER - $(INSTALL) -d $(TARGET_DIR)/var/mysql -endef - -ORACLE_MYSQL_POST_INSTALL_TARGET_HOOKS += ORACLE_MYSQL_ADD_FOLDER - -define ORACLE_MYSQL_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(ORACLE_MYSQL_PKGDIR)/S97mysqld \ - $(TARGET_DIR)/etc/init.d/S97mysqld -endef - -define ORACLE_MYSQL_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(ORACLE_MYSQL_PKGDIR)/mysqld.service \ - $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service -endef - -else -ORACLE_MYSQL_CONF_OPTS += \ - --without-server -endif - -define ORACLE_MYSQL_REMOVE_TEST_PROGS - rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench -endef - -ORACLE_MYSQL_POST_INSTALL_TARGET_HOOKS += ORACLE_MYSQL_REMOVE_TEST_PROGS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) From 8708f3a23a7e28fdb04fc57406e13e6b7ff4a337 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 3 Mar 2024 21:46:41 +0100 Subject: [PATCH 129/345] package/mysql: drop virtual package Now that oracle-mysql is dropped there isn't any need for the mysql virtual package. Adjust the other packages to directly use the mariadb symbols. Signed-off-by: Peter Korsgaard --- Config.in.legacy | 8 ++++ package/Config.in | 2 +- package/apr-util/apr-util.mk | 4 +- package/collectd/Config.in | 2 +- package/collectd/collectd.mk | 4 +- package/cppdb/Config.in | 4 +- package/cppdb/cppdb.mk | 4 +- package/dovecot/Config.in | 6 +-- package/dovecot/dovecot.mk | 2 +- .../freeradius-server/freeradius-server.mk | 4 +- package/gerbera/gerbera.mk | 4 +- package/kodi/Config.in | 2 +- package/kodi/kodi.mk | 2 +- package/libdbi-drivers/libdbi-drivers.mk | 4 +- package/libodb-mysql/Config.in | 4 +- package/libodb-mysql/libodb-mysql.mk | 2 +- package/lighttpd/lighttpd.mk | 2 +- package/linknx/linknx.mk | 4 +- package/{mysql => mariadb}/Config.in | 37 ++----------------- package/mariadb/mariadb.mk | 1 - package/motion/motion.mk | 4 +- package/mysql/mysql.mk | 7 ---- package/open2300/open2300.mk | 4 +- package/perl-dbd-mysql/Config.in | 2 +- package/perl-dbd-mysql/perl-dbd-mysql.mk | 2 +- package/poco/Config.in | 2 +- package/poco/poco.mk | 2 +- package/pure-ftpd/pure-ftpd.mk | 4 +- package/qt5/qt5base/Config.in | 2 +- package/qt5/qt5base/qt5base.mk | 2 +- package/qt6/qt6base/Config.in | 2 +- package/qt6/qt6base/qt6base.mk | 2 +- package/rsyslog/rsyslog.mk | 4 +- package/sconeserver/Config.in | 2 +- package/sconeserver/sconeserver.mk | 2 +- package/strongswan/Config.in | 2 +- package/strongswan/strongswan.mk | 2 +- package/tcl/tcl.mk | 4 +- package/ulogd/ulogd.mk | 4 +- package/zabbix/Config.in | 2 +- package/zabbix/zabbix.mk | 2 +- 41 files changed, 66 insertions(+), 95 deletions(-) rename package/{mysql => mariadb}/Config.in (62%) delete mode 100644 package/mysql/mysql.mk diff --git a/Config.in.legacy b/Config.in.legacy index 918f5075af65..1b15d25d6bf1 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2024.02" +config BR2_PACKAGE_MYSQL + bool "mysql virtual package removed" + select BR2_LEGACY + help + The mysql virtual package has been removed as mariadb is the + only supported mysql variant. Use the mariadb package + instead. + config BR2_PACKAGE_ORACLE_MYSQL bool "oracle mysql removed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index bf0fe078b955..33039331f7dc 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1587,8 +1587,8 @@ menu "Database" source "package/libodb-mysql/Config.in" source "package/libodb-pgsql/Config.in" source "package/libpqxx/Config.in" + source "package/mariadb/Config.in" source "package/mongodb/Config.in" - source "package/mysql/Config.in" source "package/postgresql/Config.in" if BR2_PACKAGE_POSTGRESQL source "package/osm2pgsql/Config.in" diff --git a/package/apr-util/apr-util.mk b/package/apr-util/apr-util.mk index 02b6d5e2771a..477db1c59329 100644 --- a/package/apr-util/apr-util.mk +++ b/package/apr-util/apr-util.mk @@ -35,9 +35,9 @@ else APR_UTIL_CONF_OPTS += --without-gdbm endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) APR_UTIL_CONF_OPTS += --with-mysql="$(STAGING_DIR)/usr" -APR_UTIL_DEPENDENCIES += mysql +APR_UTIL_DEPENDENCIES += mariadb else APR_UTIL_CONF_OPTS += --without-mysql endif diff --git a/package/collectd/Config.in b/package/collectd/Config.in index a0c367c78dde..e6d549f81f18 100644 --- a/package/collectd/Config.in +++ b/package/collectd/Config.in @@ -394,7 +394,7 @@ config BR2_PACKAGE_COLLECTD_MYSQL depends on BR2_INSTALL_LIBSTDCPP # mysql depends on BR2_USE_MMU # mysql depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB help Connects to a MySQL database and issues a "show status" command. diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index 76f622b8db7b..b47b2efaba80 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -194,7 +194,7 @@ COLLECTD_DEPENDENCIES = \ $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ $(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \ $(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \ - $(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql) \ + $(if $(BR2_PACKAGE_COLLECTD_MYSQL),mariadb) \ $(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \ $(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \ $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \ @@ -224,7 +224,7 @@ endif ifeq ($(BR2_PACKAGE_LUAJIT),y) COLLECTD_CONF_ENV += LIBLUA_PKG_CONFIG_NAME=luajit endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) COLLECTD_CONF_OPTS += --with-libmysql=$(STAGING_DIR)/usr endif ifeq ($(BR2_PACKAGE_NETSNMP),y) diff --git a/package/cppdb/Config.in b/package/cppdb/Config.in index ceff0ab76f7c..1394c1efd8d7 100644 --- a/package/cppdb/Config.in +++ b/package/cppdb/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_CPPDB depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS # Can be built without them but it's useless - depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE + depends on BR2_PACKAGE_MARIADB || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE help CppDB is an SQL connectivity library that is designed to provide platform and Database independent connectivity API @@ -15,6 +15,6 @@ config BR2_PACKAGE_CPPDB http://cppcms.com/sql/cppdb/ comment "cppdb needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE + depends on BR2_PACKAGE_MARIADB || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ BR2_STATIC_LIBS diff --git a/package/cppdb/cppdb.mk b/package/cppdb/cppdb.mk index e73f04e19438..d2a901d28b2c 100644 --- a/package/cppdb/cppdb.mk +++ b/package/cppdb/cppdb.mk @@ -12,8 +12,8 @@ CPPDB_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) CPPDB_LICENSE = BSL-1.0 or MIT CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt -ifeq ($(BR2_PACKAGE_MYSQL),y) -CPPDB_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +CPPDB_DEPENDENCIES += mariadb else CPPDB_CONF_OPTS += -DDISABLE_MYSQL=ON endif diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in index 377fd4dbb84b..20b08b62bebc 100644 --- a/package/dovecot/Config.in +++ b/package/dovecot/Config.in @@ -17,9 +17,9 @@ if BR2_PACKAGE_DOVECOT config BR2_PACKAGE_DOVECOT_MYSQL bool "mysql support" - depends on BR2_INSTALL_LIBSTDCPP # mysql - depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL + depends on BR2_INSTALL_LIBSTDCPP # mariadb + depends on BR2_TOOLCHAIN_HAS_THREADS # mariadb + select BR2_PACKAGE_MARIADB help Enable MySQL support. diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index 2933401cbc09..f90996fdd7a4 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -83,7 +83,7 @@ endif ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL),y) DOVECOT_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config" DOVECOT_CONF_OPTS += --with-mysql -DOVECOT_DEPENDENCIES += mysql +DOVECOT_DEPENDENCIES += mariadb else DOVECOT_CONF_OPTS += --without-mysql endif diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 1b5751d7534a..1e8ada6bb937 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -140,9 +140,9 @@ else FREERADIUS_SERVER_CONF_OPTS += --without-rlm_cache_memcached endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) FREERADIUS_SERVER_CONF_OPTS += --with-rlm_sql_mysql -FREERADIUS_SERVER_DEPENDENCIES += mysql +FREERADIUS_SERVER_DEPENDENCIES += mariadb else FREERADIUS_SERVER_CONF_OPTS += --without-rlm_sql_mysql endif diff --git a/package/gerbera/gerbera.mk b/package/gerbera/gerbera.mk index c60d49b0f908..6616a83e7462 100644 --- a/package/gerbera/gerbera.mk +++ b/package/gerbera/gerbera.mk @@ -89,8 +89,8 @@ GERBERA_DEPENDENCIES += libupnp GERBERA_CONF_OPTS += -DWITH_NPUPNP=OFF endif -ifeq ($(BR2_PACKAGE_MYSQL),y) -GERBERA_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +GERBERA_DEPENDENCIES += mariadb GERBERA_CONF_OPTS += -DWITH_MYSQL=ON else GERBERA_CONF_OPTS += -DWITH_MYSQL=OFF diff --git a/package/kodi/Config.in b/package/kodi/Config.in index 6b68e6d504ec..8ad9fdae789b 100644 --- a/package/kodi/Config.in +++ b/package/kodi/Config.in @@ -198,7 +198,7 @@ comment "nfs support needs a toolchain w/ threads support" config BR2_PACKAGE_KODI_MYSQL bool "mysql" - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB help Enable MySQL support diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index d057eb3f053f..eebb48238a4d 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -216,7 +216,7 @@ endif ifeq ($(BR2_PACKAGE_KODI_MYSQL),y) KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=ON -KODI_DEPENDENCIES += mysql +KODI_DEPENDENCIES += mariadb else KODI_CONF_OPTS += -DENABLE_MYSQLCLIENT=OFF endif diff --git a/package/libdbi-drivers/libdbi-drivers.mk b/package/libdbi-drivers/libdbi-drivers.mk index af8db79581f7..a6ff9d9cfeda 100644 --- a/package/libdbi-drivers/libdbi-drivers.mk +++ b/package/libdbi-drivers/libdbi-drivers.mk @@ -15,8 +15,8 @@ LIBDBI_DRIVERS_AUTORECONF = YES LIBDBI_DRIVERS_CONF_OPTS = --with-dbi-libdir=$(STAGING_DIR)/usr/lib -ifeq ($(BR2_PACKAGE_MYSQL),y) -LIBDBI_DRIVERS_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +LIBDBI_DRIVERS_DEPENDENCIES += mariadb LIBDBI_DRIVERS_CONF_OPTS += --with-mysql LIBDBI_DRIVERS_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config" else diff --git a/package/libodb-mysql/Config.in b/package/libodb-mysql/Config.in index d606165f9b0d..5645ccbbfbd4 100644 --- a/package/libodb-mysql/Config.in +++ b/package/libodb-mysql/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBODB_MYSQL bool "libodb-mysql" depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_MYSQL + depends on BR2_PACKAGE_MARIADB select BR2_PACKAGE_LIBODB help This package contains the MySQL ODB runtime library. Every @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBODB_MYSQL comment "libodb-mysql needs a toolchain w/ C++, threads" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_MYSQL + depends on BR2_PACKAGE_MARIADB diff --git a/package/libodb-mysql/libodb-mysql.mk b/package/libodb-mysql/libodb-mysql.mk index 88b6f4cb31fc..427224dfb0c7 100644 --- a/package/libodb-mysql/libodb-mysql.mk +++ b/package/libodb-mysql/libodb-mysql.mk @@ -11,7 +11,7 @@ LIBODB_MYSQL_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_MYSQL_VE LIBODB_MYSQL_INSTALL_STAGING = YES LIBODB_MYSQL_LICENSE = GPL-2.0 LIBODB_MYSQL_LICENSE_FILES = LICENSE -LIBODB_MYSQL_DEPENDENCIES = libodb mysql +LIBODB_MYSQL_DEPENDENCIES = libodb mariadb LIBODB_MYSQL_CONF_ENV = \ CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" \ LIBS=`$(STAGING_DIR)/usr/bin/mysql_config --libs` diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk index 91877f8aaec3..5109e3cebb12 100644 --- a/package/lighttpd/lighttpd.mk +++ b/package/lighttpd/lighttpd.mk @@ -73,7 +73,7 @@ LIGHTTPD_CONF_OPTS += -Dwith_maxminddb=disabled endif ifeq ($(BR2_PACKAGE_LIGHTTPD_MYSQL),y) -LIGHTTPD_DEPENDENCIES += mysql +LIGHTTPD_DEPENDENCIES += mariadb LIGHTTPD_CONF_OPTS += -Dwith_mysql=enabled else LIGHTTPD_CONF_OPTS += -Dwith_mysql=disabled diff --git a/package/linknx/linknx.mk b/package/linknx/linknx.mk index dcfcd5e3f592..683e0c49cb0d 100644 --- a/package/linknx/linknx.mk +++ b/package/linknx/linknx.mk @@ -49,9 +49,9 @@ else LINKNX_CONF_OPTS += --without-lua endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) LINKNX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr -LINKNX_DEPENDENCIES += mysql +LINKNX_DEPENDENCIES += mariadb else LINKNX_CONF_OPTS += --without-mysql endif diff --git a/package/mysql/Config.in b/package/mariadb/Config.in similarity index 62% rename from package/mysql/Config.in rename to package/mariadb/Config.in index 3257253166b2..d88dda3cdacb 100644 --- a/package/mysql/Config.in +++ b/package/mariadb/Config.in @@ -1,22 +1,9 @@ -config BR2_PACKAGE_MYSQL - bool "mysql support" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Select the desired mysql provider. - -if BR2_PACKAGE_MYSQL - -choice - prompt "mysql variant" - help - Select either the oracle mysql server or the mariadb server - config BR2_PACKAGE_MARIADB bool "mariadb" depends on BR2_INSTALL_LIBSTDCPP # fmt depends on !BR2_STATIC_LIBS + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 depends on BR2_USE_WCHAR # fmt select BR2_PACKAGE_LIBAIO @@ -25,7 +12,6 @@ config BR2_PACKAGE_MARIADB select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_PCRE2 - select BR2_PACKAGE_HAS_MYSQL help MariaDB is one of the most popular database servers in the world. It's made by the original developers of MySQL and @@ -33,13 +19,11 @@ config BR2_PACKAGE_MARIADB http://www.mariadb.org/ -comment "mariadb needs a toolchain w/ dynamic library, C++, wchar" +comment "mariadb needs a toolchain w/ dynamic library, C++, threads, wchar" depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_USE_WCHAR + || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 -endchoice - if BR2_PACKAGE_MARIADB config BR2_PACKAGE_MARIADB_SERVER @@ -54,16 +38,3 @@ config BR2_PACKAGE_MARIADB_SERVER_EMBEDDED Install the mariadb embedded server on the target. endif - -config BR2_PACKAGE_HAS_MYSQL - bool - -config BR2_PACKAGE_PROVIDES_MYSQL - string - default "mariadb" if BR2_PACKAGE_MARIADB - -endif - -comment "mysql needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 7f3755892aaa..8641437d4def 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -13,7 +13,6 @@ MARIADB_LICENSE_FILES = README.md COPYING MARIADB_CPE_ID_VENDOR = mariadb MARIADB_SELINUX_MODULES = mysql MARIADB_INSTALL_STAGING = YES -MARIADB_PROVIDES = mysql MARIADB_CONFIG_SCRIPTS = mysql_config MARIADB_DEPENDENCIES = \ diff --git a/package/motion/motion.mk b/package/motion/motion.mk index a42c2ad149d6..ff5e2c1403da 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -23,8 +23,8 @@ else MOTION_CONF_OPTS += --without-ffmpeg endif -ifeq ($(BR2_PACKAGE_MYSQL),y) -MOTION_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +MOTION_DEPENDENCIES += mariadb MOTION_CONF_OPTS += --with-mysql else MOTION_CONF_OPTS += --without-mysql diff --git a/package/mysql/mysql.mk b/package/mysql/mysql.mk deleted file mode 100644 index d65562563d8d..000000000000 --- a/package/mysql/mysql.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# mysql -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package/open2300/open2300.mk b/package/open2300/open2300.mk index 9fb7dbc2fd49..74f6d720f985 100644 --- a/package/open2300/open2300.mk +++ b/package/open2300/open2300.mk @@ -15,8 +15,8 @@ OPEN2300_BINS = \ OPEN2300_CFLAGS = $(TARGET_CFLAGS) OPEN2300_LDFLAGS = $(TARGET_LDFLAGS) -ifeq ($(BR2_PACKAGE_MYSQL),y) -OPEN2300_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +OPEN2300_DEPENDENCIES += mariadb OPEN2300_BINS += mysql2300 mysqlhistlog2300 OPEN2300_CFLAGS += $(shell $(STAGING_DIR)/usr/bin/mysql_config --cflags) OPEN2300_LDFLAGS += $(shell $(STAGING_DIR)/usr/bin/mysql_config --libs) diff --git a/package/perl-dbd-mysql/Config.in b/package/perl-dbd-mysql/Config.in index 55bbc953477c..eff76f5b6196 100644 --- a/package/perl-dbd-mysql/Config.in +++ b/package/perl-dbd-mysql/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_PERL_DBD_MYSQL depends on BR2_INSTALL_LIBSTDCPP # mysql depends on BR2_USE_MMU # mysql depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB select BR2_PACKAGE_PERL_DBI # runtime help A MySQL driver for the Perl5 Database Interface (DBI). diff --git a/package/perl-dbd-mysql/perl-dbd-mysql.mk b/package/perl-dbd-mysql/perl-dbd-mysql.mk index 98521a78cfb3..e87e34100afa 100644 --- a/package/perl-dbd-mysql/perl-dbd-mysql.mk +++ b/package/perl-dbd-mysql/perl-dbd-mysql.mk @@ -9,7 +9,7 @@ PERL_DBD_MYSQL_SOURCE = DBD-mysql-$(PERL_DBD_MYSQL_VERSION).tar.gz PERL_DBD_MYSQL_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CA/CAPTTOFU PERL_DBD_MYSQL_DEPENDENCIES = \ host-perl-dbi \ - mysql + mariadb PERL_DBD_MYSQL_LICENSE = Artistic or GPL-1.0+ PERL_DBD_MYSQL_LICENSE_FILES = LICENSE PERL_DBD_MYSQL_DISTNAME = DBD-mysql diff --git a/package/poco/Config.in b/package/poco/Config.in index 820e6319662b..7cb9987ec7a9 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -46,7 +46,7 @@ config BR2_PACKAGE_POCO_DATA config BR2_PACKAGE_POCO_DATA_MYSQL bool "Data/MySQL" depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB select BR2_PACKAGE_POCO_DATA config BR2_PACKAGE_POCO_DATA_PGSQL diff --git a/package/poco/poco.mk b/package/poco/poco.mk index f8c2a658de8b..b1d5a653c487 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -15,7 +15,7 @@ POCO_DEPENDENCIES = \ pcre2 \ zlib \ $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) \ + $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mariadb) \ $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ $(if $(BR2_PACKAGE_POCO_DATA_PGSQL),postgresql) \ $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index 138b05ebb400..ffd27d7b9926 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -31,9 +31,9 @@ ifeq ($(BR2_PACKAGE_LIBSODIUM),y) PURE_FTPD_DEPENDENCIES += libsodium endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) PURE_FTPD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr -PURE_FTPD_DEPENDENCIES += mysql +PURE_FTPD_DEPENDENCIES += mariadb else PURE_FTPD_CONF_OPTS += --without-mysql endif diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 0c7ed41c46a4..6e6a7cf98409 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -62,7 +62,7 @@ if BR2_PACKAGE_QT5BASE_SQL config BR2_PACKAGE_QT5BASE_MYSQL bool "MySQL Plugin" depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB select BR2_PACKAGE_NCURSES select BR2_PACKAGE_READLINE help diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index fbd882da212e..e173639cca6b 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -129,7 +129,7 @@ endif ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y) QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config -QT5BASE_DEPENDENCIES += mysql +QT5BASE_DEPENDENCIES += mariadb else QT5BASE_CONFIGURE_OPTS += -no-sql-mysql endif diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 98a7520486b7..3b15d40c8327 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -190,7 +190,7 @@ config BR2_PACKAGE_QT6BASE_MYSQL depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB help Build MySQL plugin diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 667dd4133f0a..6857725ef5cd 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -313,7 +313,7 @@ QT6BASE_CONF_OPTS += -DFEATURE_sql_db2=OFF -DFEATURE_sql_ibase=OFF -DFEATURE_sql ifeq ($(BR2_PACKAGE_QT6BASE_MYSQL),y) QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=ON -QT6BASE_DEPENDENCIES += mysql +QT6BASE_DEPENDENCIES += mariadb else QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=OFF endif diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index 1919863f4fac..dc30a2edcd3c 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -102,8 +102,8 @@ else RSYSLOG_CONF_OPTS += --disable-impcap endif -ifeq ($(BR2_PACKAGE_MYSQL),y) -RSYSLOG_DEPENDENCIES += mysql +ifeq ($(BR2_PACKAGE_MARIADB),y) +RSYSLOG_DEPENDENCIES += mariadb RSYSLOG_CONF_OPTS += --enable-mysql RSYSLOG_CONF_ENV += ac_cv_prog_MYSQL_CONFIG=$(STAGING_DIR)/usr/bin/mysql_config else diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index 0e8a99509059..cce21fc860e4 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -67,7 +67,7 @@ config BR2_PACKAGE_SCONESERVER_MATHS config BR2_PACKAGE_SCONESERVER_MYSQL bool "mysql" depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB help MySQL module for Sconeserver diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index 89abc8d3b297..10a0a22597fd 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -63,7 +63,7 @@ SCONESERVER_CONF_OPTS += -DWITH_MATHS=OFF endif ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) -SCONESERVER_DEPENDENCIES += mysql +SCONESERVER_DEPENDENCIES += mariadb SCONESERVER_CONF_OPTS += -DWITH_MYSQL=ON else SCONESERVER_CONF_OPTS += -DWITH_MYSQL=OFF diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index 5231e69ca824..9be5fe177d70 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -193,7 +193,7 @@ config BR2_PACKAGE_STRONGSWAN_STROKE config BR2_PACKAGE_STRONGSWAN_SQL bool "Enable SQL database configuration backend" - depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MYSQL + depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MARIADB config BR2_PACKAGE_STRONGSWAN_BYPASS_LAN bool "Enable BYPASS-LAN plugin" diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index 5521fb7dd45e..41959793a315 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -80,7 +80,7 @@ STRONGSWAN_DEPENDENCIES += \ ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y) STRONGSWAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_MYSQL),mysql) + $(if $(BR2_PACKAGE_MARIADB),mariadb) endif # disable connmark/forecast until net/if.h vs. linux/if.h conflict resolved diff --git a/package/tcl/tcl.mk b/package/tcl/tcl.mk index 1943bc7b27ee..18171aebd724 100644 --- a/package/tcl/tcl.mk +++ b/package/tcl/tcl.mk @@ -35,7 +35,7 @@ HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES # We remove the bundled sqlite as we prefer to not use bundled stuff at all. define TCL_REMOVE_PACKAGES rm -fr $(@D)/pkgs/sqlite3* \ - $(if $(BR2_PACKAGE_MYSQL),,$(@D)/pkgs/tdbcmysql*) \ + $(if $(BR2_PACKAGE_MARIADB),,$(@D)/pkgs/tdbcmysql*) \ $(@D)/pkgs/tdbcodbc* \ $(if $(BR2_PACKAGE_POSTGRESQL),,$(@D)/pkgs/tdbcpostgres*) \ $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3*) @@ -74,7 +74,7 @@ endef TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_MYSQL),mysql) \ + $(if $(BR2_PACKAGE_MARIADB),mariadb) \ $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) \ zlib diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 033acb06c2f6..2ebf076d9a2b 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -22,11 +22,11 @@ ULOGD_DEPENDENCIES += libdbi else ULOGD_CONF_OPTS += --disable-dbi endif -ifeq ($(BR2_PACKAGE_MYSQL),y) +ifeq ($(BR2_PACKAGE_MARIADB),y) ULOGD_CONF_OPTS += \ --enable-mysql \ --with-mysql-config=$(STAGING_DIR)/usr/bin/mysql_config -ULOGD_DEPENDENCIES += mysql +ULOGD_DEPENDENCIES += mariadb else ULOGD_CONF_OPTS += --disable-mysql endif diff --git a/package/zabbix/Config.in b/package/zabbix/Config.in index af677f782ea6..9ac668117da1 100644 --- a/package/zabbix/Config.in +++ b/package/zabbix/Config.in @@ -39,7 +39,7 @@ config BR2_PACKAGE_ZABBIX_SERVER_MYSQL bool "mysql" depends on BR2_INSTALL_LIBSTDCPP # mysql depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL + select BR2_PACKAGE_MARIADB config BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL bool "postgresql" diff --git a/package/zabbix/zabbix.mk b/package/zabbix/zabbix.mk index 3b126caa4982..76568f5a18c2 100644 --- a/package/zabbix/zabbix.mk +++ b/package/zabbix/zabbix.mk @@ -107,7 +107,7 @@ ZABBIX_POST_INSTALL_TARGET_HOOKS += ZABBIX_SERVER_COPY_FRONTEND endif ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_MYSQL),y) -ZABBIX_DEPENDENCIES += mysql +ZABBIX_DEPENDENCIES += mariadb ZABBIX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config --without-postgresql ZABBIX_DATABASE = mysql else ifeq ($(BR2_PACKAGE_ZABBIX_SERVER_POSTGRESQL),y) From 20406b715946887902e40ffcf8815a90dcb5faaf Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 3 Mar 2024 00:29:40 +0100 Subject: [PATCH 130/345] package/rust: provide RUSTFLAGS for cargo While building the rust toolchain, the build system ends up using cargo (from [...]/output/build/host-rust-bin-1.74.1/cargo/bin/cargo) to build some tools like rustdoc-tool. But the host-rust package doesn't use the cargo infractructure (since it provides cargo binary) and our cargo environment variables [1] are not set to crosscompile cargo packages in the rust toolchain. For exemple, we usually set RUSTFLAGS="-C link-arg=-Wl,-rpath,$(HOST_DIR)/lib" to force cargo using libraries provided by Buildroot in $(HOST_DIR)/lib. RUSTFLAGS is actually needed to find zlib library (host-zlib) to link rustdoc-tool when zlib is not installed on the host. Add $(HOST_PKG_CARGO_ENV) in HOST_RUST_BUILD_CMDS since it already includes RUSTFLAGS but also CARGO_HOME. Fixes: error: could not compile `rustdoc-tool` (bin "rustdoc_tool_binary") due to previous error [1] https://gitlab.com/buildroot.org/buildroot/-/blob/2024.02-rc1/package/pkg-cargo.mk#L165 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN --- package/rust/rust.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rust/rust.mk b/package/rust/rust.mk index 4903060368d3..c544582c9982 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -70,7 +70,8 @@ define HOST_RUST_CONFIGURE_CMDS endef define HOST_RUST_BUILD_CMDS - cd $(@D); $(HOST_MAKE_ENV) $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build + cd $(@D); $(HOST_MAKE_ENV) $(HOST_PKG_CARGO_ENV) \ + $(HOST_DIR)/bin/python$(PYTHON3_VERSION_MAJOR) x.py build endef HOST_RUST_INSTALL_OPTS = \ From 15109dd7ebcf2c670c2eea31fa79460a8a1446e9 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 4 Mar 2024 19:18:41 +0100 Subject: [PATCH 131/345] package/python-django: security bump to 5.0.3 Fixes: CVE-2024-27351: Potential regular expression denial-of-service in django.utils.text.Truncator.words() [1] Remove patch that is included in this release. [1] https://docs.djangoproject.com/en/dev/releases/5.0.3/ Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- ...d-sensitive_variables-sensitive_post.patch | 45 ------------------- package/python-django/python-django.hash | 4 +- package/python-django/python-django.mk | 4 +- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch diff --git a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch b/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch deleted file mode 100644 index 90dc9c7dd0ed..000000000000 --- a/package/python-django/0001-Fixed-sensitive_variables-sensitive_post.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d294b7679f2cb51c7231d6a7fb22e76eb74e49ec Mon Sep 17 00:00:00 2001 -From: Mariusz Felisiak -Date: Sat, 17 Feb 2024 08:15:59 +0100 -Subject: [PATCH] Fixed #35187 -- Fixed - @sensitive_variables/sensitive_post_parameters decorators crash with - .pyc-only builds. - -Thanks Jon Janzen for the implementation idea. - -Thanks Marcus Hoffmann for the report. - -Regression in 38e391e95fe5258bc6d2467332dc9cd44ce6ba52. -Backport of d1be05b3e9209fd0787841c71a95819d81061187 from main - -Signed-off-by: Marcus Hoffmann -Upstream: https://github.com/django/django/commit/41a4bba817f139f3cfd94f04e728e046560c9a18 ---- - django/views/decorators/debug.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/django/views/decorators/debug.py b/django/views/decorators/debug.py -index 7ea8a540de..6540fc0651 100644 ---- a/django/views/decorators/debug.py -+++ b/django/views/decorators/debug.py -@@ -47,7 +47,6 @@ def sensitive_variables(*variables): - - try: - file_path = inspect.getfile(wrapped_func) -- _, first_file_line = inspect.getsourcelines(wrapped_func) - except TypeError: # Raises for builtins or native functions. - raise ValueError( - f"{func.__name__} cannot safely be wrapped by " -@@ -55,7 +54,8 @@ def sensitive_variables(*variables): - "Python file (not a builtin or from a native extension)." - ) - else: -- key = hash(f"{file_path}:{first_file_line}") -+ first_line_number = wrapped_func.__code__.co_firstlineno -+ key = hash(f"{file_path}:{first_line_number}") - - if variables: - coroutine_functions_to_sensitive_variables[key] = variables --- -2.34.1 - diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index 20b66a410618..d5684a083c07 100644 --- a/package/python-django/python-django.hash +++ b/package/python-django/python-django.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/django/json -md5 5d0df847e1b751a4a5d2bde1563c75fc Django-5.0.2.tar.gz -sha256 b5bb1d11b2518a5f91372a282f24662f58f66749666b0a286ab057029f728080 Django-5.0.2.tar.gz +md5 1009c48d70060cadb40000cc15a8058a Django-5.0.3.tar.gz +sha256 5fb37580dcf4a262f9258c1f4373819aacca906431f505e4688e37f3a99195df Django-5.0.3.tar.gz # Locally computed sha256 checksums sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE diff --git a/package/python-django/python-django.mk b/package/python-django/python-django.mk index 231de0b83389..258ff9e0c1c9 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.2 +PYTHON_DJANGO_VERSION = 5.0.3 PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz # The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/50/98/499a2d11eb0b22fdd55ce5895e0f5ce6d7d4957a785f237a89317cb478fa +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/e1/b1/ac6a16aaf0049637b50afbcf06b8ec2fa5c6ce42d4ae6ba66bbaf4c3609a PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From 0193f559dd4fafd6bc70168e1af5b02fcaccd987 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 4 Mar 2024 14:10:33 +0100 Subject: [PATCH 132/345] package/rauc: bump to version 1.11.2 Release Notes: https://github.com/rauc/rauc/releases/tag/v1.11.2 Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/rauc/rauc.hash | 4 ++-- package/rauc/rauc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 63aa4715e02c..6899ca94fe14 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ -# Locally calculated -sha256 391d13d709abb630c459e79e62e474e68224c5d07c816355784bba75a86a2507 rauc-1.11.1.tar.xz +# Locally calculated after checking pgp signature +sha256 e47070e97f89136ca8d0b2b044c40e68ac0f44432046176d08d66717320df4a7 rauc-1.11.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index fbdea4e23539..7bb374259fcd 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.11.1 +RAUC_VERSION = 1.11.2 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From 6e6b0cbf5270bf9164de5badfabbc6d2a6242b0e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 16:35:39 +0100 Subject: [PATCH 133/345] package/fluent-bit: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/thomas/autobuild/instance-1/output-1/host/microblaze-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/thomas/autobuild/instance-1/output-1/host/microblaze-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, from /home/thomas/autobuild/instance-1/output-1/host/microblaze-buildroot-linux-gnu/sysroot/usr/include/stdio.h:27, from /home/thomas/autobuild/instance-1/output-1/build/fluent-bit-2.1.7/tools/xxd-c/xxd-c.c:27: /home/thomas/autobuild/instance-1/output-1/host/microblaze-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround was present since the addition of the package in commit 6a0f7c39bcb48fc13aa2ce3fc4996baf1be66483 and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - http://autobuild.buildroot.org/results/ff5c60cd038550453ce138fe2a9383af2f5d6f2f Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index e51322aad680..00a8904c55b8 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -12,8 +12,6 @@ FLUENT_BIT_CPE_ID_VENDOR = treasuredata FLUENT_BIT_CPE_ID_PRODUCT = fluent_bit FLUENT_BIT_DEPENDENCIES = host-bison host-flex libyaml openssl -FLUENT_BIT_CFLAGS = $(TARGET_CFLAGS) - FLUENT_BIT_CONF_OPTS += \ -DFLB_DEBUG=No \ -DFLB_RELEASE=Yes \ @@ -55,11 +53,6 @@ FLUENT_BIT_CONF_OPTS += \ FLUENT_BIT_CONF_OPTS += \ -DCMAKE_INSTALL_SYSCONFDIR="/etc/" -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# https://bugzilla.redhat.com/show_bug.cgi?id=574992 -FLUENT_BIT_CFLAGS += -U_FILE_OFFSET_BITS - ifeq ($(BR2_PACKAGE_LIBEXECINFO),y) FLUENT_BIT_DEPENDENCIES += libexecinfo FLUENT_BIT_LDFLAGS += -lexecinfo @@ -76,8 +69,7 @@ FLUENT_BIT_LDFLAGS += -latomic endif FLUENT_BIT_CONF_OPTS += \ - -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" \ - -DCMAKE_C_FLAGS="$(FLUENT_BIT_CFLAGS)" + -DCMAKE_EXE_LINKER_FLAGS="$(FLUENT_BIT_LDFLAGS)" define FLUENT_BIT_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/fluent-bit/S99fluent-bit \ From b146a0b944dedf45153348761ac313ca9062a7c0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 16:50:09 +0100 Subject: [PATCH 134/345] package/rauc-hawkbit-updater: fix build with gcc 4.8 Fix the following build failure with gcc 4.8 raised since the addition of the package in commit 928b7219cd7079864eadadc66dbff21c5cd72804: ../src/hawkbit-client.c:873:17: error: 'for' loop initial declarations are only allowed in C99 mode for (const gint *code = &resumable_codes[0]; *code; code++) ^ ../src/hawkbit-client.c:873:17: note: use option -std=c99 or -std=gnu99 to compile your code Fixes: 928b7219cd7079864eadadc66dbff21c5cd72804 - http://autobuild.buildroot.org/results/e275d0ec4fe1da418a6163b46666316034b83b19 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk index a453f75a28c3..3836d3c84e34 100644 --- a/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk +++ b/package/rauc-hawkbit-updater/rauc-hawkbit-updater.mk @@ -10,5 +10,6 @@ RAUC_HAWKBIT_UPDATER_SOURCE = rauc-hawkbit-updater-$(RAUC_HAWKBIT_UPDATER_VERSIO RAUC_HAWKBIT_UPDATER_LICENSE = LGPL-2.1 RAUC_HAWKBIT_UPDATER_LICENSE_FILES = LICENSE RAUC_HAWKBIT_UPDATER_DEPENDENCIES = json-glib libcurl +RAUC_HAWKBIT_UPDATER_CFLAGS = $(TARGET_CFLAGS) -std=c99 $(eval $(meson-package)) From a9ccdc11704de3ac7aac892080e2cd8561dc3482 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 16:54:26 +0100 Subject: [PATCH 135/345] package/tllist: fix build with gcc 4.8 Fix the following build failure with gcc 4.8 raised since the addition of the package in commit 996b786cfc03c3cf2ac631045650545c901e3075: In file included from ../test.c:7:0: ../test.c: In function 'main': ../tllist.h:213:17: error: 'for' loop initial declarations are only allowed in C99 mode for (int _i = 0; _i < __insize; _i++) { \ ^ Fixes: 996b786cfc03c3cf2ac631045650545c901e3075 - http://autobuild.buildroot.org/results/e82fdf4f9ef199e1baa169d38a75872bddd4e6dd Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/tllist/tllist.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/tllist/tllist.mk b/package/tllist/tllist.mk index 88a28d242756..69a34a65ab8f 100644 --- a/package/tllist/tllist.mk +++ b/package/tllist/tllist.mk @@ -12,5 +12,6 @@ TLLIST_LICENSE_FILES = LICENSE # header only TLLIST_INSTALL_TARGET = NO TLLIST_INSTALL_STAGING = YES +TLLIST_CFLAGS = $(TARGET_CFLAGS) -std=c99 $(eval $(meson-package)) From d4fdd78a7207935c24427bbe736c443f0ad2a745 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 17:19:53 +0100 Subject: [PATCH 136/345] package/libva: fix build with gcc 4.8 Fix the following build failure with gcc 4.8 raised since bump to version 2.20.0 in commit e926c83928e08c0ecd6cd4383e1cca151a8a4d2c and https://github.com/intel/libva/commit/4f5a4345fc9f92565763ca22026891475e3cf835: ../va/va.c: In function 'va_new_opendriver': ../va/va.c:695:9: error: 'for' loop initial declarations are only allowed in C99 mode for (unsigned int i = 0; i < num_drivers; i++) ^ ../va/va.c:695:9: note: use option -std=c99 or -std=gnu99 to compile your code Fixes: e926c83928e08c0ecd6cd4383e1cca151a8a4d2c - http://autobuild.buildroot.org/results/b9dbd104fa05c59883d87f74e6522c55620a4252 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libva/libva.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 9e9d5d698cb8..4481be9e7bb9 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -10,6 +10,7 @@ LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING LIBVA_INSTALL_STAGING = YES LIBVA_DEPENDENCIES = host-pkgconf libdrm +LIBVA_CFLAGS = $(TARGET_CFLAGS) -std=gnu99 # libdrm is a hard-dependency LIBVA_CONF_OPTS = \ From 11a577c19e23d0b774f357b2d62ac3c41b7f201f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 17:07:57 +0100 Subject: [PATCH 137/345] package/botan: needs C++20 C++20 is mandatory since bump to version 3.2.0 in commit 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 and https://github.com/randombit/botan/commit/e2efb744ceda875b193bc5ce589f2c45ceaa3a82 resulting in the following build failure: powerpc-linux-g++.br_real: error: unrecognized command line option '-std=c++20'; did you mean '-std=c++2a'? BR2_TOOLCHAIN_HAS_GCC_BUG_64735 dependency can be dropped as gcc > 7 is not affected by this bug Fixes: 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 - http://autobuild.buildroot.org/results/4171515ce33832fb07c8b42cda2575067f9e9859 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/botan/Config.in | 11 +++-------- package/strongswan/Config.in | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/package/botan/Config.in b/package/botan/Config.in index 8f7f3f5c7aa0..5c3f31726eb0 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -14,10 +14,9 @@ config BR2_PACKAGE_BOTAN_ARCH_SUPPORTS config BR2_PACKAGE_BOTAN bool "botan" depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS help @@ -25,11 +24,7 @@ config BR2_PACKAGE_BOTAN http://botan.randombit.net -comment "botan needs a toolchain w/ C++, threads, gcc >= 4.8" +comment "botan needs a toolchain w/ C++, threads, gcc >= 10" depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS - -comment "botan needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in index 9be5fe177d70..a62688f9c37b 100644 --- a/package/strongswan/Config.in +++ b/package/strongswan/Config.in @@ -35,19 +35,14 @@ config BR2_PACKAGE_STRONGSWAN_BOTAN bool "botan" depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # botan select BR2_PACKAGE_BOTAN -comment "botan backend needs a toolchain w/ C++, gcc >= 4.8" +comment "botan backend needs a toolchain w/ C++, gcc >= 10" depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS -comment "botan backend needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - config BR2_PACKAGE_STRONGSWAN_OPENSSL bool "OpenSSL" select BR2_PACKAGE_OPENSSL From fd484c1f57781aed6e99a61cbfae21e0edbe7dd8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 4 Mar 2024 18:07:23 +0100 Subject: [PATCH 138/345] package/poco: fix BR2_SHARED_STATIC_LIBS build poco can't be built statically since commit 073a89196a22f995c142cd11640d3cfb7cef691d. However, commit add7c433d250e153d9e58fe7da3bd52171ba2652 enabled static (and shared) build with BR2_SHARED_STATIC_LIBS resulting in the following build failure since at least version 1.11.1: /home/buildroot/autobuild/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips-buildroot-linux-gnu/11.2.0/../../../../mips-buildroot-linux-gnu/bin/ld: /home/buildroot/autobuild/instance-1/output-1/build/poco-1.11.1/lib/Linux/mips/libPocoXML.a(ParserEngine.o): in function `Poco::XML::ParserEngine::handleStartElement(void*, char const*, char const**)': ParserEngine.cpp:(.text+0x2f8): undefined reference to `XML_GetSpecifiedAttributeCount' Fixes: add7c433d250e153d9e58fe7da3bd52171ba2652 - http://autobuild.buildroot.org/results/afc434a13d5e7a8affa4abb4058d7bebc81aca29 - http://autobuild.buildroot.org/results/860b70a8c9c4a6a53247ac4bdb4fd0851b28c61a Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/poco/poco.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/poco/poco.mk b/package/poco/poco.mk index b1d5a653c487..cc8a22fc2a3e 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -57,13 +57,7 @@ ifeq ($(BR2_SOFT_FLOAT),y) POCO_CONF_OPTS += --no-fpenvironment endif -ifeq ($(BR2_STATIC_LIBS),y) -POCO_MAKE_TARGET = static_release -else ifeq ($(BR2_SHARED_LIBS),y) POCO_MAKE_TARGET = shared_release -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -POCO_MAKE_TARGET = all_release -endif POCO_LDFLAGS=$(TARGET_LDFLAGS) ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) From 4766ace0d05dd264c37ee923634b897ba0dd3a43 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 09:56:16 +0100 Subject: [PATCH 139/345] package/openblas: fix mips64 build Use MIPS64_GENERIC instead of SICORTEX with mips64 to avoid the following build failure raised at least since bump to version 0.3.25 in commit 6a172ffe6b2aa5c59427696775cfa4c189f99c19: ../kernel/mips64/amax.S:76: Error: opcode not supported on this processor: mips64 (mips64) `mtc1 $0,$f0' MIPS64_GENERIC is available since version 0.3.22 and https://github.com/OpenMathLib/OpenBLAS/commit/a50b29c540c25baf8f788131cc905ebe0575f253 Fixes: - http://autobuild.buildroot.org/results/b8da10aeb16343540ce3672faabdaa4d3bffb020 - http://autobuild.buildroot.org/results/32702ccaa2384252058840960d8998abca294fad Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/openblas/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/openblas/Config.in b/package/openblas/Config.in index 26a76d29fbfb..74c4a3aa5cc0 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -28,7 +28,7 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "PPC440FP2" if BR2_powerpc_440fp # P5600 is built with MSA support which is only available in Codescape toolchains default "P5600" if BR2_mips_p5600 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - default "SICORTEX" if BR2_MIPS_CPU_MIPS64 + default "MIPS64_GENERIC" if BR2_MIPS_CPU_MIPS64 # I6400 is built with MSA support which is only available in Codescape toolchains default "I6400" if BR2_mips_i6400 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS # OpenBLAS assumes SPARC=Sparc v9 From 06026055fcef1d36f586c5e808ca595b9ab782f2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 10:13:02 +0100 Subject: [PATCH 140/345] package/ltp-testsuite: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: configure:5239: /home/autobuild/autobuild/instance-1/output-1/host/bin/mips-buildroot-linux-gnu-gcc -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 -Os -g2 -I/home/autobuild/autobuild/instance-1/output-1/host/bin/../mips-buildroot-linux-gnu/sysroot/usr/include/tirpc -fno-builtin -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_TIME_BITS=64 conftest.c >&5 In file included from /home/autobuild/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/autobuild/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/bits/libc-header-start.h:33, from /home/autobuild/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/limits.h:26, from /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/mips-buildroot-linux-gnu/13.2.0/include/limits.h:205, from /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/mips-buildroot-linux-gnu/13.2.0/include/syslimits.h:7, from /home/autobuild/autobuild/instance-1/output-1/host/lib/gcc/mips-buildroot-linux-gnu/13.2.0/include/limits.h:34, from conftest.c:12: /home/autobuild/autobuild/instance-1/output-1/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ [...] checking for /home/autobuild/autobuild/instance-1/output-1/host/bin/mips-buildroot-linux-gnu-gcc options needed to detect all undeclared functions... cannot detect configure: error: in `/home/autobuild/autobuild/instance-1/output-1/build/ltp-testsuite-20240129': configure: error: cannot make /home/autobuild/autobuild/instance-1/output-1/host/bin/mips-buildroot-linux-gnu-gcc report undeclared builtins Indeed, this LFS workaround was added by commit ca3524ba707126de7284210c00268a8e7ca6379a and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: - http://autobuild.buildroot.org/results/d2e75a79bc42b6a9a2b407fd557aca5c7f207d84 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ltp-testsuite/ltp-testsuite.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/ltp-testsuite/ltp-testsuite.mk b/package/ltp-testsuite/ltp-testsuite.mk index ea57686a9c23..0996b77e5869 100644 --- a/package/ltp-testsuite/ltp-testsuite.mk +++ b/package/ltp-testsuite/ltp-testsuite.mk @@ -47,10 +47,7 @@ else LTP_TESTSUITE_CONF_ENV += have_numa_headers=no endif -# ltp-testsuite uses , which isn't compatible with largefile -# support. -LTP_TESTSUITE_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) -LTP_TESTSUITE_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) +LTP_TESTSUITE_CFLAGS = $(TARGET_CFLAGS) LTP_TESTSUITE_LIBS = ifeq ($(BR2_PACKAGE_LIBTIRPC),y) @@ -66,7 +63,6 @@ endif LTP_TESTSUITE_CONF_ENV += \ CFLAGS="$(LTP_TESTSUITE_CFLAGS)" \ - CPPFLAGS="$(LTP_TESTSUITE_CPPFLAGS)" \ LIBS="$(LTP_TESTSUITE_LIBS)" \ SYSROOT="$(STAGING_DIR)" From 87e979e4572449ecb7d2058b02d642b38cc3b0f8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 5 Mar 2024 14:46:21 +0100 Subject: [PATCH 141/345] Update for 2024.02 Signed-off-by: Peter Korsgaard --- CHANGES | 16 ++++++++++++++++ Makefile | 4 ++-- docs/website/download.html | 22 +++++++++++----------- docs/website/news.html | 21 +++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 5 files changed, 51 insertions(+), 14 deletions(-) diff --git a/CHANGES b/CHANGES index d5f1bf579499..8f0b4042fa1f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,19 @@ +2024.02, released March 5th, 2024 + + Various fixes. + + Updated/fixed packages: botan, conmon, dash, efivar, expat, + fluent-bit, gcc, gst1-vaapi, libcoap, libselinux, liburing, + libva, libxml2, ltp-testsuite, luvi, newlib-bare-metal, + nginx-naxsi, octave, openblas, openvmtools, parted, poco, + powertop, python-aiohttp, python-cheroot, python-django, + python-grpcio, rauc, rauc-hawkbit-updater, rtl8822cs, rust, + sdl2, shadow, spirv-tools, strace, strongswan, tar, tllist, + vim + + Removed packages: mysql (virtual), oracle-mysql, + python-setuptools-scm-git-archive + 2024.02-rc2, released March 1st, 2024 Fixes all over the tree. diff --git a/Makefile b/Makefile index 3389da2852c8..6d5e9a797229 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02-rc2 +export BR2_VERSION := 2024.02 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1709318000 +BR2_VERSION_EPOCH = 1709640000 # 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 70a1de5b6d2d..c1393134df29 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,40 +8,40 @@
          Download
          -

          Latest long term support release: 2023.02.10

          +

          Latest stable / long term support release: 2024.02

          - +
          - +
          -

          buildroot-2023.02.10.tar.gz

          -

          PGP signature

          +

          buildroot-2024.02.tar.gz

          +

          PGP signature

          - +
          - +
          -

          buildroot-2023.02.10.tar.xz

          -

          PGP signature

          +

          buildroot-2024.02.tar.xz

          +

          PGP signature

          - + This and earlier releases (and their PGP signatures) can always be downloaded from http://buildroot.net/downloads/.
          diff --git a/docs/website/news.html b/docs/website/news.html index f142515889f9..a51da7f4bb77 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,27 @@

          News

            +
          • +
            +
            +
            +

            2023.02 released

            +

            5 March 2024

            +
            +
            +

            The stable 2024.02 release is out - Thanks to everyone + contributing and testing the release candidates. See the + CHANGES + file for more details + and go to the downloads page to pick up the + 2024.02 release.

            + +

            Notice that this is a long term support release which will be + supported with security and other important fixes until March 2025.

            +
            +
            +
            • +
          • diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index ba06c5f5fd01..73bdcc8b5e7b 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.11.2' +RELEASE='2024.02' ### Change here for more memory/cores ### VM_MEMORY=2048 From c5c15b606bb56a4ff77cd935de8cccb01202ddda Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 5 Mar 2024 16:16:25 +0100 Subject: [PATCH 142/345] docs/website/news.html: add 2024.02 announcement link And fix the s/2023/2024 typo in the title. Signed-off-by: Peter Korsgaard --- docs/website/news.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/website/news.html b/docs/website/news.html index a51da7f4bb77..4d19605e8b9a 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -13,14 +13,15 @@

            News

            -

            2023.02 released

            +

            2024.02 released

            5 March 2024

            The stable 2024.02 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2024.02 release.

            From 38b9fee944c05191f086b62238e8a73558db1f38 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 5 Mar 2024 16:17:28 +0100 Subject: [PATCH 143/345] Kickoff 2024.05 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6d5e9a797229..91973cca6062 100644 --- a/Makefile +++ b/Makefile @@ -90,7 +90,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02 +export BR2_VERSION := 2024.05-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1709640000 From a94f816e4595e651e78eebfa49fa695cfe44cd77 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 5 Mar 2024 16:34:54 -0800 Subject: [PATCH 144/345] package/go: security bump to go1.21.8 Fixes the following CVEs: CVE-2024-24783: crypto/x509: Verify panics on certificates with an unknown public key algorithm CVE-2023-45290: net/http: memory exhaustion in Request.ParseMultipartForm CVE-2023-45289: net/http, net/http/cookiejar: incorrect forwarding of sensitive headers and cookies on HTTP redirect CVE-2024-24785: html/template: errors returned from MarshalJSON methods may break template escaping CVE-2024-24784: net/mail: comments in display names are incorrectly handled https://go.dev/doc/devel/release#go1.21.8 Signed-off-by: Christian Stewart 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 d008019e94bb..b1aed10c7c4a 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6 go1.21.7.src.tar.gz +sha256 dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 go1.21.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 9efd4a3123e9..3ca055b25d78 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.7 +GO_VERSION = 1.21.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 2695f48ead67e951668d20240dbb9ad122d20f1d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 16:59:20 +0100 Subject: [PATCH 145/345] package/ell: bump to version 0.63 https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.63 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/ell/ell.hash | 2 +- package/ell/ell.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ell/ell.hash b/package/ell/ell.hash index 8bc61ee293ac..f5ded676c3d2 100644 --- a/package/ell/ell.hash +++ b/package/ell/ell.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/libs/ell/sha256sums.asc -sha256 c21ba3530d530c736f9b3e6acc954d4404c1ce4abaf2a4694e46ecec17653fa0 ell-0.61.tar.xz +sha256 7397c76996d7646b9917ebf016cd67586b10166295af2e0e18cdb5b8f6659965 ell-0.63.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/ell/ell.mk b/package/ell/ell.mk index 300c1eee885a..f43dbdb5f7e2 100644 --- a/package/ell/ell.mk +++ b/package/ell/ell.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELL_VERSION = 0.61 +ELL_VERSION = 0.63 ELL_SOURCE = ell-$(ELL_VERSION).tar.xz ELL_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ell ELL_LICENSE = LGPL-2.1+ From e2bcdcdd109561780e5e419ccaa3ca5135fa7b3e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 16:59:21 +0100 Subject: [PATCH 146/345] package/iwd: security bump to version 2.16 Fix CVE-2023-52161: The Access Point functionality in eapol_auth_key_handle in eapol.c in iNet wireless daemon (IWD) before 2.14 allows attackers to gain unauthorized access to a protected Wi-Fi network. An attacker can complete the EAPOL handshake by skipping Msg2/4 and instead sending Msg4/4 with an all-zero key. https://git.kernel.org/pub/scm/network/wireless/iwd.git/tree/ChangeLog?h=2.16 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/iwd/iwd.hash | 2 +- package/iwd/iwd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iwd/iwd.hash b/package/iwd/iwd.hash index 4eea644842c6..3f18146e133e 100644 --- a/package/iwd/iwd.hash +++ b/package/iwd/iwd.hash @@ -1,5 +1,5 @@ # From https://mirrors.edge.kernel.org/pub/linux/network/wireless/sha256sums.asc -sha256 f7ac93aeef672604f5b5194ca038035ae222925be392c4345873c9742f477797 iwd-2.6.tar.xz +sha256 c1a82032e994861e794cf3b5a16d07ae1aa03a6674f716c73408ffeae2a233ba iwd-2.16.tar.xz # License files sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING diff --git a/package/iwd/iwd.mk b/package/iwd/iwd.mk index f20427114b56..af6b2f849a7e 100644 --- a/package/iwd/iwd.mk +++ b/package/iwd/iwd.mk @@ -4,7 +4,7 @@ # ################################################################################ -IWD_VERSION = 2.6 +IWD_VERSION = 2.16 IWD_SOURCE = iwd-$(IWD_VERSION).tar.xz IWD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/wireless IWD_LICENSE = LGPL-2.1+ From 1c2dbcdcf0bb589d325c379246acaa39bb07b7be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 14:21:48 +0100 Subject: [PATCH 147/345] package/libcgroup: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from ../include/libcgroup/error.h:9, from ../include/libcgroup.h:21, from log.c:15: /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround is there since the addition of the package in commit ff7191c12e88b044848f6655f7015335235bdc7a and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/libcgroup/libcgroup.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk index cfe1d0f9f860..28f572d3256f 100644 --- a/package/libcgroup/libcgroup.mk +++ b/package/libcgroup/libcgroup.mk @@ -12,13 +12,6 @@ LIBCGROUP_CPE_ID_VALID = YES LIBCGROUP_DEPENDENCIES = host-bison host-flex LIBCGROUP_INSTALL_STAGING = YES -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. See https://bugzilla.redhat.com/show_bug.cgi?id=574992 -# for more information. -LIBCGROUP_CONF_ENV = \ - CXXFLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" - LIBCGROUP_CONF_OPTS = \ --disable-daemon \ --disable-initscript-install From 85acd9b5b9b46808749d1618b26789c782cc81a0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 14:47:46 +0100 Subject: [PATCH 148/345] package/restorecond: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/fts.h:53, from restore.h:6, from restore.c:1: /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround was there since the addititon of the package in commit 9d6da7a264a5b36ad641a0d26b3a3d27188d3624 and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/restorecond/restorecond.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/restorecond/restorecond.mk b/package/restorecond/restorecond.mk index cd409052305f..96ef8d2a5077 100644 --- a/package/restorecond/restorecond.mk +++ b/package/restorecond/restorecond.mk @@ -11,13 +11,8 @@ RESTORECOND_LICENSE_FILES = LICENSE RESTORECOND_DEPENDENCIES = libglib2 libsepol libselinux dbus-glib -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information RESTORECOND_MAKE_OPTS += \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" \ ARCH="$(BR2_ARCH)" # We need to pass DESTDIR at build time because it's used by From 0ac2d5a41ad776b493e6b0c44c760968a28ec81e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 14:57:24 +0100 Subject: [PATCH 149/345] package/policycoreutils: fix build with BR2_TIME_BITS_64 Do not remove _FILE_OFFSET_BITS=64 from CFLAGS and CPPFLAGS to avoid the following build failure with BR2_TIME_BITS_64 raised since commit 3c427c64726560ea1743282a3fdb78f5b28692eb: In file included from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features.h:394, from /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/errno.h:25, from pp.c:20: /home/fabrice/buildroot/output/host/mips-buildroot-linux-gnu/sysroot/usr/include/features-time64.h:26:5: error: #error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" 26 | # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" | ^~~~~ Indeed, this LFS workaround was there since the addition of the package in commit cb328f77f8f07bfd89d6b69385c941a7b281732b and is only needed to fix a build failure with the old codesourcery-arm toolchain from 2014 which uses glibc < 2.23. as glibc 2.23 was released in February 2016: https://sourceware.org/glibc/wiki/Release/2.23, drop this workaround as already done for libselinux in commit c1fa9bc2f7a4e5481edf4fce5c03dd45862fe72c. A follow-up patch will also drop codesourcery-arm toolchain. Fixes: 3c427c64726560ea1743282a3fdb78f5b28692eb - No autobuilder failures (yet) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/policycoreutils/policycoreutils.mk | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/package/policycoreutils/policycoreutils.mk b/package/policycoreutils/policycoreutils.mk index 61d91066d401..0e639760fa66 100644 --- a/package/policycoreutils/policycoreutils.mk +++ b/package/policycoreutils/policycoreutils.mk @@ -11,7 +11,7 @@ POLICYCOREUTILS_LICENSE_FILES = LICENSE POLICYCOREUTILS_CPE_ID_VENDOR = selinuxproject POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng $(TARGET_NLS_DEPENDENCIES) -POLICYCOREUTILS_MAKE_OPTS = LDLIBS=$(TARGET_NLS_LIBS) +POLICYCOREUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) LDLIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_LINUX_PAM),y) POLICYCOREUTILS_DEPENDENCIES += linux-pam @@ -28,14 +28,6 @@ ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_PACKAGE_AUDIT),yy) POLICYCOREUTILS_MAKE_OPTS += LSPP_PRIV=y endif -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -POLICYCOREUTILS_MAKE_OPTS += \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" - POLICYCOREUTILS_MAKE_DIRS = \ load_policy newrole run_init \ secon semodule sestatus setfiles \ @@ -59,14 +51,9 @@ endef HOST_POLICYCOREUTILS_DEPENDENCIES = host-libsemanage -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -# We also need to pass PREFIX because it defaults to $(DESTDIR)/usr +# We need to pass PREFIX because it defaults to $(DESTDIR)/usr HOST_POLICYCOREUTILS_MAKE_OPTS = \ $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(HOST_CPPFLAGS) -U_FILE_OFFSET_BITS" \ PREFIX=$(HOST_DIR) \ ETCDIR=$(HOST_DIR)/etc \ SBINDIR=$(HOST_DIR)/sbin From c944f455adf9730b1c72e70cf5b5e14a64a470be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 13:52:56 +0100 Subject: [PATCH 150/345] package/botan: fix build without NPTL botan unconditionally uses pthread_setname_np since bump to version 3.2.0 in commit 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 and https://github.com/randombit/botan/commit/313e439c786d68bcf374b2cb0edfe3ffd891db94 resulting in the following build failure: src/lib/utils/os_utils.cpp:625:22: error: 'pthread_setname_np' was not declared in this scope 625 | static_cast(pthread_setname_np(thread.native_handle(), name.c_str())); | ^~~~~~~~~~~~~~~~~~ So only enable threads if NPTL is available Fixes: 2f8feb66204ff661e9fd5f508e2dfd1ebc0f2813 - http://autobuild.buildroot.org/results/03677de6270ff5de61fff2a76e5cd723aa34e64e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/botan/Config.in | 5 ++--- package/botan/botan.mk | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/botan/Config.in b/package/botan/Config.in index 5c3f31726eb0..c74128bb9d32 100644 --- a/package/botan/Config.in +++ b/package/botan/Config.in @@ -15,7 +15,6 @@ config BR2_PACKAGE_BOTAN bool "botan" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_GCC_AT_LEAST_10 # C++20 - depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS select BR2_PACKAGE_BOOST_FILESYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS select BR2_PACKAGE_BOOST_SYSTEM if BR2_PACKAGE_BOOST && BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS @@ -24,7 +23,7 @@ config BR2_PACKAGE_BOTAN http://botan.randombit.net -comment "botan needs a toolchain w/ C++, threads, gcc >= 10" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ +comment "botan needs a toolchain w/ C++, gcc >= 10" + depends on !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_GCC_AT_LEAST_10 depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS diff --git a/package/botan/botan.mk b/package/botan/botan.mk index 88dbfa580727..95352ea41b11 100644 --- a/package/botan/botan.mk +++ b/package/botan/botan.mk @@ -48,6 +48,12 @@ else BOTAN_CONF_OPTS += --without-stack-protector endif +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y) +BOTAN_CONF_OPTS += --with-os-feature=threads +else +BOTAN_CONF_OPTS += --without-os-feature=threads +endif + ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) BOTAN_CONF_OPTS += --without-os-feature=explicit_bzero,getauxval,getentropy endif From 2824aa8a23a765b660219c129d4980f1b7c7691c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2024 16:40:03 +0100 Subject: [PATCH 151/345] package/php: add libucontext optional dependency Select libucontext if the toolchain doesn't support ucontext to allow building php on musl Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/php/Config.in | 3 +++ package/php/php.mk | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/package/php/Config.in b/package/php/Config.in index 69b4268c1d4d..af8574ac7547 100644 --- a/package/php/Config.in +++ b/package/php/Config.in @@ -9,6 +9,7 @@ config BR2_PACKAGE_PHP_ARCH_SUPPORTS default y if BR2_RISCV_64 default y if BR2_s390x default y if BR2_TOOLCHAIN_HAS_UCONTEXT + default y if BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS config BR2_PACKAGE_PHP bool "php" @@ -25,6 +26,8 @@ config BR2_PACKAGE_PHP BR2_USE_MMU select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU select BR2_PACKAGE_PCRE2 + select BR2_PACKAGE_LIBUCONTEXT if \ + BR2_PACKAGE_LIBUCONTEXT_ARCH_SUPPORTS help PHP is a widely-used general-purpose scripting language that is especially suited for Web development diff --git a/package/php/php.mk b/package/php/php.mk index 4daf7f633dc5..28893be4c644 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -40,6 +40,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) PHP_EXTRA_LIBS += -latomic endif +ifeq ($(BR2_PACKAGE_LIBUCONTEXT),y) +PHP_DEPENDENCIES += libucontext +PHP_EXTRA_LIBS += -lucontext +endif + ifeq ($(call qstrip,$(BR2_TARGET_LOCALTIME)),) PHP_LOCALTIME = UTC else From 5fb79cad04d73f18a5a1316152573ac1abc2b06d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2024 12:47:10 +0100 Subject: [PATCH 152/345] package/iozone: fix uclibc build Fix the following uclibc build failure raised since bump to version 3.506 in commit 57008d384bc1f2e42d6add6cd73203e11a75d6c9: /home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/12.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: iozone_linux-noaio.o: in function `read_perf_test': iozone.c:(.text+0x11a74): undefined reference to `end_async' Fixes: - http://autobuild.buildroot.org/results/31a4f0ac9eeb71df5d2f40ffe9f1f256cb58e399 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- .../iozone/0002-fix-build-without-aio.patch | 176 ++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 package/iozone/0002-fix-build-without-aio.patch diff --git a/package/iozone/0002-fix-build-without-aio.patch b/package/iozone/0002-fix-build-without-aio.patch new file mode 100644 index 000000000000..8b54bef4e1df --- /dev/null +++ b/package/iozone/0002-fix-build-without-aio.patch @@ -0,0 +1,176 @@ +Fix build without ASYNC_IO + +Fix the following build failure without ASYNC_IO: + +/home/buildroot/autobuild/run/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mipsel-buildroot-linux-uclibc/12.3.0/../../../../mipsel-buildroot-linux-uclibc/bin/ld: iozone_linux-noaio.o: in function `read_perf_test': +iozone.c:(.text+0x11a74): undefined reference to `end_async' + +Fixes: + - http://autobuild.buildroot.org/results/31a4f0ac9eeb71df5d2f40ffe9f1f256cb58e399 + +Signed-off-by: Fabrice Fontaine +Upstream: sent to capps@iozone.org + +diff '--color=auto' -Nura iozone3_506.orig/src/current/iozone.c iozone3_506/src/current/iozone.c +--- iozone3_506.orig/src/current/iozone.c 2024-03-06 12:28:16.734023725 +0100 ++++ iozone3_506/src/current/iozone.c 2024-03-06 12:39:14.453991162 +0100 +@@ -9153,6 +9153,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -9160,6 +9161,7 @@ + end_async(gc); + gc=0; + } ++#endif + buffer1=0; + if(hist_summary) + { +@@ -9634,6 +9636,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -9641,6 +9644,7 @@ + end_async(gc); + gc=0; + } ++#endif + if(rlocking) + { + lock_offset=I_LSEEK(fd,0,SEEK_CUR); +@@ -10097,6 +10101,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -10104,6 +10109,7 @@ + end_async(gc); + gc=0; + } ++#endif + if(rlocking) + { + mylockr((int) fd, (int) 0, (int)1, +@@ -10749,6 +10755,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -10756,6 +10763,7 @@ + end_async(gc); + gc=0; + } ++#endif + + /* This is a bit tricky. The goal is to read with a stride through + the file. The problem is that you need to touch all of the file +@@ -15485,6 +15493,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -15492,6 +15501,7 @@ + end_async(gc); + gc=0; + } ++#endif + read_so_far+=reclen/1024; + r_traj_bytes_completed+=reclen; + r_traj_ops_completed++; +@@ -16050,6 +16060,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -16057,6 +16068,7 @@ + end_async(gc); + gc=0; + } ++#endif + read_so_far+=reclen/1024; + r_traj_bytes_completed+=reclen; + r_traj_ops_completed++; +@@ -16665,6 +16677,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -16672,6 +16685,7 @@ + end_async(gc); + gc=0; + } ++#endif + re_read_so_far+=reclen/1024; + r_traj_bytes_completed+=reclen; + r_traj_ops_completed++; +@@ -17244,6 +17258,7 @@ + lock_offset, reclen); + } + current_position+=reclen; ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -17251,6 +17266,7 @@ + end_async(gc); + gc=0; + } ++#endif + t_offset = (off64_t)reclen*2; + if (!(h_flag || k_flag || mmapflag)) + { +@@ -17778,6 +17794,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -17785,6 +17802,7 @@ + end_async(gc); + gc=0; + } ++#endif + if(current_position + (stride * reclen) >= (numrecs64 * reclen)-reclen) + { + current_position=0; +@@ -18528,6 +18546,7 @@ + } + } + } ++#ifdef ASYNC_IO + if(async_flag) + { + if(no_copy_flag) +@@ -18535,6 +18554,7 @@ + end_async(gc); + gc=0; + } ++#endif + ranread_so_far+=reclen/1024; + if(*stop_flag) + { From b8db5c466046dc2f3d9c411e6c9924667dd1a40c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2024 13:18:23 +0100 Subject: [PATCH 153/345] package/squid: needs gcc and host gcc >= 8 cf_gen.cc is compiled by host compiler and unconditionally uses auto since bump to version 6.6 in commit c13199c9326fa2daa574f08ec8fc063a48d0eb06 and https://github.com/squid-cache/squid/commit/09835feb258c3058d028918e36d959dccb3f7496 resulting in the following build failure with host gcc < 8: /usr/bin/g++ -O2 -I/home/buildroot/autobuild/run/instance-1/output-1/host/include -o cf_gen ./cf_gen.cc -I. -I../include/ -I../src ./cf_gen.cc: In function 'int main(int, char**)': ./cf_gen.cc:268:63: error: forming reference to void auto &newEntry = entries.emplace_back(name); ^ So add a dependency on host gcc >= 8 and gcc >= 8 as advocated by upstream in https://github.com/squid-cache/squid/blob/9d3433c4ac6cd547c10cf298b8a5e61a463fb753/doc/release-notes/release-6.sgml.in: This release adds a dependency on C++17 support in any compiler used to build Squid. GCC 8+ and Clang 8+ support C++17. While at it, drop BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is always false with gcc >= 7 Fixes: c13199c9326fa2daa574f08ec8fc063a48d0eb06 - http://autobuild.buildroot.org/results/f1766d1a3b2ce7745fa23cdeae1101806cd97aea Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/squid/Config.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/squid/Config.in b/package/squid/Config.in index 89b5a377c778..149884d8150d 100644 --- a/package/squid/Config.in +++ b/package/squid/Config.in @@ -1,18 +1,18 @@ -comment "squid needs a toolchain w/ C++, threads, gcc >= 7 not affected by bug 64735" +comment "squid needs a toolchain w/ C++, threads, gcc >= 8, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 || \ - !BR2_INSTALL_LIBSTDCPP || \ + depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ + !BR2_HOST_GCC_AT_LEAST_8 config BR2_PACKAGE_SQUID bool "squid" depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::current_exception - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 + depends on BR2_HOST_GCC_AT_LEAST_8 # C++17 # needs fork() depends on BR2_USE_MMU select BR2_PACKAGE_LIBCAP From 6b56e0b4f09b36140e2cb9e41072d5ac6074f375 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2024 20:26:04 +0100 Subject: [PATCH 154/345] linux: disable -Werror MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable -Werror to fix the following build failure with esp-hosted raised at least since commit a382a7d55432918d2a1e47ae4cbe7ed50fa17a08: In function ‘destroy_cmd_wq’, inlined from ‘esp_commands_teardown’ at /home/autobuild/autobuild/instance-4/output-1/build/esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404/esp_hosted_ng/host/esp_cmd.c:1467:2: ./include/linux/workqueue.h:639:9: error: call to ‘__warn_flushing_systemwide_wq’ declared with attribute warning: Please avoid flushing system-wide workqueues. [-Werror=attribute-warning] 639 | __warn_flushing_systemwide_wq(); \ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/autobuild/autobuild/instance-4/output-1/build/esp-hosted-ce3c50a33fa4bc562a1b6cbcee292c1ae0b0a404/esp_hosted_ng/host/esp_cmd.c:408:17: note: in expansion of macro ‘flush_scheduled_work’ 408 | flush_scheduled_work(); | ^~~~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/6ac7a4601938d3296ed1657c06f8cdf433757d73 - http://autobuild.buildroot.org/results/7997cc8a67645a6e1cf4e24d172c6feae459dcfb Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- linux/linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/linux.mk b/linux/linux.mk index 53e2ad6d4884..4e12b36c1fd4 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -436,6 +436,7 @@ define LINUX_KCONFIG_FIXUP_CMDS $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO) $(call KCONFIG_ENABLE_OPT,CONFIG_LOGO_LINUX_CLUT224)) $(call KCONFIG_DISABLE_OPT,CONFIG_GCC_PLUGINS) + $(call KCONFIG_DISABLE_OPT,CONFIG_WERROR) $(PACKAGES_LINUX_CONFIG_FIXUPS) endef From 31abe2f6a9f5787e8ddb9ce9353b2ea72466be4c Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Mar 2024 17:45:40 -0800 Subject: [PATCH 155/345] package/docker-compose: bump version to 2.24.7 https://github.com/docker/compose/releases/tag/v2.24.7 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard --- package/docker-compose/docker-compose.hash | 2 +- package/docker-compose/docker-compose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-compose/docker-compose.hash b/package/docker-compose/docker-compose.hash index 92f7b227d3cd..ca3d08cf6362 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ed132bcc226261a595469f5ca6d4ea20b02965867216b56d4e7a5962efb46570 docker-compose-2.24.5.tar.gz +sha256 931bfcc34eb43106be07787372bb853d4cd82830a5785f3049c5192ab0e4ac35 docker-compose-2.24.7.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 947f09d0b3dc..5417ba2d4f3a 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.24.5 +DOCKER_COMPOSE_VERSION = 2.24.7 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From 45a3a8bd5a26953d4f5419fda7079fa0608dd43f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 11 Feb 2024 23:27:05 +0100 Subject: [PATCH 156/345] package/util-linux: bump to version 2.39.3 Fixes: http://autobuild.buildroot.net/results/623/623b21e29693e1de8945cb25e258488f06e6040e/ Changes between 2.39.2 and 2.39.3: 2da5c904e18fdcffd2b252d641e6f76374c7b406 build-sys: release++ (v2.39.3) 03c939edda81c5a4d6e5f5c1cb896e79c1e82e16 docs: update v2.39.3-ReleaseNotes dafb120ef79c878cfd1b65c1d1c46497f17a7f7e docs: update AUTHORS file bfc9691ce5d964b87f6c02cc236361b4772456d0 po-man: merge changes d2232b60963a6e4e43fd359d1a4b552c4291b327 po: merge changes 4ab356c1c02c34cd3935e1bb0aa47ed6e27cfe3c po: add ro.po (from translationproject.org) 7e147d16c06f14b3f760b620d4f359cef12fe4ad po: update es.po (from translationproject.org) e8cb61f07430d5f1d624245a219c2e21694c5f52 lsfd: fix memory leak in append_filter_expr() 192d8aaa07e088e44fcb78736a53baae1ead7ccd lsfd: avoid undefined behavior 756588f8c8b2ed93c124ca15cfb3f0efc4a0f9f6 lsfd: (man) fix the form for the optional argument of --inet option 8d78c1306d1a9d5ebf9ec058344685da0360b87b Add Phytium FTC310 & FTC664 support b75322cdb13c6c0b3789ff8fc19dcd017c069784 Add Phytium FTC862 cpu model. fix:#2486 ec1b0eb36bd6c5a5079293ab03241163f61a8bf4 libmount: accept '\' as escape for options separator 2e5f5c8d85338811595d321a77647a40e12321c9 tests: add ts_skip_docker 0b3254cac3a275bbe32af57c6037cd29c21324d7 Merge branch 'stable-2.39/bcachefs-fixes' of https://github.com/t-8ch/util-linux into PR/stable-v2.39.3 6498439340a16e6acee54987df016c6b7928b17a tests: skip broken tests on docker fa9b5365861934faab9ba73bd405095f56f02e45 libblkid: (bcachefs) add support for sub-device labels 3c5d991b0323b33816e661e52da5d6f5402f47b5 libblkid: (bcachefs) adapt to major.minor version ece194082fb318d0fa3fec31193ce6f61b97c67a libuuid: avoid truncate clocks.txt to improve performance 84a62c1a5a614bde2530544bf2558c73f0179d42 libuuid/src/gen_uuid.c: fix cs_min declaration 93239aa7869ddd236db8e5a28b4e6873ce6e0f22 libmount: fix possible NULL dereference [coverity scan] a6def815e21d50db7a99ec74080c3fd7eb64e934 meson: install wall executable with group 'tty' c6c1c69c3e83606eced938d841af03c1acef03a0 meson: install write executable with group 'tty' bf2cd1d5a6eb273fbb11931b86ae165e7da5a397 libmount: improve mnt_table_next_child_fs() c14f5bf37adf681c378fc004f0996e0bcfd30ce0 docs: add SPDX to boilerplate.c fdd9f11f5e38b044617d3bc5f6c00789096b233f disk-utils: add SPDX and Copyright notices e7dbe9c788da98b86f8cf87bc20ec74e32206451 include/audit-arch: add missing SPDX 5ec7b14a72d9893d2a8d8c7f40cd45b44c9575c9 setterm: avoid restoring flags from uninitialized memory 64d2300e6443c311219f187433046751a86ed18e Fix man page for col to correct documentation error 7cc2c962567fe40daa9b12481224e5a0e6f96c47 Update col.c to fix option mistake 122d7e7afb44d8a823e362673b0d2d1e31f7d478 umount: handle bindmounts during --recursive da18b31ff1cb504e3d288f77d1f1d1179c39e4d8 lscpu: fix caches separator for --parse= 3a5c9c1dd6935fb16f15f210b80ce9c5228e6a19 Use empty libuser config file. 7058d793def09c3d4645e9efd1d8a5d212e839b0 libblkid: exfat: fix fail to find volume label d065ff00a36b7244842f743372099837bc61328b blkpr: store return value of getopt_long in int 9ca6f1712a5803e32e26e065e32e99837ba8b5d2 lib/path: Set errno in case of fgets failure e2f0aa5c25c0295ef6187d3c53c2801fe17385e5 autotools: fix AC_DEFINE_UNQUOTED() use cefd05c479e5456af8db2a86fabad165d247176b autotools: fix librtas check f27fbafb24bdcefaa2463d47abc18491c3497451 lib/path: fix typos f8ab70477e2ca7ac050fd4e2337b76a1972c8aa3 lib/path: set errno in case of error 5ec30a362a5dd91c018c04a64fd1a481029dc4c6 lib/path: fix possible out of boundary access edc723cd3341ff3d3e660051525dca40a2af6b3b libblkid: reset errno before calling probefuncs 8de89778b945d552796f09576925310810ce798b setpriv: fix group argument completion 41599054c7248f12c8a54d02f7161d0aff4275a9 libfdisk: reset errno before calling read() cce4e44059405f3170b166fbf1774bf4b89c11c4 blkid: fix call to err_exclusive_options b718f985cb6cc3bc65618649e9f231ecafcf81fb docs: use HTTPS for GitHub clone URLs 2bddfa6928af328675b2ffbfc9b6546e9ee81722 libblkid: (probe) handle probe without chain gracefully 3d31216787d6725fed361d27f0f01aff6ef46981 lib/idcache: always gracefully handle null cache 368521e45e1c9cb44145fc72c04d1cc903a883e8 script-playutils: close filestream in case ignore_line() fails 087b0d2383b8ab1ee4564d692d5f797ac781896f libblkid: (vxfs) report endianness 7e5056f33bdfd867ce6f1a642f560fdf0b402c1e libblkid: (ntfs) validate that sector_size is a power of two f368ccc759f9684338da723a93449764d0a8e312 libsmartcols: handle nameless tables in export format f5cace8da07291c94b76b5cf80da1f921be67419 ldattach: don't call exit() from signal handler 03c12a34c58d2550c6c718275950866d387d33f5 lslogins: fix realloc() loop allocation size 83ba179b12d3c6c5f400bf78f2f742b1cc7ce256 lib/env: avoid underflow of read_all_alloc() return value 813851fba28cb3ecde6a7f0c90a7e343920cd8c7 libblkid: avoid memory leak of cachefile path 4459623cde42a5d021a6d71e38fcdfd4fff3e171 libmount: gracefully handle NULL path in mnt_resolve_target() dbde7a537f27b23d64a8d3f583af472357de7192 more: avoid out-of-bound access c26badd5d4295d52e987c75e69113edfb407fb27 libfdisk: handle allocation failure in fdisk_new_partition 5c250aa6425fc3e35c07bce019eb4b7fa34bf722 login: Use pid_t for child_pid be3f1712ee2e1e43d9b82b7cf4987c8a609a81ef login: move comment 98be90b5bafa66d98655f8639efb3ffa984fc530 build-sys: fix libmount/src/hooks.c use a711af02d32c0a0a31f1bbb943ffff2e94203e86 lscpu: Use 4K buffer size instead of BUFSIZ 45c6136cba5f7607cca08c5aaab8e9b22ef87c25 autotools: fix typos aa98c4ecc938a3459ffb759a444a8a585a9d0a3a libmount: make.stx_mnt_id use more robust c697c2bb69f55aa24b6c0e2e752548f823c53796 libmount: report statx in features list 13711f3ab79dfa92e8815eb9b752ec2bf4832d80 libmount: fix statx() includes e9ed5a2b80bf8a76924caf8cd93b4cfff4d210a7 libblkid: (vfat) avoid modifying shared buffer d2cadf0992cce589bfffeb603325c3c2fe54a991 libblkid: (jmicron_raid) use checksum APIs c54c99efd0c3fc7f1e8db8b7191a6e1e3b295f1f libblkid: (jmicron_raid) avoid modifying shared buffer 64418c52bc594abf01fc4ae8148e7aa93e4b3f22 libblkid: (zonefs) avoid modifying shared buffer b66da7ce4a04d6c960817a56fe82498c4e7dea44 losetup: fix JSON MAJ:MIN 44d7bf2c8d1c6d34a40416807d16db6c07ac4916 lslogins: (man) fix -y option formatting 7d6c71e51ed3c5f8505c67962b6d03490738a879 include: add DragonFlyBSD GPT partition types 6b9fda87c4e5d0c6f945d7565197f157b9fa3d5f libblkid: (bcachefs) fix size validation acbf17ae8f8ee0f941fe98ed12f115f2b349bba8 libblkid: (bcachefs) fix compiler warning [-Werror=sign-compare] 1ec71634aa4ef5ddca23d65c8a296f3614231e8a libblkid: (bcachefs) fix not detecting large superblocks 68564ebb50f8afab5a9527c534417e247cca0b27 libmount: Fix regression when mounting with atime We can drop 0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch as it was backported by upstream to the 2.39.x branch, and included in 2.39.3. Update the hash for README.licensing after upstream clarified the licensing situation with https://github.com/util-linux/util-linux/commit/fdd9f11f5e38b044617d3bc5f6c00789096b233f Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...rc-gen_uuid.c-fix-cs_min-declaration.patch | 80 ------------------- package/util-linux/util-linux.hash | 4 +- package/util-linux/util-linux.mk | 2 +- 3 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch diff --git a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch b/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch deleted file mode 100644 index bba4d54619a1..000000000000 --- a/package/util-linux/0001-libuuid-src-gen_uuid.c-fix-cs_min-declaration.patch +++ /dev/null @@ -1,80 +0,0 @@ -From bcd11dece7d278bb0b76b138d08dedea80fa8262 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Nov 2023 18:43:57 +0100 -Subject: [PATCH] libuuid/src/gen_uuid.c: fix cs_min declaration - -Define cs_min through a define and not a const int to avoid the -following build failure with -O0 raised since version 2.39 and -https://github.com/util-linux/util-linux/commit/2fa4168c8bc9d5438bc1dfadda293c7c21b6fa59: - -libuuid/src/gen_uuid.c: In function 'uuid_generate_time_generic': -libuuid/src/gen_uuid.c:536:33: error: initializer element is not constant - THREAD_LOCAL int cache_size = cs_min; - ^~~~~~ - -For consistency, also use define for cs_max and cs_factor - -Fixes: - - http://autobuild.buildroot.org/results/2f80a5cdb523cc3c8c0f3693607a1be036b2ae98 - -Signed-off-by: Fabrice Fontaine -Upstream: https://github.com/util-linux/util-linux/commit/07e5c29d501c19e7af84fecb5915e0f9f94cb49f ---- - libuuid/src/gen_uuid.c | 19 ++++++++++--------- - 1 file changed, 10 insertions(+), 9 deletions(-) - -diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c -index 619ef0131..db793c374 100644 ---- a/libuuid/src/gen_uuid.c -+++ b/libuuid/src/gen_uuid.c -@@ -518,6 +518,10 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - return __uuid_generate_time_internal(out, num, cont_offset); - } - -+#define CS_MIN (1<<6) -+#define CS_MAX (1<<18) -+#define CS_FACTOR 2 -+ - /* - * Generate time-based UUID and store it to @out - * -@@ -529,11 +533,8 @@ int __uuid_generate_time_cont(uuid_t out, int *num, uint32_t cont_offset) - static int uuid_generate_time_generic(uuid_t out) { - #ifdef HAVE_TLS - /* thread local cache for uuidd based requests */ -- const int cs_min = (1<<6); -- const int cs_max = (1<<18); -- const int cs_factor = 2; - THREAD_LOCAL int num = 0; -- THREAD_LOCAL int cache_size = cs_min; -+ THREAD_LOCAL int cache_size = CS_MIN; - THREAD_LOCAL int last_used = 0; - THREAD_LOCAL struct uuid uu; - THREAD_LOCAL time_t last_time = 0; -@@ -552,10 +553,10 @@ static int uuid_generate_time_generic(uuid_t out) { - * Start with a small cache size to cover short running applications - * and adjust the cache size over the runntime. - */ -- if ((last_used == cache_size) && (cache_size < cs_max)) -- cache_size *= cs_factor; -- else if ((last_used < (cache_size / cs_factor)) && (cache_size > cs_min)) -- cache_size /= cs_factor; -+ if ((last_used == cache_size) && (cache_size < CS_MAX)) -+ cache_size *= CS_FACTOR; -+ else if ((last_used < (cache_size / CS_FACTOR)) && (cache_size > CS_MIN)) -+ cache_size /= CS_FACTOR; - - num = cache_size; - -@@ -568,7 +569,7 @@ static int uuid_generate_time_generic(uuid_t out) { - } - /* request to daemon failed, reset cache */ - num = 0; -- cache_size = cs_min; -+ cache_size = CS_MIN; - } - if (num > 0) { /* serve uuid from cache */ - uu.time_low++; --- -2.43.0 - diff --git a/package/util-linux/util-linux.hash b/package/util-linux/util-linux.hash index 1638cd9967b1..d47f47fdbae5 100644 --- a/package/util-linux/util-linux.hash +++ b/package/util-linux/util-linux.hash @@ -1,7 +1,7 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.39/sha256sums.asc -sha256 87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f util-linux-2.39.2.tar.xz +sha256 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f util-linux-2.39.3.tar.xz # License files, locally calculated -sha256 64dfeae1519bf0e27563d905a71264310fb6a8fa74e5cf99bb36e4d30d7ef455 README.licensing +sha256 13f0ea46d12d798c095a6ad39d7ddc988e2e4d274c6494115f6b463f7bc4f702 README.licensing sha256 9b718a9460fed5952466421235bc79eb49d4e9eacc920d7a9dd6285ab8fd6c6d Documentation/licenses/COPYING.BSD-3-Clause sha256 ba7640f00d93e72e92b94b9d71f25ec53bac2f1682f5c4adcccb0018359f60f8 Documentation/licenses/COPYING.BSD-4-Clause-UC sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Documentation/licenses/COPYING.GPL-2.0-or-later diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 72126adb005f..a9e5b0bf6854 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -8,7 +8,7 @@ # util-linux-libs/util-linux-libs.mk needs to be updated accordingly as well. UTIL_LINUX_VERSION_MAJOR = 2.39 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 +UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).3 UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) From a3a88ff1c85ba0067af1028bc232f8f61b628979 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 9 Mar 2024 17:52:37 +0100 Subject: [PATCH 157/345] package/bitcoin: security bump to version 26.0 For all release notes since 0.21.2, see [1]. This commit also: - removes the package patches, all included in this release, - removes the patch entry in ".checkpackageignore", - adds a comment about pgp signature check in the hash file, - updates the license hash, due to year update, - adds the requirement on gcc >= 9, see [2], - removes the dependency on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is no longer needed, due to the gcc version requirement. Fixes: - [3] Note: this CVE-2023-33297 is not explicitly mentioned in the Bitcoin core release notes. It is not either appearing in CVE list at [4]. The change corresponding to this vulnerability is "#27610 Improve performance of p2p inv to send queues" in the version 24.1 release note. See [5] and [6]. [1] https://github.com/bitcoin/bitcoin/tree/v26.0/doc/release-notes [2] https://github.com/bitcoin/bitcoin/blob/v26.0/doc/dependencies.md [3] https://nvd.nist.gov/vuln/detail/CVE-2023-33297 [4] https://en.bitcoin.it/wiki/Common_Vulnerabilities_and_Exposures [5] https://github.com/bitcoin/bitcoin/blob/v26.0/doc/release-notes/release-notes-24.1.md?plain=1#L45 [6] https://github.com/bitcoin/bitcoin/pull/27610 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - ...rc-randomenv.cpp-fix-build-on-uclibc.patch | 48 ------------------- ...includes-to-fix-gcc-13-compile-error.patch | 48 ------------------- ...efactor-add-most-of-src-util-to-iwyu.patch | 34 ------------- .../0004-src-util-string-h-fix-gcc13.patch | 23 --------- package/bitcoin/Config.in | 11 ++--- package/bitcoin/bitcoin.hash | 8 ++-- package/bitcoin/bitcoin.mk | 2 +- 8 files changed, 10 insertions(+), 165 deletions(-) delete mode 100644 package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch delete mode 100644 package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch delete mode 100644 package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch delete mode 100644 package/bitcoin/0004-src-util-string-h-fix-gcc13.patch diff --git a/.checkpackageignore b/.checkpackageignore index 5f4928b64876..f413e5a49714 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -194,7 +194,6 @@ package/berkeleydb/0002-atomic_compare_exchange.patch Upstream package/bind/0001-cross.patch Upstream package/bind/S81named Indent Shellcheck Variables package/bird/0001-configure.ac-fix-build-with-autoconf-2.70.patch Upstream -package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch Upstream package/bmx7/0001-Fix-schedule.c-378-36-error-SIOCGSTAMP-undeclared.patch Upstream package/bmx7/0002-Fix-linking-error.patch Upstream package/bmx7/0003-Reorder-includes-to-avoid-ethhdr-collision.patch Upstream 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 deleted file mode 100644 index 8038a311d362..000000000000 --- a/package/bitcoin/0001-src-randomenv.cpp-fix-build-on-uclibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -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/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch b/package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch deleted file mode 100644 index 22c0ca2adf6d..000000000000 --- a/package/bitcoin/0002-Add-missing-includes-to-fix-gcc-13-compile-error.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 339a95b7537b47e5d6b732c0633a00afd96e3ca0 Mon Sep 17 00:00:00 2001 -From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> -Date: Thu, 19 Jan 2023 19:35:43 +0100 -Subject: [PATCH] Add missing includes to fix gcc-13 compile error - -Upstream: https://github.com/bitcoin/bitcoin/commit/fadeb6b103cb441e0e91ef506ef29febabb10715 - -Signed-off-by: Bernd Kuhls ---- - src/support/lockedpool.cpp | 3 +++ - src/support/lockedpool.h | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp -index 26de780f2..11131d551 100644 ---- a/src/support/lockedpool.cpp -+++ b/src/support/lockedpool.cpp -@@ -22,6 +22,9 @@ - #endif - - #include -+#include -+#include -+#include - #ifdef ARENA_DEBUG - #include - #include -diff --git a/src/support/lockedpool.h b/src/support/lockedpool.h -index b9e2e99d1..25b4c0f36 100644 ---- a/src/support/lockedpool.h -+++ b/src/support/lockedpool.h -@@ -5,11 +5,11 @@ - #ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H - #define BITCOIN_SUPPORT_LOCKEDPOOL_H - --#include -+#include - #include - #include --#include - #include -+#include - #include - - /** --- -2.39.2 - diff --git a/package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch b/package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch deleted file mode 100644 index 095fa648dd3d..000000000000 --- a/package/bitcoin/0003-refactor-add-most-of-src-util-to-iwyu.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c187efa907fd64ea2c7b7d699c5c97f9d5b79960 Mon Sep 17 00:00:00 2001 -From: fanquake -Date: Thu, 9 Jun 2022 16:26:55 +0100 -Subject: [PATCH] refactor: add most of src/util to iwyu - -These files change infrequently, and not much header shuffling is required. - -We don't add everything in src/util/ yet, because IWYU makes some -dubious suggestions, which I'm going to follow up with upstream. - -Upstream: https://github.com/bitcoin/bitcoin/commit/07f2c25d04c39a0074e1d9ee1b24b3e359c8153f - -[Bernd: backported relevant part from upstream commit to version 0.21.2 - to fix build error with gcc 13.x] -Signed-off-by: Bernd Kuhls ---- - src/util/bip32.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/util/bip32.h b/src/util/bip32.h -index 347e83db9..6ef051c48 100644 ---- a/src/util/bip32.h -+++ b/src/util/bip32.h -@@ -6,6 +6,7 @@ - #define BITCOIN_UTIL_BIP32_H - - #include -+#include - #include - #include - --- -2.39.2 - diff --git a/package/bitcoin/0004-src-util-string-h-fix-gcc13.patch b/package/bitcoin/0004-src-util-string-h-fix-gcc13.patch deleted file mode 100644 index 00a9ef2b9712..000000000000 --- a/package/bitcoin/0004-src-util-string-h-fix-gcc13.patch +++ /dev/null @@ -1,23 +0,0 @@ -From fa2deae2a86417d7e0d4cd33fb933b1000d20313 Mon Sep 17 00:00:00 2001 -From: MacroFake -Date: Thu, 5 May 2022 08:28:29 +0200 -Subject: [PATCH] Wrap boost::replace_all - -Upstream: https://github.com/bitcoin/bitcoin/commit/fa2deae2a86417d7e0d4cd33fb933b1000d20313 - -[Bernd: backported relevant part from upstream commit to version 0.21.2 - to fix build error with gcc 13.x] -Signed-off-by: Bernd Kuhls ---- -diff --git a/src/util/string.h b/src/util/string.h -index 2e91347b27a10..df20e34ae9aaa 100644 ---- a/src/util/string.h -+++ b/src/util/string.h -@@ -9,6 +9,7 @@ - - #include - #include -+#include - #include - #include - #include diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index a344811d6b45..c4a2447fc959 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -11,8 +11,8 @@ config BR2_PACKAGE_BITCOIN bool "bitcoin" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread, boost-filesystem - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::future depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_USE_WCHAR select BR2_PACKAGE_BOOST @@ -36,12 +36,9 @@ config BR2_PACKAGE_BITCOIN https://bitcoincore.org -comment "bitcoin needs a toolchain w/ C++, threads, wchar" +comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 9" depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - -comment "bitcoin needs a toolchain not affected by GCC bug 64735" - depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_9 diff --git a/package/bitcoin/bitcoin.hash b/package/bitcoin/bitcoin.hash index 643fcbc14199..6b3008af863c 100644 --- a/package/bitcoin/bitcoin.hash +++ b/package/bitcoin/bitcoin.hash @@ -1,5 +1,7 @@ -# From https://bitcoincore.org/bin/bitcoin-core-0.21.2/SHA256SUMS.asc -sha256 4146f751fc5691bdcf911cbdb8d32d8d25c297d29d58173227ae1ae6438edb9e bitcoin-0.21.2.tar.gz +# Hash from: https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS +# After checking pgp signature from: +# https://bitcoincore.org/bin/bitcoin-core-26.0/SHA256SUMS.asc +sha256 ab1d99276e28db62d1d9f3901e85ac358d7f1ebcb942d348a9c4e46f0fcdc0a1 bitcoin-26.0.tar.gz # Hash for license file -sha256 96fe807030b21f88305adc32af62f9aa19915f2783509fd6f52aea02cf83f644 COPYING +sha256 a6331cd1f889397adfc0c3b0535682a20950c6cf8e5c712e9997a15ce98324e1 COPYING diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 10ae32202cf5..493c569336a0 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -4,7 +4,7 @@ # ################################################################################ -BITCOIN_VERSION = 0.21.2 +BITCOIN_VERSION = 26.0 BITCOIN_SITE = https://bitcoincore.org/bin/bitcoin-core-$(BITCOIN_VERSION) BITCOIN_AUTORECONF = YES BITCOIN_LICENSE = MIT From 36ed69f0bf6415243741e8d5b5357ab7c91a57b4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:42:18 +0100 Subject: [PATCH 158/345] package/kodi: bump version to 20.5-Nexus Release notes: https://github.com/xbmc/xbmc/releases/tag/20.5-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk | 2 +- package/kodi-texturepacker/kodi-texturepacker.mk | 2 +- package/kodi/kodi.hash | 2 +- package/kodi/kodi.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk index b785a71b6eea..a43ee57e0089 100644 --- a/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk +++ b/package/kodi-jsonschemabuilder/kodi-jsonschemabuilder.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_JSONSCHEMABUILDER_VERSION = 20.4-Nexus +KODI_JSONSCHEMABUILDER_VERSION = 20.5-Nexus KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_DL_SUBDIR = kodi diff --git a/package/kodi-texturepacker/kodi-texturepacker.mk b/package/kodi-texturepacker/kodi-texturepacker.mk index 98101930142f..e640ab3a9044 100644 --- a/package/kodi-texturepacker/kodi-texturepacker.mk +++ b/package/kodi-texturepacker/kodi-texturepacker.mk @@ -6,7 +6,7 @@ # Not possible to directly refer to kodi variables, because of # first/second expansion trickery... -KODI_TEXTUREPACKER_VERSION = 20.4-Nexus +KODI_TEXTUREPACKER_VERSION = 20.5-Nexus KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_DL_SUBDIR = kodi diff --git a/package/kodi/kodi.hash b/package/kodi/kodi.hash index 7b26778b6812..b497ab7dca5b 100644 --- a/package/kodi/kodi.hash +++ b/package/kodi/kodi.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 ccb2d3e382b5ae628a89db2325f5e778f1770a2a182f6eaa25645a22ccdffb18 kodi-20.4-Nexus.tar.gz +sha256 9bf3257ebf251d20f276b7f90681985a270779150af2fb395d4b593c04002deb kodi-20.5-Nexus.tar.gz sha256 f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e kodi-libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz sha256 584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc kodi-libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz sha256 719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62 kodi-libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk index eebb48238a4d..085169367d29 100644 --- a/package/kodi/kodi.mk +++ b/package/kodi/kodi.mk @@ -6,7 +6,7 @@ # When updating the version, please also update kodi-jsonschemabuilder # and kodi-texturepacker -KODI_VERSION_MAJOR = 20.4 +KODI_VERSION_MAJOR = 20.5 KODI_VERSION_NAME = Nexus KODI_VERSION = $(KODI_VERSION_MAJOR)-$(KODI_VERSION_NAME) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) From aebe2b1dae2dd5c1e7952d00ad124064821be718 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:41:52 +0100 Subject: [PATCH 159/345] package/kodi-pvr-hts: bump version to 20.7.2-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-hts/kodi-pvr-hts.hash | 2 +- package/kodi-pvr-hts/kodi-pvr-hts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.hash b/package/kodi-pvr-hts/kodi-pvr-hts.hash index a268940b0eb7..2a59b7bbe560 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.hash +++ b/package/kodi-pvr-hts/kodi-pvr-hts.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 15d68d928e0794fb42fd0f3483403fb0290c5c94aa3d3b648a8a2f8e8316dfff kodi-pvr-hts-20.7.0-Nexus.tar.gz +sha256 244cfc1488aa0c51465af411f3df8884b4a571a08acfa20ac9defdb8ef49022e kodi-pvr-hts-20.7.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-hts/kodi-pvr-hts.mk b/package/kodi-pvr-hts/kodi-pvr-hts.mk index c56d0e0546f4..ebc31ddbdfe2 100644 --- a/package/kodi-pvr-hts/kodi-pvr-hts.mk +++ b/package/kodi-pvr-hts/kodi-pvr-hts.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_HTS_VERSION = 20.7.0-Nexus +KODI_PVR_HTS_VERSION = 20.7.2-Nexus KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE_FILES = LICENSE.md From 646918e03ac49445bbb938dbb5e3a0ca30f4a1b3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:41:53 +0100 Subject: [PATCH 160/345] package/kodi-pvr-mythtv: bump version to 20.6.9-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash | 2 +- package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash index c61c3918255a..ff3d0f05b719 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 eb21e185d1333a8696565138bc58df3d37970c9a3615193396e9f296a56a24c4 kodi-pvr-mythtv-20.5.10-Nexus.tar.gz +sha256 32196265ee5b78bb97e0bd8e633778f4566e95d54df96e4577764e5d3681fcf1 kodi-pvr-mythtv-20.6.9-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk index 66f194874140..a3a5678651a9 100644 --- a/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ b/package/kodi-pvr-mythtv/kodi-pvr-mythtv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_MYTHTV_VERSION = 20.5.10-Nexus +KODI_PVR_MYTHTV_VERSION = 20.6.9-Nexus KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE_FILES = LICENSE.md From 150a1722a78c51dd7996c5aaa3b42476f60451d1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:43:07 +0100 Subject: [PATCH 161/345] package/intel-mediadriver: bump version to 24.1.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index a1b098094bb0..4b410fb961ce 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a024e96abd662193e4295f427a76c5894087503df46bd82c0e5bea103e44b171 intel-media-24.1.3.tar.gz +sha256 7ea727b3e2890cf8f50307a3910664209bcbae1ce0d3d8f81bb9f522b0f66d59 intel-media-24.1.4.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 72a22fe5c9a1..9fdbef93bbd8 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.1.3 +INTEL_MEDIADRIVER_VERSION = 24.1.4 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 45f964d8dde03161fdfbe69013d19e9a13fb005f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:43:08 +0100 Subject: [PATCH 162/345] package/libvpl: bump version to 2.10.2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/libvpl/libvpl.hash | 2 +- package/libvpl/libvpl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libvpl/libvpl.hash b/package/libvpl/libvpl.hash index df1914e4a410..19407e01bad5 100644 --- a/package/libvpl/libvpl.hash +++ b/package/libvpl/libvpl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 524299a7b920ac0de1f6913ca90515858ea3a8ea2daaea60f8e0be62f22c8041 libvpl-2.10.1.tar.gz +sha256 ad956ea7ecf14614325f59dfb44cc5ba08e2fcac373342d61c7db152ac651253 libvpl-2.10.2.tar.gz sha256 bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677 LICENSE diff --git a/package/libvpl/libvpl.mk b/package/libvpl/libvpl.mk index 0c5d35487415..645fda14de66 100644 --- a/package/libvpl/libvpl.mk +++ b/package/libvpl/libvpl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPL_VERSION = 2.10.1 +LIBVPL_VERSION = 2.10.2 LIBVPL_SITE = $(call github,intel,libvpl,v$(LIBVPL_VERSION)) LIBVPL_LICENSE = MIT LIBVPL_LICENSE_FILES = LICENSE From 1d69b083e8c724a82d7e0cfbf5989147b3c2f5e7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:43:09 +0100 Subject: [PATCH 163/345] package/onevpl-intel-gpu: bump version to 24.1.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index a45758a2c39e..8dd42c471365 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 15d34e4304d7aeb5ea5e529b6f51171109cef42525113321f675bc14e56c697e onevpl-intel-gpu-24.1.3.tar.gz +sha256 879a232351ce0647522a0981edded3760104aec9f2bdc2ad31f70df03c95a6a9 onevpl-intel-gpu-24.1.4.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index 509698ce2654..ca2c866735e3 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 24.1.3 +ONEVPL_INTEL_GPU_VERSION = 24.1.4 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE From bb8766cc5463e59b931a10ec67793a79fb06eda7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:48:47 +0100 Subject: [PATCH 164/345] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Signed-off-by: Bernd Kuhls 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 07d6b2b5ec86..df84cce539e5 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.18" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.21" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" 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 15c0dc8d3d53..977ad30f7302 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,12 +1,12 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 4e43d8c5fba14f7c82597838011648056487b7550fd83276ad534559e8499b1d linux-6.6.18.tar.xz -sha256 faa49ca22fb55ed4d5ca2a55e07dd10e4e171cfc3b92568a631453cd2068b39b linux-6.1.79.tar.xz +sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz +sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 bd84809a367eb400eb04e0e70294e6ba12fc03b6bfb5a7dfaca548f8947501b0 linux-5.15.149.tar.xz -sha256 4ea63c5a90fdc3c459ab35c11ee8c93d2364a7cdbfb101100f8cab70d490ef6d linux-5.10.210.tar.xz -sha256 ff54bec6d053c7994f3bb8c45021de2858ff9f740d2ccbbcf072b87821a918cf linux-5.4.269.tar.xz +sha256 8a1e760bf2660947234109aa4fdbbe3686238b4e852157b96c59356689107e49 linux-5.15.151.tar.xz +sha256 0cf3e467bd8d35533888327e9f8a9a9d354fdf83e8f82e9fe5a234f896a07493 linux-5.10.212.tar.xz +sha256 cdbc61334cdadbd3945b08f03ed197c65bdf358c3383a4334b3e5b483bd95850 linux-5.4.271.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 83eeff613405d0045d0f717c6ac14c178678fe0a163c41d9dd8878ac0f73e352 linux-4.19.307.tar.xz +sha256 95ada7aa6ef1c69d7a469432f936365e35b004d24e751d82c21a371edd2c84f9 linux-4.19.309.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 63e82c49dfd9..fe4fc5011e79 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -403,12 +403,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.307" if BR2_KERNEL_HEADERS_4_19 - default "5.4.269" if BR2_KERNEL_HEADERS_5_4 - default "5.10.210" if BR2_KERNEL_HEADERS_5_10 - default "5.15.149" if BR2_KERNEL_HEADERS_5_15 - default "6.1.79" if BR2_KERNEL_HEADERS_6_1 - default "6.6.18" if BR2_KERNEL_HEADERS_6_6 + default "4.19.309" if BR2_KERNEL_HEADERS_4_19 + default "5.4.271" if BR2_KERNEL_HEADERS_5_4 + default "5.10.212" if BR2_KERNEL_HEADERS_5_10 + default "5.15.151" if BR2_KERNEL_HEADERS_5_15 + default "6.1.81" if BR2_KERNEL_HEADERS_6_1 + default "6.6.21" if BR2_KERNEL_HEADERS_6_6 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 1dfe980b19b83ee695e51e92aecb0c8cdf202a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Thu, 14 Mar 2024 17:16:20 +0100 Subject: [PATCH 165/345] package/expat: security bump to version 2.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Security fixes: - CVE-2024-28757 -- Prevent billion laughs attacks with isolated use of external parsers. Please see the commit message of commit 1d50b80cf31de87750103656f6eb693746854aa8 for details. https://blog.hartwork.org/posts/expat-2-6-2-released/ https://github.com/libexpat/libexpat/blob/R_2_6_2/expat/Changes Signed-off-by: Sébastien Szymanski Signed-off-by: Peter Korsgaard --- package/expat/expat.hash | 8 ++++---- package/expat/expat.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/expat/expat.hash b/package/expat/expat.hash index 980a9ab6a79d..63890b54df29 100644 --- a/package/expat/expat.hash +++ b/package/expat/expat.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.6.1/ -md5 84d0ee1c554212dc8f068e538de5b823 expat-2.6.1.tar.xz -sha1 1a1804b7c565a8b21abbd3433ef67ed8a4476960 expat-2.6.1.tar.xz +# From https://sourceforge.net/projects/expat/files/expat/2.6.2/ +md5 0cb75c8feb842c0794ba89666b762a2d expat-2.6.1.tar.xz +sha1 d9e5f953dcacda3c9e69b4886382c3d8847b81bd expat-2.6.1.tar.xz # Locally calculated -sha256 cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e expat-2.6.0.tar.xz +sha256 ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364 expat-2.6.2.tar.xz sha256 122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534 COPYING diff --git a/package/expat/expat.mk b/package/expat/expat.mk index e09fcc673fa5..c6b7fc8b44f0 100644 --- a/package/expat/expat.mk +++ b/package/expat/expat.mk @@ -4,7 +4,7 @@ # ################################################################################ -EXPAT_VERSION = 2.6.1 +EXPAT_VERSION = 2.6.2 EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz EXPAT_INSTALL_STAGING = YES From b7eb1dcbb65682b2e800b6523688102ffb4d4821 Mon Sep 17 00:00:00 2001 From: Nicolas Cavallari Date: Thu, 14 Mar 2024 13:27:34 +0100 Subject: [PATCH 166/345] package/libgit2: security bump to version 1.7.2 Fixes the following security issues: - CVE-2024-24575 (infinite loop DoS on revision lookup) and - CVE-2024-24577 (heap out of bound write on index update) https://github.com/libgit2/libgit2/releases/tag/v1.7.2 Signed-off-by: Nicolas Cavallari [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- package/libgit2/libgit2.hash | 2 +- package/libgit2/libgit2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgit2/libgit2.hash b/package/libgit2/libgit2.hash index 76d599b81e5c..022fb35a9c97 100644 --- a/package/libgit2/libgit2.hash +++ b/package/libgit2/libgit2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17d2b292f21be3892b704dddff29327b3564f96099a1c53b00edc23160c71327 libgit2-1.7.1.tar.gz +sha256 de384e29d7efc9330c6cdb126ebf88342b5025d920dcb7c645defad85195ea7f libgit2-1.7.2.tar.gz sha256 6f3c2cd59b057e366c1acc073b038135c52d77892bb33bd4d931c5369d3f062b COPYING diff --git a/package/libgit2/libgit2.mk b/package/libgit2/libgit2.mk index 46ccc1e5173b..498b66580889 100644 --- a/package/libgit2/libgit2.mk +++ b/package/libgit2/libgit2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGIT2_VERSION = 1.7.1 +LIBGIT2_VERSION = 1.7.2 LIBGIT2_SITE = $(call github,libgit2,libgit2,v$(LIBGIT2_VERSION)) LIBGIT2_LICENSE = \ GPL-2.0 with linking exception, \ From 9246579f01d768c038fe5891f77937c977dbb76d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 13 Mar 2024 22:51:57 +0100 Subject: [PATCH 167/345] package/znc: bump version to 1.9.0 Removed all patches, they are included in this release. Bumped gcc dependency to >= 8 according to changelog: https://wiki.znc.in/ChangeLog/1.9.0 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 - ...0001-LibreSSL-3.5-opaqued-structures.patch | 27 -------- .../znc/0002-Fix-build-with-libressl.patch | 68 ------------------- ...DH_get0_key-have-existed-since-Libre.patch | 30 -------- ...rt-SWIG-4.1.0-drop-support-for-4.0.1.patch | 53 --------------- package/znc/Config.in | 6 +- package/znc/znc.hash | 2 +- package/znc/znc.mk | 2 +- 8 files changed, 5 insertions(+), 186 deletions(-) delete mode 100644 package/znc/0001-LibreSSL-3.5-opaqued-structures.patch delete mode 100644 package/znc/0002-Fix-build-with-libressl.patch delete mode 100644 package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch delete mode 100644 package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch diff --git a/.checkpackageignore b/.checkpackageignore index f413e5a49714..0a993096829a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1429,9 +1429,6 @@ package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch Upstrea package/zip/0007-timezone.c-needs-time.h-fixes-musl-compile.patch Upstream package/zip/0008-fix-musl-static-build.patch Upstream package/zmqpp/0001-Allow-building-shared-or-static-library-only.patch Upstream -package/znc/0001-LibreSSL-3.5-opaqued-structures.patch Upstream -package/znc/0002-Fix-build-with-libressl.patch Upstream -package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch Upstream package/zziplib/0001-implant-ZZIP_LIBLATEST-for-zzip_lib.patch Upstream support/dependencies/check-host-asciidoc.sh Shellcheck support/dependencies/check-host-cmake.sh Shellcheck diff --git a/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch b/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch deleted file mode 100644 index d0019e21a400..000000000000 --- a/package/znc/0001-LibreSSL-3.5-opaqued-structures.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 87f3dac8ba8dea5628b05416bdef454b4ef2d236 Mon Sep 17 00:00:00 2001 -From: Charlie Li -Date: Mon, 14 Mar 2022 17:36:36 -0400 -Subject: [PATCH] LibreSSL 3.5 opaqued structures - -Downloaded from upstream commit -https://github.com/znc/Csocket/commit/87f3dac8ba8dea5628b05416bdef454b4ef2d236 - -Signed-off-by: Bernd Kuhls -(rebased for znc) ---- - Csocket.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Csocket.cc b/Csocket.cc -index 46a3bfd..a30da14 100644 ---- a/third_party/Csocket/Csocket.cc -+++ b/third_party/Csocket/Csocket.cc -@@ -61,7 +61,7 @@ - # define OPENSSL_NO_TLS1_1 /* 1.0.1-pre~: openssl/openssl@637f374ad49d5f6d4f81d87d7cdd226428aa470c */ - # define OPENSSL_NO_TLS1_2 /* 1.0.1-pre~: openssl/openssl@7409d7ad517650db332ae528915a570e4e0ab88b */ - # endif --# ifndef LIBRESSL_VERSION_NUMBER /* forked from OpenSSL 1.0.1g, sets high version "with the idea of discouraging software from relying on magic numbers for detecting features"(!) */ -+# if !defined(LIBRESSL_VERSION_NUMBER) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x03050000fL) - # if OPENSSL_VERSION_NUMBER >= 0x10100000 - # undef HAVE_ERR_REMOVE_THREAD_STATE /* 1.1.0-pre4: openssl/openssl@8509dcc9f319190c565ab6baad7c88d37a951d1c */ - # undef OPENSSL_NO_SSL2 /* 1.1.0-pre4: openssl/openssl@e80381e1a3309f5d4a783bcaa508a90187a48882 */ diff --git a/package/znc/0002-Fix-build-with-libressl.patch b/package/znc/0002-Fix-build-with-libressl.patch deleted file mode 100644 index b8d22445fb0e..000000000000 --- a/package/znc/0002-Fix-build-with-libressl.patch +++ /dev/null @@ -1,68 +0,0 @@ -From dcb5f3df82fcfec48aab356252067dc897fb98cf Mon Sep 17 00:00:00 2001 -From: Alexey Sokolov -Date: Sun, 14 Nov 2021 00:45:01 +0000 -Subject: [PATCH] Fix build with libressl - -It got another feature of openssl implemented, which broke this - -Downloaded from upstream commit -https://github.com/znc/znc/commit/dcb5f3df82fcfec48aab356252067dc897fb98cf - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 14 ++++++++++++++ - include/znc/zncconfig.h.cmake.in | 1 + - modules/schat.cpp | 3 +-- - 3 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0913ff2691..1f77f5632b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -82,6 +82,20 @@ endmacro() - tristate_option(OPENSSL "Support SSL") - if(WANT_OPENSSL) - find_package(OpenSSL ${TRISTATE_OPENSSL_REQUIRED}) -+ -+ if(OPENSSL_FOUND) -+ # SSL_SESSION was made opaque in OpenSSL 1.1.0; -+ # LibreSSL gained that function later too. -+ # TODO: maybe remove this check at some point, and stop supporting old -+ # libssl versions -+ function(check_SSL_SESSION_get0_cipher) -+ set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) -+ set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) -+ check_cxx_symbol_exists(SSL_SESSION_get0_cipher openssl/ssl.h -+ HAVE_SSL_SESSION_get0_cipher) -+ endfunction() -+ check_SSL_SESSION_get0_cipher() -+ endif() - endif() - set(HAVE_LIBSSL "${OPENSSL_FOUND}") - -diff --git a/include/znc/zncconfig.h.cmake.in b/include/znc/zncconfig.h.cmake.in -index 5426b828af..7b07b99aec 100644 ---- a/include/znc/zncconfig.h.cmake.in -+++ b/include/znc/zncconfig.h.cmake.in -@@ -31,6 +31,7 @@ - #define HAVE_PTHREAD 1 - #cmakedefine HAVE_THREADED_DNS 1 - #cmakedefine HAVE_LIBSSL 1 -+#cmakedefine HAVE_SSL_SESSION_get0_cipher 1 - #cmakedefine HAVE_IPV6 1 - #cmakedefine HAVE_ZLIB 1 - #cmakedefine HAVE_I18N 1 -diff --git a/modules/schat.cpp b/modules/schat.cpp -index aa7a338dcd..66e67e695c 100644 ---- a/modules/schat.cpp -+++ b/modules/schat.cpp -@@ -25,8 +25,7 @@ - #include - #include - --#if !defined(OPENSSL_VERSION_NUMBER) || defined(LIBRESSL_VERSION_NUMBER) || \ -- OPENSSL_VERSION_NUMBER < 0x10100007 -+#ifndef HAVE_SSL_SESSION_get0_cipher - /* SSL_SESSION was made opaque in OpenSSL 1.1.0, cipher accessor was added 2 - weeks before the public release. - See openssl/openssl@e92813234318635639dba0168c7ef5568757449b. */ diff --git a/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch b/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch deleted file mode 100644 index a2946643fc85..000000000000 --- a/package/znc/0003-DH_set0_pqg-and-DH_get0_key-have-existed-since-Libre.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7c8ac8981a8516edaba469641aff4d8ec452ae9e Mon Sep 17 00:00:00 2001 -From: Charlie Li -Date: Mon, 14 Mar 2022 18:32:46 -0400 -Subject: [PATCH] DH_set0_pqg and DH_get0_key have existed since LibreSSL 2.7 - -https://github.com/libressl-portable/openbsd/commit/848e2a019c796b685fc8c5848283b86e48fbe0bf -https://github.com/libressl-portable/openbsd/commit/3789e379353c1d53313a249461b3d735de4ac742 - -Downloaded from upstream commit -https://github.com/znc/znc/commit/7c8ac8981a8516edaba469641aff4d8ec452ae9e - -Signed-off-by: Bernd Kuhls ---- - modules/crypt.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules/crypt.cpp b/modules/crypt.cpp -index 7655371b6e..68f7aafcea 100644 ---- a/modules/crypt.cpp -+++ b/modules/crypt.cpp -@@ -68,7 +68,8 @@ class CCryptMod : public CModule { - CString m_sPrivKey; - CString m_sPubKey; - --#if OPENSSL_VERSION_NUMBER < 0X10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#if OPENSSL_VERSION_NUMBER < 0X10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x02070000fL) - static int DH_set0_pqg(DH* dh, BIGNUM* p, BIGNUM* q, BIGNUM* g) { - /* If the fields p and g in dh are nullptr, the corresponding input - * parameters MUST be non-nullptr. q may remain nullptr. diff --git a/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch b/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch deleted file mode 100644 index cb0988e63149..000000000000 --- a/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch +++ /dev/null @@ -1,53 +0,0 @@ -From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001 -From: Alexey Sokolov -Date: Sat, 5 Nov 2022 12:54:40 +0000 -Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1 - -https://bugs.gentoo.org/878587 - -Upstream: https://github.com/znc/znc/commit/fecdd9895894b3afe903021b0843a422eb4d3308 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 2 +- - modules/modperl/CMakeLists.txt | 1 - - modules/modpython/CMakeLists.txt | 1 - - 3 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9d43578e0e..efab0ee1ee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS - endif() - endif() - if(search_swig) -- find_package(SWIG 3.0.0) -+ find_package(SWIG 4.0.1) - if(NOT SWIG_FOUND) - message(FATAL_ERROR - "Can't find SWIG, therefore Perl and Python aren't supported. " -diff --git a/modules/modperl/CMakeLists.txt b/modules/modperl/CMakeLists.txt -index e18fe47644..a87f74e478 100644 ---- a/modules/modperl/CMakeLists.txt -+++ b/modules/modperl/CMakeLists.txt -@@ -53,7 +53,6 @@ if(SWIG_FOUND) - "-I${PROJECT_SOURCE_DIR}/include" - "-I${CMAKE_CURRENT_SOURCE_DIR}/.." - "-I${CMAKE_CURRENT_SOURCE_DIR}/include" -- -DZNC_EXPORT_LIB_EXPORT - -outdir "${CMAKE_CURRENT_BINARY_DIR}" - -o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/modperl.i" -diff --git a/modules/modpython/CMakeLists.txt b/modules/modpython/CMakeLists.txt -index edbeb41ed5..36a2e649f0 100644 ---- a/modules/modpython/CMakeLists.txt -+++ b/modules/modpython/CMakeLists.txt -@@ -50,7 +50,6 @@ if(SWIG_FOUND) - "-I${PROJECT_BINARY_DIR}/include" - "-I${PROJECT_SOURCE_DIR}/include" - "-I${CMAKE_CURRENT_SOURCE_DIR}/.." -- -DZNC_EXPORT_LIB_EXPORT - -outdir "${CMAKE_CURRENT_BINARY_DIR}" - -o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/modpython.i" diff --git a/package/znc/Config.in b/package/znc/Config.in index 915b5f632cd3..3b8f0f719541 100644 --- a/package/znc/Config.in +++ b/package/znc/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_ZNC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # fork() depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBOPENSSL_ENABLE_BLOWFISH if BR2_PACKAGE_LIBOPENSSL help @@ -11,7 +11,7 @@ config BR2_PACKAGE_ZNC http://www.znc.in -comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 4.8, threads" +comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 8, threads" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || !BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU diff --git a/package/znc/znc.hash b/package/znc/znc.hash index e86171ba1fae..8d59c7a1dc87 100644 --- a/package/znc/znc.hash +++ b/package/znc/znc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ff238aae3f2ae0e44e683c4aee17dc8e4fdd261ca9379d83b48a7d422488de0d znc-1.8.2.tar.gz +sha256 8b99c9dbb21c1309705073460be9bfacb6f7b0e83a15fe5d4b7140201b39d2a1 znc-1.9.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/znc/znc.mk b/package/znc/znc.mk index 07fced84073c..a91065519597 100644 --- a/package/znc/znc.mk +++ b/package/znc/znc.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZNC_VERSION = 1.8.2 +ZNC_VERSION = 1.9.0 ZNC_SITE = http://znc.in/releases/archive ZNC_LICENSE = Apache-2.0 ZNC_LICENSE_FILES = LICENSE From 05dabbd5fcc08724f20f8a4168a5a6e0b97aec06 Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Sun, 10 Mar 2024 09:08:33 +0300 Subject: [PATCH 168/345] package/postgis: bump to version 3.4.2 https://github.com/postgis/postgis/blob/3.4.2/NEWS Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/postgis/postgis.hash | 2 +- package/postgis/postgis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/postgis/postgis.hash b/package/postgis/postgis.hash index 2d2676d0d6d8..7e62e8e16814 100644 --- a/package/postgis/postgis.hash +++ b/package/postgis/postgis.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fef6a141213d0ff27bf45b33b849cc396c22ddb1ffc6fed435469c9e891fc81d postgis-3.4.1.tar.gz +sha256 c8c874c00ba4a984a87030af6bf9544821502060ad473d5c96f1d4d0835c5892 postgis-3.4.2.tar.gz sha256 2a3bde0a77224496ea6d8efa686da7e29ab0dd6b1a8f90ba12beaf7ae28e878a LICENSE.TXT diff --git a/package/postgis/postgis.mk b/package/postgis/postgis.mk index 5f1c643ceb2e..867aa4caea90 100644 --- a/package/postgis/postgis.mk +++ b/package/postgis/postgis.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGIS_VERSION = 3.4.1 +POSTGIS_VERSION = 3.4.2 POSTGIS_SITE = https://download.osgeo.org/postgis/source # parallel build issues POSTGIS_MAKE = $(MAKE1) From 9f0090ed45fe69989f4759a4076e74f586f5747c Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Sun, 10 Mar 2024 09:17:14 +0300 Subject: [PATCH 169/345] package/timescaledb: bump version to 2.14.2 Release notes: https://github.com/timescale/timescaledb/blob/2.14.2/CHANGELOG.md Signed-off-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard --- package/timescaledb/timescaledb.hash | 2 +- package/timescaledb/timescaledb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/timescaledb/timescaledb.hash b/package/timescaledb/timescaledb.hash index 8d0fc125d62a..f98098bdb801 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ca4f48147cb1bf3bf22af9f643822a5931e12a89909cc73c4a89ddae3c828ac1 timescaledb-2.13.1.tar.gz +sha256 c7768b267ea67914d0491b28da102faecd317060e429b2da7530517fbc94e73b timescaledb-2.14.2.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index a5d77eda8068..59731270c587 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.13.1 +TIMESCALEDB_VERSION = 2.14.2 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 7ee7b1ba6d5031405533193ec7c6edfd5dbde175 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 7 Mar 2024 20:52:33 +0100 Subject: [PATCH 170/345] package/mmc-utils: bump version to 2024-03-05 Fixes: http://autobuild.buildroot.net/results/06f972f95f4f2e0e7504b1fa069b89695b7377ef Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/mmc-utils/mmc-utils.hash | 2 +- package/mmc-utils/mmc-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mmc-utils/mmc-utils.hash b/package/mmc-utils/mmc-utils.hash index cd9d13324fcc..2c1bb8606605 100644 --- a/package/mmc-utils/mmc-utils.hash +++ b/package/mmc-utils/mmc-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 84be5003ae83b4fdb0279a693f320fd472aebd14908a1ac16bda4f675e92ad40 mmc-utils-80271e9a6fd0db9cb3a85d024664da886e94315c-br1.tar.gz +sha256 83b1bd7602b0c8d05a8ff2f842d80fa7c9a0b084b7159bb9eed796b0075b94d1 mmc-utils-e1281d4de9166b7254ba30bb58f9191fc2c9e7fb-br1.tar.gz sha256 4207d81122a02555f78c5a11b61c83a331ee03dc933e1ef9dd932ef9b434d12d README diff --git a/package/mmc-utils/mmc-utils.mk b/package/mmc-utils/mmc-utils.mk index ef4d97c1caae..48c347d8466e 100644 --- a/package/mmc-utils/mmc-utils.mk +++ b/package/mmc-utils/mmc-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -MMC_UTILS_VERSION = 80271e9a6fd0db9cb3a85d024664da886e94315c +MMC_UTILS_VERSION = e1281d4de9166b7254ba30bb58f9191fc2c9e7fb MMC_UTILS_SITE = https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git MMC_UTILS_SITE_METHOD = git MMC_UTILS_LICENSE = GPL-2.0 From 387bf13c6292837c6847d9c0f79a7872f0f2176e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 7 Mar 2024 21:10:42 +0100 Subject: [PATCH 171/345] package/cryptsetup: bump version to 2.7.1 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/cryptsetup/cryptsetup.hash | 2 +- package/cryptsetup/cryptsetup.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cryptsetup/cryptsetup.hash b/package/cryptsetup/cryptsetup.hash index df92ff36b881..531432aaaf23 100644 --- a/package/cryptsetup/cryptsetup.hash +++ b/package/cryptsetup/cryptsetup.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/sha256sums.asc -sha256 94003a00cd5a81944f45e8dc529e0cfd2a6ff629bd2cd21cf5e574e465daf795 cryptsetup-2.7.0.tar.xz +sha256 da5d1419e2a86e01aa32fd79582cd54d208857cb541bca2fd426a5ff1aaabbc3 cryptsetup-2.7.1.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index d17de961438c..b15f45857633 100644 --- a/package/cryptsetup/cryptsetup.mk +++ b/package/cryptsetup/cryptsetup.mk @@ -5,7 +5,7 @@ ################################################################################ CRYPTSETUP_VERSION_MAJOR = 2.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).0 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).1 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From 50c7bf3b22fd609000150938df6e9b35fa8cc549 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:49:24 +0100 Subject: [PATCH 172/345] package/sqlite: bump version to 3.45.1 Release notes: https://sqlite.org/releaselog/3_45_1.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 38cff902d738..e7b5d2b22492 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c6719a148bc41cf0f2bbbe3926d7ce3f5ca09d878f1246fcc20767b175bb407 sqlite-autoconf-3440200.tar.gz +sha256 cd9c27841b7a5932c9897651e20b86c701dd740556989b01ca596fcfa3d49a0a sqlite-autoconf-3450100.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index b54bd9580c48..040d405b8ada 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,10 +4,10 @@ # ################################################################################ -SQLITE_VERSION = 3.44.2 -SQLITE_TAR_VERSION = 3440200 +SQLITE_VERSION = 3.45.1 +SQLITE_TAR_VERSION = 3450100 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz -SQLITE_SITE = https://www.sqlite.org/2023 +SQLITE_SITE = https://www.sqlite.org/2024 SQLITE_LICENSE = blessing SQLITE_LICENSE_FILES = tea/license.terms SQLITE_CPE_ID_VENDOR = sqlite From d566d6a3692df6859a2b62c994bddd0ec8768a24 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 7 Mar 2024 18:49:47 +0100 Subject: [PATCH 173/345] package/xmrig: bump version to 6.21.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/xmrig/xmrig.hash | 2 +- package/xmrig/xmrig.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xmrig/xmrig.hash b/package/xmrig/xmrig.hash index 3a54d66ce443..9d84ab7957b2 100644 --- a/package/xmrig/xmrig.hash +++ b/package/xmrig/xmrig.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4b197c71fa06030216b641b4ea57f7a3d977a17df1b55bd13759d4705dbf5941 xmrig-6.21.0.tar.gz +sha256 c45baea5a210143b647349b5234a2192164d3473a39d2b1cab7fb35b1a2a8ba9 xmrig-6.21.1.tar.gz sha256 589ed823e9a84c56feb95ac58e7cf384626b9cbf4fda2a907bc36e103de1bad2 LICENSE diff --git a/package/xmrig/xmrig.mk b/package/xmrig/xmrig.mk index 35cd1d8d8213..37a613820d73 100644 --- a/package/xmrig/xmrig.mk +++ b/package/xmrig/xmrig.mk @@ -4,7 +4,7 @@ # ################################################################################ -XMRIG_VERSION = 6.21.0 +XMRIG_VERSION = 6.21.1 XMRIG_SITE = $(call github,xmrig,xmrig,v$(XMRIG_VERSION)) XMRIG_LICENSE = GPL-3.0+ XMRIG_LICENSE_FILES = LICENSE From 2c00fbfb9bd86c825f07c259d9c4a4cfd0bab42b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 10 Mar 2024 20:26:17 +0100 Subject: [PATCH 174/345] configs/ci20_defconfig: bump Linux to version 6.1.81 The kernel build now requires FIT support in mkimage: ITB arch/mips/boot/vmlinux.gz.itb /home/peko/source/buildroot/output-ci20/host/bin/mkimage: unsupported type Flat Device Tree So enable that. Signed-off-by: Peter Korsgaard --- configs/ci20_defconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 7e119376e153..f9070d5098fe 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -3,7 +3,7 @@ BR2_mipsel=y BR2_mips_xburst=y # BR2_MIPS_SOFT_FLOAT is not set BR2_KERNEL_HEADERS_AS_KERNEL=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" @@ -15,7 +15,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg" # kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.254" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.81" BR2_LINUX_KERNEL_DEFCONFIG="ci20" BR2_LINUX_KERNEL_INSTALL_TARGET=y @@ -29,6 +29,7 @@ BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin" BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE=y BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SOURCE="board/ci20/uboot-env.txt" BR2_PACKAGE_HOST_UBOOT_TOOLS_ENVIMAGE_SIZE="32768" From dedb7dc6d6543d5ce16ac73f927e0a33806075e1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 10 Mar 2024 20:26:18 +0100 Subject: [PATCH 175/345] configs/ci20_defconfig: bump u-boot to version 2024.01 Signed-off-by: Peter Korsgaard --- configs/ci20_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index f9070d5098fe..31019aeae27e 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -23,7 +23,7 @@ BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ci20_mmc" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y From a3629797616433b0cd5b876aa3ae0996ff90b696 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 10 Mar 2024 20:26:19 +0100 Subject: [PATCH 176/345] configs/ci20_defconfig: configure eth0 through BR2_SYSTEM_DHCP rather than kernel cmdline Passing ip=dhcp to the kernel will cause it to try to configure the network interface using DHCP and wait up to 120s for the interface to detect a link, slowing down boots without a network cable a lot. Instead use the "normal" BR2_SYSTEM_DHCP, E.G. trigger ifup to run the DHCP client in the background. Signed-off-by: Peter Korsgaard --- board/ci20/uboot-env.txt | 2 +- configs/ci20_defconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/board/ci20/uboot-env.txt b/board/ci20/uboot-env.txt index 3093496cc9cb..2d693af7b798 100644 --- a/board/ci20/uboot-env.txt +++ b/board/ci20/uboot-env.txt @@ -1,6 +1,6 @@ baudrate=115200 board_mfr=NP -bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 ip=dhcp +bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 bootcmd=run ethargs; ext4load mmc 0:1 0x88000000 /boot/uImage; bootm 0x88000000 bootdelay=1 ethargs=env set bootargs ${bootargs} diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig index 31019aeae27e..4b3c742173b0 100644 --- a/configs/ci20_defconfig +++ b/configs/ci20_defconfig @@ -7,6 +7,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttyS4" +BR2_SYSTEM_DHCP="eth0" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" From 53a8c5150e5eeeb6dbbead0275dbf9141f507511 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2024 17:49:46 +0100 Subject: [PATCH 177/345] toolchain: drop codesourcery arm/aarch64 toolchains codesourcery arm/aarch64 toolchains are old (2014) and use glibc 2.18/2.20 which are not compatible with 64-bit time_t raising the following build failure with libcgroup since commit 1c2dbcdcf0bb589d325c379246acaa39bb07b7be: In file included from ./libcgroup-internal.h:25:0, from parse.y:21: /home/buildroot/autobuild/run/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/include/fts.h:41:3: error: #error " cannot be used with -D_FILE_OFFSET_BITS==64" # error " cannot be used with -D_FILE_OFFSET_BITS==64" ^ Fixes: 1c2dbcdcf0bb589d325c379246acaa39bb07b7be - http://autobuild.buildroot.org/results/e28f955f2b360f6e7bb231a5a3800cfbd17a23d7 Signed-off-by: Fabrice Fontaine [Peter: add Config.in.legacy entries] Signed-off-by: Peter Korsgaard --- Config.in.legacy | 14 +++ package/guile/guile.mk | 5 - package/mesa3d/mesa3d.mk | 6 -- package/tpm2-totp/Config.in | 2 - .../autobuild/sourcery-arm-armv4t.config | 4 - .../autobuild/sourcery-arm-thumb2.config | 7 -- .../autobuild/sourcery-arm.config | 3 - .../autobuild/toolchain-configs.csv | 5 - .../testing/tests/toolchain/test_external.py | 97 ------------------- toolchain/Config.in | 1 - toolchain/toolchain-external/Config.in | 4 - .../Config.in | 19 ---- .../Config.in.options | 9 -- ...olchain-external-codesourcery-aarch64.hash | 3 - ...toolchain-external-codesourcery-aarch64.mk | 12 --- .../Config.in | 35 ------- .../Config.in.options | 9 -- .../toolchain-external-codesourcery-arm.hash | 3 - .../toolchain-external-codesourcery-arm.mk | 13 --- 19 files changed, 14 insertions(+), 237 deletions(-) delete mode 100644 support/config-fragments/autobuild/sourcery-arm-armv4t.config delete mode 100644 support/config-fragments/autobuild/sourcery-arm-thumb2.config delete mode 100644 support/config-fragments/autobuild/sourcery-arm.config delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk diff --git a/Config.in.legacy b/Config.in.legacy index e899fc3afa88..b99d9c1fb560 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,20 @@ endif comment "Legacy options removed in 2024.05" +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 + bool "CodeSourcery AArch64 2014.11" + select BR2_LEGACY + help + The Sourcery CodeBench AArch64 toolchain has been removed, + use an ARM/Bootlin/Linaro toolchain instead. + +config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM + bool "Sourcery CodeBench ARM 2014.05 has been removed" + select BR2_LEGACY + help + The Sourcery CodeBench ARM toolchain has been removed, use + an ARM/Bootlin/Linaro toolchain instead. + config BR2_BINUTILS_VERSION_2_39_X bool "binutils 2.39 has been removed" select BR2_LEGACY diff --git a/package/guile/guile.mk b/package/guile/guile.mk index 1d2e8038f0e4..82daaf5ad44e 100644 --- a/package/guile/guile.mk +++ b/package/guile/guile.mk @@ -44,11 +44,6 @@ ifeq ($(BR2_STATIC_LIBS),y) GUILE_CFLAGS += -DGC_NO_DLOPEN endif -# Triggers assembler error with -Os -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM)$(BR2_OPTIMIZE_S),yy) -GUILE_CFLAGS += -O2 -endif - # jit triggers build failures with gcc < 5 ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),) GUILE_CONF_OPTS += --disable-jit diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 8e3cd7245dee..df0079bf80e3 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -29,12 +29,6 @@ MESA3D_CONF_OPTS = \ -Dgallium-omx=disabled \ -Dpower8=disabled -# Codesourcery ARM 2014.05 fail to link libmesa_dri_drivers.so with --as-needed linker -# flag due to a linker bug between binutils 2.24 and 2.25 (2.24.51.20140217). -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM),y) -MESA3D_CONF_OPTS += -Db_asneeded=false -endif - ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) MESA3D_CONF_OPTS += -Ddri3=enabled ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) diff --git a/package/tpm2-totp/Config.in b/package/tpm2-totp/Config.in index dcadf5a5f284..a26604abb8b8 100644 --- a/package/tpm2-totp/Config.in +++ b/package/tpm2-totp/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_TPM2_TOTP bool "tpm2-totp" depends on !BR2_STATIC_LIBS # tpm2-tss - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # glibc < 2.20 select BR2_PACKAGE_LIBQRENCODE select BR2_PACKAGE_TPM2_TSS help @@ -20,4 +19,3 @@ config BR2_PACKAGE_TPM2_TOTP comment "tpm2-totp needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM diff --git a/support/config-fragments/autobuild/sourcery-arm-armv4t.config b/support/config-fragments/autobuild/sourcery-arm-armv4t.config deleted file mode 100644 index 4c0e01fecba9..000000000000 --- a/support/config-fragments/autobuild/sourcery-arm-armv4t.config +++ /dev/null @@ -1,4 +0,0 @@ -BR2_arm=y -BR2_arm920t=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y diff --git a/support/config-fragments/autobuild/sourcery-arm-thumb2.config b/support/config-fragments/autobuild/sourcery-arm-thumb2.config deleted file mode 100644 index e726757a1611..000000000000 --- a/support/config-fragments/autobuild/sourcery-arm-thumb2.config +++ /dev/null @@ -1,7 +0,0 @@ -BR2_arm=y -BR2_cortex_a8=y -BR2_ARM_EABI=y -BR2_ARM_INSTRUCTIONS_THUMB2=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y -BR2_TARGET_OPTIMIZATION="" diff --git a/support/config-fragments/autobuild/sourcery-arm.config b/support/config-fragments/autobuild/sourcery-arm.config deleted file mode 100644 index 8ade4647f206..000000000000 --- a/support/config-fragments/autobuild/sourcery-arm.config +++ /dev/null @@ -1,3 +0,0 @@ -BR2_arm=y -BR2_TOOLCHAIN_EXTERNAL=y -BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y diff --git a/support/config-fragments/autobuild/toolchain-configs.csv b/support/config-fragments/autobuild/toolchain-configs.csv index a65e9bacc39a..2c4fa45fe7d5 100644 --- a/support/config-fragments/autobuild/toolchain-configs.csv +++ b/support/config-fragments/autobuild/toolchain-configs.csv @@ -18,9 +18,6 @@ support/config-fragments/autobuild/bootlin-x86-64-musl.config,x86_64 # Test a MMU toolchain without dynamic library support support/config-fragments/autobuild/br-arm-full-static.config,x86_64 -# Test a toolchain with an old gcc version (gcc 4.8) -support/config-fragments/autobuild/sourcery-arm.config,x86 - # Toolchains used by test-pkg only when the '-a' option is passed: support/config-fragments/autobuild/arm-aarch64.config,x86_64 support/config-fragments/autobuild/bootlin-aarch64-glibc.config,x86_64 @@ -66,8 +63,6 @@ support/config-fragments/autobuild/br-xtensa-full-internal.config,any support/config-fragments/autobuild/linaro-aarch64.config,x86 support/config-fragments/autobuild/linaro-aarch64-be.config,x86 support/config-fragments/autobuild/linaro-arm.config,x86 -support/config-fragments/autobuild/sourcery-arm-armv4t.config,x86 -support/config-fragments/autobuild/sourcery-arm-thumb2.config,x86 support/config-fragments/autobuild/sourcery-mips64.config,x86 support/config-fragments/autobuild/sourcery-mips.config,x86 support/config-fragments/autobuild/sourcery-nios2.config,x86 diff --git a/support/testing/tests/toolchain/test_external.py b/support/testing/tests/toolchain/test_external.py index d22f38cedcd0..27dfd68500eb 100644 --- a/support/testing/tests/toolchain/test_external.py +++ b/support/testing/tests/toolchain/test_external.py @@ -37,103 +37,6 @@ def common_check(self): self.assertTrue(os.path.exists(interp_path)) -class TestExternalToolchainSourceryArmv4(TestExternalToolchain): - config = BASIC_CONFIG + \ - """ - BR2_arm=y - BR2_arm920t=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y - """ - toolchain_prefix = "arm-none-linux-gnueabi" - - def test_run(self): - TestExternalToolchain.common_check(self) - - # Check the architecture variant - arch = infra.get_file_arch(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6") - self.assertEqual(arch, "v4T") - - # Check the sysroot symlink - symlink = os.path.join(self.builddir, "staging", "armv4t") - self.assertTrue(os.path.exists(symlink)) - self.assertEqual(os.readlink(symlink), "./") - - # Boot the system - img = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv5", - kernel="builtin", - options=["-initrd", img]) - self.emulator.login() - - -class TestExternalToolchainSourceryArmv5(TestExternalToolchain): - config = BASIC_CONFIG + \ - """ - BR2_arm=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y - """ - toolchain_prefix = "arm-none-linux-gnueabi" - - def test_run(self): - TestExternalToolchain.common_check(self) - - # Check the architecture variant - arch = infra.get_file_arch(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6") - self.assertEqual(arch, "v5TE") - - # Boot the system - img = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv5", - kernel="builtin", - options=["-initrd", img]) - self.emulator.login() - - -class TestExternalToolchainSourceryArmv7(TestExternalToolchain): - config = BASIC_CONFIG + \ - """ - BR2_arm=y - BR2_cortex_a8=y - BR2_ARM_EABI=y - BR2_ARM_INSTRUCTIONS_THUMB2=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM=y - """ - toolchain_prefix = "arm-none-linux-gnueabi" - - def test_run(self): - TestExternalToolchain.common_check(self) - - # Check the architecture variant - arch = infra.get_file_arch(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6") - self.assertEqual(arch, "v7") - isa = infra.get_elf_arch_tag(self.builddir, - self.toolchain_prefix, - "lib/libc.so.6", - "Tag_THUMB_ISA_use") - self.assertEqual(isa, "Thumb-2") - - # Check we have the sysroot symlink - symlink = os.path.join(self.builddir, "staging", "thumb2") - self.assertTrue(os.path.exists(symlink)) - self.assertEqual(os.readlink(symlink), "./") - - # Boot the system - img = os.path.join(self.builddir, "images", "rootfs.cpio") - self.emulator.boot(arch="armv7", - kernel="builtin", - options=["-initrd", img]) - self.emulator.login() - - class TestExternalToolchainLinaroArm(TestExternalToolchain): config = BASIC_CONFIG + \ """ diff --git a/toolchain/Config.in b/toolchain/Config.in index 3dd6e83d3542..1641dbae0628 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -886,7 +886,6 @@ config BR2_TOOLCHAIN_HAS_SYNC_8 config BR2_TOOLCHAIN_HAS_LIBATOMIC bool default y if BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 && \ - !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 && \ BR2_TOOLCHAIN_HAS_THREADS && \ !BR2_BINFMT_FLAT diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index c1c159cb8eb1..b5432b71d7d2 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -11,7 +11,6 @@ choice # Aarch64 (use ARM toolchain by default) source "toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in" source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in" -source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in" # Aarch64 big-endian source "toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in" @@ -23,7 +22,6 @@ source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in" # ARM (use ARM toolchain by default) source "toolchain/toolchain-external/toolchain-external-arm-arm/Config.in" source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" -source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in" # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" @@ -115,7 +113,6 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX # Aarch64 source "toolchain/toolchain-external/toolchain-external-arm-aarch64/Config.in.options" source "toolchain/toolchain-external/toolchain-external-linaro-aarch64/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options" # Aarch64 big-endian source "toolchain/toolchain-external/toolchain-external-arm-aarch64-be/Config.in.options" @@ -127,7 +124,6 @@ source "toolchain/toolchain-external/toolchain-external-synopsys-arc/Config.in.o # ARM source "toolchain/toolchain-external/toolchain-external-arm-arm/Config.in.options" source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options" # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.options" diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in deleted file mode 100644 index 8c0f985c5bf6..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - bool "CodeSourcery AArch64 2014.11" - depends on BR2_aarch64 - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5 - # a57/a53 and a72/a53 appeared in gcc-6 or were broken before - depends on !BR2_cortex_a57_a53 && !BR2_cortex_a72_a53 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - help - Sourcery CodeBench toolchain for the AArch64 architecture, - from Mentor Graphics. It uses gcc 4.9.1, binutils - 2.24.51.20140217, glibc 2.20, gdb 7.7.50 and kernel headers - 3.16.2. diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options deleted file mode 100644 index 1eab83921669..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "aarch64-amd-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-aarch64" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash deleted file mode 100644 index 8f8fca0d0c3a..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 405aada821146755c5f2df566375c2a682456d6b8451ee47b88cf1a52b093676 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu-i686-pc-linux-gnu.tar.bz2 -sha256 3f50dd6ee433eb5b6992a1071b988e50379a738f54f58722bc60081613764716 aarch64-amd-2014.11-95-aarch64-amd-linux-gnu.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk deleted file mode 100644 index 192763a0e0e1..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-aarch64/toolchain-external-codesourcery-aarch64.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-aarch64 -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION = 2014.11-95 -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_SOURCE = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_ACTUAL_SOURCE_TARBALL = aarch64-amd-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in deleted file mode 100644 index aea2ba34f25a..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM - bool "Sourcery CodeBench ARM 2014.05" - depends on BR2_arm - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_ARM_EABI - # Unsupported ARM cores - depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8A - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_HAS_SSP - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_INSTALL_LIBSTDCPP - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_13 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - help - Sourcery CodeBench toolchain for the ARM architecture, from - Mentor Graphics. It uses gcc 4.8.3, binutils 2.24.51, glibc - 2.18 and gdb 7.7.50, kernel headers 3.13. It has support - for the following variants: - - ARMv5TE, little endian, soft-float, glibc - Select ARM926T, ARM10T, XScale or another ARMv5 core - Select BR2_SOFT_FLOAT - - ARMv4T, little endian, soft-float, glibc - Select ARM720T, ARM920T, ARM922T or another ARMv4 core - Select BR2_SOFT_FLOAT - - ARMv7-A, Thumb 2, little endian, soft-float, glibc - Select Cortex-A8, Cortex-A9 or another ARMv7-A core - Select BR2_SOFT_FLOAT - Set BR2_TARGET_OPTIMIZATION to -mthumb - -comment "Sourcery CodeBench toolchains available for the EABI ABI" - depends on BR2_arm - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_4_9 - depends on !BR2_ARM_EABI diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options deleted file mode 100644 index 7f3654dc70a6..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "arm-none-linux-gnueabi" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codesourcery-arm" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash deleted file mode 100644 index c01a7b17c598..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 39ee0e789034334ecc89af94e838e3a4815400ac5ff980f808f466b04778532e arm-2014.05-29-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 -sha256 e16a5b1e41d7ff1e74161f9405182001bc8d1360d89564e73911032e6966cc0d arm-2014.05-29-arm-none-linux-gnueabi.src.tar.bz2 diff --git a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk b/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk deleted file mode 100644 index f15a50c43e13..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codesourcery-arm/toolchain-external-codesourcery-arm.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# toolchain-external-codesourcery-arm -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION = 2014.05-29 - -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SITE = https://sourcery.mentor.com/public/gnu_toolchain/$(TOOLCHAIN_EXTERNAL_PREFIX) -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_SOURCE = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX)-i686-pc-linux-gnu.tar.bz2 -TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_ACTUAL_SOURCE_TARBALL = arm-$(TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM_VERSION)-$(TOOLCHAIN_EXTERNAL_PREFIX).src.tar.bz2 - -$(eval $(toolchain-external-package)) From 665086ba5ddff7653dd283074d67e74f5dc25c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Fri, 15 Mar 2024 18:24:16 +0100 Subject: [PATCH 178/345] package/rt-tests: bump version to 2.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Szymanski Signed-off-by: Arnout Vandecappelle --- package/rt-tests/rt-tests.hash | 2 +- package/rt-tests/rt-tests.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rt-tests/rt-tests.hash b/package/rt-tests/rt-tests.hash index eb28f4d441a6..017447bce665 100644 --- a/package/rt-tests/rt-tests.hash +++ b/package/rt-tests/rt-tests.hash @@ -1,4 +1,4 @@ # From https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/sha256sums.asc -sha256 2ed2e4c965c7f336a15d3354dec090e27a0b1e9ada91ae0b9ef18bbcb993874e rt-tests-2.5.tar.xz +sha256 761d10c4b7f5b28400f0c301fe0171eaa74f347df64cb359210254b8e6aff19f rt-tests-2.6.tar.xz # locally computed hash sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk index 8ad4215ee192..4b1aa3179647 100644 --- a/package/rt-tests/rt-tests.mk +++ b/package/rt-tests/rt-tests.mk @@ -6,7 +6,7 @@ RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 2.5 +RT_TESTS_VERSION = 2.6 RT_TESTS_LICENSE = GPL-2.0+ RT_TESTS_LICENSE_FILES = COPYING From 44f3c736a800d2afd154e5e476cdc60ae30a0108 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 15 Mar 2024 16:08:02 +0100 Subject: [PATCH 179/345] package/rauc: bump version to 1.11.3 Contains a single fix for a regression since 1.11.0. https://github.com/rauc/rauc/releases/tag/v1.11.3 Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- package/rauc/rauc.hash | 2 +- package/rauc/rauc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rauc/rauc.hash b/package/rauc/rauc.hash index 6899ca94fe14..391d89a8f655 100644 --- a/package/rauc/rauc.hash +++ b/package/rauc/rauc.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 e47070e97f89136ca8d0b2b044c40e68ac0f44432046176d08d66717320df4a7 rauc-1.11.2.tar.xz +sha256 ef82ee452939c03a24fd40649afa96497f3cec965994e6c9c0d94239b640bc10 rauc-1.11.3.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/rauc/rauc.mk b/package/rauc/rauc.mk index 7bb374259fcd..7239d84cc745 100644 --- a/package/rauc/rauc.mk +++ b/package/rauc/rauc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RAUC_VERSION = 1.11.2 +RAUC_VERSION = 1.11.3 RAUC_SITE = https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION) RAUC_SOURCE = rauc-$(RAUC_VERSION).tar.xz RAUC_LICENSE = LGPL-2.1 From 136d4dfbe6126b5ed20237c571f599dfc163d110 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:51:52 +0100 Subject: [PATCH 180/345] package/libpciaccess: bump to version 0.18 - Update hash of COPYING (update in year with: https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/cde74b51014053175497ac75cbaea10d6184ab57) - Switch to meson-package https://lists.x.org/archives/xorg-announce/2024-February/003453.html Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libpciaccess/libpciaccess.hash | 6 +++--- package/libpciaccess/libpciaccess.mk | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/libpciaccess/libpciaccess.hash b/package/libpciaccess/libpciaccess.hash index 27ec59a4523a..4662314509af 100644 --- a/package/libpciaccess/libpciaccess.hash +++ b/package/libpciaccess/libpciaccess.hash @@ -1,4 +1,4 @@ -# From https://lists.x.org/archives/xorg-announce/2022-October/003226.html -sha512 8484605c66ef18c8d8a3e029a6d33e26fcaa450c1263790d89ac8b0a160ffb2dfceaa6140ac9ad7d8087283ecbec8ac801f757e44890d547c3cbecd2c922ca47 libpciaccess-0.17.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-February/003453.html +sha512 54dff9a493344586d072edf8c8eb8f7960c7dfd64aa5c51a8ec8d4e341f703fd39eb606ee41c4fdd9d5aad3372b7efe6e0fe96eadc575ea91de276320ebc3fbd libpciaccess-0.18.tar.xz # Hash for license file: -sha256 47012fd746980d1712ac4f3841ab6164bda1d2b84880760e45dbe1e1dc07f608 COPYING +sha256 f33f360f8905940dac01aa21597fe8a6727ca6f4ffa43b380e2116fd0666aa8a COPYING diff --git a/package/libpciaccess/libpciaccess.mk b/package/libpciaccess/libpciaccess.mk index 525a3bcd027a..04f3e2083b5f 100644 --- a/package/libpciaccess/libpciaccess.mk +++ b/package/libpciaccess/libpciaccess.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBPCIACCESS_VERSION = 0.17 +LIBPCIACCESS_VERSION = 0.18 LIBPCIACCESS_SOURCE = libpciaccess-$(LIBPCIACCESS_VERSION).tar.xz LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib LIBPCIACCESS_LICENSE = MIT @@ -13,10 +13,10 @@ LIBPCIACCESS_INSTALL_STAGING = YES LIBPCIACCESS_DEPENDENCIES = host-pkgconf ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBPCIACCESS_CONF_OPTS += --with-zlib +LIBPCIACCESS_CONF_OPTS += -Dzlib=enabled LIBPCIACCESS_DEPENDENCIES += zlib else -LIBPCIACCESS_CONF_OPTS += --without-zlib +LIBPCIACCESS_CONF_OPTS += -Dzlib=disabled endif -$(eval $(autotools-package)) +$(eval $(meson-package)) From dbc6398f1d4c68fa32c5f9d6329dfff7cb109a4b Mon Sep 17 00:00:00 2001 From: Wilfred Mallawa Date: Fri, 15 Mar 2024 07:44:23 +1000 Subject: [PATCH 181/345] package/libspdm: bump version to 3.2.0 Additionally, add an upstream patch that fixes the configuration for "NONE" toolchain variant in libspdm. That is, where the build environment provides compile/link options. Reviewed-by: Alistair Francis Signed-off-by: Wilfred Mallawa Signed-off-by: Arnout Vandecappelle --- ...eLists-remove-fixed-options-for-NONE.patch | 52 +++++++++++++++++++ package/libspdm/libspdm.hash | 2 +- package/libspdm/libspdm.mk | 2 +- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch diff --git a/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch new file mode 100644 index 000000000000..0de0ad00793e --- /dev/null +++ b/package/libspdm/0001-CMakeLists-remove-fixed-options-for-NONE.patch @@ -0,0 +1,52 @@ +From d4d6b138d727e484fa9d0fef476ca181681d0695 Mon Sep 17 00:00:00 2001 +From: Wilfred Mallawa +Date: Mon, 19 Feb 2024 09:56:14 +1000 +Subject: [PATCH] CMakeLists: remove fixed options for NONE + +The use of the NONE toolchain option is such that we can provide at the +build project level (buildroot etc...). However, the changes introduced +in 811f2b596def04b3a36368cf2098546d7907767f set certain compiler/linker +option that does not comply with the definition of the options as +specified in [1]. This change removes those options. + +[1] https://github.com/DMTF/libspdm/blob/main/doc/build.md#linux-builds-inside-build-environments + +Upstream: https://github.com/DMTF/libspdm/commit/d4d6b138d727e484fa9d0fef476ca181681d0695 +Signed-off-by: Wilfred Mallawa +--- + CMakeLists.txt | 19 ------------------- + 1 file changed, 19 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9c300cc817..f6cf17d269 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -618,25 +618,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(CMAKE_EXE_LINKER_FLAGS "") + + SET(CMAKE_C_LINK_EXECUTABLE "") +- +- elseif(TOOLCHAIN STREQUAL "NONE") +- ADD_COMPILE_OPTIONS(-fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-array-bounds -ffunction-sections -fdata-sections -fno-common -Wno-address -fpie -fno-asynchronous-unwind-tables -flto -DUSING_LTO -Wno-maybe-uninitialized -Wno-uninitialized -Wno-builtin-declaration-mismatch -Wno-nonnull-compare -Werror-implicit-function-declaration) +- if(CMAKE_BUILD_TYPE STREQUAL "Debug") +- ADD_COMPILE_OPTIONS(-g) +- endif() +- if(GCOV STREQUAL "ON") +- ADD_COMPILE_OPTIONS(--coverage -fprofile-arcs -ftest-coverage) +- endif() +- SET(OPENSSL_FLAGS -include base.h -Wno-error=maybe-uninitialized -Wno-error=format -Wno-format -Wno-error=unused-but-set-variable -Wno-cast-qual -Wno-error=implicit-function-declaration) +- SET(CMOCKA_FLAGS -std=gnu99 -Wpedantic -Wall -Wshadow -Wmissing-prototypes -Wcast-align -Werror=address -Wstrict-prototypes -Werror=strict-prototypes -Wwrite-strings -Werror=write-strings -Werror-implicit-function-declaration -Wpointer-arith -Werror=pointer-arith -Wdeclaration-after-statement -Werror=declaration-after-statement -Wreturn-type -Werror=return-type -Wuninitialized -Werror=uninitialized -Werror=strict-overflow -Wstrict-overflow=2 -Wno-format-zero-length -Wmissing-field-initializers -Wformat-security -Werror=format-security -fno-common -Wformat -fno-common -fstack-protector-strong -Wno-cast-qual) +- +- SET(CMAKE_LINKER ${CMAKE_C_COMPILER}) +- SET(CMAKE_EXE_LINKER_FLAGS "-flto -Wno-error -no-pie" ) +- if(GCOV STREQUAL "ON") +- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage -lgcov -fprofile-arcs -ftest-coverage") +- endif() +- SET(CMAKE_C_LINK_EXECUTABLE " -o -Wl,--start-group -Wl,--end-group") +- + endif() + + if(NOT TOOLCHAIN STREQUAL "NIOS2_GCC") +-- +2.43.2 + diff --git a/package/libspdm/libspdm.hash b/package/libspdm/libspdm.hash index 23faba1c4b04..32415bcfcecb 100644 --- a/package/libspdm/libspdm.hash +++ b/package/libspdm/libspdm.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 84d4a755f57b17775c63b5c8be646d518ce34d5d1b85994b6150ebce9d31b183 libspdm-3.1.1.tar.gz +sha256 0ee460c0ce5c4d126ca65f9c4bdabd5725b87cec7160b2d06721169df58f3a95 libspdm-3.2.0.tar.gz sha256 7dc072bff163df39209bbb63e0916f4667c2a84cf3c36ccc84ec7425bc3e4779 LICENSE.md diff --git a/package/libspdm/libspdm.mk b/package/libspdm/libspdm.mk index 34dbb457c4d9..2ec35be0ac48 100644 --- a/package/libspdm/libspdm.mk +++ b/package/libspdm/libspdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSPDM_VERSION = 3.1.1 +LIBSPDM_VERSION = 3.2.0 LIBSPDM_SITE = $(call github,DMTF,libspdm,$(LIBSPDM_VERSION)) LIBSPDM_LICENSE = BSD-3-Clause LIBSPDM_LICENSE_FILES = LICENSE.md From 0a0b522b23fdadeafbca904a56047b8cf35760df Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:42:25 +0100 Subject: [PATCH 182/345] package/libnfs: bump to version 5.0.3 https://github.com/sahlberg/libnfs/blob/libnfs-5.0.3/CHANGELOG Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libnfs/libnfs.hash | 2 +- package/libnfs/libnfs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnfs/libnfs.hash b/package/libnfs/libnfs.hash index b67a5d2eda0f..c5e5197c1301 100644 --- a/package/libnfs/libnfs.hash +++ b/package/libnfs/libnfs.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 637e56643b19da9fba98f06847788c4dad308b723156a64748041035dcdf9bd3 libnfs-5.0.2.tar.gz +sha256 d945cb4f4c8f82ee1f3640893a168810f794a28e1010bb007ec5add345e9df3e libnfs-5.0.3.tar.gz sha256 edd960c0142b8ada98b43b6396b78f4e557b0bc70ac601a51e397ad04070e2c5 COPYING sha256 d9406ced95457941032aa11d04623b8ab71f2827a3395ebef137aec475be35b1 LICENCE-BSD.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENCE-LGPL-2.1.txt diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk index b013decfc7ee..eb919406f30c 100644 --- a/package/libnfs/libnfs.mk +++ b/package/libnfs/libnfs.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFS_VERSION = 5.0.2 +LIBNFS_VERSION = 5.0.3 LIBNFS_SITE = $(call github,sahlberg,libnfs,libnfs-$(LIBNFS_VERSION)) LIBNFS_INSTALL_STAGING = YES LIBNFS_AUTORECONF = YES From 355ceb893078b4e1d458a3367fc2c989911fefe1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:32:52 +0100 Subject: [PATCH 183/345] package/libkrb5: force arm mode instead of Thumb mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix the following build failure in Thumb mode: /tmp/ccdzbA2E.s:845: Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/08be1fa0fee0f05818cd78d4718caa3476c570ae Signed-off-by: Fabrice Fontaine Reviewed-by: André Zwing Signed-off-by: Arnout Vandecappelle --- package/libkrb5/libkrb5.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libkrb5/libkrb5.mk b/package/libkrb5/libkrb5.mk index 62a34b23791a..c58763eddd3d 100644 --- a/package/libkrb5/libkrb5.mk +++ b/package/libkrb5/libkrb5.mk @@ -33,6 +33,13 @@ LIBKRB5_CONF_OPTS = \ --without-tcl \ --disable-rpath +# libkrb5 has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `mcr p15,0,r2,c7,c10,5' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBKRB5_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + # Enabling static and shared at the same time is not supported ifeq ($(BR2_SHARED_STATIC_LIBS),y) LIBKRB5_CONF_OPTS += --disable-static From 773ef1fdbafc461be787f9ac69f64de62a6f55e0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 14 Mar 2024 22:20:43 +0100 Subject: [PATCH 184/345] package/{mesa3d, mesa3d-headers}: bump version to 24.0.3 Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000749.html https://lists.freedesktop.org/archives/mesa-announce/2024-February/000751.html https://lists.freedesktop.org/archives/mesa-announce/2024-March/000752.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- 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 1d006dbc910e..7f39fefaf560 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 = 24.0.0 +MESA3D_HEADERS_VERSION = 24.0.3 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 49b42e2132b2..1e94c2c612bd 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html -sha256 dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 mesa-24.0.0.tar.xz -sha512 9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15 mesa-24.0.0.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2024-March/000752.html +sha256 77aec9a2a37b7d3596ea1640b3cc53d0b5d9b3b52abed89de07e3717e91bfdbe mesa-24.0.3.tar.xz +sha512 76b3b479877c40f729d7f530af4e3577fa74363edcd3d9474350d498a51dbb761fc034b39bee8547e97c30fd3a520cbc50c742d5a187746e83ddab1df44f37e9 mesa-24.0.3.tar.xz # License sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index df0079bf80e3..29c67b77b993 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 = 24.0.0 +MESA3D_VERSION = 24.0.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos From e2f87b3c15c100a411d277589ba8de1de564efd4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 14 Mar 2024 22:15:57 +0100 Subject: [PATCH 185/345] package/mesa3d: rework dri3 handling While fixing a build error ../src/egl/drivers/dri2/platform_x11.c: In function 'dri2_x11_get_msc_rate': ../src/egl/drivers/dri2/platform_x11.c:1229:44: error: 'struct dri2_egl_display' has no member named 'screen_resources' with this defconfig: BR2_x86_64=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_MESA3D_OPENGL_EGL=y BR2_PACKAGE_MESA3D_OPENGL_ES=y BR2_PACKAGE_XORG7=y (crocus and i915 drivers are also affected) it turns out that we can assume the need for dri3 support when X.org is enabled as a hard depen- dency even if mesa3d's configure does not throw errors when missing, like for the Intel drivers. Before this patch these Config.in options were used: config BR2_PACKAGE_MESA3D_DRI3 select BR2_PACKAGE_XLIB_LIBXSHMFENCE select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 which can be translated into: select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XORG7 and used at option BR2_PACKAGE_MESA3D_DRIVER. Configure option -Ddri3=enabled is passed to mesa3d when at least one driver is enabled along with X.org: ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/mesa3d/Config.in | 15 ++------------- package/mesa3d/mesa3d.mk | 4 +--- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 39a4f706e234..459051b2dba3 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -56,11 +56,7 @@ config BR2_PACKAGE_MESA3D_OPENCL select BR2_PACKAGE_LIBCLC select BR2_PACKAGE_HAS_LIBOPENCL -# inform the .mk file of gallium, dri, dri3 or vulkan driver selection -config BR2_PACKAGE_MESA3D_DRI3 - bool - select BR2_PACKAGE_XLIB_LIBXSHMFENCE - +# inform the .mk file of gallium or vulkan driver selection config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER bool select BR2_PACKAGE_MESA3D_DRIVER @@ -71,6 +67,7 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER config BR2_PACKAGE_MESA3D_DRIVER bool + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XORG7 # Gallium xa state tracker. # Quote from mesa3d meson.build: "XA state tracker requires at least @@ -103,7 +100,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV bool "Gallium Etnaviv driver" depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_ETNAVIV help @@ -117,7 +113,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO # can't see is just spurious. However, that dependency is about # the toolchain having sync4 primitives, which is always a given # for arm/aarch64. - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_FREEDRENO help @@ -141,7 +136,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA bool "Gallium lima driver" depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help Mesa driver for ARM Mali Utgard GPUs. @@ -158,7 +152,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST bool "Gallium panfrost driver" depends on (BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_RISCV_32) || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER help Mesa driver for ARM Mali Midgard and Bifrost GPUs. @@ -239,7 +232,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D bool "Gallium v3d driver" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 # runtime select BR2_PACKAGE_MESA3D_OPENGL_EGL @@ -255,7 +247,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 bool "Gallium vc4 driver" depends on (BR2_arm && BR2_ARM_CPU_HAS_NEON) || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_VC4 select BR2_PACKAGE_MESA3D_OPENGL_EGL @@ -295,7 +286,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_BROADCOM bool "Vulkan broadcom driver" depends on BR2_arm || BR2_aarch64 depends on BR2_TOOLCHAIN_HAS_SYNC_4 # dri3/libxshmfence - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_VULKAN_DRIVER help Vulkan broadcom driver. @@ -306,7 +296,6 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL depends on BR2_TOOLCHAIN_HAS_SYNC_4 || !BR2_PACKAGE_XORG7 # libxshmfence depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert - select BR2_PACKAGE_MESA3D_DRI3 if BR2_PACKAGE_XORG7 select BR2_PACKAGE_MESA3D_VULKAN_DRIVER help Vulkan driver for Intel hardware from Ivy Bridge onward. diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 29c67b77b993..bdb7ea9a6c2b 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -29,11 +29,9 @@ MESA3D_CONF_OPTS = \ -Dgallium-omx=disabled \ -Dpower8=disabled -ifeq ($(BR2_PACKAGE_MESA3D_DRI3),y) +ifeq ($(BR2_PACKAGE_MESA3D_DRIVER)$(BR2_PACKAGE_XORG7),yy) MESA3D_CONF_OPTS += -Ddri3=enabled -ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y) MESA3D_DEPENDENCIES += xlib_libxshmfence -endif else MESA3D_CONF_OPTS += -Ddri3=disabled endif From 9a5160ed5abded9d2b843a2422a48d4964cff42e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:41:25 +0100 Subject: [PATCH 186/345] package/libnfs: fix pthread option Fix typo added by commit f9f5b3a6cbc4e62beefdd0448842ef0c8c3eb6f6 Fixes: f9f5b3a6cbc4e62beefdd0448842ef0c8c3eb6f6 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libnfs/libnfs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnfs/libnfs.mk b/package/libnfs/libnfs.mk index eb919406f30c..e5e302a4f8bb 100644 --- a/package/libnfs/libnfs.mk +++ b/package/libnfs/libnfs.mk @@ -17,9 +17,9 @@ LIBNFS_DEPENDENCIES += libtirpc endif ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBNFS_CONF_OPTS += --enable-threads +LIBNFS_CONF_OPTS += --enable-pthread else -LIBNFS_CONF_OPTS += --disable-threads +LIBNFS_CONF_OPTS += --disable-pthread endif $(eval $(autotools-package)) From 89bc66d08e17bca0c1ca40346c0c248f550b6013 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2024 22:11:17 +0100 Subject: [PATCH 187/345] package/multipath-tools: fix legal info Commit cc363e9a93484e734313b17962b931b3df6eedaa forgot to update hash of README.md (changes not related to license) Fixes: cc363e9a93484e734313b17962b931b3df6eedaa - http://autobuild.buildroot.org/results/d41b3eedb337ac7559afceed459c3e28a9bf15a2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/multipath-tools/multipath-tools.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index 0f51c3884645..c1f32e7a3b07 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -4,4 +4,4 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENS sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 5887418b2e0e595da5aca08b2dff25298f20618f9894d5e26ce852d9d1ae90c4 README.md +sha256 9c69bb0089aa0b82b10a25095c04a7c4aec6b5bbf0776b7129123c8459fe7725 README.md From 2b59ee9f191bfaaf9dcb8d74efdcc67754d8db3e Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Fri, 15 Mar 2024 20:38:36 +0100 Subject: [PATCH 188/345] Config.in.legacy: fix indentation (tab instead of spaces) Found by check-package. Fixes: 53a8c5150e5eeeb6dbbead0275dbf9141f507511 Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/6406596540 Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index b99d9c1fb560..5aaaae0eec50 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -147,14 +147,14 @@ endif comment "Legacy options removed in 2024.05" config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - bool "CodeSourcery AArch64 2014.11" + bool "CodeSourcery AArch64 2014.11" select BR2_LEGACY help The Sourcery CodeBench AArch64 toolchain has been removed, use an ARM/Bootlin/Linaro toolchain instead. config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM - bool "Sourcery CodeBench ARM 2014.05 has been removed" + bool "Sourcery CodeBench ARM 2014.05 has been removed" select BR2_LEGACY help The Sourcery CodeBench ARM toolchain has been removed, use From 8b025251d370357a0580acfdba876d4f8387559f Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 14 Mar 2024 18:31:30 +0100 Subject: [PATCH 189/345] package/luarocks: bump to version 3.11.0 COPYING: update copyright notice see https://github.com/luarocks/luarocks/commit/a0bc05dcc7f44b94fb4585c560928ba9be6d8bdc Signed-off-by: Francois Perrad Signed-off-by: Arnout Vandecappelle --- package/luarocks/buildroot.lua | 3 +++ package/luarocks/luarocks.hash | 4 ++-- package/luarocks/luarocks.mk | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/luarocks/buildroot.lua b/package/luarocks/buildroot.lua index 3c044d89b5f2..2b52358667ed 100644 --- a/package/luarocks/buildroot.lua +++ b/package/luarocks/buildroot.lua @@ -350,8 +350,11 @@ function buildroot.command(args) return nil, "Error loading rockspec: " .. err end if rockspec.source.file then + rockspec.source.dir = rockspec.source.dir or dir.deduce_base_dir(rockspec.source.file) ok, err = fs.unpack_archive(rockspec.source.file) if not ok then return nil, err end + else + rockspec.source.dir = rockspec.source.dir or '.' end if rockspec.source.dir ~= '.' then diff --git a/package/luarocks/luarocks.hash b/package/luarocks/luarocks.hash index 713645692317..fbf52702168d 100644 --- a/package/luarocks/luarocks.hash +++ b/package/luarocks/luarocks.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ffafd83b1c42aa38042166a59ac3b618c838ce4e63f4ace9d961a5679ef58253 luarocks-3.9.1.tar.gz -sha256 542ad0ee9b8ba582437ca7b4d0959c9b9432f25d2067f144d017188a7a84dd2f COPYING +sha256 25f56b3c7272fb35b869049371d649a1bbe668a56d24df0a66e3712e35dd44a6 luarocks-3.11.0.tar.gz +sha256 660773f53ed17cd0d8be7d67168c25e8cc664a506788c7b5971192bdd2994a9d COPYING diff --git a/package/luarocks/luarocks.mk b/package/luarocks/luarocks.mk index 2bec2fca255b..4c9922914260 100644 --- a/package/luarocks/luarocks.mk +++ b/package/luarocks/luarocks.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUAROCKS_VERSION = 3.9.1 +LUAROCKS_VERSION = 3.11.0 LUAROCKS_SITE = https://luarocks.org/releases LUAROCKS_LICENSE = MIT LUAROCKS_LICENSE_FILES = COPYING From 30af227f9bac1e568c1208cfc392748a8ddbbf0d Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Wed, 13 Mar 2024 13:19:39 -0300 Subject: [PATCH 190/345] configs/imx7d-sdb: bump the kernel version Bump the kernel version to 6.6.21. Also pass the nxp/imx/ path due to the devicetree reorganization in kernel 6.6. Signed-off-by: Fabio Estevam Signed-off-by: Arnout Vandecappelle --- configs/imx7d-sdb_defconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/imx7d-sdb_defconfig b/configs/imx7d-sdb_defconfig index cf4da342c150..e7f3df81568a 100644 --- a/configs/imx7d-sdb_defconfig +++ b/configs/imx7d-sdb_defconfig @@ -3,8 +3,8 @@ BR2_arm=y BR2_cortex_a7=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 6.1 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y +# Linux headers same as kernel, a 6.6 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # system BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" @@ -12,10 +12,10 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.34" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-sdb" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/imx/imx7d-sdb" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_INSTALL_TARGET=y From 945b9f8d8e9704fd3d2dbd2579ebf9178ed49d89 Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 15:14:13 -0500 Subject: [PATCH 191/345] package/targetcli-fb: needs python-gobject Without python-gobject, we get the following runtime error: ModuleNotFoundError: No module named 'gi' Add python-gobject and propagate its dependencies. While we're at it, split the DEPENDENCIES over several line and sort them alphabetically. Signed-off-by: Jeremy J. Peper Reviewed-by: Adam Duskett [Arnout: reorder everything alphabeticall, split DEPENDENCIES over several lines.] Signed-off-by: Arnout Vandecappelle --- package/targetcli-fb/Config.in | 13 ++++++++++++- package/targetcli-fb/targetcli-fb.mk | 6 +++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/Config.in b/package/targetcli-fb/Config.in index 04c6a1ac09dd..eb7528fbea45 100644 --- a/package/targetcli-fb/Config.in +++ b/package/targetcli-fb/Config.in @@ -1,12 +1,23 @@ -comment "targetcli-fb depends on Python" +comment "targetcli-fb needs Python, a glibc toolchain, gcc >= 4.9, host gcc >= 8" depends on !BR2_PACKAGE_PYTHON3 + depends on BR2_USE_MMU + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS + depends on !BR2_HOST_GCC_AT_LEAST_8 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ + !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_TARGETCLI_FB bool "targetcli-fb" depends on BR2_PACKAGE_PYTHON3 # python-configshell-fb + depends on BR2_USE_MMU # python-gobject -> gobject-introspection + depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # python-gobject -> gobject-introspection + depends on BR2_HOST_GCC_AT_LEAST_8 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # python-gobject -> gobject-introspection + depends on BR2_TOOLCHAIN_USES_GLIBC # python-gobject -> gobject-introspection select BR2_PACKAGE_PYTHON_CONFIGSHELL_FB select BR2_PACKAGE_PYTHON_RTSLIB_FB select BR2_PACKAGE_PYTHON_SIX + select BR2_PACKAGE_PYTHON_GOBJECT help targetcli-fb is a command-line interface for configuring the LIO generic SCSI target, present in 3.x Linux kernel diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index d2cbf79e264e..56ed7c6174e2 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -12,7 +12,11 @@ TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING TARGETCLI_FB_CPE_ID_VALID = YES TARGETCLI_FB_SETUP_TYPE = setuptools -TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six +TARGETCLI_FB_DEPENDENCIES = \ + python-configshell-fb \ + python-gobject \ + python-rtslib-fb \ + python-six define TARGETCLI_FB_INSTALL_INIT_SYSV $(INSTALL) -m 0755 -D package/targetcli-fb/S50target \ From 242781bb61bdad2690b089cc5eaf7705d2632e5d Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 14:35:25 -0500 Subject: [PATCH 192/345] package/targetcli-fb: bump version to 2.1.58 bump to latest version because previous version did not work with python 3.11 corrected version mismatch with my first submission Signed-off-by: Jeremy J. Peper Signed-off-by: Arnout Vandecappelle --- package/targetcli-fb/targetcli-fb.hash | 2 +- package/targetcli-fb/targetcli-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/targetcli-fb/targetcli-fb.hash b/package/targetcli-fb/targetcli-fb.hash index 64f68a6675ab..1732fa99e54e 100644 --- a/package/targetcli-fb/targetcli-fb.hash +++ b/package/targetcli-fb/targetcli-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 7ae4120a54f24b13263b4b85c43952a03546f8b9fc9bd15fe87678f68245a33f targetcli-fb-2.1.54.tar.gz +sha256 605f4e4e4e7189d6a03f11a4f55e7ddb4671002d542c2f684f87dd68391dcdc2 targetcli-fb-2.1.58.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/targetcli-fb/targetcli-fb.mk b/package/targetcli-fb/targetcli-fb.mk index 56ed7c6174e2..503b9224d030 100644 --- a/package/targetcli-fb/targetcli-fb.mk +++ b/package/targetcli-fb/targetcli-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = 2.1.54 +TARGETCLI_FB_VERSION = 2.1.58 TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,v$(TARGETCLI_FB_VERSION)) TARGETCLI_FB_LICENSE = Apache-2.0 TARGETCLI_FB_LICENSE_FILES = COPYING From 0c27711002a82bbbb47363efceb526be7862bab3 Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 14:35:26 -0500 Subject: [PATCH 193/345] package/python-configshell-fb: bump version to 1.1.30 bump to latest version because previous version did not work with python 3.11 Signed-off-by: Jeremy J. Peper Signed-off-by: Arnout Vandecappelle --- package/python-configshell-fb/python-configshell-fb.hash | 2 +- package/python-configshell-fb/python-configshell-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-configshell-fb/python-configshell-fb.hash b/package/python-configshell-fb/python-configshell-fb.hash index 8fc38f61a6b8..e090501056ad 100644 --- a/package/python-configshell-fb/python-configshell-fb.hash +++ b/package/python-configshell-fb/python-configshell-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 24b47284b463dcfb9ee0c1558827e13442127e62fa279b6e0253f136cf49058c python-configshell-fb-1.1.29.tar.gz +sha256 44696b92bea2b44c1d0bf2828477dddeb3b4dfb312ad82ce06d7b704c0985e27 python-configshell-fb-1.1.30.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-configshell-fb/python-configshell-fb.mk b/package/python-configshell-fb/python-configshell-fb.mk index d0dd421e8dad..3446a86e8dbe 100644 --- a/package/python-configshell-fb/python-configshell-fb.mk +++ b/package/python-configshell-fb/python-configshell-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade python-rtslib-fb # and targetcli-fb at the same time. -PYTHON_CONFIGSHELL_FB_VERSION = 1.1.29 +PYTHON_CONFIGSHELL_FB_VERSION = 1.1.30 PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,v$(PYTHON_CONFIGSHELL_FB_VERSION)) PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING From 8a69af5fa4b545767ab292d1ad01266b87d45e92 Mon Sep 17 00:00:00 2001 From: "Jeremy J. Peper" Date: Tue, 12 Mar 2024 14:35:27 -0500 Subject: [PATCH 194/345] package/python-rtslib-fb: 2.1.76 bump to latest version because previous version did not work with python 3.11 Signed-off-by: Jeremy J. Peper Signed-off-by: Arnout Vandecappelle --- package/python-rtslib-fb/python-rtslib-fb.hash | 2 +- package/python-rtslib-fb/python-rtslib-fb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-rtslib-fb/python-rtslib-fb.hash b/package/python-rtslib-fb/python-rtslib-fb.hash index 3c2e39fffd11..39c390edb268 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.hash +++ b/package/python-rtslib-fb/python-rtslib-fb.hash @@ -1,3 +1,3 @@ # locally computed -sha256 9f581c4bcffebc60be236af8a6ebdeccdb66d0435eeb04ab1b743c170b95d046 python-rtslib-fb-2.1.74.tar.gz +sha256 ac15c113d09209c7b0d14d94a12ed88205a7c2feadd1096f573049fd737f7e74 python-rtslib-fb-2.1.76.tar.gz sha256 5df2a0d87d6c562f0ea11c688ac52532aa28d744cabc7994ff0537f64b3b3320 COPYING diff --git a/package/python-rtslib-fb/python-rtslib-fb.mk b/package/python-rtslib-fb/python-rtslib-fb.mk index 09bde874f0b5..6396d26a3f54 100644 --- a/package/python-rtslib-fb/python-rtslib-fb.mk +++ b/package/python-rtslib-fb/python-rtslib-fb.mk @@ -6,7 +6,7 @@ # When upgrading the version, be sure to also upgrade # python-configshell-fb and targetcli-fb at the same time. -PYTHON_RTSLIB_FB_VERSION = 2.1.74 +PYTHON_RTSLIB_FB_VERSION = 2.1.76 # Do not switch site to PyPI: it does not contain the latest version. PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,v$(PYTHON_RTSLIB_FB_VERSION)) PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 From 33605ea6d9b370d052dbf6b06d89e7b2a16d4275 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 13:51:32 +0100 Subject: [PATCH 195/345] toolchain: drop codescape mips toolchains Codescape mips toolchains are old (2018) and use glibc 2.20 which is not compatible with 64-bit time_t raising the following build failure with libselinux since commit 1c2dbcdcf0bb589d325c379246acaa39bb07b7be: In file included from selinux_restorecon.c:17:0: /home/buildroot/autobuild/instance-1/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/fts.h:41:3: error: #error " cannot be used with -D_FILE_OFFSET_BITS==64" # error " cannot be used with -D_FILE_OFFSET_BITS==64" ^~~~~ Fixes: 1c2dbcdcf0bb589d325c379246acaa39bb07b7be - http://autobuild.buildroot.org/results/a4d38af627a42a2c55d60129787c51353d5883bf Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 16 +++- package/openblas/Config.in | 4 - toolchain/toolchain-external/Config.in | 6 +- .../Config.in | 66 ---------------- .../Config.in.options | 9 --- ...toolchain-external-codescape-img-mips.hash | 4 - .../toolchain-external-codescape-img-mips.mk | 51 ------------- .../Config.in | 76 ------------------- .../Config.in.options | 9 --- ...toolchain-external-codescape-mti-mips.hash | 4 - .../toolchain-external-codescape-mti-mips.mk | 51 ------------- 11 files changed, 16 insertions(+), 280 deletions(-) delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash delete mode 100644 toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk diff --git a/Config.in.legacy b/Config.in.legacy index 5aaaae0eec50..1d3dc8b5c8af 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,8 +146,22 @@ endif comment "Legacy options removed in 2024.05" +config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS + bool "Codescape IMG GNU Linux Toolchain 2018.09 has been removed" + select BR2_LEGACY + help + The Codescape IMG GNU Linux toolchain has been removed, use a + Bootlin toolchain instead. + +config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS + bool "Codescape MTI GNU Linux Toolchain 2018.09 has been removed" + select BR2_LEGACY + help + The Codescape MTI GNU Linux toolchain has been removed, use a + Bootlin toolchain instead. + config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AARCH64 - bool "CodeSourcery AArch64 2014.11" + bool "CodeSourcery AArch64 2014.11 has been removed" select BR2_LEGACY help The Sourcery CodeBench AArch64 toolchain has been removed, diff --git a/package/openblas/Config.in b/package/openblas/Config.in index 74c4a3aa5cc0..7d4727003b5b 100644 --- a/package/openblas/Config.in +++ b/package/openblas/Config.in @@ -26,11 +26,7 @@ config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET default "PPC970" if BR2_powerpc_970 default "PPC440" if BR2_powerpc_440 default "PPC440FP2" if BR2_powerpc_440fp - # P5600 is built with MSA support which is only available in Codescape toolchains - default "P5600" if BR2_mips_p5600 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS default "MIPS64_GENERIC" if BR2_MIPS_CPU_MIPS64 - # I6400 is built with MSA support which is only available in Codescape toolchains - default "I6400" if BR2_mips_i6400 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS # OpenBLAS assumes SPARC=Sparc v9 default "SPARC" if BR2_sparc_v9 # Cortex-A15 always have a VFPv4 diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index b5432b71d7d2..af9082cf6ebb 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -26,10 +26,8 @@ source "toolchain/toolchain-external/toolchain-external-linaro-arm/Config.in" # ARM big-endian source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in" -# MIPS (use codesourcery toolchain by default) +# MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in" -source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in" -source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in" # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in" @@ -130,8 +128,6 @@ source "toolchain/toolchain-external/toolchain-external-linaro-armeb/Config.in.o # MIPS source "toolchain/toolchain-external/toolchain-external-codesourcery-mips/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options" -source "toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options" # NIOSII source "toolchain/toolchain-external/toolchain-external-codesourcery-niosII/Config.in.options" diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in deleted file mode 100644 index d49c61023754..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in +++ /dev/null @@ -1,66 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - bool "Codescape IMG GNU Linux Toolchain 2018.09" - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R6 || (BR2_MIPS_CPU_MIPS64R6 && !BR2_MIPS_SOFT_FLOAT) - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - select BR2_TOOLCHAIN_HAS_FORTRAN - select BR2_TOOLCHAIN_HAS_OPENMP - help - Codescape IMG GNU Linux Toolchain 2018.09 for the MIPS - architecture, from MIPS Tech LLC. It uses gcc 6.3.0, - binutils 2.28.51, glibc 2.20, gdb 7.9.1 and kernel headers - 4.7. It has support for the following variants: - - MIPS32r6 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r6 - Big-Endian, Soft-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r6 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS32r6 - Little-Endian, Soft-Float, 2008 NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r6' Target Architecture Variant - Enable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS64r6 - Big-Endian, Hard-Float, 2008 NaN, n32 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Little-Endian, Hard-Float, 2008 NaN, n32 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Big-Endian, Hard-Float, 2008 NaN, n64 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' - - MIPS64r6 - Little-Endian, Hard-Float, 2008 NaN, n64 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r6' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options deleted file mode 100644 index 3eaa2a9522bc..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "mips-img-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codescape-img-mips" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash deleted file mode 100644 index 65e1861f127d..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Codescape toolchains from MIPS Tech LLC -# From: https://codescape.mips.com/components/toolchain/nanomips/2018.09-02/downloads.html -sha256 ac035f3b6a8767522977963d8e1490520d58bccca7956f4503a1eefff6492b71 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86.tar.gz -sha256 09280f4fcbb993607905bf9a43bf5f3db2beed85726f0675b8453e19a9ddc429 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk b/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk deleted file mode 100644 index 55424918c772..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-img-mips/toolchain-external-codescape-img-mips.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# toolchain-external-codescape-img-mips -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION = 2018.09-02 -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SITE = https://codescape.mips.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STRIP_COMPONENTS = 2 - -ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-6.x86.tar.gz -else -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_VERSION).for.MIPS.IMG.Linux.CentOS-6.x86_64.tar.gz -endif - -# Special fixup for Codescape MIPS toolchains, that have bin- and -# sbin- directories. We create symlinks bin -> bin- and sbin -# -> sbin- so that the rest of Buildroot can find the toolchain -# tools in the appropriate location. -ifeq ($(BR2_MIPS_OABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = o32 -else ifeq ($(BR2_MIPS_NABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = n32 -else ifeq ($(BR2_MIPS_NABI64),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX = n64 -endif - -define TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STAGING_FIXUPS - rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin - ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin - ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin -endef - -# The Codescape toolchain uses a sysroot layout that places them -# side-by-side instead of nested like multilibs. A symlink is needed -# much like for the nested sysroots which are handled in -# copy_toolchain_sysroot but there is not enough information in there -# to determine whether the sysroot layout was nested or side-by-side. -# Add the symlink here for now. -define TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SYMLINK - $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ - ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ - ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} -endef - -TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_POST_INSTALL_STAGING_HOOKS += \ - TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_STAGING_FIXUPS \ - TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS_SYMLINK - -$(eval $(toolchain-external-package)) diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in deleted file mode 100644 index 720d705d14ba..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in +++ /dev/null @@ -1,76 +0,0 @@ -config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - bool "Codescape MTI GNU Linux Toolchain 2018.09" - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_MIPS_CPU_MIPS32R2 || (BR2_MIPS_CPU_MIPS64R2 && !BR2_MIPS_SOFT_FLOAT) - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_7 - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - select BR2_TOOLCHAIN_HAS_FORTRAN - select BR2_TOOLCHAIN_HAS_OPENMP - help - Codescape MTI GNU Linux Toolchain 2018.09 for the MIPS - architecture, from MIPS Tech LLC. It uses gcc 6.3.0, - binutils 2.28.51, glibc 2.20, gdb 7.9.1 and kernel headers - 4.7. It has support for the following variants: - - MIPS32r2 - Big-Endian, Hard-Float, Legacy NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r2 - Big-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mnan=2008' - - MIPS32r2 - Big-Endian, Soft-Float, Legacy NaN, o32 ABI - Select 'MIPS (big endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, Legacy NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mnan=2008' - - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - - MIPS32r2 - Little-Endian, Hard-Float, 2008 NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Enable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS32r2 - Little-Endian, Soft-Float, Legacy NaN, o32 ABI, - microMIPS - Select 'MIPS (little endian)' Target Architecture - Select 'mips 32r2' Target Architecture Variant - Disable 'Use soft-float' - Set BR2_TARGET_OPTIMIZATION to '-mmicromips' - - MIPS64r2 - Big-Endian, Hard-Float, Legacy NaN, n32 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Little-Endian, Hard-Float, Legacy NaN, n32 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n32' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Big-Endian, Hard-Float, Legacy NaN, n64 ABI - Select 'MIPS64 (big endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' - - MIPS64r2 - Little-Endian, Hard-Float, Legacy NaN, n64 ABI - Select 'MIPS64 (little endian)' Target Architecture - Select 'mips 64r2' Target Architecture Variant - Select 'n64' Target ABI - Disable 'Use soft-float' diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options deleted file mode 100644 index 464c9b844893..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/Config.in.options +++ /dev/null @@ -1,9 +0,0 @@ -if BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - -config BR2_TOOLCHAIN_EXTERNAL_PREFIX - default "mips-mti-linux-gnu" - -config BR2_PACKAGE_PROVIDES_TOOLCHAIN_EXTERNAL - default "toolchain-external-codescape-mti-mips" - -endif diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash deleted file mode 100644 index b07281de4883..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Codescape toolchains from MIPS Tech LLC -# From: https://codescape.mips.com/components/toolchain/nanomips/2018.09-02/downloads.html -sha256 c883a404fd7ea5718e2249a530802e223381f2be52265f88e9b1ce7035c232f3 Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86.tar.gz -sha256 d6310a970b0a8a19ad8e0a2b3ead8c38ee90d0e284a9b2511200ce447f460d2c Codescape.GNU.Tools.Package.2018.09-02.for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz diff --git a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk b/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk deleted file mode 100644 index 9bee1ab87d85..000000000000 --- a/toolchain/toolchain-external/toolchain-external-codescape-mti-mips/toolchain-external-codescape-mti-mips.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# toolchain-external-codescape-mti-mips -# -################################################################################ - -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION = 2018.09-02 -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SITE = https://codescape.mips.com/components/toolchain/$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STRIP_COMPONENTS = 2 - -ifeq ($(HOSTARCH),x86) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-6.x86.tar.gz -else -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SOURCE = Codescape.GNU.Tools.Package.$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_VERSION).for.MIPS.MTI.Linux.CentOS-6.x86_64.tar.gz -endif - -# Special fixup for Codescape MIPS toolchains, that have bin- and -# sbin- directories. We create symlinks bin -> bin- and sbin -# -> sbin- so that the rest of Buildroot can find the toolchain -# tools in the appropriate location. -ifeq ($(BR2_MIPS_OABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = o32 -else ifeq ($(BR2_MIPS_NABI32),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = n32 -else ifeq ($(BR2_MIPS_NABI64),y) -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX = n64 -endif - -define TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STAGING_FIXUPS - rmdir $(STAGING_DIR)/usr/bin $(STAGING_DIR)/usr/sbin - ln -sf bin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/bin - ln -sf sbin-$(TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_BIN_DIR_SUFFIX) $(STAGING_DIR)/usr/sbin -endef - -# The Codescape toolchain uses a sysroot layout that places them -# side-by-side instead of nested like multilibs. A symlink is needed -# much like for the nested sysroots which are handled in -# copy_toolchain_sysroot but there is not enough information in there -# to determine whether the sysroot layout was nested or side-by-side. -# Add the symlink here for now. -define TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SYMLINK - $(Q)ARCH_SYSROOT_DIR="$(call toolchain_find_sysroot,$(TOOLCHAIN_EXTERNAL_CC) $(TOOLCHAIN_EXTERNAL_CFLAGS))"; \ - ARCH_SUBDIR=`basename $${ARCH_SYSROOT_DIR}`; \ - ln -snf . $(STAGING_DIR)/$${ARCH_SUBDIR} -endef - -TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_POST_INSTALL_STAGING_HOOKS += \ - TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_STAGING_FIXUPS \ - TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS_SYMLINK - -$(eval $(toolchain-external-package)) From 9347905b95dfe045ee40ae69d9d3f00a2c1b7168 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 13:56:31 +0100 Subject: [PATCH 196/345] package/squid: fix build with host gcc 10 Pass -std=c++17 to fix the following build failure with host gcc 10 raised since bump to version 6.6 in commit c13199c9326fa2daa574f08ec8fc063a48d0eb06: /usr/bin/g++ -O2 -I/home/buildroot/instance-0/output-1/host/include -o cf_gen ./cf_gen.cc -I. -I../include/ -I../src ./cf_gen.cc: In function 'int main(int, char**)': ./cf_gen.cc:268:63: error: forming reference to void 268 | auto &newEntry = entries.emplace_back(name); | ^ Fixes: - http://autobuild.buildroot.org/results/613fee008c77f8dbbe04df9a4ce4347e43de9ef9 - https://bugs.buildroot.org/show_bug.cgi?id=15997 Reported-by: Roland Franke Suggested-by: Peter Seiderer Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/squid/squid.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 3a9edac71e37..6a2b52233647 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -21,7 +21,7 @@ SQUID_CONF_ENV = \ ac_cv_func_strnstr=no \ ac_cv_have_squid=yes \ BUILDCXX="$(HOSTCXX)" \ - BUILDCXXFLAGS="$(HOST_CXXFLAGS)" + BUILDCXXFLAGS="$(HOST_CXXFLAGS) -std=c++17" SQUID_CONF_OPTS = \ --enable-async-io=8 \ --enable-linux-netfilter \ From 54dbd8e2c5c0b2f40cb53066b265535266eaf8d6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 10:40:37 +0100 Subject: [PATCH 197/345] package/poco: needs C++17 poco needs C++17 and gcc >=8 since bump to version 1.13.2 in commit 433c4fd38b15efcf74b410e5068e2e51eeba6e46 and https://github.com/pocoproject/poco/commit/78234857bf416b718455496800d1b7be3a0d0a53 https://github.com/pocoproject/poco/commit/10f41c06d9416a6ae0884c4827ea2a91bf5d2cf8 resulting in the following build failure with gcc 7: In file included from src/Thread.cpp:28:0: src/Thread_POSIX.cpp: In member function 'void Poco::ThreadImpl::setNameImpl(const string&)': src/Thread_POSIX.cpp:162:56: error: no matching function for call to 'std::__cxx11::basic_string::append(const string&, std::__cxx11::basic_string::size_type)' truncName.append(threadName, threadName.size() - half); ^ Fixes: 433c4fd38b15efcf74b410e5068e2e51eeba6e46 - http://autobuild.buildroot.org/results/7b1c144f39a8be4ce8f964aa13a52d0bf62dd0aa Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/poco/Config.in | 6 +++--- package/poco/poco.mk | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/poco/Config.in b/package/poco/Config.in index 7cb9987ec7a9..9bdef125ad36 100644 --- a/package/poco/Config.in +++ b/package/poco/Config.in @@ -12,7 +12,7 @@ config BR2_PACKAGE_POCO bool "poco" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 # pthread_condattr_setclock depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() @@ -116,8 +116,8 @@ config BR2_PACKAGE_POCO_ZIP endif # BR2_PACKAGE_POCO -comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 5 w/ C++14" +comment "poco needs a toolchain w/ wchar, NPTL, C++, dynamic library, gcc >= 8" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_PACKAGE_POCO_ARCH_SUPPORTS diff --git a/package/poco/poco.mk b/package/poco/poco.mk index cc8a22fc2a3e..233252c67b09 100644 --- a/package/poco/poco.mk +++ b/package/poco/poco.mk @@ -68,7 +68,6 @@ define POCO_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ --config=Linux \ --prefix=/usr \ - --cflags=-std=c++14 \ --ldflags="$(POCO_LDFLAGS)" \ --omit="$(POCO_OMIT)" \ $(POCO_CONF_OPTS) \ From 0ee43b015768dc13649fb13096ed6d3f1da654c9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 16 Feb 2024 21:59:04 +0100 Subject: [PATCH 198/345] package/libnss: bump version to 3.99 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/libnss/libnss.hash | 4 ++-- package/libnss/libnss.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnss/libnss.hash b/package/libnss/libnss.hash index fdfe9773d276..8c7c807f7920 100644 --- a/package/libnss/libnss.hash +++ b/package/libnss/libnss.hash @@ -1,4 +1,4 @@ -# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_97_RTM/src/SHA256SUMS -sha256 078efb8393f32e40b1fb4bf6930fff7f1aabed01287fcc5fe58aba736765fa0a nss-3.97.tar.gz +# From https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_99_RTM/src/SHA256SUMS +sha256 5cd5c2c8406a376686e6fa4b9c2de38aa280bea07bf927c0d521ba07c88b09bd nss-3.99.tar.gz # Locally calculated sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 nss/COPYING diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 60a33456b0ae..671228ec8f8e 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNSS_VERSION = 3.97 +LIBNSS_VERSION = 3.99 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src LIBNSS_DISTDIR = dist From f68c45f73334b9c83c44e5bbb3d505050f8b720e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:32 +0100 Subject: [PATCH 199/345] configs/ti_am62x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am62x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am62x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/ti_am62x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index f88252a89c68..c3ad555a8184 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y From fde806f8220720b95cb3973fe9d7e55057a1bee7 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:33 +0100 Subject: [PATCH 200/345] configs/ti_am64x_sk_defconfig: fix BR2_TARGET_OPTEE_OS_PLATFORM setting Using PLATFORM=k3 can leads to a runtime boot crash on some K3 SoC (e.g. j721e) because the optee flavor is missing. We could use BR2_TARGET_OPTEE_OS_PLATFORM=k3 and BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR=am64x but we actually can use BR2_TARGET_OPTEE_OS_PLATFORM=k3-am64x as explained in the optee-os Makefile [1]: # If $(PLATFORM) is defined and contains a hyphen, parse it as # $(PLATFORM)-$(PLATFORM_FLAVOR) for convenience This is how meta-ti set the optee-os platform: meta-ti]$ git grep OPTEEMACHINE meta-ti-bsp/conf/machine/am437x-hs-evm.conf:OPTEEMACHINE = "ti-am43xx" meta-ti-bsp/conf/machine/am57xx-hs-evm.conf:OPTEEMACHINE = "ti-am57xx" meta-ti-bsp/conf/machine/beagleplay.conf:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/dra7xx-hs-evm.conf:OPTEEMACHINE = "ti-dra7xx" meta-ti-bsp/conf/machine/include/am62axx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62pxx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am62xx.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/am64xx.inc:OPTEEMACHINE = "k3-am64x" meta-ti-bsp/conf/machine/include/am65xx.inc:OPTEEMACHINE = "k3-am65x" meta-ti-bsp/conf/machine/include/j7200.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721e.inc:OPTEEMACHINE = "k3-j721e" meta-ti-bsp/conf/machine/include/j721s2.inc:OPTEEMACHINE = "k3-j784s4" meta-ti-bsp/conf/machine/include/j722s.inc:OPTEEMACHINE = "k3-am62x" meta-ti-bsp/conf/machine/include/j784s4.inc:OPTEEMACHINE = "k3-j784s4" meta-ti uses the OPTEEMACHINE to set optee-os platform [2]. [1] https://github.com/OP-TEE/optee_os/blob/4.0.0/Makefile#L37 [2] https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-security/optee/optee-os.inc?h=4.0.3#n23 Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/ti_am64x_sk_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 4bfd31f0c8d3..097175bd8f39 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -21,7 +21,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="k3" BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD="lite" BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y BR2_TARGET_OPTEE_OS=y -BR2_TARGET_OPTEE_OS_PLATFORM="k3" +BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y From a01997fd393cdbc9b7912afa0f1aaaba0684fb56 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:34 +0100 Subject: [PATCH 201/345] configs/ti_am62x_sk_defconfig: explicitly set the ti-k3-r5-loader version Commit 4b8fddb060fb ("configs/ti_am62x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/ti_am62x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am62x_sk_defconfig b/configs/ti_am62x_sk_defconfig index c3ad555a8184..a129e216d25b 100644 --- a/configs/ti_am62x_sk_defconfig +++ b/configs/ti_am62x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am62x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM62X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am62x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y From e3a3e163253cd702d99ba731d546f2cdb6eedc05 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:35 +0100 Subject: [PATCH 202/345] configs/ti_am64x_sk_defconfig: explicitly set the ti-k3-r5-loader version Commit 6b2329bb80 ("configs/ti_am64x_sk: new defconfig") forgot to specify the ti-k3-r5-loader, so do that now. When the defconfig was added, the default version was 2022.10, so use it. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- configs/ti_am64x_sk_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/ti_am64x_sk_defconfig b/configs/ti_am64x_sk_defconfig index 097175bd8f39..26195194c7d6 100644 --- a/configs/ti_am64x_sk_defconfig +++ b/configs/ti_am64x_sk_defconfig @@ -25,6 +25,8 @@ BR2_TARGET_OPTEE_OS_PLATFORM="k3-am64x" BR2_TARGET_TI_K3_IMAGE_GEN=y BR2_TARGET_TI_K3_IMAGE_GEN_SOC_AM64X=y BR2_TARGET_TI_K3_R5_LOADER=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION=y +BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE="2022.10" BR2_TARGET_TI_K3_R5_LOADER_BOARD_DEFCONFIG="am64x_evm_r5" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y From a904f1530f9a8613c077c17395d92a065cf11737 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:36 +0100 Subject: [PATCH 203/345] boot/ti-k3-r5-loader: bump to version 2024.01 All in-tree configs with the ti-k3-r5 bootloader use a custom version, so this patch is mostly for the menuconfig default version. Keep the old hash so that defconfigs still have a hash to validate downloads against. Suggested-by: Romain Naour Signed-off-by: Dario Binacchi [yann.morin.1998@free.fr: keep the old hash] Signed-off-by: Yann E. MORIN --- boot/ti-k3-r5-loader/Config.in | 4 ++-- boot/ti-k3-r5-loader/ti-k3-r5-loader.hash | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/boot/ti-k3-r5-loader/Config.in b/boot/ti-k3-r5-loader/Config.in index 8c8368a1a5a8..5f86c045c99f 100644 --- a/boot/ti-k3-r5-loader/Config.in +++ b/boot/ti-k3-r5-loader/Config.in @@ -16,7 +16,7 @@ choice here as it is used to build the main U-Boot package. config BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION - bool "2022.10" + bool "2024.01" config BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION bool "Custom version" @@ -60,7 +60,7 @@ endif config BR2_TARGET_TI_K3_R5_LOADER_VERSION string - default "2022.10" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION + default "2024.01" if BR2_TARGET_TI_K3_R5_LOADER_LATEST_VERSION default BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION_VALUE \ if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_VERSION default "custom" if BR2_TARGET_TI_K3_R5_LOADER_CUSTOM_TARBALL diff --git a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash index c5d1cb8e09f0..279cb7763afd 100644 --- a/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash +++ b/boot/ti-k3-r5-loader/ti-k3-r5-loader.hash @@ -1,3 +1,4 @@ # Locally computed: sha256 50b4482a505bc281ba8470c399a3c26e145e29b23500bc35c50debd7fa46bdf8 u-boot-2022.10.tar.bz2 +sha256 b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3 u-boot-2024.01.tar.bz2 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 Licenses/gpl-2.0.txt From 2d004d83016f0c69c63ec30aaef2f8e25de155a2 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:37 +0100 Subject: [PATCH 204/345] package/python-attrs: add host variant Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/python-attrs/python-attrs.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-attrs/python-attrs.mk b/package/python-attrs/python-attrs.mk index 8a1236cc4402..fb1729e62fa2 100644 --- a/package/python-attrs/python-attrs.mk +++ b/package/python-attrs/python-attrs.mk @@ -15,4 +15,10 @@ PYTHON_ATTRS_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_ATTRS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + $(eval $(python-package)) +$(eval $(host-python-package)) From 7e2387edaf33b15eb96aa453af3c9631437f8511 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:38 +0100 Subject: [PATCH 205/345] package/python-rpds-py: add host variant Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/python-rpds-py/python-rpds-py.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-rpds-py/python-rpds-py.mk b/package/python-rpds-py/python-rpds-py.mk index 80670f2e4fde..cee2ff290a4e 100644 --- a/package/python-rpds-py/python-rpds-py.mk +++ b/package/python-rpds-py/python-rpds-py.mk @@ -12,3 +12,4 @@ PYTHON_RPDS_PY_LICENSE = MIT PYTHON_RPDS_PY_LICENSE_FILES = LICENSE $(eval $(python-package)) +$(eval $(host-python-package)) From a86104ea9575ee693f768b1a64b2b18b534ff68e Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:39 +0100 Subject: [PATCH 206/345] package/python-referencing: add host variant Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/python-referencing/python-referencing.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/python-referencing/python-referencing.mk b/package/python-referencing/python-referencing.mk index 27d1452e913a..66d59ed8091a 100644 --- a/package/python-referencing/python-referencing.mk +++ b/package/python-referencing/python-referencing.mk @@ -14,4 +14,15 @@ PYTHON_REFERENCING_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_REFERENCING_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_REFERENCING_DEPENDENCIES += \ + host-python-attrs \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) From 1ddb3c82ea6d29f1b80ddd206e0e35a0dfdec762 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:40 +0100 Subject: [PATCH 207/345] package/python-jsonschema-specifications: add host variant Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- .../python-jsonschema-specifications.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk index 40879898c9d4..653c839bb450 100644 --- a/package/python-jsonschema-specifications/python-jsonschema-specifications.mk +++ b/package/python-jsonschema-specifications/python-jsonschema-specifications.mk @@ -14,4 +14,14 @@ PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ host-python-hatchling \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_SPECIFICATIONS_DEPENDENCIES += \ + host-python-referencing + $(eval $(python-package)) +$(eval $(host-python-package)) From c93d137303693cfb91b5d0d79433930cfe7d59c7 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Mon, 4 Mar 2024 16:32:41 +0100 Subject: [PATCH 208/345] package/python-jsonschema: add host variant Recent version of U-Boot use binman to provide a mechanism for building images, from simple SPL + U-Boot combinations, to more complex arrangements with many parts. This package is required by binman. Co-developed-by: Michael Trimarchi Signed-off-by: Michael Trimarchi Co-developed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN --- package/python-jsonschema/python-jsonschema.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/python-jsonschema/python-jsonschema.mk b/package/python-jsonschema/python-jsonschema.mk index 512c92aa7752..9e8b6e18b876 100644 --- a/package/python-jsonschema/python-jsonschema.mk +++ b/package/python-jsonschema/python-jsonschema.mk @@ -15,4 +15,18 @@ PYTHON_JSONSCHEMA_DEPENDENCIES = \ host-python-hatch-fancy-pypi-readme \ host-python-hatch-vcs +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES = \ + host-python-hatchling \ + host-python-hatch-fancy-pypi-readme \ + host-python-hatch-vcs + +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_JSONSCHEMA_DEPENDENCIES += \ + host-python-attrs \ + host-python-jsonschema-specifications \ + host-python-referencing \ + host-python-rpds-py + $(eval $(python-package)) +$(eval $(host-python-package)) From 455ce5fc02488983a6732087bcbbb15e04c75937 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Mar 2024 21:06:46 +0100 Subject: [PATCH 209/345] package/putty: fix arm uclibc build Fix the following arm uclibc build failure raised since bump to version 0.78 in commit 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 which wrongly removed patch because file was renamed. Patch was sent upstream in 2021 but rejected, even a second iteration defining AT_HWCAP2 to 26 if needed was also rejected. Fixes: 5673ea3ce4d4dd721bb17fc8d5b1283f5c1080b4 - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f Signed-off-by: Fabrice Fontaine [Arnout: add Upstream: to patch comment] Signed-off-by: Arnout Vandecappelle --- ...-arm_arch_queries.h-fix-uclibc-build.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch diff --git a/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch new file mode 100644 index 000000000000..d2abcb64cf77 --- /dev/null +++ b/package/putty/0001-unix-utils-arm_arch_queries.h-fix-uclibc-build.patch @@ -0,0 +1,41 @@ +From 2631c745f986b356fbe5e1d418cff63b46134df6 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 19 Mar 2024 20:37:33 +0100 +Subject: [PATCH] unix/utils/arm_arch_queries.h: fix uclibc build + +Build on uclibc is broken since version 0.75 and commit +65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used +even if is not available: + +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c: In function 'platform_aes_neon_available': +/home/buildroot/autobuild/run/instance-3/output-1/build/putty-0.80/unix/utils/arm_arch_queries.c:18:22: error: 'AT_HWCAP2' undeclared (first use in this function) + 18 | return getauxval(AT_HWCAP2) & HWCAP2_AES; + | ^~~~~~~~~ + +To fix this build failure, include + +Fixes: + - http://autobuild.buildroot.org/results/547d1c0e8a89e1e4b601aa756d26886bfc3d586f + +Upstream: Rejected after sending to Simon Tatham +Signed-off-by: Fabrice Fontaine +--- + unix/utils/arm_arch_queries.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/unix/utils/arm_arch_queries.h b/unix/utils/arm_arch_queries.h +index fa46c622..5cce7f31 100644 +--- a/unix/utils/arm_arch_queries.h ++++ b/unix/utils/arm_arch_queries.h +@@ -18,6 +18,8 @@ + + #if defined __arm__ || defined __aarch64__ + ++#include ++ + #if HAVE_SYS_TYPES_H + #include + #endif +-- +2.43.0 + From 87504a1b7948dbfa3648ad02c3c034a3c36dcd92 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Mar 2024 23:24:08 +0100 Subject: [PATCH 210/345] package/pulseaudio: bump to version 17.0 - Drop three upstreamed patches - This bump will fix the following build failure raised since bump of webrtc-audio-processsing to version 1.3 in commit ef0fa986eb7ff25c0a5db70ec0b62032e2d71538: ../output-1/build/pulseaudio-16.1/meson.build:723:15: ERROR: Dependency "webrtc-audio-processing" not found, tried pkgconfig and cmake https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/blob/v17.0/NEWS Fixes: ef0fa986eb7ff25c0a5db70ec0b62032e2d71538 - http://autobuild.buildroot.org/results/528717c7481adbb5333d77758ef94830f46bc3f1 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 3 - ...ild-sys-Fix-atomic-support-detection.patch | 59 -------- ...d-missing-libatomic_ops-dependencies.patch | 129 ------------------ ...0004-meson.build-fix-build-without-C.patch | 56 -------- package/pulseaudio/pulseaudio.hash | 4 +- package/pulseaudio/pulseaudio.mk | 2 +- 6 files changed, 3 insertions(+), 250 deletions(-) delete mode 100644 package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch delete mode 100644 package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch delete mode 100644 package/pulseaudio/0004-meson.build-fix-build-without-C.patch diff --git a/.checkpackageignore b/.checkpackageignore index 0a993096829a..3b64c90d8bc0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1030,9 +1030,6 @@ package/ptpd2/0002-ntp_isc_md5-rename-EVP_MD_CTX-into-PTPD_EVP_MD_CTX.patch Upst package/ptpd2/0003-Solve-issue-25-Removing-type-U64-from-net-snmp-relat.patch Upstream package/ptpd2/S65ptpd2 Indent Shellcheck Variables package/pulseaudio/0001-shm.c-use-_Static_assert-instead-of-static_assert-fo.patch Upstream -package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch Upstream -package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch Upstream -package/pulseaudio/0004-meson.build-fix-build-without-C.patch Upstream package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Variables package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch Upstream package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch Upstream diff --git a/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch b/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch deleted file mode 100644 index 631cb7f01614..000000000000 --- a/package/pulseaudio/0002-build-sys-Fix-atomic-support-detection.patch +++ /dev/null @@ -1,59 +0,0 @@ -From a5392576ceba92d04706cefc1929ddd5ace5537a Mon Sep 17 00:00:00 2001 -From: Nicolas Cavallari -Date: Fri, 1 Jul 2022 14:03:44 +0200 -Subject: [PATCH] build-sys: Fix atomic support detection - -Attempting to use atomics operations on an architecture that does not -support them generally results in a link error: - -ld: /tmp/ccjYcMPP.o: in function `func': -testfile.c:(.text+0x1c): undefined reference to `__sync_bool_compare_and_swap_4' - -The current build system uses cc.compiles() to check if atomic ops are -supported, but cc.compiles() does not attempt to link, so the test fails -to enable libatomics_opts. - -Fix this by using cc.links() instead of cc.compiles(). - -Signed-off-by: Nicolas Cavallari -Upstream-status: Submitted [https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/732] ---- - meson.build | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/meson.build b/meson.build -index c6db7e670..c5135330f 100644 ---- a/meson.build -+++ b/meson.build -@@ -498,22 +498,24 @@ endif - - need_libatomic_ops = false - --atomictest = '''void func() { -+atomictest = '''int main() { - volatile int atomic = 2; - __sync_bool_compare_and_swap (&atomic, 2, 3); -+ return 0; - } - ''' - --if cc.compiles(atomictest) -+if cc.links(atomictest) - cdata.set('HAVE_ATOMIC_BUILTINS', 1) - -- newatomictest = '''void func() { -+ newatomictest = '''int main() { - int c = 0; - __atomic_store_n(&c, 4, __ATOMIC_SEQ_CST); -+ return 0; - } - ''' - -- if(cc.compiles(newatomictest)) -+ if(cc.links(newatomictest)) - cdata.set('HAVE_ATOMIC_BUILTINS_MEMORY_MODEL', 1) - endif - --- -2.36.1 - diff --git a/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch b/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch deleted file mode 100644 index fac441e7dd2d..000000000000 --- a/package/pulseaudio/0003-build-sys-Add-missing-libatomic_ops-dependencies.patch +++ /dev/null @@ -1,129 +0,0 @@ -From 96361ff2a8f37dd3ce7ea188ce4e7b038bb6a5aa Mon Sep 17 00:00:00 2001 -From: Nicolas Cavallari -Date: Mon, 4 Jul 2022 13:49:34 +0200 -Subject: [PATCH] build-sys: Add missing libatomic_ops dependencies - -Add libatomic_ops dependencies to libraries/modules that showed a -failure on an arch that does not have native atomic operations support. - -Not all optional dependencies were tested, so it is possible that -some optional modules are still missing libatomic_ops dependencies. - -Signed-off-by: Nicolas Cavallari -Upstream-status: Submitted [https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/732] ---- - src/meson.build | 2 +- - src/modules/meson.build | 6 +++--- - src/pulse/meson.build | 2 +- - src/pulsecore/meson.build | 10 +++++----- - 4 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/meson.build b/src/meson.build -index 96dcec354..9efb561d8 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -205,7 +205,7 @@ else - libm_dep, thread_dep, dl_dep, shm_dep, iconv_dep, sndfile_dep, dbus_dep, - x11_dep, libsystemd_dep, glib_dep.partial_dependency(compile_args: true), - gtk_dep.partial_dependency(compile_args: true), asyncns_dep, libintl_dep, -- platform_dep, platform_socket_dep, execinfo_dep, -+ platform_dep, platform_socket_dep, execinfo_dep, libatomic_ops_dep, - ], - implicit_include_directories : false) - -diff --git a/src/modules/meson.build b/src/modules/meson.build -index 1d8004300..1e12569dc 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -14,7 +14,7 @@ all_modules = [ - [ 'module-cli-protocol-tcp', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_CLI', '-DUSE_TCP_SOCKETS'], [], libprotocol_cli ], - [ 'module-cli-protocol-unix', 'module-protocol-stub.c', [], ['-DUSE_PROTOCOL_CLI', '-DUSE_UNIX_SOCKETS'], [], libprotocol_cli ], - [ 'module-combine', 'module-combine.c' ], -- [ 'module-combine-sink', 'module-combine-sink.c' ], -+ [ 'module-combine-sink', 'module-combine-sink.c', [], [], [libatomic_ops_dep] ], - # [ 'module-coreaudio-detect', 'macosx/module-coreaudio-detect.c' ], - # [ 'module-coreaudio-device', 'macosx/module-coreaudio-device.c' ], - [ 'module-default-device-restore', 'module-default-device-restore.c', [], [], [], libprotocol_native ], -@@ -73,7 +73,7 @@ endif - - if host_machine.system() != 'windows' - all_modules += [ -- [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [], librtp ], -+ [ 'module-rtp-recv', 'rtp/module-rtp-recv.c', [], [], [libatomic_ops_dep], librtp ], - [ 'module-rtp-send', 'rtp/module-rtp-send.c' , [], [], [], librtp ], - ] - endif -@@ -243,7 +243,7 @@ module_echo_cancel_sources = [ - ] - module_echo_cancel_orc_sources = [] - module_echo_cancel_flags = [] --module_echo_cancel_deps = [] -+module_echo_cancel_deps = [libatomic_ops_dep] - module_echo_cancel_libs = [] - - if get_option('adrian-aec') -diff --git a/src/pulse/meson.build b/src/pulse/meson.build -index c2128e087..1b82c807c 100644 ---- a/src/pulse/meson.build -+++ b/src/pulse/meson.build -@@ -85,7 +85,7 @@ libpulse = shared_library('pulse', - link_args : [nodelete_link_args, versioning_link_args], - install : true, - install_rpath : privlibdir, -- dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep], -+ dependencies : [libm_dep, thread_dep, libpulsecommon_dep, dbus_dep, dl_dep, iconv_dep, libintl_dep, platform_dep, platform_socket_dep, libatomic_ops_dep], - implicit_include_directories : false) - - libpulse_dep = declare_dependency(link_with: libpulse) -diff --git a/src/pulsecore/meson.build b/src/pulsecore/meson.build -index b30264b3a..b37fec499 100644 ---- a/src/pulsecore/meson.build -+++ b/src/pulsecore/meson.build -@@ -251,7 +251,7 @@ libcli = shared_library('cli', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -@@ -268,7 +268,7 @@ libprotocol_cli = shared_library('protocol-cli', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libcli_dep, libatomic_ops_dep], - install : true, - install_rpath : rpath_dirs, - install_dir : modlibexecdir, -@@ -280,7 +280,7 @@ libprotocol_http = shared_library('protocol-http', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -@@ -292,7 +292,7 @@ libprotocol_native = shared_library('protocol-native', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, dbus_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, -@@ -304,7 +304,7 @@ libprotocol_simple = shared_library('protocol-simple', - c_args : [pa_c_args, server_c_args, database_c_args], - link_args : [nodelete_link_args], - include_directories : [configinc, topinc], -- dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep], -+ dependencies : [libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep], - install : true, - install_rpath : privlibdir, - install_dir : modlibexecdir, --- -2.36.1 - diff --git a/package/pulseaudio/0004-meson.build-fix-build-without-C.patch b/package/pulseaudio/0004-meson.build-fix-build-without-C.patch deleted file mode 100644 index e770927f5419..000000000000 --- a/package/pulseaudio/0004-meson.build-fix-build-without-C.patch +++ /dev/null @@ -1,56 +0,0 @@ -From ac88536d7c3fde3c22933368296c9029bb67b9fc Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 25 Jul 2022 21:49:25 +0200 -Subject: [PATCH] meson.build: fix build without C++ - -Fix the following build failure without C++: - -../output-1/build/pulseaudio-16.1/meson.build:1:0: ERROR: Unknown compiler(s): [['/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++']] -The following exception(s) were encountered: -Running "/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++ --version" gave "[Errno 2] No such file or directory: '/home/autobuild/autobuild/instance-1/output-1/per-package/pulseaudio/host/bin/powerpc64-buildroot-linux-gnu-g++'" - -Fixes: - - http://autobuild.buildroot.org/results/6526a21bd4da3b8458188f27c1ec04c381e4b673 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/737] ---- - meson.build | 3 ++- - src/modules/echo-cancel/meson.build | 2 ++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index c5135330f..8248f263b 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,4 +1,4 @@ --project('pulseaudio', 'c', 'cpp', -+project('pulseaudio', 'c', - version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version')).stdout().strip(), - meson_version : '>= 0.50.0', - default_options : [ 'c_std=gnu11', 'cpp_std=c++11' ] -@@ -433,6 +433,7 @@ endif - # Code coverage - - if get_option('gcov') -+ add_languages('cpp') - add_project_arguments('--coverage', language: ['c', 'cpp']) - add_project_link_arguments('--coverage', language: ['c', 'cpp']) - endif -diff --git a/src/modules/echo-cancel/meson.build b/src/modules/echo-cancel/meson.build -index 641cd35e7..3b998364e 100644 ---- a/src/modules/echo-cancel/meson.build -+++ b/src/modules/echo-cancel/meson.build -@@ -6,6 +6,8 @@ - # '-Wl,--unresolved-symbols=ignore-in-object-files' otherwise it fails - # at link time. - -+add_languages('cpp') -+ - libwebrtc_util_sources = [ - 'webrtc.cc' - ] --- -GitLab - diff --git a/package/pulseaudio/pulseaudio.hash b/package/pulseaudio/pulseaudio.hash index acbb56a07dfc..67f6cc6ef2e9 100644 --- a/package/pulseaudio/pulseaudio.hash +++ b/package/pulseaudio/pulseaudio.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2022-June/032287.html -sha256 8eef32ce91d47979f95fd9a935e738cd7eb7463430dabc72863251751e504ae4 pulseaudio-16.1.tar.xz +# From https://lists.freedesktop.org/archives/pulseaudio-discuss/2024-January/032426.html +sha256 053794d6671a3e397d849e478a80b82a63cb9d8ca296bd35b73317bb5ceb87b5 pulseaudio-17.0.tar.xz # Locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 GPL sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LGPL diff --git a/package/pulseaudio/pulseaudio.mk b/package/pulseaudio/pulseaudio.mk index 89191db541d3..254e05348d42 100644 --- a/package/pulseaudio/pulseaudio.mk +++ b/package/pulseaudio/pulseaudio.mk @@ -4,7 +4,7 @@ # ################################################################################ -PULSEAUDIO_VERSION = 16.1 +PULSEAUDIO_VERSION = 17.0 PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz PULSEAUDIO_SITE = https://freedesktop.org/software/pulseaudio/releases PULSEAUDIO_INSTALL_STAGING = YES From fee7efafd05872282e24a6923e40c1505e041196 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 18 Mar 2024 23:04:20 +0100 Subject: [PATCH 211/345] support/scripts: use FKIE git tree Currently, we grab the per-year CVE feeds, in two passes: first, we grab the meta files, and check whether something has changed since last we downloaded it; second, we download the feed proper, unless the meta file has not changed, in which case we use the locally cached feed. However, it has appeared that the FKIE releases no longer provide the meta files, which means that (once again), our daily reports are broken. The obvious fix would be to drop the use of the meta file, and always and unconditionally download the feeds. That's relatively trivial to do, but the feeds are relatively big (even as xz-xompressed). However, the CVE database from FKIE is available as a git tree. Git is pretty good at only sending delta when updating a local copy. In addition, the git tree, contains each CVE as an individual file, so it is relatively easier to scan and parse. Switch to using a local git clone. Slightly surprisingly (but not so much either), parsing the CVE files is much faster when using the git working copy, than it is when parsing the per-year feeds: indeed, the per-year feeds are xz-compressed, and even if python is slow-ish to scan a directory and opening files therein, it is still much faster than to decompress xz files. The timing delta [0] is ~100s before and ~10s now, about a ten time improvement, over the whole package set. The drawback, however, is that the git tree is much bigger on-disk, from ~55MiB for the per-year compressed feeds, to 2.1GiB for the git tree (~366MiB) and a working copy (~1.8GiB)... Given very few people are going to use that, that's considered acceptable... Eventually, with a bit of hacking [1], the two pkg-stats, before and after this change, yield the same data (except for the date and commit hash). [0] hacking support/scripts/pkg-stats to display the time before/after the CVE scan, and hacking support/scripts/cve.py to do no download so that only the CVE scan happens (and also because the meta files are no longer available). [1] sorting the CVE lists in json, sorting the json keys, and using the commit from the FKIE git tree that was used for the current per-year feeds. Signed-off-by: Yann E. MORIN Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle --- support/scripts/cve.py | 88 ++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 59 deletions(-) diff --git a/support/scripts/cve.py b/support/scripts/cve.py index 7167ecbc6a80..e25825581e05 100755 --- a/support/scripts/cve.py +++ b/support/scripts/cve.py @@ -19,29 +19,16 @@ import datetime import os -import requests # URL checking import distutils.version -import lzma -import time +import json +import subprocess import sys import operator -try: - import ijson - # backend is a module in < 2.5, a string in >= 2.5 - if 'python' in getattr(ijson.backend, '__name__', ijson.backend): - try: - import ijson.backends.yajl2_cffi as ijson - except ImportError: - sys.stderr.write('Warning: Using slow ijson python backend\n') -except ImportError: - sys.stderr.write("You need ijson to parse NVD for CVE check\n") - exit(1) - sys.path.append('utils/') NVD_START_YEAR = 1999 -NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/releases/latest/download" +NVD_BASE_URL = "https://github.com/fkie-cad/nvd-json-data-feeds/" ops = { '>=': operator.ge, @@ -81,41 +68,24 @@ def __init__(self, nvd_cve): self.nvd_cve = nvd_cve @staticmethod - def download_nvd_year(nvd_path, year): - metaf = "CVE-%s.meta" % year - path_metaf = os.path.join(nvd_path, metaf) - jsonf_xz = "CVE-%s.json.xz" % year - path_jsonf_xz = os.path.join(nvd_path, jsonf_xz) - - # If the database file is less than a day old, we assume the NVD data - # locally available is recent enough. - if os.path.exists(path_jsonf_xz) and os.stat(path_jsonf_xz).st_mtime >= time.time() - 86400: - return path_jsonf_xz - - # If not, we download the meta file - url = "%s/%s" % (NVD_BASE_URL, metaf) - print("Getting %s" % url) - page_meta = requests.get(url) - page_meta.raise_for_status() - - # If the meta file already existed, we compare the existing - # one with the data newly downloaded. If they are different, - # we need to re-download the database. - # If the database does not exist locally, we need to redownload it in - # any case. - if os.path.exists(path_metaf) and os.path.exists(path_jsonf_xz): - meta_known = open(path_metaf, "r").read() - if page_meta.text == meta_known: - return path_jsonf_xz - - # Grab the compressed JSON NVD, and write files to disk - url = "%s/%s" % (NVD_BASE_URL, jsonf_xz) - print("Getting %s" % url) - page_json = requests.get(url) - page_json.raise_for_status() - open(path_jsonf_xz, "wb").write(page_json.content) - open(path_metaf, "w").write(page_meta.text) - return path_jsonf_xz + def download_nvd(nvd_git_dir): + print(f"Updating from {NVD_BASE_URL}") + if os.path.exists(nvd_git_dir): + subprocess.check_call( + ["git", "pull"], + cwd=nvd_git_dir, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + else: + # Create the directory and its parents; git + # happily clones into an empty directory. + os.makedirs(nvd_git_dir) + subprocess.check_call( + ["git", "clone", NVD_BASE_URL, nvd_git_dir], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) @staticmethod def sort_id(cve_ids): @@ -131,15 +101,15 @@ def read_nvd_dir(cls, nvd_dir): feeds since NVD_START_YEAR. If the files are missing or outdated in nvd_dir, a fresh copy will be downloaded, and kept in .json.gz """ + nvd_git_dir = os.path.join(nvd_dir, "git") + CVE.download_nvd(nvd_git_dir) for year in range(NVD_START_YEAR, datetime.datetime.now().year + 1): - filename = CVE.download_nvd_year(nvd_dir, year) - try: - content = ijson.items(lzma.LZMAFile(filename), 'cve_items.item') - except: # noqa: E722 - print("ERROR: cannot read %s. Please remove the file then rerun this script" % filename) - raise - for cve in content: - yield cls(cve) + for dirpath, _, filenames in os.walk(os.path.join(nvd_git_dir, f"CVE-{year}")): + for filename in filenames: + if filename[-5:] != ".json": + continue + with open(os.path.join(dirpath, filename), "rb") as f: + yield cls(json.load(f)) def each_product(self): """Iterate over each product section of this cve""" From 356a93594de1c6a67dc35c335b35531c4607d284 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 18 Mar 2024 21:38:55 +0100 Subject: [PATCH 212/345] package/harfbuzz: bump to version 8.3.1 Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle --- package/harfbuzz/harfbuzz.hash | 2 +- package/harfbuzz/harfbuzz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index fbe890910aec..f107aee8c2bf 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 109501eaeb8bde3eadb25fab4164e993fbace29c3d775bcaa1c1e58e2f15f847 harfbuzz-8.3.0.tar.xz +sha256 f73e1eacd7e2ffae687bc3f056bb0c705b7a05aee86337686e09da8fc1c2030c harfbuzz-8.3.1.tar.xz sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 599ea548d08e..e3da4add43f4 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 8.3.0 +HARFBUZZ_VERSION = 8.3.1 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library) From f9ef4ed8657cf58d743ada711071303d6f3d800a Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 18 Mar 2024 21:35:37 +0100 Subject: [PATCH 213/345] package/rtl8812au-aircrack-ng: bump to version 2024-03-16 on branch v5.6.4.2 This version adds support up to Linux version 6.8. Signed-off-by: Giulio Benetti Reviewed-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash | 2 +- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash index 414ea98b08ba..6283cb0f87f0 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 969fa96c90e16fcaf8f6b30d4576a8446c7041932bea34bbfea7e9c91038bfe5 rtl8812au-aircrack-ng-4a983e47dafc048019412350d36270864f6b5f2d.tar.gz +sha256 752d9ae67140966eddc463238fde1f6b86457db22a45f61c13886c3244eaffe1 rtl8812au-aircrack-ng-f23979f0d20aafb563ac71b56fcbc74268c798c2.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index df3b03998e40..d5571b9d5c74 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8812AU_AIRCRACK_NG_VERSION = 4a983e47dafc048019412350d36270864f6b5f2d +RTL8812AU_AIRCRACK_NG_VERSION = f23979f0d20aafb563ac71b56fcbc74268c798c2 RTL8812AU_AIRCRACK_NG_SITE = $(call github,aircrack-ng,rtl8812au,$(RTL8812AU_AIRCRACK_NG_VERSION)) RTL8812AU_AIRCRACK_NG_LICENSE = GPL-2.0 RTL8812AU_AIRCRACK_NG_LICENSE_FILES = LICENSE From 3d8e92e318c39b9d838ca607a3213c7ed1f69bc0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 23:00:28 +0100 Subject: [PATCH 214/345] package/osm2pgsql: only supports 64 bits osm2pgsql only supports 64 bits architectures since bump to version 1.10.0 in commit e056aeeca9cf8c00c6da62c39979ce6c55c92791 and https://github.com/osm2pgsql-dev/osm2pgsql/commit/389904269a1b1f246641d203abadfcd5cebb97cc resulting in the following build failure with arm: CMake Error at CMakeLists.txt:20 (message): osm2pgsql needs a 64 bit architecture Fixes: e056aeeca9cf8c00c6da62c39979ce6c55c92791 - http://autobuild.buildroot.org/results/30c2675a732fd810c68dffbb6483f9cf8e4fcbf3 Signed-off-by: Fabrice Fontaine Reviewed-by: Maxim Kochetkov Signed-off-by: Arnout Vandecappelle --- package/osm2pgsql/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index c6a38f318065..439309df951d 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_OSM2PGSQL bool "osm2pgsql" + depends on BR2_ARCH_IS_64 depends on BR2_INSTALL_LIBSTDCPP # boost, libosmium, protozero depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libosmium @@ -24,9 +25,11 @@ config BR2_PACKAGE_OSM2PGSQL https://osm2pgsql.org comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" + depends on BR2_ARCH_IS_64 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS comment "osm2pgsql needs a toolchain not affected by GCC bug 64735" + depends on BR2_ARCH_IS_64 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 From 752ab5a9e635f4c039c031ed00381356b60f4398 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 15:47:01 +0100 Subject: [PATCH 215/345] package/mraa: fix build with musl >= 1.2.5 Fix the following build failure with musl >= 1.2.5 (raised since commit f7f03445cf320adbbc41270a806b38c911d3454a): /home/autobuild/autobuild/instance-9/output-1/build/mraa-2.2.0/src/mraa.c: In function 'mraa_count_iio_devices': /home/autobuild/autobuild/instance-9/output-1/build/mraa-2.2.0/src/mraa.c:341:38: error: implicit declaration of function 'basename'; did you mean 'rename'? [-Werror=implicit-function-declaration] 341 | if (fnmatch(IIO_DEVICE_WILDCARD, basename(path), 0) == 0) { | ^~~~~~~~ | rename Fixes: f7f03445cf320adbbc41270a806b38c911d3454a - http://autobuild.buildroot.org/results/1f16df70e49a9f8823a791c0fcc677de07136835 Signed-off-by: Fabrice Fontaine Reviewed-by: Pieterjan Camerlynck Signed-off-by: Arnout Vandecappelle --- .../mraa/0002-mraa-Use-posix-basename.patch | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 package/mraa/0002-mraa-Use-posix-basename.patch diff --git a/package/mraa/0002-mraa-Use-posix-basename.patch b/package/mraa/0002-mraa-Use-posix-basename.patch new file mode 100644 index 000000000000..3c5c99f031c1 --- /dev/null +++ b/package/mraa/0002-mraa-Use-posix-basename.patch @@ -0,0 +1,45 @@ +From 47c3850cddd63cebd9dc48e411963314449118f1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 31 Dec 2023 19:16:35 -0800 +Subject: [PATCH] mraa: Use posix basename + +Musl has removed the declaration from string.h [1] which exposes the +problem especially with clang-17+ compiler where implicit function +declaration is flagged as error. Use posix basename and make a copy of +string to operate on to emulate GNU basename behaviour. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Signed-off-by: Khem Raj + +Upstream: https://github.com/eclipse/mraa/commit/47c3850cddd63cebd9dc48e411963314449118f1 +Signed-off-by: Fabrice Fontaine +--- + src/mraa.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/mraa.c b/src/mraa.c +index 653ea1fa7..b556d0455 100644 +--- a/src/mraa.c ++++ b/src/mraa.c +@@ -12,6 +12,7 @@ + #endif + + #include ++#include + #include + #include + #include +@@ -341,9 +342,11 @@ static int + mraa_count_iio_devices(const char* path, const struct stat* sb, int flag, struct FTW* ftwb) + { + // we are only interested in files with specific names +- if (fnmatch(IIO_DEVICE_WILDCARD, basename(path), 0) == 0) { ++ char* tmp = strdup(path); ++ if (fnmatch(IIO_DEVICE_WILDCARD, basename(tmp), 0) == 0) { + num_iio_devices++; + } ++ free(tmp); + return 0; + } + From 43ca417c0c883f245dde9be82d49c49adaceea2c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 21 Mar 2024 22:12:45 +0100 Subject: [PATCH 216/345] package/containerd: fix btrfs handling btrfs handling doesn't depend on btrfs-progs but on kernel >= 4.12 since bump to version 1.7.7 in commit 79e01ef9506a6cdc4836912607dc594ae7b1999d and https://github.com/containerd/containerd/commit/024a748c092cbddde0918f2e93a646ce50116e11 resulting in the following build failure: In file included from vendor/github.com/containerd/btrfs/v2/btrfs.go:21:0: ./btrfs.h:19:2: error: #error "Headers from kernel >= 4.12 are required on compilation time (not on run time)" #error "Headers from kernel >= 4.12 are required on compilation time (not on run time)" ^~~~~ In file included from vendor/github.com/containerd/btrfs/v2/btrfs.go:21:0: ./btrfs.h:22:10: fatal error: linux/btrfs_tree.h: No such file or directory #include ^~~~~~~~~~~~~~~~~~~~ Fixes: 79e01ef9506a6cdc4836912607dc594ae7b1999d - http://autobuild.buildroot.org/results/d6afeef47daae1783dcce3e2b6a0a16e3e5d5fbd Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/containerd/Config.in | 7 ++++--- package/containerd/containerd.mk | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/containerd/Config.in b/package/containerd/Config.in index 12a53bc11122..2dd04b109c7c 100644 --- a/package/containerd/Config.in +++ b/package/containerd/Config.in @@ -20,12 +20,13 @@ if BR2_PACKAGE_CONTAINERD config BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS bool "btrfs snapshot driver" - depends on BR2_USE_MMU # btrfs-progs - depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs - select BR2_PACKAGE_BTRFS_PROGS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 help Build the btrfs snapshot driver for containerd. +comment "brtfs snapshot driver needs headers >= 4.12" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_CONTAINERD_DRIVER_DEVMAPPER bool "devmapper snapshot driver" depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 50c2965b8737..9bf51c93ae4e 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -35,9 +35,7 @@ CONTAINERD_DEPENDENCIES += libseccomp host-pkgconf CONTAINERD_TAGS += seccomp endif -ifeq ($(BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS),y) -CONTAINERD_DEPENDENCIES += btrfs-progs -else +ifneq ($(BR2_PACKAGE_CONTAINERD_DRIVER_BTRFS),y) CONTAINERD_TAGS += no_btrfs endif From e30b38f1c5bcc62d387f4b96d20a7a9f4715c7a5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 21 Mar 2024 22:14:56 +0100 Subject: [PATCH 217/345] package/docker-engine: fix btrfs handling btrfs doesn't depend on btrfs-progs but on headers >= 4.12 since bump to version 24.0.2 in commit 314f62eda347ba02b4688ac94c6bab55b4a4d6c9 and https://github.com/moby/moby/commit/3208dcabdc8997340b255f5b880fef4e3f54580d resulting in the following build failure: daemon/graphdriver/btrfs/btrfs.go:13:6: error: #error "Headers from kernel >= 4.12 are required to build with Btrfs support." #error "Headers from kernel >= 4.12 are required to build with Btrfs support." ^~~~~ daemon/graphdriver/btrfs/btrfs.go:14:6: error: #error "HINT: Set 'DOCKER_BUILDTAGS=exclude_graphdriver_btrfs' to build without Btrfs." #error "HINT: Set 'DOCKER_BUILDTAGS=exclude_graphdriver_btrfs' to build without Btrfs." ^~~~~ daemon/graphdriver/btrfs/btrfs.go:18:10: fatal error: linux/btrfs_tree.h: No such file or directory #include ^~~~~~~~~~~~~~~~~~~~ Fixes: 314f62eda347ba02b4688ac94c6bab55b4a4d6c9 - http://autobuild.buildroot.org/results/7d07eba37149d341dc86f9742bd166de874dcd5e Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/docker-engine/Config.in | 7 ++++--- package/docker-engine/docker-engine.mk | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 71bf670f17f0..d48ffe6484a5 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -21,12 +21,13 @@ if BR2_PACKAGE_DOCKER_ENGINE config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS bool "btrfs filesystem driver" - depends on BR2_USE_MMU # btrfs-progs - depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs - select BR2_PACKAGE_BTRFS_PROGS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 help Build the btrfs filesystem driver for Docker. +comment "brtfs filesystem driver needs headers >= 4.12" + depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 + config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER bool "devicemapper filesystem driver" depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index 262be2df202e..05bf23ad3de3 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -35,9 +35,7 @@ DOCKER_ENGINE_DEPENDENCIES += systemd DOCKER_ENGINE_TAGS += systemd journald endif -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) -DOCKER_ENGINE_DEPENDENCIES += btrfs-progs -else +ifneq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) DOCKER_ENGINE_TAGS += exclude_graphdriver_btrfs endif From 8b3497f3ab19ec828a94eaf19923a07603b5e916 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 15:05:05 +0100 Subject: [PATCH 218/345] package/mariadb: requires DES in openssl Enable DES in openssl to avoid the following build failure raised since commit a83d41867c8d69a77d5cd0a665aa216af5340359: In file included from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/mysqld.cc:50, from /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/lib_sql.cc:34: /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:26:3: error: 'DES_cblock' does not name a type 26 | DES_cblock key1, key2, key3; | ^~~~~~~~~~ /home/buildroot/autobuild/run/instance-2/output-1/build/mariadb-10.11.6/libmysqld/../sql/des_key_file.h:31:3: error: 'DES_key_schedule' does not name a type; did you mean 'st_des_keyschedule'? 31 | DES_key_schedule ks1, ks2, ks3; | ^~~~~~~~~~~~~~~~ | st_des_keyschedule Fixes: a83d41867c8d69a77d5cd0a665aa216af5340359 - http://autobuild.buildroot.org/results/bd067de9c2699dc9628c00b929a01890b14d53c1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/mariadb/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mariadb/Config.in b/package/mariadb/Config.in index d88dda3cdacb..acedd1da9d89 100644 --- a/package/mariadb/Config.in +++ b/package/mariadb/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_MARIADB select BR2_PACKAGE_FMT select BR2_PACKAGE_NCURSES select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_PCRE2 help MariaDB is one of the most popular database servers in the From 4e5ea3163094e4c8cf185959b983ce95c97944e4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 14:14:46 +0100 Subject: [PATCH 219/345] package/spice: fix libressl build Fix the following build failure raised since bump of libressl to version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2: red-stream.cpp: In function 'RedStreamSslStatus red_stream_ssl_accept(RedStream*)': red-stream.cpp:526:22: error: invalid use of incomplete type 'SSL' {aka 'struct ssl_st'} 526 | stream->priv->ssl->s3->flags |= SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS; | ^~ In file included from /home/buildroot/autobuild/instance-1/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/include/openssl/err.h:120, from red-stream.cpp:33: /home/buildroot/autobuild/instance-1/output-1/host/i686-buildroot-linux-gnu/sysroot/usr/include/openssl/ossl_typ.h:173:16: note: forward declaration of 'SSL' {aka 'struct ssl_st'} 173 | typedef struct ssl_st SSL; | ^~~~~~ Fixes: - http://autobuild.buildroot.org/results/273eadf9e49af55e0932a8293ca65762fb43114f - http://autobuild.buildroot.org/results/97601f321efc532de0c2ea6aa618ce11fad9e851 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- ...SL_OP_NO_RENEGOTIATION-fallback-path.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch diff --git a/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch b/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch new file mode 100644 index 000000000000..edb8b2ed1796 --- /dev/null +++ b/package/spice/0001-server-add-SSL_OP_NO_RENEGOTIATION-fallback-path.patch @@ -0,0 +1,43 @@ +From 5e580eefac44d0c709afcf93eb5fca2fb353166a Mon Sep 17 00:00:00 2001 +From: orbea +Date: Fri, 26 May 2023 13:38:34 -0700 +Subject: [PATCH] server: add SSL_OP_NO_RENEGOTIATION fallback path + +With LibreSSL SSL_OP_NO_CLIENT_RENEGOTIATION is opaque which is not +compatible with the OpenSSL 1.0.2 and earlier code path in +red-stream.cpp while SSL_OP_NO_RENEGOTIATION is not yet defined for the +newer OpenSSL code path in reds.cpp. + +So with OpenSSL 1.1.0 and later if SSL_OP_NO_RENEGOTIATION is undefined +and SSL_OP_NO_CLIENT_RENEGOTIATION is defined then define the former as +the latter. This will allow the build to succeed with LibreSSL 3.7.2 and +in the future when newer LibreSSL versions add SSL_OP_NO_RENEGOTIATION +that code path will then be used automatically. + +Signed-off-by: orbea +Acked-by: Frediano Ziglio + +Upstream: https://gitlab.freedesktop.org/spice/spice/-/commit/5e580eefac44d0c709afcf93eb5fca2fb353166a +Signed-off-by: Fabrice Fontaine +--- + server/red-stream.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/server/red-stream.h b/server/red-stream.h +index 716e93317..8e57c5e5e 100644 +--- a/server/red-stream.h ++++ b/server/red-stream.h +@@ -25,6 +25,10 @@ + + SPICE_BEGIN_DECLS + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(SSL_OP_NO_RENEGOTIATION) && defined(SSL_OP_NO_CLIENT_RENEGOTIATION) ++#define SSL_OP_NO_RENEGOTIATION SSL_OP_NO_CLIENT_RENEGOTIATION ++#endif ++ + typedef void (*AsyncReadDone)(void *opaque); + typedef void (*AsyncReadError)(void *opaque, int err); + +-- +GitLab + From c09830644466022de14a350d569e06041b394c53 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2024 16:22:05 +0100 Subject: [PATCH 220/345] package/axel: needs gcc >= 4.9 Fix the following build failure raised since bump to version 2.17.12 in commit 50ba0b0a40187b695740a2fce2d2f3ed7cbf58c5 and https://github.com/axel-download-accelerator/axel/commit/517d3ea036c2837b779a15b410331cd0df4fb066: src/random.c:1:23: fatal error: stdatomic.h: No such file or directory #include ^ Fixes: - http://autobuild.buildroot.org/results/ca62edddd42252bf21caa8243f8aaba38992fc68 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/axel/Config.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/axel/Config.in b/package/axel/Config.in index 4507855ff8e7..740095a50514 100644 --- a/package/axel/Config.in +++ b/package/axel/Config.in @@ -1,10 +1,12 @@ config BR2_PACKAGE_AXEL bool "axel" depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C11/stdatomic.h help HTTP/FTP download accelerator. https://github.com/axel-download-accelerator/axel/ -comment "axel needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS +comment "axel needs a toolchain w/ threads, gcc >= 4.9" + depends on !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From f84b73bfa25ac388e3edd3df85ac642f063055c9 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 14:25:39 -0800 Subject: [PATCH 221/345] package/ttyd: bump version to 1.7.4 change log - https://github.com/tsl0922/ttyd/releases/tag/1.7.4 Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/ttyd/ttyd.hash | 2 +- package/ttyd/ttyd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ttyd/ttyd.hash b/package/ttyd/ttyd.hash index 85bd71ba2d8b..b11327c46557 100644 --- a/package/ttyd/ttyd.hash +++ b/package/ttyd/ttyd.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c9cf5eece52d27c5d728000f11315d36cb400c6948d1964a34a7eae74b454099 ttyd-1.7.3.tar.gz +sha256 300d8cef4b0b32b0ec30d7bf4d3721a5d180e22607f9467a95ab7b6d9652ca9b ttyd-1.7.4.tar.gz sha256 8b7e100f8311cb428c57609164d93099bada2599f948359045d1ac876a7a625b LICENSE diff --git a/package/ttyd/ttyd.mk b/package/ttyd/ttyd.mk index d17e21d60baa..d0e144b25225 100644 --- a/package/ttyd/ttyd.mk +++ b/package/ttyd/ttyd.mk @@ -4,7 +4,7 @@ # ################################################################################ -TTYD_VERSION = 1.7.3 +TTYD_VERSION = 1.7.4 TTYD_SITE = $(call github,tsl0922,ttyd,$(TTYD_VERSION)) TTYD_LICENSE = MIT TTYD_LICENSE_FILES = LICENSE From 66d11f8942fd48887bc19a1c07d036ab7eca2007 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 17:32:22 -0800 Subject: [PATCH 222/345] package/{tzdata, zic}: bump version to 2024a Release notes - https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/tzdata/tzdata.hash | 4 ++-- package/tzdata/tzdata.mk | 2 +- package/zic/zic.hash | 4 ++-- package/zic/zic.mk | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 5488625ddd29..d353bc4410fa 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html -sha512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 tzdata2023c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html +sha512 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 tzdata2024a.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 33e296d7d740..e36720527712 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2023c +TZDATA_VERSION = 2024a TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_SELINUX_MODULES = tzdata diff --git a/package/zic/zic.hash b/package/zic/zic.hash index a2720a27baa3..80c96ed79340 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html -sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz +# From https://mm.icann.org/pipermail/tz-announce/2024-February/000081.html +sha512 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c tzcode2024a.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index a915f6d25653..95fa1eaa96ee 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2023c +ZIC_VERSION = 2024a ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 From 4ac57d33fcbe73fcd17a4f002803a81e455d949a Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 22:08:14 -0800 Subject: [PATCH 223/345] package/bash: bump to version 5.2.21 Build tested using the following config option: BR2_PACKAGE_BASH=y $ ./utils/test-pkg -c bash.config -p bash bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: OK 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/bash/bash.hash | 4 ++-- package/bash/bash.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bash/bash.hash b/package/bash/bash.hash index e0a1ebac916d..44c1c5ed50e5 100644 --- a/package/bash/bash.hash +++ b/package/bash/bash.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature from -# https://ftp.gnu.org/gnu/bash/bash-5.2.15.tar.gz.sig -sha256 13720965b5f4fc3a0d4b61dd37e7565c741da9a5be24edc2ae00182fc1b3588c bash-5.2.15.tar.gz +# https://ftp.gnu.org/gnu/bash/bash-5.2.21.tar.gz.sig +sha256 c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8 bash-5.2.21.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/bash/bash.mk b/package/bash/bash.mk index 9a73ed8c3677..9d173a5c7c0c 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -4,7 +4,7 @@ # ################################################################################ -BASH_VERSION = 5.2.15 +BASH_VERSION = 5.2.21 BASH_SITE = $(BR2_GNU_MIRROR)/bash BASH_DEPENDENCIES = ncurses readline host-bison BASH_LICENSE = GPL-3.0+ From 9f94b3b35423a3d7b93e7fdd67e97dea6e33de60 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 23:00:11 -0800 Subject: [PATCH 224/345] package/iperf3: bump to version 3.16 Release notes - https://github.com/esnet/iperf/releases/tag/3.16 Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/iperf3/iperf3.hash | 4 ++-- package/iperf3/iperf3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 02ada0dcc644..a8634c4a7eda 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.14.tar.gz.sha256 -sha256 723fcc430a027bc6952628fa2a3ac77584a1d0bd328275e573fc9b206c155004 iperf-3.14.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.16.tar.gz.sha256 +sha256 cc740c6bbea104398cc3e466befc515a25896ec85e44a662d5f4a767b9cf713e iperf-3.16.tar.gz # Locally computed sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index c00b16ce613d..6d902c3b13bb 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.14 +IPERF3_VERSION = 3.16 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT From 38a20a0998117f3debb4de06e209ba5d82bb7a9d Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:06 -0400 Subject: [PATCH 225/345] package/fdk-aac: bump to version 2.0.3 Change log: https://github.com/mstorsjo/fdk-aac/blob/master/ChangeLog Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/fdk-aac/fdk-aac.hash | 5 ++--- package/fdk-aac/fdk-aac.mk | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/fdk-aac/fdk-aac.hash b/package/fdk-aac/fdk-aac.hash index b10d5f92b166..ae5c81b30fdd 100644 --- a/package/fdk-aac/fdk-aac.hash +++ b/package/fdk-aac/fdk-aac.hash @@ -1,6 +1,5 @@ # From https://sourceforge.net/projects/opencore-amr/files/fdk-aac/ -sha1 579b34e8174b4feb21a9c598695f5ff4a7ceef8c fdk-aac-2.0.2.tar.gz -md5 b41222194b31f570b3132bd622a9aef6 fdk-aac-2.0.2.tar.gz +sha1 29f5485a6ec718335243440600ff78418cd4765b fdk-aac-2.0.3.tar.gz # Locally computed: -sha256 c9e8630cf9d433f3cead74906a1520d2223f89bcd3fa9254861017440b8eb22f fdk-aac-2.0.2.tar.gz +sha256 829b6b89eef382409cda6857fd82af84fabb63417b08ede9ea7a553f811cb79e fdk-aac-2.0.3.tar.gz sha256 95ec80da40b4af12ad4c4f3158c9cfb80f2479f3246e4260cb600827cc8c7836 NOTICE diff --git a/package/fdk-aac/fdk-aac.mk b/package/fdk-aac/fdk-aac.mk index c66f6df79753..01a100fa9480 100644 --- a/package/fdk-aac/fdk-aac.mk +++ b/package/fdk-aac/fdk-aac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FDK_AAC_VERSION = 2.0.2 +FDK_AAC_VERSION = 2.0.3 FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac FDK_AAC_LICENSE = fdk-aac license FDK_AAC_LICENSE_FILES = NOTICE From d0d443dd9f17e660b9120770d48721a4f1d5f253 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:08 -0400 Subject: [PATCH 226/345] package/leptonica: bump to version 1.84.1 Change log: http://www.leptonica.org/source/version-notes.html Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/leptonica/leptonica.hash | 2 +- package/leptonica/leptonica.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/leptonica/leptonica.hash b/package/leptonica/leptonica.hash index 6511d6b4103f..3416cfeb3997 100644 --- a/package/leptonica/leptonica.hash +++ b/package/leptonica/leptonica.hash @@ -1,3 +1,3 @@ # locally computed hash -sha256 8f18615e0743af7df7f50985c730dfcf0c93548073d1f56621e4156a8b54d3dd leptonica-1.83.1.tar.gz +sha256 2b3e1254b1cca381e77c819b59ca99774ff43530209b9aeb511e1d46588a64f6 leptonica-1.84.1.tar.gz sha256 87829abb5bbb00b55a107365da89e9a33f86c4250169e5a1e5588505be7d5806 leptonica-license.txt diff --git a/package/leptonica/leptonica.mk b/package/leptonica/leptonica.mk index 4cb73296e81d..0e902c6488a4 100644 --- a/package/leptonica/leptonica.mk +++ b/package/leptonica/leptonica.mk @@ -4,7 +4,7 @@ # ################################################################################ -LEPTONICA_VERSION = 1.83.1 +LEPTONICA_VERSION = 1.84.1 LEPTONICA_SITE = https://github.com/DanBloomberg/leptonica/releases/download/$(LEPTONICA_VERSION) LEPTONICA_LICENSE = BSD-2-Clause LEPTONICA_LICENSE_FILES = leptonica-license.txt From e9d97cf81dce303cbe104c310ca7631d1cf94806 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:09 -0400 Subject: [PATCH 227/345] package/libolm: bump to version 3.2.16 Change log: https://gitlab.matrix.org/matrix-org/olm/-/blob/master/CHANGELOG.rst Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/libolm/libolm.hash | 2 +- package/libolm/libolm.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libolm/libolm.hash b/package/libolm/libolm.hash index 044bb24f0615..a95115d2feed 100644 --- a/package/libolm/libolm.hash +++ b/package/libolm/libolm.hash @@ -1,3 +1,3 @@ # locally computed -sha256 614c0e4dc4721f57e56c3385bd8def2f71c6631f928a480efd0b4bd8e5435df9 olm-3.2.9.tar.gz +sha256 1e90f9891009965fd064be747616da46b232086fe270b77605ec9bda34272a68 olm-3.2.16.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/libolm/libolm.mk b/package/libolm/libolm.mk index 6f066865550b..5c8bcd1f5928 100644 --- a/package/libolm/libolm.mk +++ b/package/libolm/libolm.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOLM_VERSION = 3.2.9 +LIBOLM_VERSION = 3.2.16 LIBOLM_SOURCE = olm-$(LIBOLM_VERSION).tar.gz LIBOLM_SITE = https://gitlab.matrix.org/matrix-org/olm/-/archive/$(LIBOLM_VERSION) LIBOLM_LICENSE = Apache-2.0 From 39b5a8afb02e85fc31e4378b3284029a15b42180 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:10 -0400 Subject: [PATCH 228/345] package/ocrad: bump to version 0.29 Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/ocrad/ocrad.hash | 2 +- package/ocrad/ocrad.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ocrad/ocrad.hash b/package/ocrad/ocrad.hash index cd5b0039ea78..736dd6ad4cac 100644 --- a/package/ocrad/ocrad.hash +++ b/package/ocrad/ocrad.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 34ccea576dbdadaa5979e6202344c3ff68737d829ca7b66f71c8497d36bbbf2e ocrad-0.28.tar.lz +sha256 11200cc6b0b7ba16884a72dccb58ef694f7aa26cd2b2041e555580f064d2d9e9 ocrad-0.29.tar.lz sha256 3d77c1a58fbde5ddba612d1fe09965e20a3804953eca12e8c1892298bb8a5eef COPYING diff --git a/package/ocrad/ocrad.mk b/package/ocrad/ocrad.mk index d62b7af35156..2452070bcf0c 100644 --- a/package/ocrad/ocrad.mk +++ b/package/ocrad/ocrad.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCRAD_VERSION = 0.28 +OCRAD_VERSION = 0.29 OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad OCRAD_LICENSE = GPL-2.0+ From c2ca1249e1d227c55c4044c4ef6aca2bc09c99ba Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:11 -0400 Subject: [PATCH 229/345] package/opencl-clhpp: bump to version 2023.12.14 Change log: https://github.com/KhronosGroup/OpenCL-CLHPP/releases/tag/v2023.12.14 Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/opencl-clhpp/opencl-clhpp.hash | 2 +- package/opencl-clhpp/opencl-clhpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/opencl-clhpp/opencl-clhpp.hash b/package/opencl-clhpp/opencl-clhpp.hash index 27b27cd80cc0..3f038d634099 100644 --- a/package/opencl-clhpp/opencl-clhpp.hash +++ b/package/opencl-clhpp/opencl-clhpp.hash @@ -1,3 +1,3 @@ # Locally Computed -sha256 869456032e60787eed9fceaeaf6c6cb4452bc0ff97e0f5a271510145a1c8f4d4 opencl-clhpp-2.0.16.tar.gz +sha256 9106700634e79cfa0935ebd67197f64689ced24c42da702acf18fa8435bd8a82 opencl-clhpp-2023.12.14.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/opencl-clhpp/opencl-clhpp.mk b/package/opencl-clhpp/opencl-clhpp.mk index 933b40e3feff..93c25d0d6605 100644 --- a/package/opencl-clhpp/opencl-clhpp.mk +++ b/package/opencl-clhpp/opencl-clhpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCL_CLHPP_VERSION = 2.0.16 +OPENCL_CLHPP_VERSION = 2023.12.14 OPENCL_CLHPP_SITE = $(call github,KhronosGroup,OpenCL-CLHPP,v$(OPENCL_CLHPP_VERSION)) OPENCL_CLHPP_LICENSE = Apache-2.0 OPENCL_CLHPP_LICENSE_FILES = LICENSE.txt From 56abf4742519e989207b563e7344853c72eb68c0 Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:12 -0400 Subject: [PATCH 230/345] package/tesseract-ocr: bump to version 5.3.4 Changes since version 5.3.3: https://github.com/tesseract-ocr/tesseract/compare/5.3.3...5.3.4 Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/tesseract-ocr/tesseract-ocr.hash | 2 +- package/tesseract-ocr/tesseract-ocr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tesseract-ocr/tesseract-ocr.hash b/package/tesseract-ocr/tesseract-ocr.hash index 45b9def27fd9..41c8498bec16 100644 --- a/package/tesseract-ocr/tesseract-ocr.hash +++ b/package/tesseract-ocr/tesseract-ocr.hash @@ -1,5 +1,5 @@ # locally computed -sha256 dc4329f85f41191b2d813b71b528ba6047745813474e583ccce8795ff2ff5681 tesseract-ocr-5.3.3.tar.gz +sha256 141afc12b34a14bb691a939b4b122db0d51bd38feda7f41696822bacea7710c7 tesseract-ocr-5.3.4.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE sha256 daa0c97d651c19fba3b25e81317cd697e9908c8208090c94c3905381c23fc047 eng.traineddata sha256 eac01c1d72540d6090facb7b2f42dd0a2ee8fc57c5be1b20548ae668e2761913 fra.traineddata diff --git a/package/tesseract-ocr/tesseract-ocr.mk b/package/tesseract-ocr/tesseract-ocr.mk index d65111d4681e..0bc90f487105 100644 --- a/package/tesseract-ocr/tesseract-ocr.mk +++ b/package/tesseract-ocr/tesseract-ocr.mk @@ -4,7 +4,7 @@ # ################################################################################ -TESSERACT_OCR_VERSION = 5.3.3 +TESSERACT_OCR_VERSION = 5.3.4 TESSERACT_OCR_DATA_VERSION = 4.1.0 TESSERACT_OCR_SITE = $(call github,tesseract-ocr,tesseract,$(TESSERACT_OCR_VERSION)) TESSERACT_OCR_LICENSE = Apache-2.0 From 36902b51314d93ba2e7283d605738a38aba9d0bf Mon Sep 17 00:00:00 2001 From: Gilles Talis Date: Thu, 15 Feb 2024 10:24:13 -0400 Subject: [PATCH 231/345] package/xapian: bump to version 1.4.24 Change log: https://xapian.org/docs/xapian-core-1.4.24/NEWS Signed-off-by: Gilles Talis Signed-off-by: Peter Korsgaard --- package/xapian/xapian.hash | 4 ++-- package/xapian/xapian.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/xapian/xapian.hash b/package/xapian/xapian.hash index e570f7e2f251..16889b455942 100644 --- a/package/xapian/xapian.hash +++ b/package/xapian/xapian.hash @@ -1,5 +1,5 @@ -# From https://lists.xapian.org/pipermail/xapian-discuss/2022-January/009934.html -sha256 1fca48fca6cc3526cc4ba93dd194fe9c1326857b78edcfb37e68d086d714a9c3 xapian-core-1.4.19.tar.xz +# From https://lists.xapian.org/pipermail/xapian-discuss/2023-November/010009.html +sha256 eda5ae6dcf6b0553a8676af64b1fd304e998cd20f779031ccaaf7ab9a373531a xapian-core-1.4.24.tar.xz # locally computed sha256 c38aee9e3c8c4d5d594ff548a1be05453023016d6286931f6512db215ec1fd42 COPYING diff --git a/package/xapian/xapian.mk b/package/xapian/xapian.mk index 464e5478df0c..33c36a5a26a8 100644 --- a/package/xapian/xapian.mk +++ b/package/xapian/xapian.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPIAN_VERSION = 1.4.19 +XAPIAN_VERSION = 1.4.24 XAPIAN_SOURCE = xapian-core-$(XAPIAN_VERSION).tar.xz XAPIAN_SITE = https://oligarchy.co.uk/xapian/$(XAPIAN_VERSION) XAPIAN_LICENSE = GPL-2.0+ From 756fdeb76dc4479c9bad42e33c58c60c7150379c Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 15 Feb 2024 15:31:44 +0100 Subject: [PATCH 232/345] package/shadow: bump to version 4.14.5 Omit 4.14.4 since it was broken. Signed-off-by: Michael Vetter Signed-off-by: Peter Korsgaard --- package/shadow/shadow.hash | 4 ++-- package/shadow/shadow.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/shadow/shadow.hash b/package/shadow/shadow.hash index 4689a994de77..23c292d65940 100644 --- a/package/shadow/shadow.hash +++ b/package/shadow/shadow.hash @@ -1,4 +1,4 @@ -# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.3/shadow-4.14.3.tar.xz.asc +# Verified from https://github.com/shadow-maint/shadow/releases/download/4.14.5/shadow-4.14.5.tar.xz.asc # with key A9348594CE31283A826FBDD8D57633D441E25BB5 -sha256 6969279236fe3152768573a38c9f83cb9ca109851a5a990aec1fc672ac2cfcd2 shadow-4.14.3.tar.xz +sha256 cba74bc7b05d89c015afe23131f9159ece38779d40a8af4cf162852e6e85ca23 shadow-4.14.5.tar.xz sha256 3d25ab8f43fdc14624296a56ff8dc3e72e499ad35f32ae0c803f4959cfe17c0a COPYING diff --git a/package/shadow/shadow.mk b/package/shadow/shadow.mk index 1e7ada614835..2092903b2d70 100644 --- a/package/shadow/shadow.mk +++ b/package/shadow/shadow.mk @@ -4,7 +4,7 @@ # ################################################################################ -SHADOW_VERSION = 4.14.3 +SHADOW_VERSION = 4.14.5 SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION) SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz SHADOW_LICENSE = BSD-3-Clause From 52fc3452ec9d41abc18a69f05b6bd2d18409697f Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 15 Feb 2024 15:42:41 +0100 Subject: [PATCH 233/345] package/libmbim: bump to 1.30.0 Explicitly disable newly introduced fuzzer build option. Changelog: https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/blob/mbim-1-30/NEWS Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/libmbim/libmbim.hash | 2 +- package/libmbim/libmbim.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libmbim/libmbim.hash b/package/libmbim/libmbim.hash index 8e7633cb946b..ebc37504c58c 100644 --- a/package/libmbim/libmbim.hash +++ b/package/libmbim/libmbim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 cf74682c56f4c34ca4aee86de3b8c425a89fc2c0782052815295faf6a8e0a9fb libmbim-1.28.2.tar.gz +sha256 cfc729d23b9bf699b23a7ef2f5d732d6eff96234e31fed36b778771a6e3d3ee5 libmbim-1.30.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-or-later.txt sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1-or-later.txt diff --git a/package/libmbim/libmbim.mk b/package/libmbim/libmbim.mk index 59f55a57bc19..717c2396f7e2 100644 --- a/package/libmbim/libmbim.mk +++ b/package/libmbim/libmbim.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMBIM_VERSION = 1.28.2 +LIBMBIM_VERSION = 1.30.0 LIBMBIM_SITE = https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION) LIBMBIM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (programs) LIBMBIM_LICENSE_FILES = \ @@ -13,7 +13,7 @@ LIBMBIM_CPE_ID_VENDOR = freedesktop LIBMBIM_INSTALL_STAGING = YES LIBMBIM_DEPENDENCIES = libglib2 -LIBMBIM_CONF_OPTS = -Dman=false +LIBMBIM_CONF_OPTS = -Dman=false -Dfuzzer=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBMBIM_DEPENDENCIES += gobject-introspection From 575d7e31c6f87b0733915e376f22d614b21fc5da Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 15 Feb 2024 15:42:42 +0100 Subject: [PATCH 234/345] package/libqmi: bump to version 1.34.0 Explicitly disable new fuzzer build option. Changelog: https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/qmi-1-34/NEWS Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/libqmi/libqmi.hash | 2 +- package/libqmi/libqmi.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libqmi/libqmi.hash b/package/libqmi/libqmi.hash index 5036c1d3c0ef..7937f989a09a 100644 --- a/package/libqmi/libqmi.hash +++ b/package/libqmi/libqmi.hash @@ -1,4 +1,4 @@ # Locally computed: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB -sha256 aec96bf2733a7b5ba27bb52346ce3a1ab54440800843f78001cc2a51213ce1b9 libqmi-1.32.2.tar.gz +sha256 8690d25b4d110b6df28b31da0a8bf16c7e966d31abcfeeb854f2753451e7a400 libqmi-1.34.0.tar.gz diff --git a/package/libqmi/libqmi.mk b/package/libqmi/libqmi.mk index eae41446e2c1..524333febafe 100644 --- a/package/libqmi/libqmi.mk +++ b/package/libqmi/libqmi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBQMI_VERSION = 1.32.2 +LIBQMI_VERSION = 1.34.0 LIBQMI_SITE = https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION) LIBQMI_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs) LIBQMI_LICENSE_FILES = COPYING COPYING.LIB @@ -12,7 +12,7 @@ LIBQMI_CPE_ID_VALID = YES LIBQMI_INSTALL_STAGING = YES LIBQMI_DEPENDENCIES = libglib2 -LIBQMI_CONF_OPTS = -Dman=false +LIBQMI_CONF_OPTS = -Dman=false -Dfuzzer=false ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) LIBQMI_DEPENDENCIES += gobject-introspection From 354855c4bbdaea82fe8cce5829161ff3363e2292 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 15 Feb 2024 15:42:43 +0100 Subject: [PATCH 235/345] package/modem-manager: bump to 1.22.0 Explicitly disable newly introduced build options. Changelog: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/blob/mm-1-22/NEWS Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/modem-manager/modem-manager.hash | 4 ++-- package/modem-manager/modem-manager.mk | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 4b8b795af782..fa81acd9dc2c 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ -#Locally calculated after checking https://www.freedesktop.org/software/ModemManager/ModemManager-1.18.12.tar.xz.asc -sha256 9c16b47547faac9515f2d03d1e8175de9c5e6769b1ee16b608ba6cfe6f04b03e ModemManager-1.20.4.tar.gz +#Locally calculated +sha256 6c8f8720737a3788e394c700f36236278c9de09d76069a079e6f1daaf08b2768 ModemManager-1.22.0.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index 979a80a8e940..495dbcd258ab 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.20.4 +MODEM_MANAGER_VERSION = 1.22.0 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.gz MODEM_MANAGER_SITE = https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEM_MANAGER_VERSION) MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) @@ -13,6 +13,8 @@ MODEM_MANAGER_SELINUX_MODULES = modemmanager MODEM_MANAGER_DEPENDENCIES = host-pkgconf dbus libglib2 $(TARGET_NLS_DEPENDENCIES) host-libxslt MODEM_MANAGER_INSTALL_STAGING = YES MODEM_MANAGER_CONF_OPTS = \ + -Dbuiltin_plugins=false \ + -Dfuzzer=false \ -Dman=false \ -Dpowerd_suspend_resume=false \ -Dtests=false \ From b253f76cd26920c5f036a45ee45b8f7bb9b66910 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 15 Feb 2024 18:13:42 +0100 Subject: [PATCH 236/345] package/python-hatchling: bump to 1.21.1 Changelog: https://hatch.pypa.io/dev/history/hatchling/#hatchling-v1.21.1 Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/python-hatchling/python-hatchling.hash | 4 ++-- package/python-hatchling/python-hatchling.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-hatchling/python-hatchling.hash b/package/python-hatchling/python-hatchling.hash index e1798e882c8c..df703088e4c4 100644 --- a/package/python-hatchling/python-hatchling.hash +++ b/package/python-hatchling/python-hatchling.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/hatchling/json -md5 21e5e7ed5fa6dd0618c5b66eb847f370 hatchling-1.21.0.tar.gz -sha256 5c086772357a50723b825fd5da5278ac7e3697cdf7797d07541a6c90b6ff754c hatchling-1.21.0.tar.gz +md5 d40aaea58a04a36a2b641f6efe99e362 hatchling-1.21.1.tar.gz +sha256 bba440453a224e7d4478457fa2e8d8c3633765bafa02975a6b53b9bf917980bc hatchling-1.21.1.tar.gz # Locally computed sha256 checksums sha256 7f143a8127ad4873862d70854b5bd2abd0085aa73e64fd2b08704a3b9f5c07fc LICENSE.txt diff --git a/package/python-hatchling/python-hatchling.mk b/package/python-hatchling/python-hatchling.mk index d1ed4d23c290..550dbf0beb2b 100644 --- a/package/python-hatchling/python-hatchling.mk +++ b/package/python-hatchling/python-hatchling.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_HATCHLING_VERSION = 1.21.0 +PYTHON_HATCHLING_VERSION = 1.21.1 PYTHON_HATCHLING_SOURCE = hatchling-$(PYTHON_HATCHLING_VERSION).tar.gz -PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/fd/4a/8196e79c0d6e5eb10436dd2fcccc889a76af6ecf9bc35f87408159497d4d +PYTHON_HATCHLING_SITE = https://files.pythonhosted.org/packages/d8/a1/7dd1caa87c0b15c04c6291e25112e5d082cce02ee87f221a8be1d594f857 PYTHON_HATCHLING_LICENSE = MIT PYTHON_HATCHLING_LICENSE_FILES = LICENSE.txt PYTHON_HATCHLING_SETUP_TYPE = pep517 From a0535ef4f34a4cceda70aa695a2167ce7d466187 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Thu, 15 Feb 2024 18:18:52 +0100 Subject: [PATCH 237/345] package/eza: bump to version 0.18.3 Release notes: https://github.com/eza-community/eza/releases/tag/v0.18.3 Signed-off-by: Saeed Kazemi Signed-off-by: Peter Korsgaard --- package/eza/eza.hash | 2 +- package/eza/eza.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/eza/eza.hash b/package/eza/eza.hash index 64f46759d777..48c2fa8ffeb3 100644 --- a/package/eza/eza.hash +++ b/package/eza/eza.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11e6127a615744b52d52d66ebcdf9e5366f62746e8123b3eec00e35a057db988 eza-0.16.0.tar.gz +sha256 995a77848e75737a267b64613acaa6096ba8943f048676d5722c3ff238fb29f9 eza-0.18.3.tar.gz sha256 2762990c7fbba9d550802a2593c1d857dcd52596bb0f9f192a97e9a7ac5f4f9e LICENCE diff --git a/package/eza/eza.mk b/package/eza/eza.mk index b11c1a1e7f0f..7ec3f127b40a 100644 --- a/package/eza/eza.mk +++ b/package/eza/eza.mk @@ -4,7 +4,7 @@ # ################################################################################ -EZA_VERSION = 0.16.0 +EZA_VERSION = 0.18.3 EZA_SITE = $(call github,eza-community,eza,v$(EZA_VERSION)) EZA_LICENSE = MIT EZA_LICENSE_FILES = LICENCE From 5883b227bfaa9d34390ec0dbee940c3b2c03aee8 Mon Sep 17 00:00:00 2001 From: Saeed Kazemi Date: Thu, 15 Feb 2024 18:30:24 +0100 Subject: [PATCH 238/345] package/procs: bump to version 0.14.4 Release notes: https://github.com/dalance/procs/releases/tag/v0.14.4 Signed-off-by: Saeed Kazemi Signed-off-by: Peter Korsgaard --- package/procs/procs.hash | 2 +- package/procs/procs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/procs/procs.hash b/package/procs/procs.hash index 19832e389768..a3ec5d2b75d5 100644 --- a/package/procs/procs.hash +++ b/package/procs/procs.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2f9fdbcf7324952e22565ded58148fa40387b5a5f8723996620d6c4588925713 procs-0.14.3.tar.gz +sha256 22d9ef44bf06bbd6d0d463a40678a1560a9125fdc6e6fbb5db294e05a174ea01 procs-0.14.4.tar.gz sha256 feb87a2e0c305de3464cc44077da5393c52d8ca6362d37427157d04ec6f4510d LICENSE diff --git a/package/procs/procs.mk b/package/procs/procs.mk index 8567bf3da362..34e874a4f20a 100644 --- a/package/procs/procs.mk +++ b/package/procs/procs.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCS_VERSION = 0.14.3 +PROCS_VERSION = 0.14.4 PROCS_SITE = $(call github,dalance,procs,v$(PROCS_VERSION)) PROCS_LICENSE = MIT PROCS_LICENSE_FILES = LICENSE From f1759be118de16950063e3c27396fd69b8f2df23 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Thu, 15 Feb 2024 11:32:06 -0800 Subject: [PATCH 239/345] package/iptables: bump version to 1.8.10 Change Log : https://netfilter.org/projects/iptables/files/changes-iptables-1.8.10.txt Build test results: iptables.config BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY=y BR2_PACKAGE_IPTABLES_NFTABLES=y $ ./utils/test-pkg -c iptables.config iptables bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: SKIPPED bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: SKIPPED sourcery-arm [6/6]: OK 6 builds, 2 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/iptables/iptables.hash | 2 +- package/iptables/iptables.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/iptables/iptables.hash b/package/iptables/iptables.hash index a908b9cbc1a3..be8b0df3d6fb 100644 --- a/package/iptables/iptables.hash +++ b/package/iptables/iptables.hash @@ -1,4 +1,4 @@ # From https://netfilter.org/projects/iptables/downloads.html -sha256 ef6639a43be8325a4f8ea68123ffac236cb696e8c78501b64e8106afb008c87f iptables-1.8.9.tar.xz +sha256 5cc255c189356e317d070755ce9371eb63a1b783c34498fb8c30264f3cc59c9c iptables-1.8.10.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 561c82ca0bdf..6712136962a3 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPTABLES_VERSION = 1.8.9 +IPTABLES_VERSION = 1.8.10 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.xz IPTABLES_SITE = https://netfilter.org/projects/iptables/files IPTABLES_INSTALL_STAGING = YES From f805e05a20d61409645f6a611ea3e24d211de7b3 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Thu, 15 Feb 2024 12:31:21 -0800 Subject: [PATCH 240/345] package/libusb: bump version to 1.0.27 Change Log : https://github.com/libusb/libusb/blob/d52e355daa09f17ce64819122cb067b8a2ee0d4b/ChangeLog#L4 Build test results: libusb.config BR2_PACKAGE_LIBUSB=y BR2_PACKAGE_LIBUSB_EXAMPLES=y BR2_PACKAGE_LIBUSB_COMPAT=y $./utils/test-pkg -k -c libusb.config -p libusb bootlin-armv5-uclibc [1/6]: OK bootlin-armv7-glibc [2/6]: OK bootlin-armv7m-uclibc [3/6]: OK bootlin-x86-64-musl [4/6]: OK br-arm-full-static [5/6]: OK sourcery-arm [6/6]: SKIPPED 6 builds, 1 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed Signed-off-by: Kadambini Nema Signed-off-by: Peter Korsgaard --- package/libusb/libusb.hash | 2 +- package/libusb/libusb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libusb/libusb.hash b/package/libusb/libusb.hash index bbb0ccf5b9f9..8ca68f03baf2 100644 --- a/package/libusb/libusb.hash +++ b/package/libusb/libusb.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5 libusb-1.0.26.tar.bz2 +sha256 ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575 libusb-1.0.27.tar.bz2 sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/libusb/libusb.mk b/package/libusb/libusb.mk index 98a4a578b20d..15649a2ab11f 100644 --- a/package/libusb/libusb.mk +++ b/package/libusb/libusb.mk @@ -5,7 +5,7 @@ ################################################################################ LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).26 +LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).27 LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) LIBUSB_LICENSE = LGPL-2.1+ From 0eaf90622947758719762463214f729462771075 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Fri, 16 Feb 2024 22:13:21 +0100 Subject: [PATCH 241/345] package/libnvme: bump to version 1.8 Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard --- package/libnvme/libnvme.hash | 2 +- package/libnvme/libnvme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libnvme/libnvme.hash b/package/libnvme/libnvme.hash index 69963578cd63..469006d6326c 100644 --- a/package/libnvme/libnvme.hash +++ b/package/libnvme/libnvme.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 checksums -sha256 e9c3ad59c068788faf0f0af4296f92f8ce410d12749f0f35a541d6a21e630393 libnvme-1.7.1.tar.gz +sha256 d59939a280eec41eb7a716e1681d0d0c612099385204ffb55d07134a6be08d75 libnvme-1.8.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libnvme/libnvme.mk b/package/libnvme/libnvme.mk index 813f7279e889..bf131d2a385f 100644 --- a/package/libnvme/libnvme.mk +++ b/package/libnvme/libnvme.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNVME_VERSION = 1.7.1 +LIBNVME_VERSION = 1.8 LIBNVME_SITE = $(call github,linux-nvme,libnvme,v$(LIBNVME_VERSION)) LIBNVME_LICENSE = LGPL-2.1 LIBNVME_LICENSE_FILES = COPYING From 012b6cc874e944fb098136c697fc0f71bcc264ef Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Sun, 24 Mar 2024 00:36:52 +0800 Subject: [PATCH 242/345] configs/beaglebone_defconfig: bump Linux to 6.1.80-ti-r34 and U-Boot to 2024.01 Tested on beaglebone black. [1] https://github.com/beagleboard/linux/releases/tag/6.1.80-ti-r34 Signed-off-by: Scott Fan Signed-off-by: Arnout Vandecappelle --- configs/beaglebone_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index e2d67019b10b..064f28348951 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -17,7 +17,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.46-ti-r13)/linux-6.1.46-ti-r13.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,6.1.80-ti-r34)/linux-6.1.80-ti-r34.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bb.org" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" @@ -31,7 +31,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="am335x_evm" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y From 94636d39ca324cb48ca83b329e4ecac166c24a10 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Sun, 24 Mar 2024 00:01:19 +0800 Subject: [PATCH 243/345] package/owfs: add missing slash after the OWFS_PKGDIR variable Signed-off-by: Scott Fan Signed-off-by: Arnout Vandecappelle --- package/owfs/owfs.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/owfs/owfs.mk b/package/owfs/owfs.mk index 986dca921a21..6b22282486e9 100644 --- a/package/owfs/owfs.mk +++ b/package/owfs/owfs.mk @@ -28,7 +28,7 @@ OWFS_CONF_OPTS += \ --with-fuseinclude=$(STAGING_DIR)/usr/include \ --with-fuselib=$(STAGING_DIR)/usr/lib define OWFS_INSTALL_FUSE_INIT_SYSV - $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S60owfs \ + $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)/S60owfs \ $(TARGET_DIR)/etc/init.d/S60owfs endef define OWFS_CREATE_MOUNTPOINT @@ -78,7 +78,7 @@ endif OWFS_MAKE = $(MAKE) $(OWFS_EXTRA_MAKE_OPTS) define OWFS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S55owserver \ + $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)/S55owserver \ $(TARGET_DIR)/etc/init.d/S55owserver $(OWFS_INSTALL_FUSE_INIT_SYSV) endef From f95069814bd68cfc10ccf2dbc41efa6f1e127495 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 22 Mar 2024 18:49:41 +0100 Subject: [PATCH 244/345] package/libdrm: disable tests Disable tests to avoid the following build failure with amdgpu and gcc 5 if cunit is built before libdrm: In file included from ../tests/amdgpu/shader_test_util.c:10:0: ../tests/amdgpu/shader_code.h:113:2: error: initializer element is not constant ps_##_ps##_shader_patchinfo_code_size_gfx##_n, \ ^ tests can be disabled since https://gitlab.freedesktop.org/mesa/drm/-/commit/46d1e99a5d291b22d86ac52710b079491beedff8 Fixes: - http://autobuild.buildroot.org/results/612aad1fa642993da36bbec6c16c9020ac283e34 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libdrm/libdrm.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libdrm/libdrm.mk b/package/libdrm/libdrm.mk index 61d1c24377b6..a04331c2da8c 100644 --- a/package/libdrm/libdrm.mk +++ b/package/libdrm/libdrm.mk @@ -17,7 +17,8 @@ LIBDRM_DEPENDENCIES = \ LIBDRM_CONF_OPTS = \ -Dcairo-tests=disabled \ - -Dman-pages=disabled + -Dman-pages=disabled \ + -Dtests=false ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) LIBDRM_DEPENDENCIES += libatomic_ops From 59674e5f8de5cb0a13344d04083287eb7fd3cf22 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 21 Mar 2024 22:16:12 +0100 Subject: [PATCH 245/345] package/cctz: bump to version 2.4 https://github.com/google/cctz/releases/tag/v2.4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/cctz/cctz.hash | 2 +- package/cctz/cctz.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cctz/cctz.hash b/package/cctz/cctz.hash index b3a832079097..ac78cd611b94 100644 --- a/package/cctz/cctz.hash +++ b/package/cctz/cctz.hash @@ -1,3 +1,3 @@ # locally computed -sha256 8615b20d4e33e02a271c3b93a3b208e3d7d5d66880f5f6208b03426e448f32db cctz-2.3.tar.gz +sha256 e1a00957d472044808a24a26f1ba020f36dc26949a69c214562d96b74093adb3 cctz-2.4.tar.gz sha256 c79a7fea0e3cac04cd43f20e7b648e5a0ff8fa5344e644b0ee09ca1162b62747 LICENSE.txt diff --git a/package/cctz/cctz.mk b/package/cctz/cctz.mk index bcc80bad4709..7f5d960a42e9 100644 --- a/package/cctz/cctz.mk +++ b/package/cctz/cctz.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCTZ_VERSION = 2.3 +CCTZ_VERSION = 2.4 CCTZ_SITE = $(call github,google,cctz,v$(CCTZ_VERSION)) CCTZ_LICENSE = Apache-2.0 CCTZ_LICENSE_FILES = LICENSE.txt From 2e9f161d4a7a68a041860e5855e98bee9d3a1498 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 21 Mar 2024 22:11:44 +0100 Subject: [PATCH 246/345] package/glog: bump to version 0.7.0 - Drop patch (already in version) - Update hash of COPYING (year updated and gettimeofday license dropped with: https://github.com/google/glog/commit/70285fddc728cd5dbc2d1a20b373d358f6ae62ae) - elf detection has been reworked with https://github.com/google/glog/commit/7e6fca90e8bc69c6500ec61a6cc334dd8f682224 - threads are mandatory since https://github.com/google/glog/commit/fe46778bd326e3c012875eb756acaa4a1ca304f7 https://github.com/google/glog/releases/tag/v0.7.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - .../glog/0001-added-emscripten-support.patch | 292 ------------------ package/glog/Config.in | 9 +- package/glog/glog.hash | 4 +- package/glog/glog.mk | 6 +- 5 files changed, 8 insertions(+), 304 deletions(-) delete mode 100644 package/glog/0001-added-emscripten-support.patch diff --git a/.checkpackageignore b/.checkpackageignore index 3b64c90d8bc0..ef1c661812d9 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -461,7 +461,6 @@ package/gerbera/S99gerbera Indent package/giblib/0001-fix-imlib2-detection.patch Upstream package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch Upstream package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch Upstream -package/glog/0001-added-emscripten-support.patch Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch Upstream diff --git a/package/glog/0001-added-emscripten-support.patch b/package/glog/0001-added-emscripten-support.patch deleted file mode 100644 index bb601affce55..000000000000 --- a/package/glog/0001-added-emscripten-support.patch +++ /dev/null @@ -1,292 +0,0 @@ -From 6ed0c9e58b11680779c571996a3007bd972e0853 Mon Sep 17 00:00:00 2001 -From: Sergiu Deitsch -Date: Thu, 4 Aug 2022 22:52:47 +0200 -Subject: [PATCH] added emscripten support (#846) - -[Retrieved from: -https://github.com/google/glog/commit/6ed0c9e58b11680779c571996a3007bd972e0853, -to fix build without threads, a fix that is lost in the middle of a -larger commit adding emscripten support.] -Signed-off-by: Fabrice Fontaine ---- - .github/workflows/emscripten.yml | 60 ++++++++++++++++++++++++++++++++ - CMakeLists.txt | 14 ++++---- - src/config.h.cmake.in | 6 ++-- - src/glog/logging.h.in | 6 ++-- - src/glog/platform.h | 2 ++ - src/logging.cc | 11 ++++-- - src/raw_logging.cc | 9 ++--- - src/stacktrace_unwind-inl.h | 2 +- - src/symbolize.cc | 2 +- - src/utilities.h | 2 +- - 10 files changed, 93 insertions(+), 21 deletions(-) - create mode 100644 .github/workflows/emscripten.yml - -diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml -new file mode 100644 -index 00000000..566c67eb ---- /dev/null -+++ b/.github/workflows/emscripten.yml -@@ -0,0 +1,60 @@ -+name: Emscripten -+ -+on: [push, pull_request] -+ -+jobs: -+ build-linux: -+ defaults: -+ run: -+ shell: bash -+ name: Emscripten-C++${{matrix.std}}-${{matrix.build_type}}-${{matrix.lib}}-${{matrix.extra}} -+ runs-on: ubuntu-latest -+ container: emscripten/emsdk -+ strategy: -+ fail-fast: true -+ matrix: -+ build_type: [Release, Debug] -+ extra: [no-custom-prefix, custom-prefix] -+ lib: [static] -+ std: [98, 11, 14, 17, 20] -+ -+ steps: -+ - uses: actions/checkout@v2 -+ -+ - name: Setup Dependencies -+ run: | -+ apt-get update -+ DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \ -+ cmake \ -+ ninja-build -+ -+ - name: Setup C++98 Environment -+ if: matrix.std == '98' -+ run: | -+ echo 'CXXFLAGS=-Wno-error=variadic-macros -Wno-error=long-long ${{env.CXXFLAGS}}' >> $GITHUB_ENV -+ -+ - name: Configure -+ env: -+ CXXFLAGS: -Wall -Wextra -Wsign-conversion -Wtautological-compare -Wformat-nonliteral -Wundef -Werror -Wno-error=wasm-exception-spec ${{env.CXXFLAGS}} -+ run: | -+ cmake -S . -B build_${{matrix.build_type}} \ -+ -DBUILD_SHARED_LIBS=${{matrix.lib == 'shared'}} \ -+ -DCMAKE_AR=$(which emar) \ -+ -DCMAKE_C_COMPILER=$(which emcc) \ -+ -DCMAKE_CXX_COMPILER=$(which em++) \ -+ -DCMAKE_CXX_STANDARD=${{matrix.std}} \ -+ -DCMAKE_CXX_STANDARD_REQUIRED=ON \ -+ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ -+ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ -+ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \ -+ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER \ -+ -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/install \ -+ -DCMAKE_RANLIB=$(which emranlib) \ -+ -DWITH_CUSTOM_PREFIX=${{matrix.extra == 'custom-prefix'}} \ -+ -G Ninja \ -+ -Werror -+ -+ - name: Build -+ run: | -+ cmake --build build_${{matrix.build_type}} \ -+ --config ${{matrix.build_type}} -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 643a8b8a..ce6daa40 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -93,11 +93,11 @@ find_package (Unwind) - if (Unwind_FOUND) - set (HAVE_LIB_UNWIND 1) - else (Unwind_FOUND) -- check_include_file_cxx (unwind.h HAVE_UNWIND_H) - # Check whether linking actually succeeds. ARM toolchains of LLVM unwind - # implementation do not necessarily provide the _Unwind_Backtrace function - # which causes the previous check to succeed but the linking to fail. - check_cxx_symbol_exists (_Unwind_Backtrace unwind.h HAVE__UNWIND_BACKTRACE) -+ check_cxx_symbol_exists (_Unwind_GetIP unwind.h HAVE__UNWIND_GETIP) - endif (Unwind_FOUND) - - check_include_file_cxx (dlfcn.h HAVE_DLFCN_H) -@@ -197,9 +197,10 @@ int main(void) - } - " HAVE___SYNC_VAL_COMPARE_AND_SWAP) - --cmake_push_check_state (RESET) --set (CMAKE_REQUIRED_LIBRARIES Threads::Threads) --check_cxx_source_compiles (" -+if (Threads_FOUND) -+ cmake_push_check_state (RESET) -+ set (CMAKE_REQUIRED_LIBRARIES Threads::Threads) -+ check_cxx_source_compiles (" - #define _XOPEN_SOURCE 500 - #include - int main(void) -@@ -209,8 +210,9 @@ int main(void) - pthread_rwlock_rdlock(&l); - return 0; - } --" HAVE_RWLOCK) --cmake_pop_check_state () -+ " HAVE_RWLOCK) -+ cmake_pop_check_state () -+endif (Threads_FOUND) - - check_cxx_source_compiles (" - __declspec(selectany) int a; -diff --git a/src/config.h.cmake.in b/src/config.h.cmake.in -index b67e8a77..20b5f1c4 100644 ---- a/src/config.h.cmake.in -+++ b/src/config.h.cmake.in -@@ -118,12 +118,12 @@ - /* Define to 1 if you have the header file. */ - #cmakedefine HAVE_UNISTD_H ${HAVE_UNISTD_H} - --/* Define if you have the header file. */ --#cmakedefine HAVE_UNWIND_H -- - /* Define if you linking to _Unwind_Backtrace is possible. */ - #cmakedefine HAVE__UNWIND_BACKTRACE - -+/* Define if you linking to _Unwind_GetIP is possible. */ -+#cmakedefine HAVE__UNWIND_GETIP -+ - /* define if the compiler supports using expression for operator */ - #cmakedefine HAVE_USING_OPERATOR - -diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in -index c6def152..098e28fe 100644 ---- a/src/glog/logging.h.in -+++ b/src/glog/logging.h.in -@@ -97,7 +97,7 @@ - - @ac_google_start_namespace@ - --#if @ac_cv_have_uint16_t@ // the C99 format -+#if @ac_cv_have_stdint_h@ // the C99 format - typedef int32_t int32; - typedef uint32_t uint32; - typedef int64_t int64; -@@ -1822,8 +1822,8 @@ GLOG_EXPORT void SetEmailLogging(LogSeverity min_severity, - - // A simple function that sends email. dest is a commma-separated - // list of addressess. Thread-safe. --GLOG_EXPORT bool SendEmail(const char *dest, -- const char *subject, const char *body); -+GLOG_EXPORT bool SendEmail(const char* dest, const char* subject, -+ const char* body); - - GLOG_EXPORT const std::vector& GetLoggingDirectories(); - -diff --git a/src/glog/platform.h b/src/glog/platform.h -index e6144119..7893c45d 100644 ---- a/src/glog/platform.h -+++ b/src/glog/platform.h -@@ -50,6 +50,8 @@ - #define GLOG_OS_NETBSD - #elif defined(__OpenBSD__) - #define GLOG_OS_OPENBSD -+#elif defined(__EMSCRIPTEN__) -+#define GLOG_OS_EMSCRIPTEN - #else - // TODO(hamaji): Add other platforms. - #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github. -diff --git a/src/logging.cc b/src/logging.cc -index e65e80e9..1df1034a 100644 ---- a/src/logging.cc -+++ b/src/logging.cc -@@ -2188,6 +2188,7 @@ void SetExitOnDFatal(bool value) { - } // namespace internal - } // namespace base - -+#ifndef GLOG_OS_EMSCRIPTEN - // Shell-escaping as we need to shell out ot /bin/mail. - static const char kDontNeedShellEscapeChars[] = - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" -@@ -2222,14 +2223,14 @@ static string ShellEscape(const string& src) { - } - return result; - } -- -+#endif - - // use_logging controls whether the logging functions LOG/VLOG are used - // to log errors. It should be set to false when the caller holds the - // log_mutex. - static bool SendEmailInternal(const char*dest, const char *subject, - const char*body, bool use_logging) { --#ifndef __EMSCRIPTEN__ -+#ifndef GLOG_OS_EMSCRIPTEN - if (dest && *dest) { - if ( use_logging ) { - VLOG(1) << "Trying to send TITLE:" << subject -@@ -2275,6 +2276,12 @@ static bool SendEmailInternal(const char*dest, const char *subject, - } - } - } -+#else -+ (void)dest; -+ (void)subject; -+ (void)body; -+ (void)use_logging; -+ LOG(WARNING) << "Email support not available; not sending message"; - #endif - return false; - } -diff --git a/src/raw_logging.cc b/src/raw_logging.cc -index 43159832..befeac89 100644 ---- a/src/raw_logging.cc -+++ b/src/raw_logging.cc -@@ -59,11 +59,12 @@ - # include - #endif - --#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && (!(defined(GLOG_OS_MACOSX))) --# define safe_write(fd, s, len) syscall(SYS_write, fd, s, len) -+#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && \ -+ (!(defined(GLOG_OS_MACOSX))) && !defined(GLOG_OS_EMSCRIPTEN) -+#define safe_write(fd, s, len) syscall(SYS_write, fd, s, len) - #else -- // Not so safe, but what can you do? --# define safe_write(fd, s, len) write(fd, s, len) -+// Not so safe, but what can you do? -+#define safe_write(fd, s, len) write(fd, s, len) - #endif - - _START_GOOGLE_NAMESPACE_ -diff --git a/src/stacktrace_unwind-inl.h b/src/stacktrace_unwind-inl.h -index fbb5f988..dc1665b4 100644 ---- a/src/stacktrace_unwind-inl.h -+++ b/src/stacktrace_unwind-inl.h -@@ -73,7 +73,7 @@ static _Unwind_Reason_Code GetOneFrame(struct _Unwind_Context *uc, void *opq) { - if (targ->skip_count > 0) { - targ->skip_count--; - } else { -- targ->result[targ->count++] = (void *) _Unwind_GetIP(uc); -+ targ->result[targ->count++] = reinterpret_cast(_Unwind_GetIP(uc)); - } - - if (targ->count == targ->max_depth) { -diff --git a/src/symbolize.cc b/src/symbolize.cc -index 51025018..f56e97c9 100644 ---- a/src/symbolize.cc -+++ b/src/symbolize.cc -@@ -834,7 +834,7 @@ static ATTRIBUTE_NOINLINE bool SymbolizeAndDemangle(void *pc, char *out, - - _END_GOOGLE_NAMESPACE_ - --#elif defined(GLOG_OS_MACOSX) && defined(HAVE_DLADDR) -+#elif (defined(GLOG_OS_MACOSX) || defined(GLOG_OS_EMSCRIPTEN)) && defined(HAVE_DLADDR) - - #include - #include -diff --git a/src/utilities.h b/src/utilities.h -index bd0ec632..760c142c 100644 ---- a/src/utilities.h -+++ b/src/utilities.h -@@ -88,7 +88,7 @@ - - #if defined(HAVE_LIB_UNWIND) - # define STACKTRACE_H "stacktrace_libunwind-inl.h" --#elif defined(HAVE__UNWIND_BACKTRACE) -+#elif defined(HAVE__UNWIND_BACKTRACE) && defined(HAVE__UNWIND_GETIP) - # define STACKTRACE_H "stacktrace_unwind-inl.h" - #elif !defined(NO_FRAME_POINTER) - # if defined(__i386__) && __GNUC__ >= 2 diff --git a/package/glog/Config.in b/package/glog/Config.in index 337632300413..bbdd1e2151a9 100644 --- a/package/glog/Config.in +++ b/package/glog/Config.in @@ -1,13 +1,12 @@ config BR2_PACKAGE_GLOG bool "glog" - # __ELF__ not defined on Microblaze - depends on !BR2_microblaze depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help C++ implementation of the Google logging module https://github.com/google/glog -comment "glog needs a toolchain w/ C++" - depends on !BR2_microblaze - depends on !BR2_INSTALL_LIBSTDCPP +comment "glog needs a toolchain w/ C++, threads" + depends on !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/glog/glog.hash b/package/glog/glog.hash index fab77c522bec..fb0ea93979cf 100644 --- a/package/glog/glog.hash +++ b/package/glog/glog.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6 glog-0.6.0.tar.gz +sha256 375106b5976231b92e66879c1a92ce062923b9ae573c42b56ba28b112ee4cc11 glog-0.7.0.tar.gz # Hash for License file: -sha256 0fc497129c5c69ff6f22da6933c7e4aaef082fde8437fd57680c2780100772a4 COPYING +sha256 136d48dea7a681413691f3db3098f6cf5ffaa3119d96d97bb83b8cff3ce38c4a COPYING diff --git a/package/glog/glog.mk b/package/glog/glog.mk index ddf71fd15a8c..4b3f39be3a87 100644 --- a/package/glog/glog.mk +++ b/package/glog/glog.mk @@ -4,14 +4,12 @@ # ################################################################################ -GLOG_VERSION = 0.6.0 +GLOG_VERSION = 0.7.0 GLOG_SITE = $(call github,google,glog,v$(GLOG_VERSION)) GLOG_INSTALL_STAGING = YES GLOG_LICENSE = BSD-3-Clause GLOG_LICENSE_FILES = COPYING -GLOG_CONF_OPTS = \ - -DWITH_GTEST=OFF \ - $(if $(BR2_TOOLCHAIN_HAS_THREADS),-DWITH_THREADS=ON, -DWITH_THREADS=OFF) +GLOG_CONF_OPTS = -DWITH_GTEST=OFF ifeq ($(BR2_PACKAGE_GFLAGS),y) GLOG_DEPENDENCIES += gflags From 1f418a6d1412911a3853307752f774ebae888309 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Mar 2024 22:41:52 +0100 Subject: [PATCH 247/345] package/libpciaccess: fix static build Fix the following static build failure raised since bump to version 0.18 in commit 136d4dfbe6126b5ed20237c571f599dfc163d110: /home/autobuild/autobuild/instance-0/output-1/host/bin/arceb-buildroot-linux-uclibc-gcc -o src/libpciaccess.so.0.11.1 src/libpciaccess.so.0.11.1.p/common_bridge.c.o src/libpciaccess.so.0.11.1.p/common_iterator.c.o src/libpciaccess.so.0.11.1.p/common_init.c.o src/libpciaccess.so.0.11.1.p/common_interface.c.o src/libpciaccess.so.0.11.1.p/common_io.c.o src/libpciaccess.so.0.11.1.p/common_capability.c.o src/libpciaccess.so.0.11.1.p/common_device_name.c.o src/libpciaccess.so.0.11.1.p/common_map.c.o src/libpciaccess.so.0.11.1.p/linux_sysfs.c.o src/libpciaccess.so.0.11.1.p/linux_devmem.c.o src/libpciaccess.so.0.11.1.p/common_vgaarb.c.o -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -shared -fPIC -Wl,--start-group -Wl,-soname,libpciaccess.so.0 -static /home/autobuild/autobuild/instance-0/output-1/host/arceb-buildroot-linux-uclibc/sysroot/usr/lib/libz.a -Wl,--end-group /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/arceb-buildroot-linux-uclibc/11.4.0/../../../../arceb-buildroot-linux-uclibc/bin/ld: /home/autobuild/autobuild/instance-0/output-1/host/lib/gcc/arceb-buildroot-linux-uclibc/11.4.0/crtbeginT.o: relocation R_ARC_32_ME against `__TMC_END__' can not be used when making a shared object; recompile with -fPIC Fixes: 136d4dfbe6126b5ed20237c571f599dfc163d110 - http://autobuild.buildroot.org/results/7604706f4f4ab96a485a1dabe7cb4c98a2ef27d4 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...lding-static-library-not-just-shared.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch diff --git a/package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch b/package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch new file mode 100644 index 000000000000..df1b4b415ae0 --- /dev/null +++ b/package/libpciaccess/0001-meson-allow-building-static-library-not-just-shared.patch @@ -0,0 +1,48 @@ +From ad7e9cb4b291a46812eea321f0634cfc46fb94e2 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Thu, 14 Mar 2024 13:55:55 -0700 +Subject: [PATCH] meson: allow building static library, not just shared + +Lets builders specify -Ddefault_library={shared,static,both} +to control which types of libpciaccess library are built + +Closes: #20 +Reported-by: Maxime Gauduin (@alucryd) +Signed-off-by: Alan Coopersmith + +Upstream: https://gitlab.freedesktop.org/xorg/lib/libpciaccess/-/commit/ad7e9cb4b291a46812eea321f0634cfc46fb94e2 +Signed-off-by: Fabrice Fontaine +--- + .gitlab-ci.yml | 2 +- + src/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml +index bcb75cf..185edc2 100644 +--- a/.gitlab-ci.yml ++++ b/.gitlab-ci.yml +@@ -91,7 +91,7 @@ meson: + - MESON_OPTIONS: ['-Dzlib=disabled', '-Dzlib=enabled'] + script: + - mkdir -p ../_inst +- - meson setup builddir --prefix="$PWD/../_inst" -Dwarning_level=3 $MESON_OPTIONS ++ - meson setup builddir --prefix="$PWD/../_inst" -Dwarning_level=3 -Ddefault_library=both $MESON_OPTIONS + - meson configure builddir + - ninja -C builddir test + - ninja -C builddir install +diff --git a/src/meson.build b/src/meson.build +index 24eee04..e319688 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -38,7 +38,7 @@ endif + + inc_src = include_directories('.') + +-libpciaccess = shared_library( ++libpciaccess = library( + 'pciaccess', + [ + 'common_bridge.c', +-- +GitLab + From 2fd5876a7bedd9051865e73f831a6c05bf62179e Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 18 Mar 2024 14:02:55 +0000 Subject: [PATCH 248/345] configs/zynq_zc702_defconfig: bump to 6.1.70 This patch bumps the zynq_zc702_defconfig to Linux kernel 6.1.70. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- configs/zynq_zc702_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig index e85285a8321f..7f762abc5822 100644 --- a/configs/zynq_zc702_defconfig +++ b/configs/zynq_zc702_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From 566001a61368f99e66dbdf0200806dc3c4cfd73c Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 18 Mar 2024 14:02:56 +0000 Subject: [PATCH 249/345] configs/zynq_zc706_defconfig: bump to 6.1.70 This patch bumps the zynq_zc706_defconfig to Linux kernel 6.1.70. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- configs/zynq_zc706_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig index 3489f864e1e1..ffa734348a8f 100644 --- a/configs/zynq_zc706_defconfig +++ b/configs/zynq_zc706_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From 8977c4d77b27cd918e308a0ac8b5b910df7caf4a Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 18 Mar 2024 14:02:57 +0000 Subject: [PATCH 250/345] configs/zynq_zed_defconfig: bump to 6.1.70 This patch bumps the zynq_zed_defconfig to Linux kernel 6.1.70. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- configs/zynq_zed_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig index a3a94687f58a..4bc1880481c4 100644 --- a/configs/zynq_zed_defconfig +++ b/configs/zynq_zed_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From f2846f8fea5ff8798047266f346762a7671d6b32 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Mon, 18 Mar 2024 14:02:58 +0000 Subject: [PATCH 251/345] configs/zynq_microzed_defconfig: bump to 6.1.70 This patch bumps the zynq_microzed_defconfig to Linux kernel 6.1.70. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Arnout Vandecappelle --- configs/zynq_microzed_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig index d598a46c3969..7ada84cb6c93 100644 --- a/configs/zynq_microzed_defconfig +++ b/configs/zynq_microzed_defconfig @@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/zynq/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/zynq/post-image.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_2023.2)/xlnx_rebase_v6.1_LTS_2023.2.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Xilinx,linux-xlnx,xlnx_rebase_v6.1_LTS_merge_6.1.70)/xlnx_rebase_v6.1_LTS_merge_6.1.70.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="xilinx_zynq" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000" From 9d4874819948a654510bea71a7d5e3db7ff10bee Mon Sep 17 00:00:00 2001 From: Lukasz Tekieli Date: Thu, 8 Feb 2024 22:15:16 +0100 Subject: [PATCH 252/345] board/visionfive2: fix genimage.cfg path Set correct directory for the BR2_ROOTFS_POST_SCRIPT_ARGS. Signed-off-by: Lukasz Tekieli Signed-off-by: Peter Korsgaard --- configs/visionfive2_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index dc086953a0f1..3a1a4f527c74 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -3,7 +3,7 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/visionfive2/overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/visionfive2/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,starfive-tech,linux,05533e9c31d6f0da20efc2d436a3b0f6d516ed4b)/linux-05533e9c31d6f0da20efc2d436a3b0f6d516ed4b.tar.gz" From 6dfeb165ee9170920e9a0b1f021170a736ac4d73 Mon Sep 17 00:00:00 2001 From: Lukasz Tekieli Date: Thu, 8 Feb 2024 22:15:17 +0100 Subject: [PATCH 253/345] board/visionfive2: enable u-boot Enables U-Boot and required OpenSBI builds for the VisionFive2. Changes the sdcard.img to use GPT and adds the SPL and U-Boot to partitions specified in U-Boot's documentation for the board: https://docs.u-boot.org/en/v2024.01/board/starfive/visionfive2.html U-Boot config uses BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME with value "u-boot.itb". Using BR2_TARGET_UBOOT_FORMAT_ITB fails, because the build does not support u-boot.itb make target. Signed-off-by: Lukasz Tekieli [Peter: document boot mode setting, add U-Boot documentation link] Signed-off-by: Peter Korsgaard --- board/visionfive2/genimage.cfg | 16 +++++++++------- board/visionfive2/readme.txt | 4 ++++ configs/visionfive2_defconfig | 19 +++++++++++++++++++ 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/board/visionfive2/genimage.cfg b/board/visionfive2/genimage.cfg index c221b49c7b7a..8133e740c0da 100644 --- a/board/visionfive2/genimage.cfg +++ b/board/visionfive2/genimage.cfg @@ -2,20 +2,22 @@ image sdcard.img { hdimage { + partition-table-type = "gpt" } - # u-boot is hard coded to look at 3rd partition - partition dummy1 { - size = 512 + partition spl { + partition-type-uuid = 2E54B353-1271-4842-806F-E436D6AF6985 + image = "u-boot-spl.bin.normal.out" } - partition dummy2 { - size = 512 + partition uboot { + partition-type-uuid = BC13C2FF-59E6-4262-A352-B275FD6F7172 + image = "u-boot.itb" } partition rootfs { - partition-type = 0x83 + partition-type-uuid = 0FC63DAF-8483-4772-8E79-3D69D8477DE4 + bootable = true image = "rootfs.ext4" - bootable = "true" } } diff --git a/board/visionfive2/readme.txt b/board/visionfive2/readme.txt index 1924cbc12b72..85be1d5dfc49 100644 --- a/board/visionfive2/readme.txt +++ b/board/visionfive2/readme.txt @@ -27,6 +27,10 @@ Preparing the board Connect a TTL UART cable to pin 6 (GND), 8 (TX) and 10 (RX). +Change the boot mode pins to SD card booting (RGPIO_0=1, GRPIO_1=0): + +https://doc-en.rvspace.org/VisionFive2/Quick_Start_Guide/VisionFive2_SDK_QSG/boot_mode_settings.html + Insert your SD card. Power-up the board using an USB-C cable. diff --git a/configs/visionfive2_defconfig b/configs/visionfive2_defconfig index 3a1a4f527c74..c8576a35a7fe 100644 --- a/configs/visionfive2_defconfig +++ b/configs/visionfive2_defconfig @@ -15,4 +15,23 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y # BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION=y +BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.4" +BR2_TARGET_OPENSBI_PLAT="generic" +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set +BR2_TARGET_OPENSBI_ADDITIONAL_VARIABLES="FW_TEXT_START=0x40000000 FW_OPTIONS=0" +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +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.normal.out" BR2_PACKAGE_HOST_GENIMAGE=y From 2fda7322f999c551ad088458e661d1edd52b5b88 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 15:00:46 +0100 Subject: [PATCH 254/345] package/kodi-pvr-plutotv: bump version to 20.3.2-Nexus Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash | 2 +- package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash index 0c56c8b6b4c6..162905218c17 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 11505556200029a48a293e97f94e0469a5f78580d0e56d5d0a1da05d61f0f5b5 kodi-pvr-plutotv-20.3.1a-Nexus.tar.gz +sha256 7bccc0001acb796aa706f8a1bcce2661fcb67a7f346420c691ee0461ab5aace8 kodi-pvr-plutotv-20.3.2-Nexus.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk index fadb47efaf24..8a47d8c265e4 100644 --- a/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk +++ b/package/kodi-pvr-plutotv/kodi-pvr-plutotv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_PLUTOTV_VERSION = 20.3.1a-Nexus +KODI_PVR_PLUTOTV_VERSION = 20.3.2-Nexus KODI_PVR_PLUTOTV_SITE = $(call github,kodi-pvr,pvr.plutotv,$(KODI_PVR_PLUTOTV_VERSION)) KODI_PVR_PLUTOTV_LICENSE = GPL-2.0+ KODI_PVR_PLUTOTV_LICENSE_FILES = LICENSE.md From ad89a4567d50da964298d43a6606a27469085795 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:17 +0100 Subject: [PATCH 255/345] package/onevpl-intel-gpu: bump version to 24.1.5 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/onevpl-intel-gpu/onevpl-intel-gpu.hash | 2 +- package/onevpl-intel-gpu/onevpl-intel-gpu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash index 8dd42c471365..680ada76ea08 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.hash +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 879a232351ce0647522a0981edded3760104aec9f2bdc2ad31f70df03c95a6a9 onevpl-intel-gpu-24.1.4.tar.gz +sha256 e006d59399dbd0c3b3ecd91610822d655e9303b25a385a9a3ac94a42bf34b284 onevpl-intel-gpu-24.1.5.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk index ca2c866735e3..440d73efa255 100644 --- a/package/onevpl-intel-gpu/onevpl-intel-gpu.mk +++ b/package/onevpl-intel-gpu/onevpl-intel-gpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -ONEVPL_INTEL_GPU_VERSION = 24.1.4 +ONEVPL_INTEL_GPU_VERSION = 24.1.5 ONEVPL_INTEL_GPU_SITE = $(call github,oneapi-src,oneVPL-intel-gpu,intel-onevpl-$(ONEVPL_INTEL_GPU_VERSION)) ONEVPL_INTEL_GPU_LICENSE = MIT ONEVPL_INTEL_GPU_LICENSE_FILES = LICENSE From 1355c2c59f70223800fd8bc8de0b85b6ae8975b5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:18 +0100 Subject: [PATCH 256/345] package/intel-mediadriver: bump version to 24.1.5 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/intel-mediadriver/intel-mediadriver.hash | 2 +- package/intel-mediadriver/intel-mediadriver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-mediadriver/intel-mediadriver.hash b/package/intel-mediadriver/intel-mediadriver.hash index 4b410fb961ce..6bc9549c11e7 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7ea727b3e2890cf8f50307a3910664209bcbae1ce0d3d8f81bb9f522b0f66d59 intel-media-24.1.4.tar.gz +sha256 e23ea37c98d8d4b9d1a3a134b6489256d8f5a7a4ee71967b1db8ade70052654f intel-media-24.1.5.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 9fdbef93bbd8..875e7e7c7854 100644 --- a/package/intel-mediadriver/intel-mediadriver.mk +++ b/package/intel-mediadriver/intel-mediadriver.mk @@ -6,7 +6,7 @@ # based on https://software.intel.com/en-us/articles/build-and-debug-open-source-media-stack -INTEL_MEDIADRIVER_VERSION = 24.1.4 +INTEL_MEDIADRIVER_VERSION = 24.1.5 INTEL_MEDIADRIVER_SITE = https://github.com/intel/media-driver/archive INTEL_MEDIADRIVER_SOURCE= intel-media-$(INTEL_MEDIADRIVER_VERSION).tar.gz INTEL_MEDIADRIVER_LICENSE = MIT, BSD-3-Clause From 0ac9fdfb01ad3e16bfb10a10bb77c0a3d5f453e7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:19 +0100 Subject: [PATCH 257/345] package/intel-gmmlib: bump version to 22.3.18 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/intel-gmmlib/intel-gmmlib.hash | 2 +- package/intel-gmmlib/intel-gmmlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 9527cb9a56fa..d9cad026c4e9 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 5fa23407d4780c4ee8acd68e9ec9186e1721238150dc36ca9ab469a335891d2a intel-gmmlib-22.3.17.tar.gz +sha256 381f7ad104e3d0d8dd6c3ec0c8304e410a479c439e72db35c83fb7e2b0ec556f intel-gmmlib-22.3.18.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 5502687a4ac6..94a07ebfb8ab 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.3.17 +INTEL_GMMLIB_VERSION = 22.3.18 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md From 9cdf736efd67c94ac77d5faa8335b35460335c32 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:20 +0100 Subject: [PATCH 258/345] package/libva-utils: bump version to 2.21.0 Release notes: https://github.com/intel/libva-utils/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/libva-utils/libva-utils.hash | 2 +- package/libva-utils/libva-utils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva-utils/libva-utils.hash b/package/libva-utils/libva-utils.hash index f82a251ef837..2c80435ca6c4 100644 --- a/package/libva-utils/libva-utils.hash +++ b/package/libva-utils/libva-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 97413a7ec27ec479b97ffc7ab8acebe053615224a4b051602859cf9f88e4e889 libva-utils-2.20.1.tar.gz +sha256 15ca12bd11c7001c04af5079512754fea6ba8d79151b9f07908c99b27622714e libva-utils-2.21.0.tar.gz sha256 c6220c9f87832c27abcb8a32eafdd2823e13ce146b3ea63d5deae2a76798ef50 COPYING diff --git a/package/libva-utils/libva-utils.mk b/package/libva-utils/libva-utils.mk index 1f539647890a..f58685e51bef 100644 --- a/package/libva-utils/libva-utils.mk +++ b/package/libva-utils/libva-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_UTILS_VERSION = 2.20.1 +LIBVA_UTILS_VERSION = 2.21.0 LIBVA_UTILS_SITE = $(call github,intel,libva-utils,$(LIBVA_UTILS_VERSION)) LIBVA_UTILS_LICENSE = MIT LIBVA_UTILS_LICENSE_FILES = COPYING From 3cae883e7fd1e4175527a95e89aabcf5e3849103 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:07:21 +0100 Subject: [PATCH 259/345] package/libva: bump version to 2.21.0 Release notes: https://github.com/intel/libva/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/libva/libva.hash | 2 +- package/libva/libva.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libva/libva.hash b/package/libva/libva.hash index 2fffe8701f2b..24825ddc1fcf 100644 --- a/package/libva/libva.hash +++ b/package/libva/libva.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 117f8d658a5fc9ea406ca80a3eb4ae1d70b15a54807c9ed77199c812bed73b60 libva-2.20.0.tar.gz +sha256 f7c3fffef3f04eb146e036dad2587d852bfb70e4926d014bf437244915ef7425 libva-2.21.0.tar.gz sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de COPYING diff --git a/package/libva/libva.mk b/package/libva/libva.mk index 4481be9e7bb9..79dbe577c8b1 100644 --- a/package/libva/libva.mk +++ b/package/libva/libva.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVA_VERSION = 2.20.0 +LIBVA_VERSION = 2.21.0 LIBVA_SITE = $(call github,intel,libva,$(LIBVA_VERSION)) LIBVA_LICENSE = MIT LIBVA_LICENSE_FILES = COPYING From 2178fce10c4bdad779b35130915e85f13d2c1938 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:06:38 +0100 Subject: [PATCH 260/345] package/tvheadend: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/tvheadend/tvheadend.hash | 2 +- package/tvheadend/tvheadend.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tvheadend/tvheadend.hash b/package/tvheadend/tvheadend.hash index 62c954234dad..972db9300ecd 100644 --- a/package/tvheadend/tvheadend.hash +++ b/package/tvheadend/tvheadend.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 99a2fd954d8e620029759f5a65dc09271c168cd047a6a152a0fe643de64823cf tvheadend-b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f.tar.gz +sha256 e3f05da73596097757fb4c0f9306e415b1772f26a52b5b86c50d63811e7e65af tvheadend-c63115464d8f6556fb4cac93ce8740afea1b00d5.tar.gz sha256 16aaf037a2d00e6e7804de64619887fc7539f1ede99e3282c86dfbc61c2af63e LICENSE.md diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 816ec6e161fe..8f2e37b12202 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = b40a62b31e809523d2fe2f7f3f331cc55dfdbd0f +TVHEADEND_VERSION = c63115464d8f6556fb4cac93ce8740afea1b00d5 TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) TVHEADEND_LICENSE = GPL-3.0+ TVHEADEND_LICENSE_FILES = LICENSE.md From b4eb96e36c2d02a1b7d49ac99680b9d6c2cac87f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:06:03 +0100 Subject: [PATCH 261/345] package/openvpn: bump version to 2.6.10 Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst The fixed CVEs are only relevant for Windows. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index 6dc470360a9f..932483507e7f 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 5ede1565c8a6d880100f7f235317a7ee9eea83d5052db5547f13a9e76af7805d openvpn-2.6.8.tar.gz +sha256 1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b openvpn-2.6.10.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 28948a3ab3a3..abcb123eeab6 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.8 +OPENVPN_VERSION = 2.6.10 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From f9b1cc87d421356c91c8a9beb35691a35e9adb72 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:05:29 +0100 Subject: [PATCH 262/345] package/libxml2: bump version to 2.12.6 https://gitlab.gnome.org/GNOME/libxml2/-/blob/v2.12.6/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/libxml2/libxml2.hash | 4 ++-- package/libxml2/libxml2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxml2/libxml2.hash b/package/libxml2/libxml2.hash index 959887ab0e61..086bb410986d 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.5.sha256sum -sha256 a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21 libxml2-2.12.5.tar.xz +# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.6.sha256sum +sha256 889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb libxml2-2.12.6.tar.xz # License files, locally calculated sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 6070c07b031f..e7ed6fb75270 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.12 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).5 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).6 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From d8c440936d51b7f76472b43002780f5490b7a3bf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 24 Mar 2024 14:04:51 +0100 Subject: [PATCH 263/345] package/dav1d: bump version to 1.4.1 Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 0b2c53ec2120..a62193810ed6 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From https://download.videolan.org/pub/videolan/dav1d/1.3.0/dav1d-1.3.0.tar.xz.sha256 -sha256 6d8be2741c505c47f8f1ced3c9cc427759243436553d01d1acce201f87b39e71 dav1d-1.3.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.4.1/dav1d-1.4.1.tar.xz.sha256 +sha256 8d407dd5fe7986413c937b14e67f36aebd06e1fa5cfec679d10e548476f2d5f8 dav1d-1.4.1.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 3650f28730e8..74c68d166030 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.3.0 +DAV1D_VERSION = 1.4.1 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause From 3646c48c64cd87cbbe9c20f25a6db9e5054628a5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 13:39:26 +0100 Subject: [PATCH 264/345] package/mpc: bump to version 1.3.1 https://gitlab.inria.fr/mpc/mpc/-/blob/1.3.1/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/mpc/mpc.hash | 2 +- package/mpc/mpc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpc/mpc.hash b/package/mpc/mpc.hash index 0520a7b9b4a1..f69a5b66ca64 100644 --- a/package/mpc/mpc.hash +++ b/package/mpc/mpc.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459 mpc-1.2.1.tar.gz +sha256 ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8 mpc-1.3.1.tar.gz sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 COPYING.LESSER diff --git a/package/mpc/mpc.mk b/package/mpc/mpc.mk index 364e4c3c85a3..467bed4dbed4 100644 --- a/package/mpc/mpc.mk +++ b/package/mpc/mpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -MPC_VERSION = 1.2.1 +MPC_VERSION = 1.3.1 MPC_SITE = $(BR2_GNU_MIRROR)/mpc MPC_LICENSE = LGPL-3.0+ MPC_LICENSE_FILES = COPYING.LESSER From 00f7bd06d66b05ec694f8a3e90d56e5c4f532e6b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 13:33:00 +0100 Subject: [PATCH 265/345] package/neon: bump to version 0.33.0 Update hash of README, changes not related to license: https://github.com/notroj/neon/commit/7d39a09945830c664205dd307723c2ff51ae13e3 https://github.com/notroj/neon/commit/9c3a4cb82db956357f120556efb7d8e706b5d46c https://github.com/notroj/neon/blob/0.33.0/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/neon/neon.hash | 4 ++-- package/neon/neon.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/neon/neon.hash b/package/neon/neon.hash index 9bd6195e3915..d773b0f316a0 100644 --- a/package/neon/neon.hash +++ b/package/neon/neon.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 b1e2120e4ae07df952c4a858731619733115c5f438965de4fab41d6bf7e7a508 neon-0.32.4.tar.gz +sha256 659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8 neon-0.33.0.tar.gz # Hash for license files -sha256 ce2421ee38d6c0e02c85ac076478a0f92da6ef92b92b7a174877cabf01b2e531 README.md +sha256 6c4f5d59a60a66cc970642c0f3799cf03b40a81c9dccbc4a254f20487d143f74 README.md sha256 d7bf9d064ac3e5840f9dd02422b7eeec4f1fd03f37fadbd043602be5e882304f src/COPYING.LIB sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad test/COPYING diff --git a/package/neon/neon.mk b/package/neon/neon.mk index 96ee6087808c..a801eae28f75 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -4,7 +4,7 @@ # ################################################################################ -NEON_VERSION = 0.32.4 +NEON_VERSION = 0.33.0 NEON_SITE = https://notroj.github.io/neon NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md From f85a1eb173954cfcdda1c0e947913bba598290d8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 13:31:59 +0100 Subject: [PATCH 266/345] package/neon: drop unrecognized rpath option rpath is an unrecognized option since the addition of the package in commit 59a9c02e1355bcd630a207e8be319a044597ad1d Fixes: 59a9c02e1355bcd630a207e8be319a044597ad1d Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/neon/neon.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/neon/neon.mk b/package/neon/neon.mk index a801eae28f75..e7872df3c9cd 100644 --- a/package/neon/neon.mk +++ b/package/neon/neon.mk @@ -10,7 +10,7 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests) NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md NEON_CPE_ID_VENDOR = webdav NEON_INSTALL_STAGING = YES -NEON_CONF_OPTS = --without-gssapi --disable-rpath +NEON_CONF_OPTS = --without-gssapi NEON_CONFIG_SCRIPTS = neon-config NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES) NEON_CONF_ENV = ne_cv_libsfor_bindtextdomain=$(TARGET_NLS_LIBS) From 5e545cd269e0a3bbd6f859f885c887f14d3bd2d9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 10:49:34 +0100 Subject: [PATCH 267/345] package/vdr: bump to version 2.6.5 https://github.com/vdr-projects/vdr/blob/2.6.5/HISTORY Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/vdr/vdr.hash | 2 +- package/vdr/vdr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vdr/vdr.hash b/package/vdr/vdr.hash index 1b7ced0b7736..47179a9907f1 100644 --- a/package/vdr/vdr.hash +++ b/package/vdr/vdr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 70352c7558d627202c02e80d88c83d25d9df4c5e49a010f7d1d9ae631bd54ad0 vdr-2.6.3.tar.gz +sha256 293e355b2cc22e6152dae9c315d5b8903f3e647a2e60b6217d306ff4bceb83e1 vdr-2.6.5.tar.gz sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/vdr/vdr.mk b/package/vdr/vdr.mk index a44e1ff51226..c717d40e024e 100644 --- a/package/vdr/vdr.mk +++ b/package/vdr/vdr.mk @@ -4,7 +4,7 @@ # ################################################################################ -VDR_VERSION = 2.6.3 +VDR_VERSION = 2.6.5 VDR_SITE = $(call github,vdr-projects,vdr,$(VDR_VERSION)) VDR_LICENSE = GPL-2.0+ VDR_LICENSE_FILES = COPYING From e248a312b04a86881b5a243433a213bfd8eea057 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 10:08:17 +0100 Subject: [PATCH 268/345] package/i2pd: bump to version 2.50.2 Update hash of license file (date updated with https://github.com/PurpleI2P/i2pd/commit/d5ee1f602fdc7a47ccc9a4e239ea720dd63f123a) https://github.com/PurpleI2P/i2pd/blob/2.50.2/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/i2pd/i2pd.hash | 6 +++--- package/i2pd/i2pd.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/i2pd/i2pd.hash b/package/i2pd/i2pd.hash index 98c0db243dd2..cc099a94ffd0 100644 --- a/package/i2pd/i2pd.hash +++ b/package/i2pd/i2pd.hash @@ -1,4 +1,4 @@ -# From https://github.com/PurpleI2P/i2pd/releases/download/2.43.0/SHA512SUMS -sha512 7247850cd47cccc540346b4a1becc6dba5f40bcb333cd722e9fc59fd8b0beddee700376829d29add05cea6b84bb34303ed37e01914a1a41cf8cd94fe5c826e4a i2pd-2.43.0.tar.gz +# From https://github.com/PurpleI2P/i2pd/releases/download/2.50.2/SHA512SUMS +sha512 7df7a578711a959feee4326060829cf87c0d1669e473934549cb59d868a7aef7300ecd2d7a6b92a2295aa7e97964cc16d0e44a334db917e22b0b59573a9052de i2pd-2.50.2.tar.gz # Locally computed: -sha256 9c87aff490b272254d716475e3c4973f5f64af1d18f9f6962c1e61e252e1ad9a LICENSE +sha256 e32cc0171ce3301afa67d83f61598f29af7efdf8218dfb66cc1a72224474ec2c LICENSE diff --git a/package/i2pd/i2pd.mk b/package/i2pd/i2pd.mk index ad268a235c28..402931c65594 100644 --- a/package/i2pd/i2pd.mk +++ b/package/i2pd/i2pd.mk @@ -4,7 +4,7 @@ # ################################################################################ -I2PD_VERSION = 2.43.0 +I2PD_VERSION = 2.50.2 I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION)) I2PD_LICENSE = BSD-3-Clause I2PD_LICENSE_FILES = LICENSE From 49384a0a01ad8b73ea1dc10043c3605d035933f8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 09:58:36 +0100 Subject: [PATCH 269/345] package/libtorrent-rasterbar: bump to version 1.2.19 https://github.com/arvidn/libtorrent/releases/tag/v1.2.19 https://github.com/arvidn/libtorrent/releases/tag/v1.2.18 https://github.com/arvidn/libtorrent/releases/tag/v1.2.17 https://github.com/arvidn/libtorrent/releases/tag/v1.2.16 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libtorrent-rasterbar/libtorrent-rasterbar.hash | 2 +- package/libtorrent-rasterbar/libtorrent-rasterbar.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.hash b/package/libtorrent-rasterbar/libtorrent-rasterbar.hash index 3f59642b729d..b1abe85d8474 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.hash +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c8ad8638684c0a903ebabc30490079e31b1a6a638da2adec5a8bef6a0e62214b libtorrent-rasterbar-1.2.15.tar.gz +sha256 eee8e99548dc5eb5e643e49db9202f4f97112c032dba883dfdc8144af5b6e40e libtorrent-rasterbar-1.2.19.tar.gz sha256 f3a5dd1558cce616b12edad521427ec8976ce2bb0af33f7f359cfa648bf55ad8 COPYING diff --git a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk index 085b38343c4c..6b497bbe58c8 100644 --- a/package/libtorrent-rasterbar/libtorrent-rasterbar.mk +++ b/package/libtorrent-rasterbar/libtorrent-rasterbar.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBTORRENT_RASTERBAR_VERSION = 1.2.15 +LIBTORRENT_RASTERBAR_VERSION = 1.2.19 LIBTORRENT_RASTERBAR_SITE = \ https://github.com/arvidn/libtorrent/releases/download/v$(LIBTORRENT_RASTERBAR_VERSION) LIBTORRENT_RASTERBAR_LICENSE = BSD-3-Clause From c1c096f91da5bfc45f1842b6dd12f1f0e016dbc4 Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 22:11:51 -0700 Subject: [PATCH 270/345] package/msmtp: bump version to 1.8.25 Release notes - https://marlam.de/msmtp/news/msmtp-1-8-25/ Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle --- package/msmtp/msmtp.hash | 4 ++-- package/msmtp/msmtp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/msmtp/msmtp.hash b/package/msmtp/msmtp.hash index c5fe9d9176b1..ba4ef0274641 100644 --- a/package/msmtp/msmtp.hash +++ b/package/msmtp/msmtp.hash @@ -1,7 +1,7 @@ # Locally calculated after checking signature -# https://marlam.de/msmtp/releases/msmtp-1.8.24.tar.xz.sig +# https://marlam.de/msmtp/releases/msmtp-1.8.25.tar.xz.sig # with key 2F61B4828BBA779AECB3F32703A2A4AB1E32FD34 -sha256 bd6644b1aaab17d61b86647993e3efad860b23c54283b00ddc579c1f5110aa59 msmtp-1.8.24.tar.xz +sha256 2dfe1dbbb397d26fe0b0b6b2e9cd2efdf9d72dd42d18e70d7f363ada2652d738 msmtp-1.8.25.tar.xz # Hash for license file: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/msmtp/msmtp.mk b/package/msmtp/msmtp.mk index 93c923a123b4..b964970bfa5a 100644 --- a/package/msmtp/msmtp.mk +++ b/package/msmtp/msmtp.mk @@ -4,7 +4,7 @@ # ################################################################################ -MSMTP_VERSION = 1.8.24 +MSMTP_VERSION = 1.8.25 MSMTP_SITE = https://marlam.de/msmtp/releases MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz MSMTP_DEPENDENCIES = host-pkgconf From 33139ca6ac738861d3b8783202d04a77e38f09bf Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 21:09:02 -0700 Subject: [PATCH 271/345] package/iproute2: bump to version 6.8.0 Changelog - https://github.com/iproute2/iproute2/compare/v6.7.0...v6.8.0 Drop 0001-Revert-ss-prevent-Process-column-from-being-printed-.patch. See the upstream fix https://github.com/iproute2/iproute2/commit/87d804ca0854b09c07872e9fd6036bf5d3e0cc85 Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle --- ...t-Process-column-from-being-printed-.patch | 45 ------------------- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 3 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 package/iproute2/0001-Revert-ss-prevent-Process-column-from-being-printed-.patch diff --git a/package/iproute2/0001-Revert-ss-prevent-Process-column-from-being-printed-.patch b/package/iproute2/0001-Revert-ss-prevent-Process-column-from-being-printed-.patch deleted file mode 100644 index 10fa472d64f9..000000000000 --- a/package/iproute2/0001-Revert-ss-prevent-Process-column-from-being-printed-.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f22c49730c3691c25a1147081363eb35aa9d1048 Mon Sep 17 00:00:00 2001 -From: Stephen Hemminger -Date: Sat, 13 Jan 2024 08:51:55 -0800 -Subject: [PATCH] Revert "ss: prevent "Process" column from being printed - unless requested" - -This reverts commit 1607bf531fd2f984438d227ea97312df80e7cf56. - -This commit is being reverted because it breaks output of tcp info. -The order of the columns enum is order sensistive. - -Bug: https://bugzilla.kernel.org/show_bug.cgi?id=218372 -Signed-off-by: Stephen Hemminger -Upstream: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=f22c49730c3691c25a1147081363eb35aa9d1048 ---- - misc/ss.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/misc/ss.c b/misc/ss.c -index 09dc1f37..9438382b 100644 ---- a/misc/ss.c -+++ b/misc/ss.c -@@ -100,8 +100,8 @@ enum col_id { - COL_SERV, - COL_RADDR, - COL_RSERV, -- COL_PROC, - COL_EXT, -+ COL_PROC, - COL_MAX - }; - -@@ -5795,9 +5795,6 @@ int main(int argc, char *argv[]) - if (ssfilter_parse(¤t_filter.f, argc, argv, filter_fp)) - usage(); - -- if (!show_processes) -- columns[COL_PROC].disabled = 1; -- - if (!(current_filter.dbs & (current_filter.dbs - 1))) - columns[COL_NETID].disabled = 1; - --- -2.43.0 - diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 0be058e64bca..d57a93de7d16 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 ff942dd9828d7d1f867f61fe72ce433078c31e5d8e4a78e20f02cb5892e8841d iproute2-6.7.0.tar.xz +sha256 03a6cca3d71a908d1f15f7b495be2b8fe851f941458dc4664900d7f45fcf68ce iproute2-6.8.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 4adb4e3356a4..3db2ab925d01 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.7.0 +IPROUTE2_VERSION = 6.8.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From d4620a3128474d8e1b41ec56351eaafd8df898ce Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 20:28:57 -0700 Subject: [PATCH 272/345] package/ethtool: bump to version 6.7 Changelog - https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/tree/NEWS?id=0aadd41eab7ea76501e557ccba705a08c07ce088 Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle --- package/ethtool/ethtool.hash | 2 +- package/ethtool/ethtool.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ethtool/ethtool.hash b/package/ethtool/ethtool.hash index a37c8000158d..b9bc768e8f89 100644 --- a/package/ethtool/ethtool.hash +++ b/package/ethtool/ethtool.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 833a8493cb9cd5809ab59743092d9a38742c282290800e9626407511bbcebf9e ethtool-6.6.tar.xz +sha256 c3ae526b01ce4d8df6c794ab170de4a4104d111ea8d8db3f1fd7c25fcb905619 ethtool-6.7.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 5d632934396f90c82dfebe3c9512648bbb6333b406113d0cd331b0e0aa2d34a1 LICENSE diff --git a/package/ethtool/ethtool.mk b/package/ethtool/ethtool.mk index c9c28566126d..77a7e16937a4 100644 --- a/package/ethtool/ethtool.mk +++ b/package/ethtool/ethtool.mk @@ -4,7 +4,7 @@ # ################################################################################ -ETHTOOL_VERSION = 6.6 +ETHTOOL_VERSION = 6.7 ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool ETHTOOL_LICENSE = GPL-2.0 From 89f24c5cac91d3fe5dd8922daeb5427e8f4f1e7f Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 19:50:59 -0700 Subject: [PATCH 273/345] package/strace: bump to version 6.8 Changelog - https://github.com/strace/strace/releases/tag/v6.8 Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle --- package/strace/strace.hash | 4 ++-- package/strace/strace.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/strace/strace.hash b/package/strace/strace.hash index a35d2b0be6e7..68b9cc5f935b 100644 --- a/package/strace/strace.hash +++ b/package/strace/strace.hash @@ -1,5 +1,5 @@ # Locally calculated after checking signature with RSA key 0xA8041FA839E16E36 -# https://strace.io/files/6.7/strace-6.7.tar.xz.asc -sha256 2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7 strace-6.7.tar.xz +# https://strace.io/files/6.8/strace-6.8.tar.xz.asc +sha256 ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149 strace-6.8.tar.xz sha256 1988d0e1aa101d68855e8c4f940aacf2531051b82f6b608eb026c5fad1f33df1 COPYING sha256 7c379436436a562834aa7d2f5dcae1f80a25230fa74201046ca1fba4367d39aa LGPL-2.1-or-later diff --git a/package/strace/strace.mk b/package/strace/strace.mk index ddcdfabb2914..908aed6653b0 100644 --- a/package/strace/strace.mk +++ b/package/strace/strace.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRACE_VERSION = 6.7 +STRACE_VERSION = 6.8 STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz STRACE_SITE = https://github.com/strace/strace/releases/download/v$(STRACE_VERSION) STRACE_LICENSE = LGPL-2.1+ From 9496ff57e54c136d6961294aa2c5f8d560673ebf Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Sat, 23 Mar 2024 17:17:53 -0700 Subject: [PATCH 274/345] package/openssh: bump to version 9.7p1 Release notes - https://www.openssh.com/txt/release-9.7 Drop upstream patch - 001-better-detection-of-broken-fzero-call-used-regs.patch Signed-off-by: Akhilesh Nema Signed-off-by: Arnout Vandecappelle --- ...ction-of-broken-fzero-call-used-regs.patch | 57 ------------------- package/openssh/openssh.hash | 4 +- package/openssh/openssh.mk | 2 +- 3 files changed, 3 insertions(+), 60 deletions(-) delete mode 100644 package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch diff --git a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch b/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch deleted file mode 100644 index 5c056033a9b7..000000000000 --- a/package/openssh/0001-better-detection-of-broken-fzero-call-used-regs.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 1036d77b34a5fa15e56f516b81b9928006848cbd Mon Sep 17 00:00:00 2001 -From: Damien Miller -Date: Fri, 22 Dec 2023 17:56:26 +1100 -Subject: [PATCH] better detection of broken -fzero-call-used-regs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -gcc 13.2.0 on ppc64le refuses to compile some function, including -cipher.c:compression_alg_list() with an error: - -> sorry, unimplemented: argument ‘used’ is not supportedcw -> for ‘-fzero-call-used-regs’ on this target - -This extends the autoconf will-it-work test with a similarly- -structured function that seems to catch this. - -Spotted/tested by Colin Watson; bz3645 - -Upstream: https://github.com/openssh/openssh-portable/commit/1036d77b34a5fa15e56f516b81b9928006848cbd.patch -Signed-off-by: Brandon Maier ---- - m4/openssh.m4 | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/m4/openssh.m4 b/m4/openssh.m4 -index 5d4c56280fc..033df501c3d 100644 ---- a/m4/openssh.m4 -+++ b/m4/openssh.m4 -@@ -20,18 +20,24 @@ char *f2(char *s, ...) { - va_end(args); - return strdup(ret); - } -+const char *f3(int s) { -+ return s ? "good" : "gooder"; -+} - int main(int argc, char **argv) { -- (void)argv; - char b[256], *cp; -+ const char *s; - /* Some math to catch -ftrapv problems in the toolchain */ - int i = 123 * argc, j = 456 + argc, k = 789 - argc; - float l = i * 2.1; - double m = l / 0.5; - long long int n = argc * 12345LL, o = 12345LL * (long long int)argc; -+ (void)argv; - f(1); -- snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); -+ s = f3(f(2)); -+ snprintf(b, sizeof b, "%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); - if (write(1, b, 0) == -1) exit(0); -- cp = f2("%d %d %d %f %f %lld %lld\n", i,j,k,l,m,n,o); -+ cp = f2("%d %d %d %f %f %lld %lld %s\n", i,j,k,l,m,n,o,s); -+ if (write(1, cp, 0) == -1) exit(0); - free(cp); - /* - * Test fallthrough behaviour. clang 10's -Wimplicit-fallthrough does diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 618b13133d8f..58297aa69494 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.4p1 -sha256 910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c openssh-9.6p1.tar.gz +# From https://www.openssh.com/txt/release-9.7 +sha256 490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd openssh-9.7p1.tar.gz # Locally calculated sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ef530cc85033..ce5525312095 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.6 +OPENSSH_VERSION_MAJOR = 9.7 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) From 94e072849e6c86a8c75402b1e600642673ebfb57 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sun, 24 Mar 2024 00:21:16 +0100 Subject: [PATCH 275/345] package/fluent-bit: bump to v3.0.0 Release Notes: - https://fluentbit.io/announcements/v3.0.0/ Also drop 0004-wasm-restore-support-for-some-targets-8401.patch, which was accepted upstream. (See: https://github.com/fluent/fluent-bit/commit/40bb0fbe17efa6b4b1a96940e9ff7374b1a0c3eb) Signed-off-by: Thomas Devoogdt Signed-off-by: Arnout Vandecappelle --- ...estore-support-for-some-targets-8401.patch | 43 ------------------- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 3 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch diff --git a/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch b/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch deleted file mode 100644 index ed6206268fac..000000000000 --- a/package/fluent-bit/0004-wasm-restore-support-for-some-targets-8401.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4a6c5f56cd1a979b91c168fb8e245587c2927aca Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Mon, 22 Jan 2024 19:27:56 +0100 -Subject: [PATCH] wasm: restore support for some targets (#8401) - -Somehow, support for ARC, MIPS, and XTENSA got dropped by bumping to v1.3.0, -so restore it now. Remark that those targets are mentioned in the section above. - -See commit fa6a248746f9f481b5f6aef49716141fa0222650. - -Upstream: https://github.com/fluent/fluent-bit/pull/8401 -Signed-off-by: Thomas Devoogdt ---- - src/wasm/CMakeLists.txt | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/wasm/CMakeLists.txt b/src/wasm/CMakeLists.txt -index a258dc063..4ea7eba65 100644 ---- a/src/wasm/CMakeLists.txt -+++ b/src/wasm/CMakeLists.txt -@@ -51,6 +51,10 @@ elseif (WAMR_BUILD_TARGET MATCHES "AARCH64.*") - elseif (WAMR_BUILD_TARGET MATCHES "ARM.*") - add_definitions(-DBUILD_TARGET_ARM) - add_definitions(-DBUILD_TARGET="${WAMR_BUILD_TARGET}") -+elseif (WAMR_BUILD_TARGET STREQUAL "MIPS") -+ add_definitions(-DBUILD_TARGET_MIPS) -+elseif (WAMR_BUILD_TARGET STREQUAL "XTENSA") -+ add_definitions(-DBUILD_TARGET_XTENSA) - elseif (WAMR_BUILD_TARGET STREQUAL "RISCV64" OR WAMR_BUILD_TARGET STREQUAL "RISCV64_LP64D") - add_definitions(-DBUILD_TARGET_RISCV64_LP64D) - elseif (WAMR_BUILD_TARGET STREQUAL "RISCV64_LP64") -@@ -59,6 +63,8 @@ elseif (WAMR_BUILD_TARGET STREQUAL "RISCV32" OR WAMR_BUILD_TARGET STREQUAL "RISC - add_definitions(-DBUILD_TARGET_RISCV32_ILP32D) - elseif (WAMR_BUILD_TARGET STREQUAL "RISCV32_ILP32") - add_definitions(-DBUILD_TARGET_RISCV32_ILP32) -+elseif (WAMR_BUILD_TARGET STREQUAL "ARC") -+ add_definitions(-DBUILD_TARGET_ARC) - else () - message (FATAL_ERROR "-- Build target isn't set") - endif () --- -2.34.1 - diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index 2c34583f7a40..cc9c976d6041 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8e7e951b2907e9d29508699c71c8949a4a22d750d54ffa5ee5b96537e59371dd fluent-bit-2.2.2.tar.gz +sha256 e70ae5be2f0ca1cb842a1c8d2762437907c522765f79b5c0c391eaa1b57c9f4c fluent-bit-3.0.0.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 00a8904c55b8..33054bea66b2 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.2.2 +FLUENT_BIT_VERSION = 3.0.0 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From eda991ab095a1adc95d25bd85ed88669ed364e1e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 23 Mar 2024 22:49:51 +0100 Subject: [PATCH 276/345] package/fdk-aac: enable on s390x s390x is supported since bump to version 2.0.3 in commit 38a20a0998117f3debb4de06e209ba5d82bb7a9d and https://github.com/mstorsjo/fdk-aac/commit/c16d5d72c99a77c8bcb788a922323b0b59035803 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/fdk-aac/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/fdk-aac/Config.in b/package/fdk-aac/Config.in index 26e060b93d39..831db13b21dc 100644 --- a/package/fdk-aac/Config.in +++ b/package/fdk-aac/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el default y if BR2_powerpc default y if BR2_sh + default y if BR2_s390x config BR2_PACKAGE_FDK_AAC bool "fdk-aac" From 9efeb7e91440c20aea6cb0e07027081dbba4604d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 23 Mar 2024 22:07:53 +0100 Subject: [PATCH 277/345] package/gnu-efi: bump to version 3.0.18 For commit logs, see: https://sourceforge.net/p/gnu-efi/code/ci/3.0.18/log/ This bump is motivated by riscv64 improvements. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/gnu-efi/gnu-efi.hash | 6 +++--- package/gnu-efi/gnu-efi.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/gnu-efi/gnu-efi.hash b/package/gnu-efi/gnu-efi.hash index 7d986509917e..e059da867e01 100644 --- a/package/gnu-efi/gnu-efi.hash +++ b/package/gnu-efi/gnu-efi.hash @@ -1,6 +1,6 @@ # From http://sourceforge.net/projects/gnu-efi/files -md5 832496719182e7d6a4b12bc7c0b534d2 gnu-efi-3.0.17.tar.bz2 -sha1 9715285022124b231520d58b26709f5ab338e981 gnu-efi-3.0.17.tar.bz2 +md5 0b93ad70dff96991dd87978fc4275bd1 gnu-efi-3.0.18.tar.bz2 +sha1 4f12dc4ab3e7940070c87affea17bf8a6209957a gnu-efi-3.0.18.tar.bz2 # Locally computed -sha256 7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4 gnu-efi-3.0.17.tar.bz2 +sha256 7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c gnu-efi-3.0.18.tar.bz2 sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib diff --git a/package/gnu-efi/gnu-efi.mk b/package/gnu-efi/gnu-efi.mk index 8b9a6aa4c66f..96caaeb93365 100644 --- a/package/gnu-efi/gnu-efi.mk +++ b/package/gnu-efi/gnu-efi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNU_EFI_VERSION = 3.0.17 +GNU_EFI_VERSION = 3.0.18 GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2 GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi GNU_EFI_INSTALL_STAGING = YES From 2bf3dc5b84cf9586406d1ff6aa87860eb28d037a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 23 Mar 2024 21:35:16 +0100 Subject: [PATCH 278/345] support/testing: add iptables runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + .../testing/tests/package/test_iptables.py | 78 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 support/testing/tests/package/test_iptables.py diff --git a/DEVELOPERS b/DEVELOPERS index a6364cdd441c..328c654faed1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1797,6 +1797,7 @@ F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_iptables.py F: support/testing/tests/package/test_jailhouse.py F: support/testing/tests/package/test_jq.py F: support/testing/tests/package/test_jq/ diff --git a/support/testing/tests/package/test_iptables.py b/support/testing/tests/package/test_iptables.py new file mode 100644 index 000000000000..ee57b315589c --- /dev/null +++ b/support/testing/tests/package/test_iptables.py @@ -0,0 +1,78 @@ +import os + +import infra.basetest + + +class TestIptables(infra.basetest.BRTest): + # The iptables package has _LINUX_CONFIG_FIXUPS, so we cannot use + # the runtime test pre-built Kernel. We need to compile a Kernel + # to make sure it will include the required configuration. + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.82" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_IPTABLES=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a57", + "-m", "256M", + "-initrd", img]) + self.emulator.login() + + # We check the program can execute. + self.assertRunOk("iptables --version") + + # We delete all rules in all chains. We also set default + # policies to ACCEPT for INPUT and OUPUT chains. This should + # already be the case (default Kernel config). This makes sure + # this test starts from a known state and also those common + # command invocations works. + self.assertRunOk("iptables --flush") + self.assertRunOk("iptables --policy INPUT ACCEPT") + self.assertRunOk("iptables --policy OUTPUT ACCEPT") + + # We add a filter rule to drop all the ICMP protocol to the + # IPv4 destination 127.0.0.2, in the INPUT chain. This should + # block all pings (icmp echo-requests). + cmd = "iptables --append INPUT" + cmd += " --protocol icmp --destination 127.0.0.2 --jump DROP" + self.assertRunOk(cmd) + + # We check we can list rules. + self.assertRunOk("iptables --list") + + # A ping to 127.0.0.1 is expected to work, because it's not + # matching our rule. We expect 3 replies (-c), with 0.5s + # internal (-i), and set a maximum timeout of 2s. + ping_cmd_prefix = "ping -c 3 -i 0.5 -W 2 " + self.assertRunOk(ping_cmd_prefix + "127.0.0.1") + + # A ping to 127.0.0.2 is expected to fail, because our rule is + # supposed to drop it. + ping_test_cmd = ping_cmd_prefix + "127.0.0.2" + _, exit_code = self.emulator.run(ping_test_cmd) + self.assertNotEqual(exit_code, 0) + + # We delete our only rule #1 in the INPUT chain. + self.assertRunOk("iptables --delete INPUT 1") + + # Since we deleted the rule, the ping test command which was + # supposed to fail earlier is now supposed to succeed. + self.assertRunOk(ping_test_cmd) From 748fc4be21ed46e2c562735bffed1ea67dbbc7b9 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Sun, 24 Mar 2024 00:01:18 +0800 Subject: [PATCH 279/345] package/pkg-utils.mk: remove trailing slash in pkgdir definition Signed-off-by: Scott Fan [Arnout: move to definition of pkgdir instead of PKGDIR] Signed-off-by: Arnout Vandecappelle --- package/pkg-utils.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 723bbe4e246e..6181ae7a996c 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -42,7 +42,7 @@ KCONFIG_DISABLE_OPT = $(Q)$(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $ # directory from its makefile directory, using the $(MAKEFILE_LIST) # variable provided by make. This is used by the *-package macros to # automagically find where the package is located. -pkgdir = $(dir $(lastword $(MAKEFILE_LIST))) +pkgdir = $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) pkgname = $(lastword $(subst /, ,$(pkgdir))) # Helper to build the extension for a package archive, based on various From e50460f9f12a8c5f82f2166733afe9cca3c8cd19 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2024 22:13:27 +0100 Subject: [PATCH 280/345] package/php: bump version to 8.3.4 Removed patch 0006 which is included in this release. Rebased patch 0005. Changelog: https://www.php.net/ChangeLog-8.php#PHP_8_3 Release notes: https://www.php.net/releases/8_3_4.php Release notes: https://www.php.net/releases/8_3_3.php Release notes: https://www.php.net/releases/8_3_2.php Release notes: https://www.php.net/releases/8_3_1.php Release notes: https://www.php.net/releases/8_3_0.php Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- .../0005-allow-opcache-cross-compiling.patch | 4 +- package/php/0006-xxhash-h-Fix-GCC-12-Og.patch | 94 ------------------- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 4 files changed, 4 insertions(+), 98 deletions(-) delete mode 100644 package/php/0006-xxhash-h-Fix-GCC-12-Og.patch diff --git a/package/php/0005-allow-opcache-cross-compiling.patch b/package/php/0005-allow-opcache-cross-compiling.patch index f9bc8b3ef590..468864b0a4e8 100644 --- a/package/php/0005-allow-opcache-cross-compiling.patch +++ b/package/php/0005-allow-opcache-cross-compiling.patch @@ -14,7 +14,7 @@ CFLAGS when opcache is enabled: Signed-off-by: Adam Duskett Signed-off-by: Bernd Kuhls -[Bernd: rebased for 8.1.7] +[Bernd: rebased for 8.1.7 & 8.3.3] --- ext/opcache/config.m4 | 4 ---- 1 file changed, 4 deletions(-) @@ -23,7 +23,7 @@ diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 index 5492fd92..10c150ff 100644 --- a/ext/opcache/config.m4 +++ b/ext/opcache/config.m4 -@@ -331,10 +331,6 @@ int main() { +@@ -315,10 +315,6 @@ int main() { PHP_ADD_EXTENSION_DEP(opcache, pcre) diff --git a/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch deleted file mode 100644 index 9b5b9966cd5a..000000000000 --- a/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch +++ /dev/null @@ -1,94 +0,0 @@ -From adcb38b1ffa8e401293e5028ee5af586fd304e00 Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 12 Apr 2023 13:33:07 +0800 -Subject: [PATCH] xxhash.h: Fix GCC 12 -Og - -Change whether to inline XXH3_hashLong_withSecret to a config option - -Ref: https://github.com/Cyan4973/xxHash/commit/ace22bddc7a366a5dd8a71e8b8247694530684ec - -Signed-off-by: Mingli Yu - -Closes GH-11062. - -Upstream: https://github.com/php/php-src/commit/adcb38b1ffa8e401293e5028ee5af586fd304e00 - -Signed-off-by: Bernd Kuhls ---- - ext/hash/xxhash/xxhash.h | 35 +++++++++++++++++++++++++++++++++-- - 1 file changed, 33 insertions(+), 2 deletions(-) - -diff --git a/ext/hash/xxhash/xxhash.h b/ext/hash/xxhash/xxhash.h -index b5bd286496c7..8e816c0584eb 100644 ---- a/ext/hash/xxhash/xxhash.h -+++ b/ext/hash/xxhash/xxhash.h -@@ -1375,6 +1375,23 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, - */ - # define XXH_NO_INLINE_HINTS 0 - -+/*! -+ * @def XXH3_INLINE_SECRET -+ * @brief Determines whether to inline the XXH3 withSecret code. -+ * -+ * When the secret size is known, the compiler can improve the performance -+ * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret(). -+ * -+ * However, if the secret size is not known, it doesn't have any benefit. This -+ * happens when xxHash is compiled into a global symbol. Therefore, if -+ * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0. -+ * -+ * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers -+ * that are *sometimes* force inline on -Og, and it is impossible to automatically -+ * detect this optimization level. -+ */ -+# define XXH3_INLINE_SECRET 0 -+ - /*! - * @def XXH32_ENDJMP - * @brief Whether to use a jump for `XXH32_finalize`. -@@ -1439,6 +1456,15 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, - # endif - #endif - -+#ifndef XXH3_INLINE_SECRET -+# if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \ -+ || !defined(XXH_INLINE_ALL) -+# define XXH3_INLINE_SECRET 0 -+# else -+# define XXH3_INLINE_SECRET 1 -+# endif -+#endif -+ - #ifndef XXH32_ENDJMP - /* generally preferable for performance */ - # define XXH32_ENDJMP 0 -@@ -1515,6 +1541,11 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) - # define XXH_NO_INLINE static - #endif - -+#if XXH3_INLINE_SECRET -+# define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE -+#else -+# define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE -+#endif - - - /* ************************************* -@@ -4465,7 +4496,7 @@ XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len, - * so that the compiler can properly optimize the vectorized loop. - * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set. - */ --XXH_FORCE_INLINE XXH64_hash_t -+XXH3_WITH_SECRET_INLINE XXH64_hash_t - XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len, - XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen) - { -@@ -5263,7 +5294,7 @@ XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len, - * It's important for performance to pass @secretLen (when it's static) - * to the compiler, so that it can properly optimize the vectorized loop. - */ --XXH_FORCE_INLINE XXH128_hash_t -+XXH3_WITH_SECRET_INLINE XXH128_hash_t - XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len, - XXH64_hash_t seed64, - const void* XXH_RESTRICT secret, size_t secretLen) diff --git a/package/php/php.hash b/package/php/php.hash index 4ce3616de3e4..96f16ff2a767 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 28cdc995b7d5421711c7044294885fcde4390c9f67504a994b4cf9bc1b5cc593 php-8.2.16.tar.xz +sha256 39a337036a546e5c28aea76cf424ac172db5156bd8a8fd85252e389409a5ba63 php-8.3.4.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 28893be4c644..99dbec9de79d 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.16 +PHP_VERSION = 8.3.4 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From e511539cd29015f08d7417094cbf202a861ad533 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2024 22:47:12 +0100 Subject: [PATCH 281/345] package/multipath-tools: drop README.md from license files Drop README.md from license files as advocated by Arnout Vandecappelle: https://patchwork.ozlabs.org/project/buildroot/patch/20240314211117.9103-1-fontaine.fabrice@gmail.com The only license-related part of README.md is that specifies that the default license, if not mentioned in the file, is LGPL-2.0. Since the README file is likely to be updated with every new release, this is a lot of overhead for such a small added value. Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/multipath-tools/multipath-tools.hash | 1 - package/multipath-tools/multipath-tools.mk | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/package/multipath-tools/multipath-tools.hash b/package/multipath-tools/multipath-tools.hash index c1f32e7a3b07..03a2867144a7 100644 --- a/package/multipath-tools/multipath-tools.hash +++ b/package/multipath-tools/multipath-tools.hash @@ -4,4 +4,3 @@ sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENS sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 LICENSES/GPL-3.0 sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c LICENSES/LGPL-2.0 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSES/LGPL-2.1 -sha256 9c69bb0089aa0b82b10a25095c04a7c4aec6b5bbf0776b7129123c8459fe7725 README.md diff --git a/package/multipath-tools/multipath-tools.mk b/package/multipath-tools/multipath-tools.mk index e62e85e14daa..164d85060046 100644 --- a/package/multipath-tools/multipath-tools.mk +++ b/package/multipath-tools/multipath-tools.mk @@ -16,8 +16,7 @@ MULTIPATH_TOOLS_LICENSE_FILES = \ LICENSES/GPL-2.0 \ LICENSES/GPL-3.0 \ LICENSES/LGPL-2.0 \ - LICENSES/LGPL-2.1 \ - README.md + LICENSES/LGPL-2.1 MULTIPATH_TOOLS_CPE_ID_VENDOR = opensvc MULTIPATH_TOOLS_DEPENDENCIES = \ From 1455d5241b288770aeea7f5ba6dcd1ea31966ba1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2024 23:10:29 +0100 Subject: [PATCH 282/345] package/cvs: fix build without editor Set default editor to /bin/vi to fix the following build failure when no editor is found on host: configure:40833: checking for vim configure:40862: result: no configure:40833: checking for vi configure:40862: result: no configure:40833: checking for emacs configure:40862: result: no configure:40833: checking for nano configure:40862: result: no configure:40833: checking for pico configure:40862: result: no configure:40833: checking for edit configure:40862: result: no configure:40874: error: Failed to find a text file editor. CVS cannot be compiled without a default log message editor. Searched for `vim vi emacs nano pico edit'. Try `configure --with-editor'. While at it, drop CVS_CONFIGURE_ARGS variable for simplicity Fixes: - http://autobuild.buildroot.org/results/5b8a747698bc2e64eb1f001e87577e86e4cb8d14 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/cvs/cvs.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package/cvs/cvs.mk b/package/cvs/cvs.mk index bd1e04eee00f..64c15f16fee5 100644 --- a/package/cvs/cvs.mk +++ b/package/cvs/cvs.mk @@ -18,18 +18,18 @@ CVS_CONF_ENV = \ ac_cv_func_working_mktime=yes \ cvs_cv_func_printf_ptr=yes -CVS_CONFIGURE_ARGS = --disable-old-info-format-support +CVS_CONF_OPTS = \ + --disable-old-info-format-support \ + --with-editor=/bin/vi ifeq ($(BR2_PACKAGE_CVS_SERVER),y) -CVS_CONFIGURE_ARGS += --enable-server +CVS_CONF_OPTS += --enable-server else -CVS_CONFIGURE_ARGS += --disable-server +CVS_CONF_OPTS += --disable-server endif ifeq ($(BR2_PACKAGE_ZLIB),y) -CVS_CONFIGURE_ARGS += --with-external-zlib +CVS_CONF_OPTS += --with-external-zlib endif -CVS_CONF_OPTS = $(CVS_CONFIGURE_ARGS) - define CVS_BZIP_UNPACK $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2 From 9553dc9a55c13916c26aaae4fac037d35ddacca3 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 15 Mar 2024 23:43:16 +0000 Subject: [PATCH 283/345] package/gmp: fix target build with host gcc 4.9 GMP does not build if the host gcc is v4.9 due to the following error gen-sieve.c: In function 'setmask': gen-sieve.c:99:3: error: 'for' loop initial declarations are only allowed in C99 or C11 mode for (unsigned i = 0; i < 2 * a * b; ++i) ^ gen-sieve.c:99:3: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code The gen-sieve utility was added in GMP v6.3.0. It is built using CC_FOR_BUILD (host compiler) during cross compilation as it generates build files. Autoconf does not have a macro for add -std=c99 to CC_FOR_BUILD, so it must be set manually. For the target, it is set correctly thanks to the AC_PROG_CC_C99 macro. Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle --- package/gmp/gmp.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/gmp/gmp.mk b/package/gmp/gmp.mk index bd401c6a80ea..7e8da9025c93 100644 --- a/package/gmp/gmp.mk +++ b/package/gmp/gmp.mk @@ -14,6 +14,8 @@ GMP_CPE_ID_VENDOR = gmplib GMP_DEPENDENCIES = host-m4 HOST_GMP_DEPENDENCIES = host-m4 +GMP_CONF_ENV += CC_FOR_BUILD="$(HOSTCC) -std=c99" + # GMP doesn't support assembly for coldfire or mips r6 ISA yet # Disable for ARM v7m since it has different asm constraints ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CPU_ARMV7M),y) From c21a0556db93a85b3363e4a5b6e3a832d061ccfd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:31 +0100 Subject: [PATCH 284/345] {toolchain, linux-headers}: add support for 6.7 headers And add (and default to) 6.7 to linux-headers. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 977ad30f7302..6b0c5de1f600 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fe4fc5011e79..1c2500fb7989 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_6 + default BR2_KERNEL_HEADERS_6_7 help Select the kernel version to get headers from. @@ -47,6 +47,10 @@ config BR2_KERNEL_HEADERS_6_1 config BR2_KERNEL_HEADERS_6_6 bool "Linux 6.6.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 + +config BR2_KERNEL_HEADERS_6_7 + bool "Linux 6.7.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -124,8 +128,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 + bool "6.7.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 - bool "6.6.x or later" + bool "6.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5 @@ -409,6 +417,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.15.151" if BR2_KERNEL_HEADERS_5_15 default "6.1.81" if BR2_KERNEL_HEADERS_6_1 default "6.6.21" if BR2_KERNEL_HEADERS_6_6 + default "6.7.10" if BR2_KERNEL_HEADERS_6_7 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index 1641dbae0628..d71fb96d40f1 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -645,6 +645,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -658,6 +662,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 default "6.4" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_4 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 5554d56719ab..a7c239dcabd5 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -162,8 +162,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_7 + bool "6.7.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6 - bool "6.6.x or later" + bool "6.6.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_5 From 75bad69099dfb66433feaf4accf1105e1f8a4319 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:35 +0100 Subject: [PATCH 285/345] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- linux/linux.hash | 12 ++++++------ package/linux-headers/Config.in.host | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 6b0c5de1f600..5595e51fe016 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,13 +1,13 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz -sha256 ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 linux-6.6.21.tar.xz -sha256 0ebd861c6fd47bb0a9d3a09664d704833d1a54750c7bf9c4ad8b5e9cbd49342b linux-6.1.81.tar.xz +sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz +sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 8a1e760bf2660947234109aa4fdbbe3686238b4e852157b96c59356689107e49 linux-5.15.151.tar.xz -sha256 0cf3e467bd8d35533888327e9f8a9a9d354fdf83e8f82e9fe5a234f896a07493 linux-5.10.212.tar.xz -sha256 cdbc61334cdadbd3945b08f03ed197c65bdf358c3383a4334b3e5b483bd95850 linux-5.4.271.tar.xz +sha256 f0805225f4a5b24d0bba9302c2c2f261c04f737ac5dd931da9b112e9f3e4a47e linux-5.15.152.tar.xz +sha256 84cf30223239ec3333a5f7b2a7fba2042bba70d1582a139f7543956af871ad80 linux-5.10.213.tar.xz +sha256 3599d5959a403e64be407d7f05e56cb270d6ddd154e89a596609919ab1e2e366 linux-5.4.272.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 95ada7aa6ef1c69d7a469432f936365e35b004d24e751d82c21a371edd2c84f9 linux-4.19.309.tar.xz +sha256 95ec94c4ab8f46d8a54430893f9bd653c46b0f1587d216818aa8f52fd313de69 linux-4.19.310.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz sha256 b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441 linux-cip-5.10.162-cip24-rt10.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 1c2500fb7989..874a0a261c34 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -411,12 +411,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.19.309" if BR2_KERNEL_HEADERS_4_19 - default "5.4.271" if BR2_KERNEL_HEADERS_5_4 - default "5.10.212" if BR2_KERNEL_HEADERS_5_10 - default "5.15.151" if BR2_KERNEL_HEADERS_5_15 - default "6.1.81" if BR2_KERNEL_HEADERS_6_1 - default "6.6.21" if BR2_KERNEL_HEADERS_6_6 + default "4.19.310" if BR2_KERNEL_HEADERS_4_19 + default "5.4.272" if BR2_KERNEL_HEADERS_5_4 + default "5.10.213" if BR2_KERNEL_HEADERS_5_10 + default "5.15.152" if BR2_KERNEL_HEADERS_5_15 + default "6.1.82" if BR2_KERNEL_HEADERS_6_1 + default "6.6.22" if BR2_KERNEL_HEADERS_6_6 default "6.7.10" if BR2_KERNEL_HEADERS_6_7 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL From f30f5e4f61e72a507df96bea1960a9388c780a82 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 22:37:18 +0100 Subject: [PATCH 286/345] package/pure-ftpd: remove optional dependency to libiconv Buildroot commit 26d5d1c0a20719876220b429a43f8b1bcc29138b removed the configure option --with-rfc2640 due to upstream commit: https://github.com/jedisct1/pure-ftpd/commit/33eda763bfca8dfcf736275272b84602dcd18549 In the same upstream commit the iconv support was also removed because it was only needed for rfc2640 support, this removal was forgotten in the forementioned buildroot commit. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/pure-ftpd/pure-ftpd.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pure-ftpd/pure-ftpd.mk b/package/pure-ftpd/pure-ftpd.mk index ffd27d7b9926..b918c7093036 100644 --- a/package/pure-ftpd/pure-ftpd.mk +++ b/package/pure-ftpd/pure-ftpd.mk @@ -10,7 +10,6 @@ PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 PURE_FTPD_LICENSE = ISC PURE_FTPD_LICENSE_FILES = COPYING PURE_FTPD_CPE_ID_VENDOR = pureftpd -PURE_FTPD_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) PURE_FTPD_CONF_OPTS = \ --with-altlog \ From 24e996d14d28decfb9863996456b6b2720939422 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 10:58:11 +0100 Subject: [PATCH 287/345] package/xvisor: fix build without python interpreter Fix the following build failures on a system not providing the "python" interpreter binary raised at least since bump to version 0.3.1 in commit c4f8b8968770ecbf6444a5921c6472f126717626 and more probably since the addition of the package in commit e23ddf0c13e6d3b054782b86188396a0c2add1a5 and https://github.com/xvisor/xvisor/commit/ba904b4066f4b375cb1ad76ca41570741dbec62e: /bin/sh: line 1: /home/buildroot/autobuild/instance-2/output-1/build/xvisor-0.3.1/tools/scripts/d2c.py: cannot execute: required file not found or /bin/sh: /home/buildroot/instance-0/output-1/build/xvisor-0.3.2/tools/scripts/d2c.py: /usr/bin/python: bad interpreter: No such file or directory Fixes: - http://autobuild.buildroot.org/results/2e100bacc9e9face8351287e4c979c1729709d7b - http://autobuild.buildroot.org/results/5d8a08512db1b3095158753e3a7843b0fd6c9749 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...plicitly-use-the-python3-interpreter.patch | 35 +++++++++++++++++++ package/xvisor/xvisor.mk | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch diff --git a/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch b/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch new file mode 100644 index 000000000000..349d4415e2c7 --- /dev/null +++ b/package/xvisor/0001-TOOLS-d2c-py-explicitly-use-the-python3-interpreter.patch @@ -0,0 +1,35 @@ +From 888c94e7a121d96aa88f84c58fe7e2bd771fc5ac Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Fri, 25 Aug 2023 21:56:37 +0200 +Subject: [PATCH] TOOLS: d2c.py: explicitly use the python3 interpreter + +When compiling Xvisor on a system not providing the "python" +interpreter binary, compilation fails with output: + + (d2c) core/vio/keymaps/modifiers.c + /bin/sh: 1: /build/xvisor-0.3.2/tools/scripts/d2c.py: not found + +This commit fixes the issue following the PEP 394 recommendation: +https://peps.python.org/pep-0394/ + +It sets the "shebang" to `#! /usr/bin/env python3` to allow using other +interpreters in the PATH, or virtual environment. + +Signed-off-by: Julien Olivain + +Upstream: https://github.com/xvisor/xvisor/commit/888c94e7a121d96aa88f84c58fe7e2bd771fc5ac +Signed-off-by: Fabrice Fontaine +--- + tools/scripts/d2c.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/scripts/d2c.py b/tools/scripts/d2c.py +index b46a7bc468..daac4a5450 100755 +--- a/tools/scripts/d2c.py ++++ b/tools/scripts/d2c.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#! /usr/bin/env python3 + #/** + # Copyright (c) 2013 Anup Patel. + # All rights reserved. diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index eba37be9b7a2..2a51706b55a9 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -11,7 +11,7 @@ XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING XVISOR_INSTALL_IMAGES = YES XVISOR_INSTALL_TARGET = NO -XVISOR_DEPENDENCIES = host-bison host-dtc host-flex +XVISOR_DEPENDENCIES = host-bison host-dtc host-flex host-python3 XVISOR_MAKE_TARGETS = all From 4eba5e002c1e71b1d8decba101f9b8f945a9cd3a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 11:53:26 +0100 Subject: [PATCH 288/345] package/libunwind: drop autoreconf Commit 67d87bf7d255cd05f84fab3e3625e073b5bfccf8 forgot to drop autoreconf Fixes: 67d87bf7d255cd05f84fab3e3625e073b5bfccf8 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libunwind/libunwind.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index d7ddb8f179e9..15c4e4863f5a 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -10,7 +10,6 @@ LIBUNWIND_INSTALL_STAGING = YES LIBUNWIND_LICENSE_FILES = COPYING LIBUNWIND_LICENSE = MIT LIBUNWIND_CPE_ID_VALID = YES -LIBUNWIND_AUTORECONF = YES LIBUNWIND_CONF_OPTS = \ --disable-tests \ From 766c1613aed2fe10bee96b8b515f88bb6ee7a310 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 11:55:29 +0100 Subject: [PATCH 289/345] package/libunwind: fix libucontext handling Commit 6ea2a27f9047696ce1c463ad55fb4a78df136954 forgot to add -lucontext to LIBS resulting in the following build failure with zeromq: /home/buildroot/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/i586-buildroot-linux-musl/9.3.0/../../../../i586-buildroot-linux-musl/bin/ld: /home/buildroot/instance-0/output-1/host/i586-buildroot-linux-musl/sysroot/usr/lib32/libunwind.so.8: undefined reference to `setcontext' Fixes: 6ea2a27f9047696ce1c463ad55fb4a78df136954 - http://autobuild.buildroot.org/results/893defe1588b2ca03c115b59b47be3f4aed438fb Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/libunwind/libunwind.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libunwind/libunwind.mk b/package/libunwind/libunwind.mk index 15c4e4863f5a..94e9bbd1b876 100644 --- a/package/libunwind/libunwind.mk +++ b/package/libunwind/libunwind.mk @@ -17,6 +17,7 @@ LIBUNWIND_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_LIBUCONTEXT),y) LIBUNWIND_DEPENDENCIES += libucontext +LIBUNWIND_CONF_OPTS += LIBS=-lucontext endif $(eval $(autotools-package)) From b6816034ebddd522a8fef9daa454c28fa1230dd6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2024 15:14:38 +0100 Subject: [PATCH 290/345] package/privoxy: fix build with root Fix the following build failure when the configuration files are installed as root: id: 'privoxy': no such user ****************************************************************** WARNING! WARNING! installing config files as root! It is strongly recommended to run privoxy as a non-root user, and to install the config files as that user and/or group! Please read INSTALL, and create a privoxy user and group! ******************************************************************* make[1]: *** [GNUmakefile:861: install] Error 1 This failure is probably raised since the addition of the package in commit f8a263fe361ab37ec6765b9ff6478c3b15e3d139 and https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=26baf6bcc0b5db47b8cf5c55eece0614712b5180 Fixes: - http://autobuild.buildroot.org/results/28d8ca6f0e2d81d62196a0958c9274ad2c8c9871 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- ...on-t-exit-if-configuration-files-are.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch diff --git a/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch b/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch new file mode 100644 index 000000000000..e04d191ce007 --- /dev/null +++ b/package/privoxy/0001-GNUmakefile-in-Don-t-exit-if-configuration-files-are.patch @@ -0,0 +1,30 @@ +From 4b3b267db159dc23314de3062859481b7c397e32 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 17 Mar 2024 12:36:31 +0100 +Subject: [PATCH] GNUmakefile.in: Don't exit if configuration files are + installed as root + +... as this can be considered acceptable when cross-compiling +Privoxy inside an autobuilder with only a root user. + +Upstream: https://www.privoxy.org/gitweb/?p=privoxy.git;a=commit;h=4b3b267db159dc23314de3062859481b7c397e32 +Signed-off-by: Fabrice Fontaine +--- + GNUmakefile.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/GNUmakefile.in b/GNUmakefile.in +index 04cceb15..cf79aae1 100644 +--- a/GNUmakefile.in ++++ b/GNUmakefile.in +@@ -927,7 +927,6 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T + $(ECHO) " and to install the config files as that user and/or group!" ;\ + $(ECHO) " Please read INSTALL, and create a privoxy user and group!" ;\ + $(ECHO) "*******************************************************************" ;\ +- exit 1 ;\ + fi ;\ + else \ + GROUP_T=$(GROUP) ;\ +-- +2.39.2 + From 0b96e29723029c0a856cd558a21218fbbede7234 Mon Sep 17 00:00:00 2001 From: Javad Rahimipetroudi Date: Tue, 19 Mar 2024 13:23:42 +0100 Subject: [PATCH 291/345] configs/avenger96_defconfig: bump U-Boot version to 2024.01 Signed-off-by: Javad Rahimipetroudi Signed-off-by: Arnout Vandecappelle --- configs/avenger96_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 536899583cfb..82702bcfc73e 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -41,7 +41,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32mp15_trusted" # BR2_TARGET_UBOOT_FORMAT_BIN is not set BR2_TARGET_UBOOT_FORMAT_DTB=y From 21629634adee2e0c5541ff1d74b8bd297676815f Mon Sep 17 00:00:00 2001 From: Javad Rahimipetroudi Date: Tue, 19 Mar 2024 13:23:43 +0100 Subject: [PATCH 292/345] configs/avenger96_defconfig: bump Linux version to 6.6.22 LTS This patch upgrades Kernel version to 6.6.22 LTS on avenger96 board. Beside that, In accordance with the kernel 6.5rc1 commit 724ba6751532 ("ARM: dts: Move .dts files to vendor sub-directories") the device tree path also has been modified to point the device tree in the proper location. As another change, due to commit 3108eb2e8aa7 ("mmc: mmci: Set PROBE_PREFER_ASYNCHRONOUS"), the order of SD card and eMMC probing has swapped. The SD card is now mmcblk0 instead of mmcblk1. Thus, the default root append (mmcblk1p4) in 'extlinux.conf' file in the overlay directory of the board is changed, otherwise the rootfs was not possible to be detected. Signed-off-by: Javad Rahimipetroudi Signed-off-by: Arnout Vandecappelle --- board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf | 2 +- configs/avenger96_defconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf b/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf index 5d506b3daeae..7d6d7f8a4476 100644 --- a/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf +++ b/board/arrow/avenger96/overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label stm32mp157c-dk2-buildroot kernel /boot/zImage devicetree /boot/stm32mp157a-dhcor-avenger96.dtb - append root=/dev/mmcblk1p4 rootwait + append root=/dev/mmcblk0p4 rootwait diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 82702bcfc73e..218955fc0268 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -3,7 +3,7 @@ BR2_arm=y BR2_cortex_a7=y # Linux headers same as kernel, a 5.8 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System configuration BR2_GLOBAL_PATCH_DIR="board/arrow/avenger96/patches" @@ -13,10 +13,10 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-im # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32mp157a-dhcor-avenger96" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="st/stm32mp157a-dhcor-avenger96" BR2_LINUX_KERNEL_INSTALL_TARGET=y BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From b9b40901d1bd27aef9de13391956c959899581c6 Mon Sep 17 00:00:00 2001 From: Javad Rahimipetroudi Date: Tue, 19 Mar 2024 13:23:44 +0100 Subject: [PATCH 293/345] configs/avenger96_defconfig: bump ATF version to v2.8 LTS This patch upgrades the ATF version to the v2.8 LTS version. Please note that due to DTS changes from upstream commit 51e223058fe70b311542178f1865514745fa7874 ("feat(stm32mp15-fdts): add Avenger96 board with STM32MP157A DHCOR SoM") The ATF additional build variable is also modified to use the new DTS file. Note that the old DTS file still exists, but no longer works. Furthermore, the 'E=0' flag is removed from ATF additional build variable. It was added by commit deb8d71c9285eb60bc3d28e8abcf7208f78980a7 to avoid TFA build failure because of '-Werror' flag. However, from version v2.6 or later, it is not required anymore, the compiler warning was fixed. The ATF patch "board/arrow/avenger96/patches/arm-trusted-firmware/ 0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch" also has been removed. As it was not required due to using the new dhcore DTS file for the ATF build. Signed-off-by: Javad Rahimipetroudi [Arnout: switch to BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_8_VERSION instead of custom lts-v2.8.16] Signed-off-by: Arnout Vandecappelle --- ...ger96.dts-enable-hash-device-to-unbr.patch | 51 ------------------- configs/avenger96_defconfig | 5 +- 2 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 board/arrow/avenger96/patches/arm-trusted-firmware/0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch diff --git a/board/arrow/avenger96/patches/arm-trusted-firmware/0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch b/board/arrow/avenger96/patches/arm-trusted-firmware/0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch deleted file mode 100644 index 8cec0af3b1ff..000000000000 --- a/board/arrow/avenger96/patches/arm-trusted-firmware/0001-stm32mp157a-avenger96.dts-enable-hash-device-to-unbr.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 336dc301e02d64507447f82020ce7a349797bef3 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sun, 5 Nov 2023 14:59:16 +0100 -Subject: [PATCH] stm32mp157a-avenger96.dts: enable hash device to unbreak boot - issue - -The avenger96 board was forgotten when authentication support was added with -commit 4bdb1a7a6a1325343 (stm32mp1: add authentication support for -stm32image), causing a panic when stm32mp_init_auth() is called, so fix it -similar to how it was done for the STM32MP157C-ED1 board with: - -commit b37b52ef8bc05bfd8dcca992d4ba84cd7c5d23bb -Author: Yann Gautier -Date: Tue Oct 13 18:05:06 2020 +0200 - - fdts: add missing hash node in STM32MP157C-ED1 board DT - - Without this node, the board fails to boot and panics in the function - stm32mp_init_auth(). - - Change-Id: Ia54924410dac2a8c94dd6e45d7e93977fe7d87e2 - Signed-off-by: Yann Gautier - -Upstream: N/A - Upstream reworked authentication to skip it for MP157A - variant since v2.7, see "feat(st): disable authentication based on - part_number" - (https://github.com/ARM-software/arm-trusted-firmware/commit/49abdfd8cececb91a4bc7e7b29a30c09dce461c7) - -Signed-off-by: Peter Korsgaard ---- - fdts/stm32mp157a-avenger96.dts | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/fdts/stm32mp157a-avenger96.dts b/fdts/stm32mp157a-avenger96.dts -index b967736e4..76edecb83 100644 ---- a/fdts/stm32mp157a-avenger96.dts -+++ b/fdts/stm32mp157a-avenger96.dts -@@ -271,6 +271,10 @@ - }; - }; - -+&hash1 { -+ status = "okay"; -+}; -+ - &rng1 { - status = "okay"; - }; --- -2.39.2 - diff --git a/configs/avenger96_defconfig b/configs/avenger96_defconfig index 218955fc0268..f73b654dc877 100644 --- a/configs/avenger96_defconfig +++ b/configs/avenger96_defconfig @@ -6,7 +6,6 @@ BR2_cortex_a7=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y # System configuration -BR2_GLOBAL_PATCH_DIR="board/arrow/avenger96/patches" BR2_ROOTFS_OVERLAY="board/arrow/avenger96/overlay/" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/stmicroelectronics/common/stm32mp157/post-image.sh" @@ -29,13 +28,13 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # Bootloaders BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="lts-v2.8.16" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="stm32mp1" BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE="u-boot-nodtb.bin" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-avenger96.dtb E=0 BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="STM32MP_SDMMC=1 AARCH32_SP=sp_min DTB_FILE_NAME=stm32mp157a-dhcor-avenger96.dtb BL33_CFG=$(BINARIES_DIR)/u-boot.dtb" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="fip.bin *.stm32" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_DTC=y BR2_TARGET_UBOOT=y From d8a729d1731339da141612be33c5e59bc9928748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Fri, 22 Mar 2024 00:07:38 +0100 Subject: [PATCH 294/345] package/igt-gpu-tools: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit IGT GPU Tools is a collection of tools for development and testing of the DRM drivers Signed-off-by: Gaël PORTAY Signed-off-by: Andy Yan Signed-off-by: Bernd Kuhls [Bernd: v4 - add myself to DEVELOPERS - add dependencies to locales, mmu, wchar and headers >= 4.11 - rework libunwind dependency - remove duplicate libglib2 dependency v5 - added optional dependency to json_c - remove broken igt_stats binary v6 - updated patch series after upstream review v8 - bumped to current git HEAD to fix musl build errors - removed all patches which are included in upstream repo - added fix for segfaults with hardened toolchains on x86/x86_64] Signed-off-by: Bernd Kuhls Signed-off-by: Francois Dugast [Francois: v7 - depend on !BR2_RELRO_FULL - remove specific workaround for igt_stats binary] Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/Config.in | 1 + package/igt-gpu-tools/Config.in | 32 +++++++++++++++ package/igt-gpu-tools/igt-gpu-tools.hash | 5 +++ package/igt-gpu-tools/igt-gpu-tools.mk | 52 ++++++++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 package/igt-gpu-tools/Config.in create mode 100644 package/igt-gpu-tools/igt-gpu-tools.hash create mode 100644 package/igt-gpu-tools/igt-gpu-tools.mk diff --git a/DEVELOPERS b/DEVELOPERS index 328c654faed1..c045a8cd7c6e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -372,6 +372,7 @@ F: package/gpsd/ F: package/gptfdisk/ F: package/hddtemp/ F: package/hdparm/ +F: package/igt-gpu-tools/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ diff --git a/package/Config.in b/package/Config.in index c677c3ff4a9d..1a62bfb1be65 100644 --- a/package/Config.in +++ b/package/Config.in @@ -323,6 +323,7 @@ comment "Graphic applications" source "package/glmark2/Config.in" source "package/glslsandbox-player/Config.in" source "package/gnuplot/Config.in" + source "package/igt-gpu-tools/Config.in" source "package/ivi-homescreen/Config.in" source "package/jhead/Config.in" source "package/kmscube/Config.in" diff --git a/package/igt-gpu-tools/Config.in b/package/igt-gpu-tools/Config.in new file mode 100644 index 000000000000..809c8e28ac5b --- /dev/null +++ b/package/igt-gpu-tools/Config.in @@ -0,0 +1,32 @@ +config BR2_PACKAGE_IGT_GPU_TOOLS + bool "igt-gpu-tools" + depends on BR2_USE_MMU # fork() + depends on BR2_ENABLE_LOCALE + depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_PACKAGE_HAS_UDEV + depends on BR2_USE_WCHAR # elfutils + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 # linux/dma-buf.h + select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_ELFUTILS + select BR2_PACKAGE_KMOD + select BR2_PACKAGE_LIBDRM + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBPCIACCESS + select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_PROCPS_NG + select BR2_PACKAGE_ZLIB + help + IGT GPU Tools is a collection of tools for development and + testing of the DRM drivers. + + https://gitlab.freedesktop.org/drm/igt-gpu-tools + +comment "igt-gpu-tools needs udev /dev management and toolchain w/ threads, wchar, dynamic library, locale, headers >= 4.11" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_HAS_UDEV || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_ENABLE_LOCALE || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 diff --git a/package/igt-gpu-tools/igt-gpu-tools.hash b/package/igt-gpu-tools/igt-gpu-tools.hash new file mode 100644 index 000000000000..bf760b91d7e3 --- /dev/null +++ b/package/igt-gpu-tools/igt-gpu-tools.hash @@ -0,0 +1,5 @@ +# Locally calculated from download +sha256 de6e9443d569e76333ec6c8ffc53937b6831224161fe69bf2f07efad3bd0e04a igt-gpu-tools-0ee4074685c1e184f2d3612ea6eb4d126f9a2e23.tar.bz2 + +# Hash for license file: +sha256 1b7e266857b05808660f42369a4a797459d7b7bec7245e378aa28a8db2f213da COPYING diff --git a/package/igt-gpu-tools/igt-gpu-tools.mk b/package/igt-gpu-tools/igt-gpu-tools.mk new file mode 100644 index 000000000000..927a1225a5e5 --- /dev/null +++ b/package/igt-gpu-tools/igt-gpu-tools.mk @@ -0,0 +1,52 @@ +################################################################################ +# +# igt-gpu-tools +# +################################################################################ + +IGT_GPU_TOOLS_VERSION = 0ee4074685c1e184f2d3612ea6eb4d126f9a2e23 +IGT_GPU_TOOLS_SOURCE = igt-gpu-tools-$(IGT_GPU_TOOLS_VERSION).tar.bz2 +IGT_GPU_TOOLS_SITE = https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/archive/$(IGT_GPU_TOOLS_VERSION) +IGT_GPU_TOOLS_LICENSE = MIT +IGT_GPU_TOOLS_LICENSE_FILES = COPYING +IGT_GPU_TOOLS_INSTALL_STAGING = YES +IGT_GPU_TOOLS_DEPENDENCIES = \ + host-pkgconf \ + cairo \ + elfutils \ + kmod \ + libdrm \ + libglib2 \ + libpciaccess \ + pixman \ + procps-ng \ + udev \ + zlib + +# On x86 systems, libigt resolves igt_half_to_float and igt_float_to_half as +# indirect functions at runtime by checking CPU features with igt_x86_features. +# The igt_x86_features function is implemented is a different object and the +# call uses the PLT itself. If lazy binding is disabled, this causes a segfault +# while resolving the symbols for libigt on x64 systems. Disable BINDNOW on X86 +# systems to prevent the segfaults. +# https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/102 +# https://bugs.gentoo.org/788625#c13 +ifeq ($(BR2_i386)$(BR2_x86_64)x$(BR2_RELRO_NONE),yx) +IGT_GPU_TOOLS_LDFLAGS = $(TARGET_LDFLAGS) -Wl,-z,lazy +endif + +ifeq ($(BR2_PACKAGE_JSON_C),y) +IGT_GPU_TOOLS_CONF_OPTS += -Drunner=enabled +IGT_GPU_TOOLS_DEPENDENCIES += json-c +else +IGT_GPU_TOOLS_CONF_OPTS += -Drunner=disabled +endif + +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +IGT_GPU_TOOLS_CONF_OPTS += -Dlibunwind=enabled +IGT_GPU_TOOLS_DEPENDENCIES += libunwind +else +IGT_GPU_TOOLS_CONF_OPTS += -Dlibunwind=disabled +endif + +$(eval $(meson-package)) From 958085d5f6a90c46f812c64bbe4ac2963f83bca1 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 12 Mar 2024 19:38:36 +0100 Subject: [PATCH 295/345] package/bitcoin: add the wallet support option The bitcoin Buildroot package has always disabled the wallet support. This commit adds a config option to enable this support. This allows the bitcoin-cli command to create wallets, generate addresses and send an amount to a given address. Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- package/bitcoin/Config.in | 10 ++++++++++ package/bitcoin/bitcoin.mk | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/package/bitcoin/Config.in b/package/bitcoin/Config.in index c4a2447fc959..060cae24f5f6 100644 --- a/package/bitcoin/Config.in +++ b/package/bitcoin/Config.in @@ -36,6 +36,16 @@ config BR2_PACKAGE_BITCOIN https://bitcoincore.org +if BR2_PACKAGE_BITCOIN + +config BR2_PACKAGE_BITCOIN_WALLET + bool "wallet support" + select BR2_PACKAGE_SQLITE + help + Enable bitcoin wallet support. + +endif + comment "bitcoin needs a toolchain w/ C++, threads, wchar, gcc >= 9" depends on BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS diff --git a/package/bitcoin/bitcoin.mk b/package/bitcoin/bitcoin.mk index 493c569336a0..2f8a1777a269 100644 --- a/package/bitcoin/bitcoin.mk +++ b/package/bitcoin/bitcoin.mk @@ -13,14 +13,27 @@ BITCOIN_CPE_ID_VENDOR = bitcoin BITCOIN_CPE_ID_PRODUCT = bitcoin_core BITCOIN_DEPENDENCIES = host-pkgconf boost libevent BITCOIN_MAKE_ENV = BITCOIN_GENBUILD_NO_GIT=1 +# Berkeley Database (bdb) support is always disabled. It is only +# needed for legacy wallet format. New wallets are using SQLite. BITCOIN_CONF_OPTS = \ --disable-bench \ - --disable-wallet \ --disable-tests \ --with-boost-libdir=$(STAGING_DIR)/usr/lib/ \ --disable-hardening \ + --without-bdb \ --without-gui +ifeq ($(BR2_PACKAGE_BITCOIN_WALLET),y) +BITCOIN_DEPENDENCIES += sqlite +BITCOIN_CONF_OPTS += \ + --enable-wallet \ + --with-sqlite +else +BITCOIN_CONF_OPTS += \ + --disable-wallet \ + --without-sqlite +endif + ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) BITCOIN_DEPENDENCIES += libminiupnpc BITCOIN_CONF_OPTS += --with-miniupnpc From bc76d786a40548333be5cb9c0833e458498c06dd Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 15 Mar 2024 22:05:01 +0100 Subject: [PATCH 296/345] support/testing: add bitcoin runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + support/testing/tests/package/test_bitcoin.py | 184 ++++++++++++++++++ 2 files changed, 185 insertions(+) create mode 100644 support/testing/tests/package/test_bitcoin.py diff --git a/DEVELOPERS b/DEVELOPERS index c045a8cd7c6e..cb2132e67ae3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1771,6 +1771,7 @@ F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ F: support/testing/tests/package/test_apache.py F: support/testing/tests/package/test_bc.py +F: support/testing/tests/package/test_bitcoin.py F: support/testing/tests/package/test_brotli.py F: support/testing/tests/package/test_bzip2.py F: support/testing/tests/package/test_compressor_base.py diff --git a/support/testing/tests/package/test_bitcoin.py b/support/testing/tests/package/test_bitcoin.py new file mode 100644 index 000000000000..93aa9383ab6b --- /dev/null +++ b/support/testing/tests/package/test_bitcoin.py @@ -0,0 +1,184 @@ +import os +import time + +import infra.basetest + + +class TestBitcoin(infra.basetest.BRTest): + # infra.basetest.BASIC_TOOLCHAIN_CONFIG cannot be used as it does + # not include BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS + # needed by bitcoin. This config also uses an ext4 rootfs as + # bitcoind needs some free disk space to start (so we avoid having + # a larger initrd in RAM). + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.81" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_BITCOIN=y + BR2_PACKAGE_BITCOIN_WALLET=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="256M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + # Command prefix for the bitcoin command line interface. + cli_cmd = "bitcoin-cli -regtest" + + def create_btc_wallet(self, wallet_name): + """Create an empty wallet.""" + cmd = f"{self.cli_cmd} -named createwallet wallet_name={wallet_name}" + self.assertRunOk(cmd) + + def gen_btc_address(self, wallet_name): + """Generate an address in a wallet.""" + cmd = f"{self.cli_cmd} -rpcwallet={wallet_name} getnewaddress" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return out[0] + + def init_wallet(self, wallet_name): + """Create a wallet and generate an address in it.""" + self.create_btc_wallet(wallet_name) + return self.gen_btc_address(wallet_name) + + def get_wallet_balance(self, wallet): + """Return the (confirmed) balance of a wallet.""" + cmd = f"{self.cli_cmd} -rpcwallet={wallet} getbalance" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return float(out[0]) + + def get_wallet_unconfirmed_balance(self, wallet): + """Return the unconfirmed balance of a wallet.""" + cmd = f"{self.cli_cmd} -rpcwallet={wallet} getunconfirmedbalance" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return float(out[0]) + + def get_block_count(self): + """Returns the height of the most-work fully-validated chain.""" + cmd = f"{self.cli_cmd} getblockcount" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + return int(out[0]) + + def test_run(self): + drive = os.path.join(self.builddir, "images", "rootfs.ext4") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["root=/dev/vda console=ttyAMA0"], + options=["-M", "virt", + "-cpu", "cortex-a53", + "-m", "256M", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Values for the test. + wallet1 = "AliceWallet" + wallet2 = "BobWallet" + btc_test_amount = 10 + btc_fee = 0.00001 + req_blk_count = 101 + + # Check the binary can execute. + self.assertRunOk("bitcoind --version") + + # This cleanup is useful when run-test -k is used. It makes + # this test idempotent. Since the drive storage is preserved + # between reboots, this cleanup will make sure the test always + # starts from a clean state. + cmd = "rm -rf ~/.bitcoin" + self.assertRunOk(cmd) + + # The bitcoin daemon is not started. A client ping is expected + # to fail. + ping_cmd = f"{self.cli_cmd} ping" + _, ret = self.emulator.run(ping_cmd) + self.assertNotEqual(ret, 0) + + # Start the daemon. + cmd = f"bitcoind -regtest -daemonwait -fallbackfee={btc_fee:f}" + self.assertRunOk(cmd) + + time.sleep(2 * self.timeout_multiplier) + + # Now the daemon is started, the ping is expected to succeed. + self.assertRunOk(ping_cmd) + + # We create two wallets and addresses. + btc_addr1 = self.init_wallet(wallet1) + btc_addr2 = self.init_wallet(wallet2) + + # Since the regression test block chain is at its genesis + # block, we expect a height of zero. + cur_blk_cnt = self.get_block_count() + self.assertEqual(cur_blk_cnt, 0) + + # We also expect our wallets to be empty. + for wallet in [wallet1, wallet2]: + balance = self.get_wallet_balance(wallet) + self.assertAlmostEqual(balance, 0.0) + + # We request the generation of several blocks for address + # #1. We should receive the 50 BTC reward at this address. + cmd = self.cli_cmd + cmd += f" generatetoaddress {req_blk_count} {btc_addr1}" + self.assertRunOk(cmd) + + # We should now see the previously created blocks. + cur_blk_cnt = self.get_block_count() + self.assertEqual(cur_blk_cnt, req_blk_count) + + # We should also see the 50 BTC reward in the wallet #1. + balance = self.get_wallet_balance(wallet1) + self.assertAlmostEqual(balance, 50.0) + + # The wallet #2 should still be empty. + balance = self.get_wallet_balance(wallet2) + self.assertAlmostEqual(balance, 0.0) + + # We send an amount from wallet #1 to #2. + cmd = f"{self.cli_cmd} -rpcwallet={wallet1}" + cmd += f" sendtoaddress {btc_addr2} {btc_test_amount}" + self.assertRunOk(cmd) + + # The wallet #1 balance is expected to be subtracted by the + # spent amount and the transaction fees. + expected_balance = 50 - btc_test_amount - btc_fee + balance = self.get_wallet_balance(wallet1) + self.assertAlmostEqual(balance, expected_balance, places=4) + + # The transaction is sent, but not confirmed yet. So we should + # still see a (confirmed) balance of zero. + balance = self.get_wallet_balance(wallet2) + self.assertAlmostEqual(balance, 0.0) + + # We should see the transferred amount in the unconfirmed + # balance. + balance = self.get_wallet_unconfirmed_balance(wallet2) + self.assertAlmostEqual(balance, btc_test_amount) + + # We generate 1 block to address #2. This action will confirm + # the previous transaction (but this will not give the 50 BTC + # reward). + cmd = f"{self.cli_cmd} generatetoaddress 1 {btc_addr2}" + self.assertRunOk(cmd) + + # We should see one more block. + cur_blk_cnt = self.get_block_count() + self.assertEqual(cur_blk_cnt, req_blk_count + 1) + + # We should now see the amount in the confirmed balance. + balance = self.get_wallet_balance(wallet2) + self.assertAlmostEqual(balance, btc_test_amount) + + # The unconfirmed balance should now be zero. + balance = self.get_wallet_unconfirmed_balance(wallet2) + self.assertAlmostEqual(balance, 0.0) From 44c221c856a473179daeb9e49bcb89af2b1b1405 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:32 +0100 Subject: [PATCH 297/345] package/busybox: remove tc from default config Busybox tc fails to build with kernel >= 6.8 For details see https://bugs.busybox.net/show_bug.cgi?id=15934 In addition, tc is a very rarely used tool, so not something that you expect to be available in busybox by default. Therefore, remove it from the default config. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- package/busybox/busybox-minimal.config | 3 +-- package/busybox/busybox.config | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 1e7ad1d357e1..5d2a30806ac8 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -955,8 +955,7 @@ CONFIG_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set -CONFIG_TC=y -CONFIG_FEATURE_TC_INGRESS=y +# CONFIG_TC is not set # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 6e8bd2799d1b..cfd16172fa6d 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -968,8 +968,7 @@ CONFIG_FEATURE_FANCY_PING=y CONFIG_ROUTE=y # CONFIG_SLATTACH is not set # CONFIG_SSL_CLIENT is not set -CONFIG_TC=y -CONFIG_FEATURE_TC_INGRESS=y +# CONFIG_TC is not set # CONFIG_TCPSVD is not set # CONFIG_UDPSVD is not set CONFIG_TELNET=y From 807a44925697b9567d5bd9872a334a073b3dcf55 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:33 +0100 Subject: [PATCH 298/345] {toolchain, linux-headers}: add support for 6.8 headers And add (and default to) 6.8 to linux-headers. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- linux/linux.hash | 1 + package/linux-headers/Config.in.host | 13 +++++++++++-- toolchain/Config.in | 5 +++++ .../toolchain-external-custom/Config.in.options | 6 +++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index 5595e51fe016..4fa9f701cd5a 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,4 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 8d0c8936e3140a0fbdf511ad7a9f21121598f3656743898f47bb9052d37cff68 linux-6.8.1.tar.xz sha256 a9b99fb376f9fcd699c7c252aeef3bb5ba26280eb049711ac091b2eb2b487c03 linux-6.7.10.tar.xz sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz sha256 d150d2d9d416877668d8b56f75759f166168d192419eefaa942ed67225cbec06 linux-6.1.82.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 874a0a261c34..4c3651450eae 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -3,7 +3,7 @@ comment "Kernel Header Options" choice prompt "Kernel Headers" default BR2_KERNEL_HEADERS_AS_KERNEL if BR2_LINUX_KERNEL - default BR2_KERNEL_HEADERS_6_7 + default BR2_KERNEL_HEADERS_6_8 help Select the kernel version to get headers from. @@ -51,6 +51,10 @@ config BR2_KERNEL_HEADERS_6_6 config BR2_KERNEL_HEADERS_6_7 bool "Linux 6.7.x kernel headers" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 + +config BR2_KERNEL_HEADERS_6_8 + bool "Linux 6.8.x kernel headers" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 select BR2_KERNEL_HEADERS_LATEST config BR2_KERNEL_HEADERS_VERSION @@ -128,8 +132,12 @@ choice If your kernel headers are more recent than the latest version in the choice, then select the latest version. +config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8 + bool "6.8.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 + config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_7 - bool "6.7.x or later" + bool "6.7.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 config BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6 @@ -418,6 +426,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "6.1.82" if BR2_KERNEL_HEADERS_6_1 default "6.6.22" if BR2_KERNEL_HEADERS_6_6 default "6.7.10" if BR2_KERNEL_HEADERS_6_7 + default "6.8.1" if BR2_KERNEL_HEADERS_6_8 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \ diff --git a/toolchain/Config.in b/toolchain/Config.in index d71fb96d40f1..e8b3db64fb96 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -649,6 +649,10 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 bool select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 + +config BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 + bool + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 select BR2_TOOLCHAIN_HEADERS_LATEST # This should be selected by the latest version, above, to indicate that @@ -662,6 +666,7 @@ config BR2_TOOLCHAIN_HEADERS_LATEST # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_HEADERS_AT_LEAST string + default "6.8" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 default "6.7" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 default "6.6" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 default "6.5" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_5 diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index a7c239dcabd5..f7825cb88eb7 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -162,8 +162,12 @@ choice If your toolchain uses headers newer than the latest version in the choice, then select the latest version. +config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_8 + bool "6.8.x or later" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 + config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_7 - bool "6.7.x or later" + bool "6.7.x" select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_7 config BR2_TOOLCHAIN_EXTERNAL_HEADERS_6_6 From 3ba99f0a5aa15222f5517f041154e09b8d6a98b1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 16 Mar 2024 09:43:34 +0100 Subject: [PATCH 299/345] linux: bump latest version to 6.8 Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle --- linux/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index df84cce539e5..2767b709d466 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -28,8 +28,8 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "Latest version (6.6)" - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_6 if BR2_KERNEL_HEADERS_AS_KERNEL + bool "Latest version (6.8)" + select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_8 if BR2_KERNEL_HEADERS_AS_KERNEL config BR2_LINUX_KERNEL_LATEST_CIP_VERSION bool "Latest CIP SLTS version (5.10.162-cip24)" @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.21" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.8.1" if BR2_LINUX_KERNEL_LATEST_VERSION default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \ From f98239dada59270efe19de9d9fae50ec9ab9d28c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 18:28:55 +0100 Subject: [PATCH 300/345] package/giflib: bump to version 5.2.2 - Refresh first and fourth patches - Drop second nad third patches (already in version) https://sourceforge.net/p/giflib/code/ci/5.2.2/tree/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .checkpackageignore | 1 - ...dd-targets-to-manage-static-building.patch | 44 ++++++------- package/giflib/0002-Fix-CVE-2022-28506.patch | 34 ----------- ...veral-defects-found-by-Coverity-scan.patch | 59 ++++++++++++++++++ package/giflib/0003-Fix-CVE-2023-39742.patch | 36 ----------- ...veral-defects-found-by-Coverity-scan.patch | 61 ------------------- package/giflib/giflib.hash | 5 +- package/giflib/giflib.mk | 7 +-- 8 files changed, 86 insertions(+), 161 deletions(-) delete mode 100644 package/giflib/0002-Fix-CVE-2022-28506.patch create mode 100644 package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch delete mode 100644 package/giflib/0003-Fix-CVE-2023-39742.patch delete mode 100644 package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch diff --git a/.checkpackageignore b/.checkpackageignore index ef1c661812d9..0735b0c5dad6 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -459,7 +459,6 @@ package/genromfs/0001-build-system.patch Sob Upstream package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch Upstream package/gerbera/S99gerbera Indent package/giblib/0001-fix-imlib2-detection.patch Upstream -package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch Upstream package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream diff --git a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch index 384457d0bd91..ba8d426bea11 100644 --- a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch +++ b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch @@ -8,8 +8,7 @@ targets to allow the user to build giflib when dynamic library support is not available or enable on the toolchain Signed-off-by: Fabrice Fontaine -[Upstream status: -https://sourceforge.net/p/giflib/code/merge-requests/7] +Upstream: https://sourceforge.net/p/giflib/code/merge-requests/7 --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) @@ -18,16 +17,19 @@ diff --git a/Makefile b/Makefile index b2bf6de..111f52f 100644 --- a/Makefile +++ b/Makefile -@@ -61,10 +61,17 @@ UTILS = $(INSTALLABLE) \ +@@ -91,13 +91,20 @@ LIBUTILSO = libutil.$(SOEXTENSION) + LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION) + endif - LDLIBS=libgif.a -lm - --all: libgif.so libgif.a libutil.so libutil.a $(UTILS) -+SHARED_LIBS = libgif.so libutil.so +-all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS) ++SHARED_LIBS = $(LIBGIFSO) $(LIBUTILSO) +STATIC_LIBS = libgif.a libutil.a + +all: shared-lib static-lib $(UTILS) + ifeq ($(UNAME), Darwin) + else $(MAKE) -C doc + endif -$(UTILS):: libgif.a libutil.a +$(UTILS):: $(STATIC_LIBS) @@ -36,18 +38,18 @@ index b2bf6de..111f52f 100644 + +static-lib: $(STATIC_LIBS) - libgif.so: $(OBJECTS) $(HEADERS) - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) -@@ -79,7 +86,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) + $(LIBGIFSO): $(OBJECTS) $(HEADERS) + ifeq ($(UNAME), Darwin) +@@ -120,7 +127,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) $(AR) rcs libutil.a $(UOBJECTS) clean: -- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif.so libutil.a libutil.so *.o +- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a $(LIBGIFSO) libutil.a $(LIBUTILSO) *.o + rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o - rm -f libgif.so.$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) - rm -f libgif.so.$(LIBMAJOR) - rm -fr doc/*.1 *.html doc/staging -@@ -96,12 +103,15 @@ install-bin: $(INSTALLABLE) + rm -f $(LIBGIFSOVER) + rm -f $(LIBGIFSOMAJOR) + rm -fr doc/*.[17] *.html doc/staging +@@ -145,12 +152,15 @@ install-bin: $(INSTALLABLE) install-include: $(INSTALL) -d "$(DESTDIR)$(INCDIR)" $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" @@ -57,13 +59,13 @@ index b2bf6de..111f52f 100644 $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" +install-shared-lib: + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" - $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" - ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" - ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" + $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)" + ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)" + ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" +install-lib: install-static-lib install-shared-lib install-man: - $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" - $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7" + $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1" -- -2.20.1 +2.43.0 diff --git a/package/giflib/0002-Fix-CVE-2022-28506.patch b/package/giflib/0002-Fix-CVE-2022-28506.patch deleted file mode 100644 index 35d5f60a95d2..000000000000 --- a/package/giflib/0002-Fix-CVE-2022-28506.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c0cca041fc4fb6748d8dff3675fe7a839253d668 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:24:32 -0700 -Subject: [PATCH] Fix CVE-2022-28506 - -From: giflib-5.2.1-17.fc39.src.rpm -Fixes https://nvd.nist.gov/vuln/detail/CVE-2022-28506 -Upstream: https://sourceforge.net/p/giflib/bugs/159/ - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - gif2rgb.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gif2rgb.c b/gif2rgb.c -index 8d7c0ff..d9a469f 100644 ---- a/gif2rgb.c -+++ b/gif2rgb.c -@@ -294,6 +294,11 @@ static void DumpScreen2RGB(char *FileName, int OneFileFlag, - GifRow = ScreenBuffer[i]; - GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); - for (j = 0, BufferP = Buffer; j < ScreenWidth; j++) { -+ /* Check if color is within color palete */ -+ if (GifRow[j] >= ColorMap->ColorCount) -+ { -+ GIF_EXIT(GifErrorString(D_GIF_ERR_IMAGE_DEFECT)); -+ } - ColorMapEntry = &ColorMap->Colors[GifRow[j]]; - *BufferP++ = ColorMapEntry->Red; - *BufferP++ = ColorMapEntry->Green; --- -2.43.0 - diff --git a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch new file mode 100644 index 000000000000..f6816d07530a --- /dev/null +++ b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch @@ -0,0 +1,59 @@ +From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Tue, 5 Dec 2023 16:38:48 -0700 +Subject: [PATCH] Fix several defects found by Coverity scan + +From: giflib-5.2.1-17.fc39.src.rpm +Upstream: Not submitted + +Signed-off-by: Sandro Mani +Signed-off-by: Adam Duskett +[Fabrice: updated for 5.2.2] +Signed-off-by: Fabrice Fontaine +--- + gif2rgb.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/gif2rgb.c b/gif2rgb.c +index d9a469f..02cea41 100644 +--- a/gif2rgb.c ++++ b/gif2rgb.c +@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, + /* Open stdout for the output file: */ + if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, + EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == + GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -187,6 +191,8 @@ static void SaveGif(GifByteType *OutputBuffer, + + for (i = 0; i < Height; i++) { + if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + GifQprintf("\b\b\b\b%-4d", Height - i - 1); +@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, + + if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + } +-- +2.43.0 + diff --git a/package/giflib/0003-Fix-CVE-2023-39742.patch b/package/giflib/0003-Fix-CVE-2023-39742.patch deleted file mode 100644 index 2ba01ac8a4d7..000000000000 --- a/package/giflib/0003-Fix-CVE-2023-39742.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4288b993ee9df6550a367fe06ede3c003dc7bbc6 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:35:40 -0700 -Subject: [PATCH] Fix CVE-2023-39742 - -From: giflib-5.2.1-17.fc39.src.rpm -Fix segmentation faults due to non correct checking for args -Fixes: https://nvd.nist.gov/vuln/detail/CVE-2023-39742 -Upstream: https://sourceforge.net/p/giflib/bugs/166/ - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - getarg.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/getarg.c b/getarg.c -index d569f6c..51fbe0b 100644 ---- a/getarg.c -+++ b/getarg.c -@@ -307,6 +307,12 @@ GAGetParmeters(void *Parameters[], - int i = 0, ScanRes; - - while (!(ISSPACE(CtrlStrCopy[i]))) { -+ -+ if ((*argv) == argv_end) { -+ GAErrorToken = Option; -+ return CMD_ERR_NumRead; -+ } -+ - switch (CtrlStrCopy[i + 1]) { - case 'd': /* Get signed integers. */ - ScanRes = sscanf(*((*argv)++), "%d", --- -2.43.0 - diff --git a/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch deleted file mode 100644 index 171976987227..000000000000 --- a/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:38:48 -0700 -Subject: [PATCH] Fix several defects found by Coverity scan - -From: giflib-5.2.1-17.fc39.src.rpm -Upstream: Not submitted - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - gif2rgb.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/gif2rgb.c b/gif2rgb.c -index d9a469f..02cea41 100644 ---- a/gif2rgb.c -+++ b/gif2rgb.c -@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, - /* Open stdout for the output file: */ - if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - -@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, - EGifPutImageDesc(GifFile, - 0, 0, Width, Height, false, NULL) == GIF_ERROR) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - -@@ -187,8 +191,11 @@ static void SaveGif(GifByteType *OutputBuffer, - GifFile->Image.Width, GifFile->Image.Height); - - for (i = 0; i < Height; i++) { -- if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) -+ if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); -+ } - GifQprintf("\b\b\b\b%-4d", Height - i - 1); - - Ptr += Width; -@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, - - if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - } --- -2.43.0 - diff --git a/package/giflib/giflib.hash b/package/giflib/giflib.hash index 445e9c4b3ded..f11d4f15059c 100644 --- a/package/giflib/giflib.hash +++ b/package/giflib/giflib.hash @@ -1,5 +1,6 @@ # From http://sourceforge.net/projects/giflib/files -md5 6f03aee4ebe54ac2cc1ab3e4b0a049e5 giflib-5.2.1.tar.gz -sha1 c3f774dcbdf26afded7788979c8081d33c6426dc giflib-5.2.1.tar.gz +md5 913dd251492134e235ee3c9a91987a4d giflib-5.2.2.tar.gz +sha1 608ba98d2dd8d03dfa7476f434d57de50a33e10b giflib-5.2.2.tar.gz # Locally computed +sha256 be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb giflib-5.2.2.tar.gz sha256 0c9b7990ecdca88b676db232c226548ac408b279f550d424d996f0d83591dd8e COPYING diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index 3ac74f924447..770338507bcd 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -4,18 +4,13 @@ # ################################################################################ -GIFLIB_VERSION = 5.2.1 +GIFLIB_VERSION = 5.2.2 GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING GIFLIB_CPE_ID_VALID = YES -# 0002-Fix-CVE-2022-28506.patch -GIFLIB_IGNORE_CVES = CVE-2022-28506 -# 0003-Fix-CVE-2023-39742.patch -GIFLIB_IGNORE_CVES += CVE-2023-39742 - ifeq ($(BR2_STATIC_LIBS),y) GIFLIB_BUILD_LIBS = static-lib GIFLIB_INSTALL_LIBS = install-static-lib From bb4371d0863a2714e81b81bb2d5bafe18b4b3110 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 25 Mar 2024 07:48:13 +0100 Subject: [PATCH 301/345] package/doc-asciidoc.mk: unbreak docs logic after pkgdir change Commit 748fc4be21e (package/pkg-utils.mk: remove trailing slash in pkgdir definition) broke the docs generation logic: make manual-html >>> Preparing the manual sources... >>> Generating HTML manual... a2x: ERROR: missing ASCIIDOC_FILE: /home/peko/source/buildroot/output/build/docs/manual/manual.adoc make: *** [docs/manual/manual.mk:12: /home/peko/source/buildroot/output/docs/manual/manual.html] Error 1 As it now ends up with the .adoc file one level below (../docs/manual/manual/manual.adoc). The reason is that the pkgdir macro is used to define $(2)_DOCDIR, which is passed to rsync: rsync -a docs/manual /home/peko/source/buildroot/output/build/docs/manual Fix it by appending a / to the rsync arguments like we do elsewhere. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle --- package/doc-asciidoc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk index 40c9a725d115..d6ecd1e30ee3 100644 --- a/package/doc-asciidoc.mk +++ b/package/doc-asciidoc.mk @@ -155,7 +155,7 @@ $(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced: $$(Q)$$(call MESSAGE,"Preparing the $(1) sources...") $$(Q)mkdir -p $$(@D) - $$(Q)rsync -a $$($(2)_DOCDIR) $$(@D) + $$(Q)rsync -a $$($(2)_DOCDIR)/ $$(@D)/ $$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep)) .PHONY: $(1)-prepare-sources From 7a480207fda5ebfba0b4138f491975880ed773cc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 25 Mar 2024 09:41:51 +0100 Subject: [PATCH 302/345] package/openssh: drop autoreconf Commit 9496ff57e54c (package/openssh: bump to version 9.7p1) dropped 0001-better-detection-of-broken-fzero-call-used-regs.patch but forgot to drop the autoreconf. Do that now. Signed-off-by: Peter Korsgaard --- package/openssh/openssh.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index ce5525312095..f0b499590a55 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -13,9 +13,6 @@ OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable OPENSSH_LICENSE = BSD-3-Clause, BSD-2-Clause, Public Domain OPENSSH_LICENSE_FILES = LICENCE -# 0001-better-detection-of-broken-fzero-call-used-regs.patch -OPENSSH_AUTORECONF = YES - OPENSSH_CONF_ENV = \ LD="$(TARGET_CC)" \ LDFLAGS="$(TARGET_CFLAGS)" \ From 7f08dc612c2a52a297c50bc047d5fabd7ef7317c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 25 Mar 2024 13:23:14 +0100 Subject: [PATCH 303/345] package/xvisor: use BR2_PYTHON3_HOST_DEPENDENCY to ensure python3 is available Commit 24e996d14d28d (package/xvisor: fix build without python interpreter) added a dependency on host-python3 for the d2c.py script, but this script does not use any non-standard python modules so we can instead use BR2_PYTHON3_HOST_DEPENDENCY to only build host-python3 if the build host does not have python3. Signed-off-by: Peter Korsgaard --- package/xvisor/xvisor.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/xvisor/xvisor.mk b/package/xvisor/xvisor.mk index 2a51706b55a9..c1b61270f15c 100644 --- a/package/xvisor/xvisor.mk +++ b/package/xvisor/xvisor.mk @@ -11,7 +11,7 @@ XVISOR_LICENSE = GPL-2.0+ XVISOR_LICENSE_FILES = COPYING XVISOR_INSTALL_IMAGES = YES XVISOR_INSTALL_TARGET = NO -XVISOR_DEPENDENCIES = host-bison host-dtc host-flex host-python3 +XVISOR_DEPENDENCIES = host-bison host-dtc host-flex $(BR2_PYTHON3_HOST_DEPENDENCY) XVISOR_MAKE_TARGETS = all From dd2eec6b2fc8fd949ff37b3572fee21850851e14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Zwing?= Date: Mon, 25 Mar 2024 20:27:04 +0100 Subject: [PATCH 304/345] package/p7zip: bump to version v17.05 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The project now has its own group on github, so switch to that one. Also update the Config.in URL to point to that one - the sourceforge project is pretty much abandoned. What's Changed - add UTF-8 support for Client7z by @flyfishzy in #214 - fix issue 130 by @jinfeihan57 in 295dac8 Signed-off-by: André Zwing [Arnout: also update URL; extend commit message] Signed-off-by: Arnout Vandecappelle --- package/p7zip/Config.in | 2 +- package/p7zip/p7zip.hash | 2 +- package/p7zip/p7zip.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/p7zip/Config.in b/package/p7zip/Config.in index be2206eb7690..f1b80d2d7783 100644 --- a/package/p7zip/Config.in +++ b/package/p7zip/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_P7ZIP 7-Zip is a file archiver with highest compression ratio. - http://sourceforge.net/projects/p7zip + https://github.com/p7zip-project/p7zip if BR2_PACKAGE_P7ZIP diff --git a/package/p7zip/p7zip.hash b/package/p7zip/p7zip.hash index 0048777d8971..f0b9c2711341 100644 --- a/package/p7zip/p7zip.hash +++ b/package/p7zip/p7zip.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef p7zip-17.04.tar.gz +sha256 d2788f892571058c08d27095c22154579dfefb807ebe357d145ab2ddddefb1a6 p7zip-17.05.tar.gz sha256 555806657dcf0f1e720b581c52643c195ec86ae3f00bd18cc66d2e0f88ffa210 DOC/License.txt diff --git a/package/p7zip/p7zip.mk b/package/p7zip/p7zip.mk index b6c5adae2647..803fd38b7f93 100644 --- a/package/p7zip/p7zip.mk +++ b/package/p7zip/p7zip.mk @@ -4,8 +4,8 @@ # ################################################################################ -P7ZIP_VERSION = 17.04 -P7ZIP_SITE = $(call github,jinfeihan57,p7zip,v$(P7ZIP_VERSION)) +P7ZIP_VERSION = 17.05 +P7ZIP_SITE = $(call github,p7zip-project,p7zip,v$(P7ZIP_VERSION)) P7ZIP_LICENSE = LGPL-2.1+ with unRAR restriction P7ZIP_LICENSE_FILES = DOC/License.txt P7ZIP_CPE_ID_VENDOR = 7-zip From 189dd76fd7ce791cfd7a4f9afede52224a8ca1ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Tue, 27 Feb 2024 12:38:15 -0300 Subject: [PATCH 305/345] package/rsyslog: bump version to 8.2402.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós Signed-off-by: Thomas Petazzoni --- package/rsyslog/rsyslog.hash | 2 +- package/rsyslog/rsyslog.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rsyslog/rsyslog.hash b/package/rsyslog/rsyslog.hash index 9c003653559a..212a1accead4 100644 --- a/package/rsyslog/rsyslog.hash +++ b/package/rsyslog/rsyslog.hash @@ -1,5 +1,5 @@ # From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 774032006128a896437f5913e132aa27dbfb937cd8847e449522d5a12d63d03e rsyslog-8.2312.0.tar.gz +sha256 acbdd8579489df36b4a383dc6909a61b7623807f0aff54c062115f2de7ea85ba rsyslog-8.2402.0.tar.gz # Locally calculated sha256 054b3a047d9232376a46b87356b19b0c0c2924cb5e6911ab96a01fc4b515f083 COPYING diff --git a/package/rsyslog/rsyslog.mk b/package/rsyslog/rsyslog.mk index dc30a2edcd3c..fac78795c27e 100644 --- a/package/rsyslog/rsyslog.mk +++ b/package/rsyslog/rsyslog.mk @@ -4,7 +4,7 @@ # ################################################################################ -RSYSLOG_VERSION = 8.2312.0 +RSYSLOG_VERSION = 8.2402.0 RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog RSYSLOG_LICENSE = GPL-3.0, LGPL-3.0, Apache-2.0 RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 From 425b5ba6809c55e5368060afd2a7aabfb9113572 Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Tue, 27 Feb 2024 15:01:23 +0300 Subject: [PATCH 306/345] package/sdbus-cpp: bump to version 1.5.0 Changelog: https://github.com/Kistler-Group/sdbus-cpp/releases/tag/v1.5.0 Signed-off-by: Sergey Bobrenok Signed-off-by: Thomas Petazzoni --- package/sdbus-cpp/sdbus-cpp.hash | 2 +- package/sdbus-cpp/sdbus-cpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sdbus-cpp/sdbus-cpp.hash b/package/sdbus-cpp/sdbus-cpp.hash index f4336228af06..b5ca7ecdffb0 100644 --- a/package/sdbus-cpp/sdbus-cpp.hash +++ b/package/sdbus-cpp/sdbus-cpp.hash @@ -1,4 +1,4 @@ # Locally computed: -sha256 ca7405c7f0f9ae3023dcfa37bc68974c4b8a1c9ea2909b970e0aedc3e8657ee6 sdbus-cpp-1.4.0.tar.gz +sha256 577986929f911320fb9ef6a3e2badd464dc38411ebc25d2966f5cb85c39f0897 sdbus-cpp-1.5.0.tar.gz sha256 20c17d8b8c48a600800dfd14f95d5cb9ff47066a9641ddeab48dc54aec96e331 COPYING sha256 a1c9e75e25d8f2ce18017c88978edab2f0dbc7814ad0697d4ff2e5e59959f657 COPYING-LGPL-Exception diff --git a/package/sdbus-cpp/sdbus-cpp.mk b/package/sdbus-cpp/sdbus-cpp.mk index 9ffaeb26d2b9..18fc6a88a96b 100644 --- a/package/sdbus-cpp/sdbus-cpp.mk +++ b/package/sdbus-cpp/sdbus-cpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDBUS_CPP_VERSION = 1.4.0 +SDBUS_CPP_VERSION = 1.5.0 SDBUS_CPP_SITE = $(call github,Kistler-Group,sdbus-cpp,v$(SDBUS_CPP_VERSION)) SDBUS_CPP_INSTALL_STAGING = YES SDBUS_CPP_DEPENDENCIES = host-pkgconf systemd From e999c9fbaec0ab3f31fb3058b3f6e37c4cad9abe Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Mar 2024 17:51:05 -0800 Subject: [PATCH 307/345] package/go-bootstrap-stage2: bump version to go1.19.13 Update to the latest 1.19.x version available. Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/go-bootstrap-stage2/go-bootstrap-stage2.hash | 2 +- package/go-bootstrap-stage2/go-bootstrap-stage2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash index 6d4c718a405b..d61663cac9ea 100644 --- a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 e25c9ab72d811142b7f41ff6da5165fec2d1be5feec3ef2c66bc0bdecb431489 go1.19.11.src.tar.gz +sha256 ccf36b53fb0024a017353c3ddb22c1f00bc7a8073c6aac79042da24ee34434d3 go1.19.13.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk index 72f3200a2ef0..98bf624b5751 100644 --- a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk +++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk @@ -6,7 +6,7 @@ # Use last Go version that go-bootstrap-stage1 can build: v1.19.x # See https://golang.org/doc/install/source#bootstrapFromSource -GO_BOOTSTRAP_STAGE2_VERSION = 1.19.11 +GO_BOOTSTRAP_STAGE2_VERSION = 1.19.13 GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz From f00eb37de9b4b0ddbdeb5c7ebae48c883c27e132 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Mar 2024 17:51:06 -0800 Subject: [PATCH 308/345] package/go-bootstrap-stage3: add stage3 for go1.22 support Add a third bootstrap stage with Go1.21.x necessary for go1.22 bootstrap. go-bootstrap-stage1 is Go1.4.x, the final version to support bootstrap using a C compiler (later versions require the Go compiler for bootstrapping). See: https://go.dev/doc/install/source#bootstrapFromSource go-bootstrap-stage2 is Go 1.19.13, the last version to support bootstrap using the Go1.4.x compiler. go-bootstrap-stage3 is Go 1.21.8, the last version to support bootstrap using the Go1.19.13 compiler. Go 1.20 requires a minimum of go 1.17.13 to bootstrap. See: https://go.dev/doc/go1.20#bootstrap This patch is in preparation for bumping the host-go package to >go1.22.x, which requires a minimum of Go1.20.x for bootstrap. See: https://go.dev/doc/go1.22#bootstrap Signed-off-by: Christian Stewart [Arnout: add GOCACHE definition] Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/Config.in.host | 1 + package/go-bootstrap-stage3/Config.in.host | 4 ++ .../go-bootstrap-stage3.hash | 3 ++ .../go-bootstrap-stage3.mk | 54 +++++++++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 package/go-bootstrap-stage3/Config.in.host create mode 100644 package/go-bootstrap-stage3/go-bootstrap-stage3.hash create mode 100644 package/go-bootstrap-stage3/go-bootstrap-stage3.mk diff --git a/DEVELOPERS b/DEVELOPERS index cb2132e67ae3..99b0b1ec8f8a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -596,6 +596,7 @@ F: package/fuse-overlayfs/ F: package/go/ F: package/go-bootstrap-stage1/ F: package/go-bootstrap-stage2/ +F: package/go-bootstrap-stage3/ F: package/gocryptfs/ F: package/mbpfan/ F: package/moby-buildkit/ diff --git a/package/Config.in.host b/package/Config.in.host index f03ca16b7b79..9543a22ffc6a 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -46,6 +46,7 @@ menu "Host utilities" source "package/go/Config.in.host" source "package/go-bootstrap-stage1/Config.in.host" source "package/go-bootstrap-stage2/Config.in.host" + source "package/go-bootstrap-stage3/Config.in.host" source "package/google-breakpad/Config.in.host" source "package/gptfdisk/Config.in.host" source "package/imagemagick/Config.in.host" diff --git a/package/go-bootstrap-stage3/Config.in.host b/package/go-bootstrap-stage3/Config.in.host new file mode 100644 index 000000000000..1714c2fb1523 --- /dev/null +++ b/package/go-bootstrap-stage3/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS diff --git a/package/go-bootstrap-stage3/go-bootstrap-stage3.hash b/package/go-bootstrap-stage3/go-bootstrap-stage3.hash new file mode 100644 index 000000000000..b1aed10c7c4a --- /dev/null +++ b/package/go-bootstrap-stage3/go-bootstrap-stage3.hash @@ -0,0 +1,3 @@ +# From https://go.dev/dl +sha256 dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 go1.21.8.src.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go-bootstrap-stage3/go-bootstrap-stage3.mk b/package/go-bootstrap-stage3/go-bootstrap-stage3.mk new file mode 100644 index 000000000000..bdc84595952f --- /dev/null +++ b/package/go-bootstrap-stage3/go-bootstrap-stage3.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# go-bootstrap-stage3 +# +################################################################################ + +# Use last Go version that go-bootstrap-stage2 can build: v1.21.x +# See https://go.dev/doc/go1.22#bootstrap +GO_BOOTSTRAP_STAGE3_VERSION = 1.21.8 +GO_BOOTSTRAP_STAGE3_SITE = https://storage.googleapis.com/golang +GO_BOOTSTRAP_STAGE3_SOURCE = go$(GO_BOOTSTRAP_STAGE3_VERSION).src.tar.gz + +GO_BOOTSTRAP_STAGE3_LICENSE = BSD-3-Clause +GO_BOOTSTRAP_STAGE3_LICENSE_FILES = LICENSE + +# Use go-bootstrap-stage2 to bootstrap. +HOST_GO_BOOTSTRAP_STAGE3_DEPENDENCIES = host-go-bootstrap-stage2 + +HOST_GO_BOOTSTRAP_STAGE3_ROOT = $(HOST_DIR)/lib/go-$(GO_BOOTSTRAP_STAGE3_VERSION) + +# The go build system is not compatible with ccache, so use +# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. +HOST_GO_BOOTSTRAP_STAGE3_MAKE_ENV = \ + GO111MODULE=off \ + GOCACHE=$(HOST_GO_HOST_CACHE) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT_FINAL=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ + GOROOT="$(@D)" \ + GOBIN="$(@D)/bin" \ + GOOS=linux \ + CC=$(HOSTCC_NOCCACHE) \ + CXX=$(HOSTCXX_NOCCACHE) \ + CGO_ENABLED=0 + +define HOST_GO_BOOTSTRAP_STAGE3_BUILD_CMDS + cd $(@D)/src && \ + $(HOST_GO_BOOTSTRAP_STAGE3_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) +endef + +define HOST_GO_BOOTSTRAP_STAGE3_INSTALL_CMDS + $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/bin/go + $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/bin/gofmt + + cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/ + + mkdir -p $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/pkg + cp -a $(@D)/pkg/include $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/pkg/ + cp -a $(@D)/pkg/tool $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/pkg/ + + # The Go sources must be installed to the host/ tree for the Go stdlib. + cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_STAGE3_ROOT)/ +endef + +$(eval $(host-generic-package)) From 84caea5d58b979490260e733841f2dde591b75cc Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 6 Mar 2024 17:51:07 -0800 Subject: [PATCH 309/345] package/go: bump to version go1.22.1 Upgrade Go to the latest v1.22.x point release, go1.22.1. This requires go-bootstrap-stage3 at version go1.21.8: See: https://go.dev/doc/go1.22#bootstrap https://go.dev/doc/devel/release#go1.22.1 Signed-off-by: Christian Stewart Signed-off-by: Arnout Vandecappelle --- package/go/Config.in.host | 4 ++-- package/go/go.hash | 2 +- package/go/go.mk | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/go/Config.in.host b/package/go/Config.in.host index b87b862cec09..0d89e875adc2 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,7 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS # See https://go.dev/doc/install/source#environment # See src/go/build/syslist.go for the list of supported architectures depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ @@ -30,4 +30,4 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE2_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS diff --git a/package/go/go.hash b/package/go/go.hash index b1aed10c7c4a..06d8776db27b 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 dc806cf75a87e1414b5b4c3dcb9dd3e9cc98f4cfccec42b7af617d5a658a3c43 go1.21.8.src.tar.gz +sha256 79c9b91d7f109515a25fc3ecdaad125d67e6bdb54f6d4d98580f46799caea321 go1.22.1.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 3ca055b25d78..a8ec5d95a0cd 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.21.8 +GO_VERSION = 1.22.1 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz @@ -12,7 +12,7 @@ GO_LICENSE = BSD-3-Clause GO_LICENSE_FILES = LICENSE GO_CPE_ID_VENDOR = golang -HOST_GO_DEPENDENCIES = host-go-bootstrap-stage2 +HOST_GO_DEPENDENCIES = host-go-bootstrap-stage3 HOST_GO_GOPATH = $(HOST_DIR)/share/go-path HOST_GO_HOST_CACHE = $(HOST_DIR)/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go @@ -128,7 +128,7 @@ HOST_GO_HOST_ENV = \ HOST_GO_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE2_ROOT) \ + GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ From 631647f4a7c580e8964515f275584a628eca61bd Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:12 -0600 Subject: [PATCH 310/345] package/flutter-packages/flutter-markdown-example: new package The maintainers of the flutter-gallery package archived the project as of February 16, 2024, necessitating a new reference package for users to port their Flutter applications to Buildroot. The flutter-packages repository is the perfect candidate for a reference package for several reasons: - It contains the source code for Flutter's first-party packages. - Many of the packages contain examples. - Many of the examples include Linux-specific examples. - The repository is updated regularly and often automatically, ensuring compatibility with the latest versions of Flutter. However, the layout of the flutter-packages repository stores all of the examples in sub-directories, which creates an organizational problem; either every example application is stored in packages/flutter-example-${name}, with the version, site, site_method, license, license_files, and dependencies of each package independent from each other, or, each example application is in a sub-directory of the flutter-packages directory, and flutter-packages acts as the primary source of the above variables. As option one is a nightmare to maintain, this patch provides option two, which only necessitates the use of two features rarely used together in Buildroot: $(PKG_NAME)_DL_SUBDIR and $(PKG_NAME)_SOURCE. With these two options appropriately set, each sub-package uses the flutter-packages source tarball, which downloads once, saving time, disk space, bandwidth, and future maintenance headaches. Three variables in the .mk file help with subsequent patches that add more example applications: - FLUTTER_MARKDOWN_EXAMPLE_PKG_NAME: - Set to the name of the application. - FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR: - It uses the PKG_NAME variable to set the installation directory. - FLUTTER_MARKDOWN_EXAMPLE_SUBDIR: - Provides the directory in which to build the package. With the above variables, adding subsequent packages involves minimal effort: - Copy, paste, and rename a sub-directory to a new package name. - Set the above variables to new names and directories. - Check to see if there are any new build commands, such as specifying a dart_plugin_registrant.dart file. Another option that seems appealing is to have a single package, with the Config.in options to select which example(s) to build. However, this option does not work well for two reasons: - The logic between this package and the flutter-gallery package it replaces would be very different. As the flutter-gallery package acts as a reference package for other users, changing the logic would make the package difficult to parse and possibly useless for other users to use as a reference when porting their Flutter-based applications to Buildroot. - Not all packages in the flutter-package repository use the same directory structure. Take, for example, the flutter-rfw-local-example. The build directory is located at rfw/example/local, whereas most other packages are at ${pkg_name}/example, which makes a pure-foreach loop impossible. These packages are intended for reference, and changing the logic instead of using the same would hinder users from attempting to port their Flutter applications to Buildroot. As such, this option is ruled out for the above reasons. The first package in this series is a Markdown example application that displays several Markdown formatting demos. However, it does not support inline HTML. This package also lacks a dart_plugin_registrant file, and unlike the flutter-gallery package, the lines referencing such a file are not included in the build commands. This is not a problem, but is something to note. Also, the `FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE)` line from the configure commands is not copied from the flutter-gallery package, as it was included by mistake and did not have any effecton the clean command. Note: The version of the flutter-packages git hash is set to 947e34ce9fedcdd6750b54eb1cc74b854b49ab48, the last commit that supported Flutter 3.16.x. Newer versions require Flutter 3.19.x Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 2 + package/Config.in | 1 + package/flutter-packages/Config.in | 15 ++++++ .../flutter-markdown-example/Config.in | 7 +++ .../flutter-markdown-example.hash | 1 + .../flutter-markdown-example.mk | 54 +++++++++++++++++++ .../flutter-packages/flutter-packages.hash | 3 ++ package/flutter-packages/flutter-packages.mk | 17 ++++++ 8 files changed, 100 insertions(+) create mode 100644 package/flutter-packages/Config.in create mode 100644 package/flutter-packages/flutter-markdown-example/Config.in create mode 120000 package/flutter-packages/flutter-markdown-example/flutter-markdown-example.hash create mode 100644 package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk create mode 100644 package/flutter-packages/flutter-packages.hash create mode 100644 package/flutter-packages/flutter-packages.mk diff --git a/DEVELOPERS b/DEVELOPERS index 99b0b1ec8f8a..cf2d9e93cded 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -33,6 +33,8 @@ F: package/fcft/ F: package/foot/ F: package/flutter-engine/ F: package/flutter-gallery/ +F: package/flutter-packages/ +F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ F: package/ivi-homescreen/ diff --git a/package/Config.in b/package/Config.in index 1a62bfb1be65..dfdc71685704 100644 --- a/package/Config.in +++ b/package/Config.in @@ -316,6 +316,7 @@ comment "Graphic applications" source "package/cog/Config.in" source "package/dmenu-wayland/Config.in" source "package/flutter-gallery/Config.in" + source "package/flutter-packages/Config.in" source "package/flutter-pi/Config.in" source "package/foot/Config.in" source "package/fswebcam/Config.in" diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in new file mode 100644 index 000000000000..7cedf7c4735f --- /dev/null +++ b/package/flutter-packages/Config.in @@ -0,0 +1,15 @@ +menuconfig BR2_PACKAGE_FLUTTER_PACKAGES + bool "flutter packages" + depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS + depends on BR2_PACKAGE_FLUTTER_ENGINE + select BR2_PACKAGE_HOST_FLUTTER_SDK_BIN + help + First-party Flutter package examples. + +if BR2_PACKAGE_FLUTTER_PACKAGES +source "package/flutter-packages/flutter-markdown-example/Config.in" +endif + +comment "flutter packages need flutter-engine" + depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS + depends on !BR2_PACKAGE_FLUTTER_ENGINE diff --git a/package/flutter-packages/flutter-markdown-example/Config.in b/package/flutter-packages/flutter-markdown-example/Config.in new file mode 100644 index 000000000000..939b21053c7b --- /dev/null +++ b/package/flutter-packages/flutter-markdown-example/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FLUTTER_MARKDOWN_EXAMPLE + bool "flutter markdown example" + help + A markdown renderer for Flutter. It supports the original + format, but no inline HTML. + + https://github.com/flutter/packages/tree/main/packages/flutter_markdown diff --git a/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.hash b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.hash new file mode 120000 index 000000000000..879f2adb39ee --- /dev/null +++ b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk new file mode 100644 index 000000000000..eb6792fb020b --- /dev/null +++ b/package/flutter-packages/flutter-markdown-example/flutter-markdown-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-markdown-example +# +################################################################################ + +FLUTTER_MARKDOWN_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_MARKDOWN_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_MARKDOWN_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_MARKDOWN_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_MARKDOWN_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_MARKDOWN_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_MARKDOWN_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_MARKDOWN_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_MARKDOWN_EXAMPLE_PKG_NAME = flutter_markdown_example +FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/$(FLUTTER_MARKDOWN_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_MARKDOWN_EXAMPLE_SUBDIR = packages/flutter_markdown/example + +define FLUTTER_MARKDOWN_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_MARKDOWN_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_MARKDOWN_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_MARKDOWN_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_MARKDOWN_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_MARKDOWN_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) diff --git a/package/flutter-packages/flutter-packages.hash b/package/flutter-packages/flutter-packages.hash new file mode 100644 index 000000000000..994434e25cec --- /dev/null +++ b/package/flutter-packages/flutter-packages.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 8276276e050c1ea45787f74b0f8c915b8cf2162b6af8537ffa9886bd423f2828 flutter-packages-947e34ce9fedcdd6750b54eb1cc74b854b49ab48-br1.tar.gz +sha256 89519eca6f7b9529b35bdddd623a58c3af06a88c458dbd6531ddb4675acf75a9 LICENSE diff --git a/package/flutter-packages/flutter-packages.mk b/package/flutter-packages/flutter-packages.mk new file mode 100644 index 000000000000..4beaa3932568 --- /dev/null +++ b/package/flutter-packages/flutter-packages.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# flutter-packages +# +################################################################################ + +FLUTTER_PACKAGES_VERSION = 947e34ce9fedcdd6750b54eb1cc74b854b49ab48 +FLUTTER_PACKAGES_SITE = $(call github,flutter,packages,$(FLUTTER_PACKAGES_VERSION)) +FLUTTER_PACKAGES_LICENSE = BSD-3-Clause +FLUTTER_PACKAGES_LICENSE_FILES = LICENSE +FLUTTER_PACKAGES_DL_SUBDIR = flutter-packages +FLUTTER_PACKAGES_SOURCE = flutter-packages-$(FLUTTER_PACKAGES_VERSION)-br1.tar.gz +FLUTTER_PACKAGES_DEPENDENCIES = \ + host-flutter-sdk-bin \ + flutter-engine + +include $(sort $(wildcard package/flutter-packages/*/*.mk)) From 88a300753a8c729714570fd1ac20eda9db074555 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:13 -0600 Subject: [PATCH 311/345] package/flutter-packages/flutter-adaptive-scaffold-example: new package This package provides a nice-looking Gmail lookalike application using Material 3. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../Config.in | 8 +++ .../flutter-adaptive-scaffold-example.hash | 1 + .../flutter-adaptive-scaffold-example.mk | 54 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 package/flutter-packages/flutter-adaptive-scaffold-example/Config.in create mode 120000 package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.hash create mode 100644 package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index cf2d9e93cded..7a909f947f07 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -34,6 +34,7 @@ F: package/foot/ F: package/flutter-engine/ F: package/flutter-gallery/ F: package/flutter-packages/ +F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index 7cedf7c4735f..9c4b42b74c63 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -7,6 +7,7 @@ menuconfig BR2_PACKAGE_FLUTTER_PACKAGES First-party Flutter package examples. if BR2_PACKAGE_FLUTTER_PACKAGES +source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" endif diff --git a/package/flutter-packages/flutter-adaptive-scaffold-example/Config.in b/package/flutter-packages/flutter-adaptive-scaffold-example/Config.in new file mode 100644 index 000000000000..f7c448e06c5f --- /dev/null +++ b/package/flutter-packages/flutter-adaptive-scaffold-example/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE + bool "flutter adaptive scaffold example" + help + Adaptive Scaffold reacts to input from users, devices and + screen elements and renders your Flutter application + according to the Material 3 guidelines. + + https://github.com/flutter/packages/tree/main/packages/flutter_adaptive_scaffold/example diff --git a/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.hash b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.hash new file mode 120000 index 000000000000..879f2adb39ee --- /dev/null +++ b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk new file mode 100644 index 000000000000..f6ac08611507 --- /dev/null +++ b/package/flutter-packages/flutter-adaptive-scaffold-example/flutter-adaptive-scaffold-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-adaptive-scaffold-example +# +################################################################################ + +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_PKG_NAME = flutter_adaptive_scaffold_example +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/$(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_SUBDIR = packages/flutter_adaptive_scaffold/example + +define FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_ADAPTIVE_SCAFFOLD_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From a3239d18257fa4e5cd8268959d553693fd141ebf Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:14 -0600 Subject: [PATCH 312/345] package/flutter-packages/flutter-animations-example: new package This package provides examples of the following animations: - OpenContainer - SharedAxisTransition - FadeThroughTransisiton - FadeScaleTransition The package also provides a toggle that slows all the animations. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../flutter-animations-example/Config.in | 6 +++ .../flutter-animations-example.hash | 1 + .../flutter-animations-example.mk | 54 +++++++++++++++++++ 5 files changed, 63 insertions(+) create mode 100644 package/flutter-packages/flutter-animations-example/Config.in create mode 120000 package/flutter-packages/flutter-animations-example/flutter-animations-example.hash create mode 100644 package/flutter-packages/flutter-animations-example/flutter-animations-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index 7a909f947f07..774f3748577f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -35,6 +35,7 @@ F: package/flutter-engine/ F: package/flutter-gallery/ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ +F: package/flutter-packages/flutter-animations-example/ F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index 9c4b42b74c63..365e91cd99da 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -8,6 +8,7 @@ menuconfig BR2_PACKAGE_FLUTTER_PACKAGES if BR2_PACKAGE_FLUTTER_PACKAGES source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" +source "package/flutter-packages/flutter-animations-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" endif diff --git a/package/flutter-packages/flutter-animations-example/Config.in b/package/flutter-packages/flutter-animations-example/Config.in new file mode 100644 index 000000000000..c7801dccf1d8 --- /dev/null +++ b/package/flutter-packages/flutter-animations-example/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_FLUTTER_ANIMATIONS_EXAMPLE + bool "flutter animations example" + help + High quality pre-built Animations for Flutter + + https://github.com/flutter/packages/tree/main/packages/animations/example diff --git a/package/flutter-packages/flutter-animations-example/flutter-animations-example.hash b/package/flutter-packages/flutter-animations-example/flutter-animations-example.hash new file mode 120000 index 000000000000..879f2adb39ee --- /dev/null +++ b/package/flutter-packages/flutter-animations-example/flutter-animations-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk b/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk new file mode 100644 index 000000000000..2b5c8967360f --- /dev/null +++ b/package/flutter-packages/flutter-animations-example/flutter-animations-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-animations-example +# +################################################################################ + +FLUTTER_ANIMATIONS_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_ANIMATIONS_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_ANIMATIONS_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_ANIMATIONS_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_ANIMATIONS_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_ANIMATIONS_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_ANIMATIONS_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_ANIMATIONS_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_ANIMATIONS_EXAMPLE_PKG_NAME = animations_example +FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/$(FLUTTER_ANIMATIONS_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_ANIMATIONS_EXAMPLE_SUBDIR = packages/animations/example + +define FLUTTER_ANIMATIONS_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_ANIMATIONS_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_ANIMATIONS_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_ANIMATIONS_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_ANIMATIONS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From a1b8cb90166c6e7cff0e4fcc53a490648080fdee Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:15 -0600 Subject: [PATCH 313/345] package/flutter-packages/flutter-dynamic-layouts-example: new package This package provides two multi-sized tiles and different layouts: Stagger and Wrap. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../flutter-dynamic-layouts-example/Config.in | 8 +++ .../flutter-dynamic-layouts-example.hash | 1 + .../flutter-dynamic-layouts-example.mk | 54 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 package/flutter-packages/flutter-dynamic-layouts-example/Config.in create mode 120000 package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash create mode 100644 package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index 774f3748577f..0ca7579f8b2a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -36,6 +36,7 @@ F: package/flutter-gallery/ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-animations-example/ +F: package/flutter-packages/flutter-dynamic-layouts-example/ F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index 365e91cd99da..17e68da8e12b 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -9,6 +9,7 @@ menuconfig BR2_PACKAGE_FLUTTER_PACKAGES if BR2_PACKAGE_FLUTTER_PACKAGES source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" source "package/flutter-packages/flutter-animations-example/Config.in" +source "package/flutter-packages/flutter-dynamic-layouts-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" endif diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/Config.in b/package/flutter-packages/flutter-dynamic-layouts-example/Config.in new file mode 100644 index 000000000000..a3f66307959f --- /dev/null +++ b/package/flutter-packages/flutter-dynamic-layouts-example/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE + bool "flutter dynamic layouts example" + help + This package provides support for multi sized tiles and + different layouts. Currently the layouts that are implemented + in this package are Stagger and Wrap. + + https://github.com/flutter/packages/tree/main/packages/dynamic_layouts/example diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash new file mode 120000 index 000000000000..879f2adb39ee --- /dev/null +++ b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk new file mode 100644 index 000000000000..aefcf3f62c9d --- /dev/null +++ b/package/flutter-packages/flutter-dynamic-layouts-example/flutter-dynamic-layouts-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-dynamic-layouts-example +# +################################################################################ + +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME = example +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/dynamc-layouts-$(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_SUBDIR = packages/dynamic_layouts/example + +define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_DYNAMIC_LAYOUTS_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From 26ab7ee00a0212db37da3189cfbd241ab8fe817e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:16 -0600 Subject: [PATCH 314/345] package/flutter-packages/flutter-go-router-example: new package A Flutter plugin that manages files and interactions with file dialogs. This package contains a dart_plugin_registrant dart file, much like the flutter-gallery package. The build commands contain the three lines from the flutter-gallery package referencing the dart_plugin_registrant dart file. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../flutter-go-router-example/Config.in | 7 +++ .../flutter-go-router-example.hash | 1 + .../flutter-go-router-example.mk | 57 +++++++++++++++++++ 5 files changed, 67 insertions(+) create mode 100644 package/flutter-packages/flutter-go-router-example/Config.in create mode 120000 package/flutter-packages/flutter-go-router-example/flutter-go-router-example.hash create mode 100644 package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index 0ca7579f8b2a..a4c8fba6d242 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -37,6 +37,7 @@ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-animations-example/ F: package/flutter-packages/flutter-dynamic-layouts-example/ +F: package/flutter-packages/flutter-go-router-example/ F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index 17e68da8e12b..bbcd3aec93ca 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -10,6 +10,7 @@ if BR2_PACKAGE_FLUTTER_PACKAGES source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" source "package/flutter-packages/flutter-animations-example/Config.in" source "package/flutter-packages/flutter-dynamic-layouts-example/Config.in" +source "package/flutter-packages/flutter-go-router-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" endif diff --git a/package/flutter-packages/flutter-go-router-example/Config.in b/package/flutter-packages/flutter-go-router-example/Config.in new file mode 100644 index 000000000000..8cdb61e3bc8e --- /dev/null +++ b/package/flutter-packages/flutter-go-router-example/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FLUTTER_GO_ROUTER_EXAMPLE + bool "flutter go router example" + help + A Flutter plugin that manages files and interactions + with file dialogs. + + https://github.com/flutter/packages/tree/main/packages/go_router/example diff --git a/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.hash b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.hash new file mode 120000 index 000000000000..879f2adb39ee --- /dev/null +++ b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk new file mode 100644 index 000000000000..a7fa36ca9e43 --- /dev/null +++ b/package/flutter-packages/flutter-go-router-example/flutter-go-router-example.mk @@ -0,0 +1,57 @@ +################################################################################ +# +# flutter-go-router-example +# +################################################################################ + +FLUTTER_GO_ROUTER_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_GO_ROUTER_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_GO_ROUTER_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_GO_ROUTER_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_GO_ROUTER_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_GO_ROUTER_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_GO_ROUTER_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_GO_ROUTER_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_GO_ROUTER_EXAMPLE_PKG_NAME = go_router_examples +FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/$(FLUTTER_GO_ROUTER_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_GO_ROUTER_EXAMPLE_SUBDIR = packages/go_router/example + +define FLUTTER_GO_ROUTER_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_GO_ROUTER_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + -Dflutter.dart_plugin_registrant=file://$(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ + --source file://$(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ + --source package:flutter/src/dart_plugin_registrant.dart \ + --native-assets $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_GO_ROUTER_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_GO_ROUTER_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_GO_ROUTER_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From 83c1ba5f449182afac6f6c9c6fa7288519bc241b Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:17 -0600 Subject: [PATCH 315/345] package/flutter-packages/flutter-image-example: new package This package uses the NetworkImageWithRetry method to download the Flutter logo. The package requires ca-certificates, or else SSL errors occur when the application attempts to download the image. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../flutter-image-example/Config.in | 8 +++ .../flutter-image-example.hash | 1 + .../flutter-image-example.mk | 54 +++++++++++++++++++ 5 files changed, 65 insertions(+) create mode 100644 package/flutter-packages/flutter-image-example/Config.in create mode 120000 package/flutter-packages/flutter-image-example/flutter-image-example.hash create mode 100644 package/flutter-packages/flutter-image-example/flutter-image-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index a4c8fba6d242..d5ef02b7ad28 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -38,6 +38,7 @@ F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-animations-example/ F: package/flutter-packages/flutter-dynamic-layouts-example/ F: package/flutter-packages/flutter-go-router-example/ +F: package/flutter-packages/flutter-image-example/ F: package/flutter-packages/flutter-markdown-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index bbcd3aec93ca..bfaccef26457 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -11,6 +11,7 @@ source "package/flutter-packages/flutter-adaptive-scaffold-example/Config.in" source "package/flutter-packages/flutter-animations-example/Config.in" source "package/flutter-packages/flutter-dynamic-layouts-example/Config.in" source "package/flutter-packages/flutter-go-router-example/Config.in" +source "package/flutter-packages/flutter-image-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" endif diff --git a/package/flutter-packages/flutter-image-example/Config.in b/package/flutter-packages/flutter-image-example/Config.in new file mode 100644 index 000000000000..15ae20872ac5 --- /dev/null +++ b/package/flutter-packages/flutter-image-example/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_FLUTTER_IMAGE_EXAMPLE + bool "flutter image example" + select BR2_PACKAGE_CA_CERTIFICATES # runtime + help + Use NetworkImageWithRetry instead of Image.network to + load images from the network with a retry mechanism. + + https://github.com/flutter/packages/tree/main/packages/flutter_image/example diff --git a/package/flutter-packages/flutter-image-example/flutter-image-example.hash b/package/flutter-packages/flutter-image-example/flutter-image-example.hash new file mode 120000 index 000000000000..879f2adb39ee --- /dev/null +++ b/package/flutter-packages/flutter-image-example/flutter-image-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-image-example/flutter-image-example.mk b/package/flutter-packages/flutter-image-example/flutter-image-example.mk new file mode 100644 index 000000000000..20f185896d27 --- /dev/null +++ b/package/flutter-packages/flutter-image-example/flutter-image-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-image-example +# +################################################################################ + +FLUTTER_IMAGE_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_IMAGE_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_IMAGE_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_IMAGE_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_IMAGE_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_IMAGE_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_IMAGE_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_IMAGE_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_IMAGE_EXAMPLE_PKG_NAME = flutter_image_example +FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/$(FLUTTER_IMAGE_EXAMPLE_PKG_NAME)/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_IMAGE_EXAMPLE_SUBDIR = packages/flutter_image/example + +define FLUTTER_IMAGE_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_IMAGE_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_IMAGE_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_IMAGE_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_IMAGE_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_IMAGE_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From c51e0f4aec80ea71d812ff9956dc8214e7efdb7e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:18 -0600 Subject: [PATCH 316/345] package/flutter-packages/flutter-rfw-local-example: new package Displays a custom "Hello, World!" custom widget in a remote Flutter widget (RFW) for use by a remote widget. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- DEVELOPERS | 1 + package/flutter-packages/Config.in | 1 + .../flutter-rfw-local-example/Config.in | 7 +++ .../flutter-rfw-local-example.hash | 1 + .../flutter-rfw-local-example.mk | 54 +++++++++++++++++++ 5 files changed, 64 insertions(+) create mode 100644 package/flutter-packages/flutter-rfw-local-example/Config.in create mode 120000 package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.hash create mode 100644 package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk diff --git a/DEVELOPERS b/DEVELOPERS index d5ef02b7ad28..a76bf350bf04 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -40,6 +40,7 @@ F: package/flutter-packages/flutter-dynamic-layouts-example/ F: package/flutter-packages/flutter-go-router-example/ F: package/flutter-packages/flutter-image-example/ F: package/flutter-packages/flutter-markdown-example/ +F: package/flutter-packages/flutter-rfw-local-example/ F: package/flutter-pi/ F: package/flutter-sdk-bin/ F: package/ivi-homescreen/ diff --git a/package/flutter-packages/Config.in b/package/flutter-packages/Config.in index bfaccef26457..4e3e29582f02 100644 --- a/package/flutter-packages/Config.in +++ b/package/flutter-packages/Config.in @@ -13,6 +13,7 @@ source "package/flutter-packages/flutter-dynamic-layouts-example/Config.in" source "package/flutter-packages/flutter-go-router-example/Config.in" source "package/flutter-packages/flutter-image-example/Config.in" source "package/flutter-packages/flutter-markdown-example/Config.in" +source "package/flutter-packages/flutter-rfw-local-example/Config.in" endif comment "flutter packages need flutter-engine" diff --git a/package/flutter-packages/flutter-rfw-local-example/Config.in b/package/flutter-packages/flutter-rfw-local-example/Config.in new file mode 100644 index 000000000000..42324a1eaaea --- /dev/null +++ b/package/flutter-packages/flutter-rfw-local-example/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_FLUTTER_RFW_LOCAL_EXAMPLE + bool "remote flutter widgets example" + help + This example shows how one can create custom widgets in an RFW + client, for use by remote widgets. + + https://github.com/flutter/packages/tree/main/packages/rfw/example/local diff --git a/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.hash b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.hash new file mode 120000 index 000000000000..879f2adb39ee --- /dev/null +++ b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.hash @@ -0,0 +1 @@ +../flutter-packages.hash \ No newline at end of file diff --git a/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk new file mode 100644 index 000000000000..b57c021f8b9b --- /dev/null +++ b/package/flutter-packages/flutter-rfw-local-example/flutter-rfw-local-example.mk @@ -0,0 +1,54 @@ +################################################################################ +# +# flutter-rfw-local-example +# +################################################################################ + +FLUTTER_RFW_LOCAL_EXAMPLE_VERSION = $(FLUTTER_PACKAGES_VERSION) +FLUTTER_RFW_LOCAL_EXAMPLE_SITE = $(FLUTTER_PACKAGES_SITE) +FLUTTER_RFW_LOCAL_EXAMPLE_SITE_METHOD = $(FLUTTER_PACKAGES_SITE_METHOD) +FLUTTER_RFW_LOCAL_EXAMPLE_SOURCE = $(FLUTTER_PACKAGES_SOURCE) +FLUTTER_RFW_LOCAL_EXAMPLE_LICENSE = $(FLUTTER_PACKAGES_LICENSE) +FLUTTER_RFW_LOCAL_EXAMPLE_LICENSE_FILES = $(FLUTTER_PACKAGES_LICENSE_FILES) +FLUTTER_RFW_LOCAL_EXAMPLE_DL_SUBDIR = $(FLUTTER_PACKAGES_DL_SUBDIR) +FLUTTER_RFW_LOCAL_EXAMPLE_DEPENDENCIES = $(FLUTTER_PACKAGES_DEPENDENCIES) +FLUTTER_RFW_LOCAL_EXAMPLE_PKG_NAME = local +FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/rfw-$(FLUTTER_RFW_LOCAL_EXAMPLE_PKG_NAME)-example/$(FLUTTER_ENGINE_RUNTIME_MODE) +FLUTTER_RFW_LOCAL_EXAMPLE_SUBDIR = packages/rfw/example/local + +define FLUTTER_RFW_LOCAL_EXAMPLE_CONFIGURE_CMDS + cd $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ + $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle +endef + +define FLUTTER_RFW_LOCAL_EXAMPLE_BUILD_CMDS + cd $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR) && \ + $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ + --native-assets $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR)/.dart_tool/flutter_build/*/native_assets.yaml \ + package:$(FLUTTER_RFW_LOCAL_EXAMPLE_PKG_NAME)/main.dart && \ + $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ + --deterministic \ + --obfuscate \ + --snapshot_kind=app-aot-elf \ + --elf=libapp.so \ + .dart_tool/flutter_build/*/app.dill +endef + +define FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_TARGET_CMDS + mkdir -p $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/{data,lib} + cp -dprf $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR)/build/flutter_assets $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/data/ + + $(INSTALL) -D -m 0755 $(FLUTTER_RFW_LOCAL_EXAMPLE_BUILDDIR)/libapp.so \ + $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/lib/libapp.so + + ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ + $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/data/ + + ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/lib/ + $(RM) $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin + touch $(FLUTTER_RFW_LOCAL_EXAMPLE_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin +endef + +$(eval $(generic-package)) From a92e7c3cec351ed2d79192c08abb341130b34c81 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:19 -0600 Subject: [PATCH 317/345] support/testing/tests/package/test_flutter.py: use flutter-markdown-example The maintainers of the flutter-gallery package archived the project as of February 16, 2024. In addition, the flutter-gallery package is incompatible with Flutter 3.19.x. Because of these problems, using the flutter-gallery package as the testing application for Flutter is no longer reasonable nor maintainable. However, it is reasonable to use the flutter-markdown-example package from flutter-packages, as it is a first-party application updated regularly and often automatically, ensuring compatibility with the latest versions of Flutter. - Switch the package used for Flutter testing from flutter-gallery to flutter-markdown-example - Rename flutter-gallery.service to flutter-markdown-example.service - Change /usr/share/flutter/gallery/release/ to /usr/share/flutter/flutter_markdown_example/release/ - Run `systemctl is-active flutter-markdown-example` instead of `systemctl is-active flutter-gallery` Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- support/testing/tests/package/test_flutter.py | 5 +++-- .../multi-user.target.wants/flutter-gallery.service | 1 - .../flutter-markdown-example.service | 1 + .../usr/lib/systemd/system/flutter-gallery.service | 11 ----------- .../systemd/system/flutter-markdown-example.service | 11 +++++++++++ 5 files changed, 15 insertions(+), 14 deletions(-) delete mode 120000 support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-gallery.service create mode 120000 support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service delete mode 100644 support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-gallery.service create mode 100644 support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-markdown-example.service diff --git a/support/testing/tests/package/test_flutter.py b/support/testing/tests/package/test_flutter.py index a3e98a43e5f2..3a150a69e1b7 100644 --- a/support/testing/tests/package/test_flutter.py +++ b/support/testing/tests/package/test_flutter.py @@ -25,7 +25,8 @@ class TestFlutter(infra.basetest.BRTest): BR2_PACKAGE_FLUTTER_PI=y BR2_PACKAGE_FLUTTER_PI_RAW_KEYBOARD_PLUGIN=y BR2_PACKAGE_FLUTTER_PI_TEXT_INPUT_PLUGIN=y - BR2_PACKAGE_FLUTTER_GALLERY=y + BR2_PACKAGE_FLUTTER_PACKAGES=y + BR2_PACKAGE_FLUTTER_MARKDOWN_EXAMPLE=y BR2_PACKAGE_FLUTTER_ENGINE=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y @@ -48,7 +49,7 @@ def test_run(self): "-vnc", "none", "-drive", f"file={img},if=virtio,format=raw"]) self.emulator.login() - cmd = "systemctl is-active flutter-gallery" + cmd = "systemctl is-active flutter-markdown-example" output, exit_code = self.emulator.run(cmd, 10) self.assertEqual(exit_code, 0) self.assertEqual(output[0], "active") diff --git a/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-gallery.service b/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-gallery.service deleted file mode 120000 index 40993fb16c44..000000000000 --- a/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-gallery.service +++ /dev/null @@ -1 +0,0 @@ -../../../../usr/lib/systemd/system/flutter-gallery.service \ No newline at end of file diff --git a/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service b/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service new file mode 120000 index 000000000000..83e731ba2dff --- /dev/null +++ b/support/testing/tests/package/test_flutter/overlay/etc/systemd/system/multi-user.target.wants/flutter-markdown-example.service @@ -0,0 +1 @@ +../../../../usr/lib/systemd/system/flutter-markdown-example.service \ No newline at end of file diff --git a/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-gallery.service b/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-gallery.service deleted file mode 100644 index 88a2bcbf0bbc..000000000000 --- a/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-gallery.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=flutter-gallery daemon -After=dbus.service systemd-udevd.service - -[Service] -ExecStart=/usr/bin/flutter-pi --release /usr/share/flutter/gallery/release/ -Restart=always -KillMode=process - -[Install] -WantedBy=multi-user.target diff --git a/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-markdown-example.service b/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-markdown-example.service new file mode 100644 index 000000000000..2a64b88c2db9 --- /dev/null +++ b/support/testing/tests/package/test_flutter/overlay/usr/lib/systemd/system/flutter-markdown-example.service @@ -0,0 +1,11 @@ +[Unit] +Description=flutter-markdown-example daemon +After=dbus.service systemd-udevd.service + +[Service] +ExecStart=/usr/bin/flutter-pi --release /usr/share/flutter/flutter_markdown_example/release/ +Restart=always +KillMode=process + +[Install] +WantedBy=multi-user.target From c6f7ad6d9264c278d5012aa4475fa9277b5e68f8 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:20 -0600 Subject: [PATCH 318/345] package/flutter-gallery: drop package The maintainers of the flutter-gallery package archived the project as of February 16, 2024. In addition, the flutter-gallery package is incompatible with Flutter 3.19.x. Now that the flutter tests do not use this package, it is safe to drop it. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- Config.in.legacy | 9 ++ DEVELOPERS | 1 - package/Config.in | 1 - .../0001-remove-GetStorage.patch | 84 ------------------- package/flutter-gallery/Config.in | 16 ---- package/flutter-gallery/flutter-gallery.hash | 3 - package/flutter-gallery/flutter-gallery.mk | 57 ------------- 7 files changed, 9 insertions(+), 162 deletions(-) delete mode 100644 package/flutter-gallery/0001-remove-GetStorage.patch delete mode 100644 package/flutter-gallery/Config.in delete mode 100644 package/flutter-gallery/flutter-gallery.hash delete mode 100644 package/flutter-gallery/flutter-gallery.mk diff --git a/Config.in.legacy b/Config.in.legacy index 1d3dc8b5c8af..d00196e08b0c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2024.05" +config BR2_PACKAGE_FLUTTER_GALLERY + bool "flutter-gallery removed" + select BR2_LEGACY + help + flutter-gallery has been removed due to being abandoned + and no longer working with flutter 3.19+. It is replaced by + flutter-packages, where individual sub-packages (examples) + must be selected for the build. + config BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS bool "Codescape IMG GNU Linux Toolchain 2018.09 has been removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index a76bf350bf04..884edfe149c9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -32,7 +32,6 @@ F: package/dmenu-wayland/ F: package/fcft/ F: package/foot/ F: package/flutter-engine/ -F: package/flutter-gallery/ F: package/flutter-packages/ F: package/flutter-packages/flutter-adaptive-scaffold-example/ F: package/flutter-packages/flutter-animations-example/ diff --git a/package/Config.in b/package/Config.in index dfdc71685704..410fe0f4935a 100644 --- a/package/Config.in +++ b/package/Config.in @@ -315,7 +315,6 @@ comment "Graphic applications" source "package/cage/Config.in" source "package/cog/Config.in" source "package/dmenu-wayland/Config.in" - source "package/flutter-gallery/Config.in" source "package/flutter-packages/Config.in" source "package/flutter-pi/Config.in" source "package/foot/Config.in" diff --git a/package/flutter-gallery/0001-remove-GetStorage.patch b/package/flutter-gallery/0001-remove-GetStorage.patch deleted file mode 100644 index 142cf853da2e..000000000000 --- a/package/flutter-gallery/0001-remove-GetStorage.patch +++ /dev/null @@ -1,84 +0,0 @@ -From a1d38d78163d84d3506c188e195cd5fa363f4be6 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 17 Aug 2023 13:00:07 -0600 -Subject: [PATCH] remove GetStorage - -Commit 287b20a8bfc71196cd733625e622b98b2f84bef1 introduced the get_storage -plugin which breaks with the following error when the application is ran: - -Unhandled Exception: MissingPluginException(No implementation found for method -getApplicataionDocumentsDirectory on channel plugins.flutter.io/path_provider) - -Revert the change. - -Upstream: https://github.com/flutter/gallery/issues/994 -Signed-off-by: Adam Duskett ---- - lib/feature_discovery/feature_discovery.dart | 10 ---------- - lib/main.dart | 2 -- - pubspec.yaml | 1 - - 3 files changed, 13 deletions(-) - -diff --git a/lib/feature_discovery/feature_discovery.dart b/lib/feature_discovery/feature_discovery.dart -index 288c78b..965d83c 100644 ---- a/lib/feature_discovery/feature_discovery.dart -+++ b/lib/feature_discovery/feature_discovery.dart -@@ -6,7 +6,6 @@ import 'package:flutter/material.dart'; - import 'package:flutter/scheduler.dart'; - import 'package:gallery/feature_discovery/animation.dart'; - import 'package:gallery/feature_discovery/overlay.dart'; --import 'package:get_storage/get_storage.dart'; - - const _featureHighlightShownKey = 'feature_highlight_shown'; - -@@ -271,15 +270,6 @@ class _FeatureDiscoveryState extends State - - initAnimationControllers(); - initAnimations(); -- -- final localStorage = GetStorage(); -- final featureHiglightShown = -- localStorage.read(_featureHighlightShownKey) ?? false; -- localStorage.write(_featureHighlightShownKey, true); -- showOverlay = widget.showOverlay && !featureHiglightShown; -- if (showOverlay) { -- localStorage.write(_featureHighlightShownKey, true); -- } - } - - void initAnimationControllers() { -diff --git a/lib/main.dart b/lib/main.dart -index e9f4ff9..8c7a4e3 100644 ---- a/lib/main.dart -+++ b/lib/main.dart -@@ -16,7 +16,6 @@ import 'package:gallery/pages/backdrop.dart'; - import 'package:gallery/pages/splash.dart'; - import 'package:gallery/routes.dart'; - import 'package:gallery/themes/gallery_theme_data.dart'; --import 'package:get_storage/get_storage.dart'; - import 'package:google_fonts/google_fonts.dart'; - - import 'firebase_options.dart'; -@@ -26,7 +25,6 @@ export 'package:gallery/data/demos.dart' show pumpDeferredLibraries; - - void main() async { - GoogleFonts.config.allowRuntimeFetching = false; -- await GetStorage.init(); - - if (defaultTargetPlatform != TargetPlatform.linux && - defaultTargetPlatform != TargetPlatform.windows && -diff --git a/pubspec.yaml b/pubspec.yaml -index 964edad..4b00e40 100644 ---- a/pubspec.yaml -+++ b/pubspec.yaml -@@ -24,7 +24,6 @@ dependencies: - firebase_core: ^2.7.0 - firebase_crashlytics: ^3.1.1 - firebase_performance: ^0.9.0+14 -- get_storage: ^2.1.1 - google_fonts: ^5.0.0 - intl: any # An exact version pin will be provided by the Flutter SDK - meta: ^1.7.0 --- -2.41.0 - diff --git a/package/flutter-gallery/Config.in b/package/flutter-gallery/Config.in deleted file mode 100644 index 224457ea6f73..000000000000 --- a/package/flutter-gallery/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_FLUTTER_GALLERY - bool "flutter-gallery" - depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS - depends on BR2_PACKAGE_FLUTTER_ENGINE - select BR2_PACKAGE_HOST_FLUTTER_SDK_BIN - help - Flutter Gallery is a resource to help developers evaluate - and use Flutter. It is a collection of Material Design & - Cupertino widgets, behaviors, and vignettes implemented - with Flutter. - - https://github.com/flutter/gallery - -comment "flutter-gallery needs flutter-engine" - depends on BR2_PACKAGE_HOST_FLUTTER_SDK_BIN_ARCH_SUPPORTS - depends on !BR2_PACKAGE_FLUTTER_ENGINE diff --git a/package/flutter-gallery/flutter-gallery.hash b/package/flutter-gallery/flutter-gallery.hash deleted file mode 100644 index aea1ed39bea3..000000000000 --- a/package/flutter-gallery/flutter-gallery.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 14272aba90b7d26db33bac7b4692f0e3ed1a008286a08eaf2ea79abd478f23e9 flutter-gallery-2.10.2.tar.gz -sha256 c731cf5a33db0e12647e0680ef0bc7839f99749404ac1ba4626cf7192065b3b0 LICENSE diff --git a/package/flutter-gallery/flutter-gallery.mk b/package/flutter-gallery/flutter-gallery.mk deleted file mode 100644 index acad706daef1..000000000000 --- a/package/flutter-gallery/flutter-gallery.mk +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# -# flutter-gallery -# -################################################################################ - -FLUTTER_GALLERY_VERSION = 2.10.2 -FLUTTER_GALLERY_SITE = $(call github,flutter,gallery,v$(FLUTTER_GALLERY_VERSION)) -FLUTTER_GALLERY_LICENSE = BSD-3-Clause -FLUTTER_GALLERY_LICENSE_FILES = LICENSE -FLUTTER_GALLERY_DEPENDENCIES = \ - host-flutter-sdk-bin \ - flutter-engine - -FLUTTER_GALLERY_INSTALL_DIR = $(TARGET_DIR)/usr/share/flutter/gallery/$(FLUTTER_ENGINE_RUNTIME_MODE) - -define FLUTTER_GALLERY_CONFIGURE_CMDS - cd $(@D) && \ - FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) clean && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) pub get && \ - $(HOST_FLUTTER_SDK_BIN_FLUTTER) build bundle -endef - -define FLUTTER_GALLERY_BUILD_CMDS - cd $(@D) && \ - FLUTTER_RUNTIME_MODES=$(FLUTTER_ENGINE_RUNTIME_MODE) \ - $(HOST_FLUTTER_SDK_BIN_DART_BIN) \ - -Dflutter.dart_plugin_registrant=file://$(@D)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ - --source file://$(@D)/.dart_tool/flutter_build/dart_plugin_registrant.dart \ - --source package:flutter/src/dart_plugin_registrant.dart \ - --native-assets $(@D)/.dart_tool/flutter_build/*/native_assets.yaml \ - package:gallery/main.dart && \ - $(HOST_FLUTTER_SDK_BIN_ENV) $(FLUTTER_ENGINE_GEN_SNAPSHOT) \ - --deterministic \ - --obfuscate \ - --snapshot_kind=app-aot-elf \ - --elf=libapp.so \ - .dart_tool/flutter_build/*/app.dill -endef - -define FLUTTER_GALLERY_INSTALL_TARGET_CMDS - mkdir -p $(FLUTTER_GALLERY_INSTALL_DIR)/{data,lib} - cp -dprf $(@D)/build/flutter_assets $(FLUTTER_GALLERY_INSTALL_DIR)/data/ - - $(INSTALL) -D -m 0755 $(@D)/libapp.so \ - $(FLUTTER_GALLERY_INSTALL_DIR)/lib/libapp.so - - ln -sf /usr/share/flutter/$(FLUTTER_ENGINE_RUNTIME_MODE)/data/icudtl.dat \ - $(FLUTTER_GALLERY_INSTALL_DIR)/data/ - - ln -sf /usr/lib/libflutter_engine.so $(FLUTTER_GALLERY_INSTALL_DIR)/lib/ - $(RM) $(FLUTTER_GALLERY_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin - touch $(FLUTTER_GALLERY_INSTALL_DIR)/data/flutter_assets/kernel_blob.bin -endef - -$(eval $(generic-package)) From 2f843331a1d7c0df7cd2b2e33a9ed03c6fc5c9ef Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:21 -0600 Subject: [PATCH 319/345] package/flutter-pi: bump version to 783db32ec6441b878783bfa241777d3bfe6b35e2 Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- package/flutter-pi/flutter-pi.hash | 2 +- package/flutter-pi/flutter-pi.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flutter-pi/flutter-pi.hash b/package/flutter-pi/flutter-pi.hash index df47d666bd99..956827a5b3e5 100644 --- a/package/flutter-pi/flutter-pi.hash +++ b/package/flutter-pi/flutter-pi.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6b11f260567a4589915cf29ce2ffa62b6f80414242a65c616f01983ae3a177b7 flutter-pi-75e72fef8e8ce65ec72a002c00d9c6db4d1479d3-br1.tar.gz +sha256 4ab2ae849d46261fe22ed94eae5726841d34119a5656e85b26c7c8802050d14c flutter-pi-783db32ec6441b878783bfa241777d3bfe6b35e2-br1.tar.gz sha256 b34df9d3e1b4e5d1ba70b1740ec74b69f1189b44efd0c96b898b074ef8db1c70 LICENSE diff --git a/package/flutter-pi/flutter-pi.mk b/package/flutter-pi/flutter-pi.mk index 9edc62e7acee..ee54a2bf4ee1 100644 --- a/package/flutter-pi/flutter-pi.mk +++ b/package/flutter-pi/flutter-pi.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_PI_VERSION = 75e72fef8e8ce65ec72a002c00d9c6db4d1479d3 +FLUTTER_PI_VERSION = 783db32ec6441b878783bfa241777d3bfe6b35e2 FLUTTER_PI_SITE = https://github.com/ardera/flutter-pi.git FLUTTER_PI_SITE_METHOD = git FLUTTER_PI_LICENSE = MIT From 2f2af48e7762d52841fbdf8909b4bc7dbf5f2171 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:22 -0600 Subject: [PATCH 320/345] package/flutter-sdk-bin: bump version to 3.19.4 Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- package/flutter-sdk-bin/flutter-sdk-bin.hash | 2 +- package/flutter-sdk-bin/flutter-sdk-bin.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.hash b/package/flutter-sdk-bin/flutter-sdk-bin.hash index 48c9c7d7e3d2..1102c50cc6aa 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.hash +++ b/package/flutter-sdk-bin/flutter-sdk-bin.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7cb12032cf615a92a7bc9042100f3f2af62df7df3ca3bee27f4b153fe218b239 flutter_linux_3.16.8-stable.tar.xz +sha256 66adfe6b6559a2e2f1fdbf89c938d0af53add3860c854c79dbbd5452f5d2290a flutter_linux_3.19.4-stable.tar.xz sha256 a598db94b6290ffbe10b5ecf911057b6a943351c727fdda9e5f2891d68700a20 LICENSE diff --git a/package/flutter-sdk-bin/flutter-sdk-bin.mk b/package/flutter-sdk-bin/flutter-sdk-bin.mk index 0d9a44596dee..f8453c3090c0 100644 --- a/package/flutter-sdk-bin/flutter-sdk-bin.mk +++ b/package/flutter-sdk-bin/flutter-sdk-bin.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUTTER_SDK_BIN_VERSION = 3.16.8 +FLUTTER_SDK_BIN_VERSION = 3.19.4 FLUTTER_SDK_BIN_SITE = https://storage.googleapis.com/flutter_infra_release/releases/stable/linux FLUTTER_SDK_BIN_SOURCE = flutter_linux_$(FLUTTER_SDK_BIN_VERSION)-stable.tar.xz FLUTTER_SDK_BIN_LICENSE = BSD-3-Clause From cc38dde3575a4e69db9ad182f691542dc4aa4e06 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 25 Mar 2024 16:34:23 -0600 Subject: [PATCH 321/345] package/flutter-engine: bump version to 3.19.4 Add 0005-skip-configuration-dependency-if-unit-tests-are-disa.patch, which fixes gtk+-3.0 being an unconditional requirement. Other changes: Flutter 3.19.x made Wayland and X11 an unconditional requirement, resulting in the following errors when compiling: """ ../../flutter/third_party/swiftshader/src/WSI/libWaylandClient.hpp:18:10: fatal error: 'wayland-client.h' file not found 18 | #include | ^~~~~~~~~~~~~~~~~~ ../../flutter/third_party/swiftshader/src/WSI/WaylandSurfaceKHR.cpp:15: ../../flutter/third_party/swiftshader/src/WSI/WaylandSurfaceKHR.hpp:22:10: fatal error: 'wayland-client.h' file not found 22 | #include | ^~~~~~~~~~~~~~~~~~ 1 error generated. [1369/11229] CC obj/flutter/third_party/sqlite/sqlite.sqlite3.o """ After raising an issue found here: https://github.com/flutter/flutter/issues/144635 and after several hours of searching, the problem is https://github.com/flutter/buildroot/commit/d01da2716 which hardcodes the following values if building for a Linux platform: - ozone_platform_x11 = true - ozone_platform_wayland = true As upstream maintainers listed the above as low priority (P3), a simple fix is to add two additional sed calls in FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP and FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP which set ozone_platform_x11 and ozone_platform_wayland to the appropriate values. Signed-off-by: Adam Duskett Signed-off-by: Arnout Vandecappelle --- ...on-dependency-if-unit-tests-are-disa.patch | 32 +++++++++++++++++++ package/flutter-engine/flutter-engine.mk | 8 ++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch diff --git a/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch b/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch new file mode 100644 index 000000000000..125bfc6910b4 --- /dev/null +++ b/package/flutter-engine/0005-skip-configuration-dependency-if-unit-tests-are-disa.patch @@ -0,0 +1,32 @@ +From 2252a85e59669b5826019f60a98b7a69939dacfd Mon Sep 17 00:00:00 2001 +From: Greg Spencer +Date: Mon, 4 Mar 2024 12:30:41 -0800 +Subject: [PATCH] Skip configuration dependency if unit tests are disabled. + +Commit 88baf62f made gtk+-3.0 an unconditional requirement, see: + +Issue: https://github.com/flutter/flutter/issues/144421 +Upstream: Merged. https://github.com/flutter/engine/pull/51179 + +Signed-off-by: Greg Spencer +Signed-off-by: Adam Duskett +--- + flutter/testing/BUILD.gn | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/flutter/testing/BUILD.gn b/flutter/testing/BUILD.gn +index 9eac29452..a7d094695 100644 +--- a/flutter/testing/BUILD.gn ++++ b/flutter/testing/BUILD.gn +@@ -51,7 +51,7 @@ source_set("testing") { + + sources = [ "run_all_unittests.cc" ] + +- if (is_linux) { ++ if (enable_unittests && is_linux) { + # So that we can call gtk_init in main(). + configs += [ "//flutter/shell/platform/linux/config:gtk" ] + } +-- +2.44.0 + diff --git a/package/flutter-engine/flutter-engine.mk b/package/flutter-engine/flutter-engine.mk index d08274f546c5..ff21e0949d65 100644 --- a/package/flutter-engine/flutter-engine.mk +++ b/package/flutter-engine/flutter-engine.mk @@ -21,7 +21,7 @@ # # There is no hash provided, as the gn binary (used for configuration) relies # on the .git directories. As such, a reproducible tarball is not possible. -FLUTTER_ENGINE_VERSION = 3.16.8 +FLUTTER_ENGINE_VERSION = 3.19.4 # There is nothing for Buildroot to download. This is handled by gclient. FLUTTER_ENGINE_SITE = @@ -154,6 +154,9 @@ else define FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP $(SED) "s%vulkan_use_x11.*%vulkan_use_x11 = false%g" -i \ $(@D)/build_overrides/vulkan_headers.gni + + $(SED) "s%ozone_platform_x11.*%ozone_platform_x11 = false%g" \ + $(@D)/build/config/BUILDCONFIG.gn endef FLUTTER_ENGINE_PRE_CONFIGURE_HOOKS += FLUTTER_ENGINE_VULKAN_X11_SUPPORT_FIXUP endif @@ -164,6 +167,9 @@ else define FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP $(SED) "s%vulkan_use_wayland.*%vulkan_use_wayland = false%g" \ $(@D)/build_overrides/vulkan_headers.gni + + $(SED) "s%ozone_platform_wayland.*%ozone_platform_wayland = false%g" \ + $(@D)/build/config/BUILDCONFIG.gn endef FLUTTER_ENGINE_PRE_CONFIGURE_HOOKS += FLUTTER_ENGINE_VULKAN_WAYLAND_SUPPORT_FIXUP endif From 9b1c4300dd69f18b3bffd22aa7a2b2d45be9e38b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 26 Mar 2024 10:25:25 +0100 Subject: [PATCH 322/345] Update for 2024.02.1 Signed-off-by: Peter Korsgaard (cherry picked from commit 9a3d34139b018bf79ac1c37b0212b5b775e3ae77) [Peter: drop Makefile change] Signed-off-by: Peter Korsgaard --- CHANGES | 33 +++++++++++++++++++++++++++++++++ support/misc/Vagrantfile | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 8f0b4042fa1f..9643d5242305 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,36 @@ +2024.02.1, released March 26th, 2024 + + Important / security related fixes. + + Toolchain: Dropped old Codesourcery ARM / AARCH64 and + Codescape MIPS external toolchains as they use old Glibc + versions not compatible with 64-bit time_t + + Defconfigs: Starfive visionfive2: Use correct genimage + configuration. TI am62x_sk / am64_sk: Use correct optee-os + platform setting and use a fixed ti-k3-r5-loader version. + + Infrastructure: Use git to fetch CVE data from the FKIE + repository to work around an issue with missing meta files in + the releases. + + Updated/fixed packages: axel, bash, bitcoin, botan, busybox, + containerd, cryptsetup, cvs, docker-compose, docker-engine, + ell, expat, giflib, gmp, go, harfbuzz, intel-gmmlib, + intel-mediadriver, iwd, kodi, kodi-pvr-hts, libcgroup, libdrm, + libgit2, libkrb5, libnfs, libunwind, libvpl, + libtorrent-rasterbar, libxml2, linux, mariadb, mesa3d, + mmc-utils, msmtp, multipath-tools, neon, onevpl-intel-gpu, + openssh, openvpn, osm2pgsql, owfs, php, poco, policycoreutils, + postgis, privoxy, pulseaudio, pure-ftpd, putty, + python-configshell-fb, python-rtslib-fb, rauc, restorecond, + spice, squid, targetcli-fb, tzdata, util-linux, vdr, xmrig, + xvisor, zic + + Issues resolved (http://bugs.uclibc.org): + + #15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail + 2024.02, released March 5th, 2024 Various fixes. diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index 73bdcc8b5e7b..cb7a81af6ec2 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.02' +RELEASE='2024.02.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From 32c192fec91e8c8241412e061312a5302d31dcaf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 26 Mar 2024 11:41:29 +0100 Subject: [PATCH 323/345] docs/website: Update for 2024.02.1 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 c1393134df29..559d396ed293 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,37 +8,37 @@
            Download
            -

            Latest stable / long term support release: 2024.02

            +

            Latest stable / long term support release: 2024.02.1

            - +
            - +
            -

            buildroot-2024.02.tar.gz

            -

            PGP signature

            +

            buildroot-2024.02.1.tar.gz

            +

            PGP signature

            - +
            - +
            -

            buildroot-2024.02.tar.xz

            -

            PGP signature

            +

            buildroot-2024.02.1.tar.xz

            +

            PGP signature

            - From f578744ad43fe59e5639ce0c766877622117a84f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 26 Mar 2024 21:13:41 +0100 Subject: [PATCH 331/345] Update for 2023.02.11 Signed-off-by: Peter Korsgaard (cherry picked from commit cc34b5b2abf2588f0ef55e46a4fe85a60c19ba1f) [Peter: drop Makefile/Vagrantfile changes] Signed-off-by: Peter Korsgaard --- CHANGES | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGES b/CHANGES index a5ee80016ecb..4b0cc082442b 100644 --- a/CHANGES +++ b/CHANGES @@ -728,6 +728,29 @@ #15376: Libiconv config #15461: QtVirtualKeyboard segfaults +2023.02.11, released March 26th, 2024 + + Important / security related fixes. + + Defconfigs: Starfive visionfive2: Use correct genimage + configuration. + + Updated/fixed packages: bind, bitcoin, botan, c-ares, clamav, + cvs, dash, dnsmasq, ell, exim, expat, freetype, ghostscript, + gnupg2, google-breakpad, gst1-python, gst1-vaapi, iwd, + libcoap, libcurl, libgit2, libkrb5, libmodsecurity, libunwind, + libuv, libxml2, lua-http, luvi, nginx-naxsi, nodejs, openssh, + openvmtools, parted, php, poco, postgresql, privoxy, + pure-ftpd, putty, python-cheroot, python-configshell-fb, + python-django, python-rtslib-fb, python3, rsync, sdl2, shim, + spice, squid, strace, strongswan, sudo, systemd, targetcli-fb, + unbound, uvw, v4l2loopback, vim, webkitgtk, wpewebkit, xvisor, + zlib-ng + + Issues resolved (http://bugs.uclibc.org): + + #15997: Build Squid with GCC12.3 in Buildroot 2024.02 will fail + 2023.02.10, released March 1st, 2024 Important / security related fixes. From cd44a480e154693c5352bf9119cbb02c0f7a6f25 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Mar 2024 10:40:18 +0100 Subject: [PATCH 332/345] docs/website: Update for 2023.02.11 Signed-off-by: Peter Korsgaard --- docs/website/news.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/website/news.html b/docs/website/news.html index 457a2eaead66..a5211fdbba28 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -9,6 +9,28 @@

            News

              +
            • +
              +
              +
              +

              2023.02.11 released

              +

              27 March 2024

              +
              +
              +

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

              + +

              Notice that the 2023.02.x series is now end of life. Please migrate to + the 2024.02.x series instead.

              +
              +
              +
              • +
            • From dde89fe703507798e52c8250e3a38dd4d4fa5a36 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 24 Mar 2024 22:17:03 +0100 Subject: [PATCH 333/345] configs/lafrite_defconfig: bump kernel to 6.6.22 And add a hash for it / enable BR2_DOWNLOAD_FORCE_CHECK_HASHES. Signed-off-by: Peter Korsgaard --- .../lafrite/patches/linux-headers/linux-headers.hash | 1 + board/librecomputer/lafrite/patches/linux/linux.hash | 2 ++ configs/lafrite_defconfig | 6 ++++-- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 120000 board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash create mode 100644 board/librecomputer/lafrite/patches/linux/linux.hash diff --git a/board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash b/board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash new file mode 120000 index 000000000000..5808d92afe89 --- /dev/null +++ b/board/librecomputer/lafrite/patches/linux-headers/linux-headers.hash @@ -0,0 +1 @@ +../linux/linux.hash \ No newline at end of file diff --git a/board/librecomputer/lafrite/patches/linux/linux.hash b/board/librecomputer/lafrite/patches/linux/linux.hash new file mode 100644 index 000000000000..899adefd0793 --- /dev/null +++ b/board/librecomputer/lafrite/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 linux-6.6.22.tar.xz diff --git a/configs/lafrite_defconfig b/configs/lafrite_defconfig index b3326f6b4973..19fca02c5418 100644 --- a/configs/lafrite_defconfig +++ b/configs/lafrite_defconfig @@ -1,6 +1,8 @@ BR2_aarch64=y BR2_cortex_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y +BR2_GLOBAL_PATCH_DIR="board/librecomputer/lafrite/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/librecomputer/lafrite/overlay/" @@ -8,7 +10,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/librecomputer/lafrite/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.22" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="amlogic/meson-gxl-s805x-libretech-ac" From f0bc79fc8dd6be999f11df9b9f774434d1ba513f Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 24 Mar 2024 13:28:47 -0300 Subject: [PATCH 334/345] package/python-sqlalchemy: add cython for python-sqlalchemy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for python-sqlalchemy. Signed-off-by: James Hilliard Tested-By: Flávio Tapajós Signed-off-by: Flávio Tapajós Signed-off-by: Arnout Vandecappelle --- package/python-sqlalchemy/python-sqlalchemy.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 400ad92f6374..167c3a44983c 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -12,5 +12,6 @@ PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE PYTHON_SQLALCHEMY_CPE_ID_VENDOR = sqlalchemy PYTHON_SQLALCHEMY_CPE_ID_PRODUCT = sqlalchemy +PYTHON_SQLALCHEMY_DEPENDENCIES = host-python-cython $(eval $(python-package)) From bb5cb8955bea6cd127c06ea946cf6825066385fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Sun, 24 Mar 2024 13:28:48 -0300 Subject: [PATCH 335/345] package/python-sqlalchemy: bump version to 2.0.29 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Flávio Tapajós [Arnout: fix check-package error in hash file] Signed-off-by: Arnout Vandecappelle --- package/python-sqlalchemy/python-sqlalchemy.hash | 4 ++-- package/python-sqlalchemy/python-sqlalchemy.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sqlalchemy/python-sqlalchemy.hash b/package/python-sqlalchemy/python-sqlalchemy.hash index 7951a329785d..0bc9256c5485 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.hash +++ b/package/python-sqlalchemy/python-sqlalchemy.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sqlalchemy/json -md5 7abfc2972d7e16315c8b7492ea0e0fdb SQLAlchemy-2.0.25.tar.gz -sha256 a2c69a7664fb2d54b8682dd774c3b54f67f84fa123cf84dda2a5f40dcaa04e08 SQLAlchemy-2.0.25.tar.gz +md5 ea746e69e0702cc8d2c91c5140ce35cc SQLAlchemy-2.0.28.tar.gz +sha256 bd9566b8e58cabd700bc367b60e90d9349cd16f0984973f98a9a09f9c64e86f0 SQLAlchemy-2.0.29.tar.gz # Locally computed sha256 checksums sha256 3c0f59ab887d041de6a4e52ffe3e9edb5d9522de909fae9a6cd7adb6e7be3293 LICENSE diff --git a/package/python-sqlalchemy/python-sqlalchemy.mk b/package/python-sqlalchemy/python-sqlalchemy.mk index 167c3a44983c..b7dac92a9947 100644 --- a/package/python-sqlalchemy/python-sqlalchemy.mk +++ b/package/python-sqlalchemy/python-sqlalchemy.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SQLALCHEMY_VERSION = 2.0.25 +PYTHON_SQLALCHEMY_VERSION = 2.0.29 PYTHON_SQLALCHEMY_SOURCE = SQLAlchemy-$(PYTHON_SQLALCHEMY_VERSION).tar.gz -PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/7b/bb/85bd8e211f54983e927c7cd9b2ad66773fbef507957156fc72e481a62681 +PYTHON_SQLALCHEMY_SITE = https://files.pythonhosted.org/packages/99/04/59971bfc2f192e3b52376ca8d1e134c78d04bc044ef7e04cf10c42d2ce17 PYTHON_SQLALCHEMY_SETUP_TYPE = setuptools PYTHON_SQLALCHEMY_LICENSE = MIT PYTHON_SQLALCHEMY_LICENSE_FILES = LICENSE From 9d92841d5ae919957b9494bad3d186330a808d84 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:47 -0700 Subject: [PATCH 336/345] package/python-poetry-core: new host package Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-poetry-core/python-poetry-core.hash | 5 +++++ package/python-poetry-core/python-poetry-core.mk | 14 ++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 package/python-poetry-core/python-poetry-core.hash create mode 100644 package/python-poetry-core/python-poetry-core.mk diff --git a/package/python-poetry-core/python-poetry-core.hash b/package/python-poetry-core/python-poetry-core.hash new file mode 100644 index 000000000000..c6b180c852eb --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/poetry-core/json +md5 7461547cac0e0e9c8cd7463aa87e7470 poetry_core-1.7.0.tar.gz +sha256 8f679b83bd9c820082637beca1204124d5d2a786e4818da47ec8acefd0353b74 poetry_core-1.7.0.tar.gz +# Locally computed sha256 checksums +sha256 f1978133782b90f4733bc308ddb19267c3fe04797c88d9ed3bc219032495a982 LICENSE diff --git a/package/python-poetry-core/python-poetry-core.mk b/package/python-poetry-core/python-poetry-core.mk new file mode 100644 index 000000000000..4ca587b11d2e --- /dev/null +++ b/package/python-poetry-core/python-poetry-core.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-poetry-core +# +################################################################################ + +PYTHON_POETRY_CORE_VERSION = 1.7.0 +PYTHON_POETRY_CORE_SOURCE = poetry_core-$(PYTHON_POETRY_CORE_VERSION).tar.gz +PYTHON_POETRY_CORE_SITE = https://files.pythonhosted.org/packages/cb/1c/af7f886e723b2dfbaea9b8a739153f227b386dd856cf956f9fd0ed0a502b +PYTHON_POETRY_CORE_SETUP_TYPE = pep517 +PYTHON_POETRY_CORE_LICENSE = MIT +PYTHON_POETRY_CORE_LICENSE_FILES = LICENSE + +$(eval $(host-python-package)) From 830eda38e1590f449bd479ca89e08108aa1ade81 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:48 -0700 Subject: [PATCH 337/345] package/python-terminaltables: use correct pep517 build backend We need to migrate python-terminaltables to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Thus, specifying setuptools as the build backend is simply wrong. The current release of python-terminaltables still uses poetry rather than poetry-core as a build backend. poetry is much more heavyweight, it would need to pull in a large number of build dependencies. Therefore, include an upstream patch to switch from poetry to poetry-core. Signed-off-by: James Hilliard [Arnout: use a patch instead of sed] Signed-off-by: Arnout Vandecappelle --- ...-switch-build-backend-to-poetry-core.patch | 28 +++++++++++++++++++ .../python-terminaltables.mk | 3 +- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 package/python-terminaltables/0001-switch-build-backend-to-poetry-core.patch diff --git a/package/python-terminaltables/0001-switch-build-backend-to-poetry-core.patch b/package/python-terminaltables/0001-switch-build-backend-to-poetry-core.patch new file mode 100644 index 000000000000..2906dd740dad --- /dev/null +++ b/package/python-terminaltables/0001-switch-build-backend-to-poetry-core.patch @@ -0,0 +1,28 @@ +From 9e3dda0efb54fee6934c744a13a7336d24c6e9e9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 27 Jan 2022 10:33:08 +0100 +Subject: [PATCH] Switch build-backend to poetry-core + +poetry-core is the lightweight counterpart of poetry that is intended +to be used as a build-backend. Unlike poetry, it does not require +installing all the dependencies of the package manager, making +the builds much faster. The generated artifacts are the same. + +Upstream: https://github.com/matthewdeanmartin/terminaltables/commit/9e3dda0efb54fee6934c744a13a7336d24c6e9e9 +Signed-off-by: Arnout Vandecappelle +--- + pyproject.toml | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index a861add..ff4b190 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -62,5 +62,5 @@ python = ">=2.6 || >=3.0" + pytest = "==6.0.1" + + [build-system] +-requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++requires = ["poetry-core>=1.0.0"] ++build-backend = "poetry.core.masonry.api" diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk index b31ed332b6d6..062643adeed3 100644 --- a/package/python-terminaltables/python-terminaltables.mk +++ b/package/python-terminaltables/python-terminaltables.mk @@ -7,8 +7,9 @@ PYTHON_TERMINALTABLES_VERSION = 3.1.10 PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/f5/fc/0b73d782f5ab7feba8d007573a3773c58255f223c5940a7b7085f02153c3 -PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools +PYTHON_TERMINALTABLES_SETUP_TYPE = pep517 PYTHON_TERMINALTABLES_LICENSE = MIT PYTHON_TERMINALTABLES_LICENSE_FILES = LICENSE +PYTHON_TERMINALTABLES_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) From 4ccca0d77a9c61f3730aae0289210c4724aa1887 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:49 -0700 Subject: [PATCH 338/345] package/python-setuptools-rust: add host setuptools-scm dependency We need host-python-setuptools-scm for python-setuptools-rust to build correctly when using a pep517 frontend. Fixes: * Getting build dependencies for wheel... running egg_info writing setuptools_rust.egg-info/PKG-INFO writing dependency_links to setuptools_rust.egg-info/dependency_links.txt writing entry points to setuptools_rust.egg-info/entry_points.txt writing requirements to setuptools_rust.egg-info/requires.txt writing top-level names to setuptools_rust.egg-info/top_level.txt reading manifest file 'setuptools_rust.egg-info/SOURCES.txt' reading manifest template 'MANIFEST.in' adding license file 'LICENSE' writing manifest file 'setuptools_rust.egg-info/SOURCES.txt' ERROR Missing dependencies: setuptools_scm Signed-off-by: James Hilliard [Arnout: order dependencies alphabetically] Signed-off-by: Arnout Vandecappelle --- package/python-setuptools-rust/python-setuptools-rust.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/python-setuptools-rust/python-setuptools-rust.mk b/package/python-setuptools-rust/python-setuptools-rust.mk index f07263becfb6..1203fbf6161c 100644 --- a/package/python-setuptools-rust/python-setuptools-rust.mk +++ b/package/python-setuptools-rust/python-setuptools-rust.mk @@ -10,6 +10,9 @@ PYTHON_SETUPTOOLS_RUST_SITE = https://files.pythonhosted.org/packages/f2/40/f1e9 PYTHON_SETUPTOOLS_RUST_SETUP_TYPE = setuptools PYTHON_SETUPTOOLS_RUST_LICENSE = MIT PYTHON_SETUPTOOLS_RUST_LICENSE_FILES = LICENSE -HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = host-rustc host-python-semantic-version +HOST_PYTHON_SETUPTOOLS_RUST_DEPENDENCIES = \ + host-python-semantic-version \ + host-python-setuptools-scm \ + host-rustc $(eval $(host-python-package)) From 3c0c08e80f98f0a7a27f5f6fdd48b801ec7490d0 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:51 -0700 Subject: [PATCH 339/345] package/python-pyyaml: add cython for host-python-pyyaml When migrating to setuptools with pep517 support we need to add host-python-cython which is a pep517 build dependency for pyyaml. Signed-off-by: James Hilliard [Arnout: order dependencies alphabetically] Signed-off-by: Arnout Vandecappelle --- package/python-pyyaml/python-pyyaml.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-pyyaml/python-pyyaml.mk b/package/python-pyyaml/python-pyyaml.mk index 846c57df4ffb..40a1c25758a1 100644 --- a/package/python-pyyaml/python-pyyaml.mk +++ b/package/python-pyyaml/python-pyyaml.mk @@ -14,7 +14,8 @@ PYTHON_PYYAML_CPE_ID_VENDOR = pyyaml PYTHON_PYYAML_CPE_ID_PRODUCT = pyyaml PYTHON_PYYAML_DEPENDENCIES = host-python-cython libyaml PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 -HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml +HOST_PYTHON_PYYAML_DEPENDENCIES = host-libyaml host-python-cython +HOST_PYTHON_PYYAML_ENV = PYYAML_FORCE_CYTHON=1 $(eval $(python-package)) $(eval $(host-python-package)) From 05f315c83b63ac36211e3aaf9d30c4027fa73766 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:52 -0700 Subject: [PATCH 340/345] package/python-aiofiles: migrate to hatchling pep517 build backend When building with a pep517 frontend we need to use the specified build backend as opposed to the fallback setuptools build which only works when not building with a pep517 frontend. Fixes: ERROR Backend 'hatchling.build' is not available. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-aiofiles/python-aiofiles.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-aiofiles/python-aiofiles.mk b/package/python-aiofiles/python-aiofiles.mk index 582f7908cdde..954647bf7664 100644 --- a/package/python-aiofiles/python-aiofiles.mk +++ b/package/python-aiofiles/python-aiofiles.mk @@ -7,8 +7,9 @@ PYTHON_AIOFILES_VERSION = 23.2.1 PYTHON_AIOFILES_SOURCE = aiofiles-$(PYTHON_AIOFILES_VERSION).tar.gz PYTHON_AIOFILES_SITE = https://files.pythonhosted.org/packages/af/41/cfed10bc64d774f497a86e5ede9248e1d062db675504b41c320954d99641 -PYTHON_AIOFILES_SETUP_TYPE = setuptools +PYTHON_AIOFILES_SETUP_TYPE = pep517 PYTHON_AIOFILES_LICENSE = Apache-2.0 PYTHON_AIOFILES_LICENSE_FILES = LICENSE +PYTHON_AIOFILES_DEPENDENCIES = host-python-hatchling $(eval $(python-package)) From 72c08122c051044628bc6391458b8ba980b32153 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:53 -0700 Subject: [PATCH 341/345] package/python-aiologstash: migrate to flit build backend We need to add a patch which selects the correct flit build backend. As flit is configured as the pep517 build backend for aiologstash we need to migrate from setuptools to flit prior to migrating setuptools to pep517 as the frontend will not fall back to using setuptools once migrated. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- ...Fix-flit_core-build-requires-backend.patch | 31 +++++++++++++++++++ .../python-aiologstash/python-aiologstash.mk | 2 +- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch diff --git a/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch b/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch new file mode 100644 index 000000000000..99a150a3449d --- /dev/null +++ b/package/python-aiologstash/0001-Fix-flit_core-build-requires-backend.patch @@ -0,0 +1,31 @@ +From 3c4d1203eb9ee3dbe79b096d587c9baaf8b802ed Mon Sep 17 00:00:00 2001 +From: James Hilliard +Date: Fri, 11 Mar 2022 13:26:31 -0700 +Subject: [PATCH] Fix flit_core build requires/backend. + +Only flit_core should be required by pyproject.toml, the regular flit +package is the pep517 frontend which is not what should be set for the +build system. + +Signed-off-by: James Hilliard +Upstream: https://github.com/aio-libs/aiologstash/pull/258 +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 7bdaebb..252a660 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,6 +1,6 @@ + [build-system] +-requires = ["flit"] +-build-backend = "flit.buildapi" ++requires = ["flit_core"] ++build-backend = "flit_core.buildapi" + + [tool.flit.metadata] + module = "aiologstash" +-- +2.34.1 + diff --git a/package/python-aiologstash/python-aiologstash.mk b/package/python-aiologstash/python-aiologstash.mk index de0ed820a0e5..bcf60a72e972 100644 --- a/package/python-aiologstash/python-aiologstash.mk +++ b/package/python-aiologstash/python-aiologstash.mk @@ -7,7 +7,7 @@ PYTHON_AIOLOGSTASH_VERSION = 2.0.0 PYTHON_AIOLOGSTASH_SOURCE = aiologstash-$(PYTHON_AIOLOGSTASH_VERSION).tar.gz PYTHON_AIOLOGSTASH_SITE = https://files.pythonhosted.org/packages/1c/dc/382861d5d25ccc976d02118922598fc4547f74f3287793e270ed614d8176 -PYTHON_AIOLOGSTASH_SETUP_TYPE = setuptools +PYTHON_AIOLOGSTASH_SETUP_TYPE = flit PYTHON_AIOLOGSTASH_LICENSE = MIT PYTHON_AIOLOGSTASH_LICENSE_FILES = LICENSE From 0722978efbc9966c5595ebb60bf9667072af0cbe Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Tue, 13 Feb 2024 14:14:54 -0700 Subject: [PATCH 342/345] package/python-bleak: use correct pep517 build backend We need to migrate python-bleak to the pep517 poetry-core backend as setuptools is not supported when building with a pep517 frontend. This package currently builds using setuptools as we do not yet use setuptools with a pep517 build frontend. The package contains a setuptools fallback which only can be used when using setuptools without a pep517 frontend as the pep517 frontend will only use the build backend specified in the package pyproject.toml which is poetry-core and not setuptools. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle --- package/python-bleak/python-bleak.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-bleak/python-bleak.mk b/package/python-bleak/python-bleak.mk index ed3c3f2f933a..716b6327edf4 100644 --- a/package/python-bleak/python-bleak.mk +++ b/package/python-bleak/python-bleak.mk @@ -7,8 +7,9 @@ PYTHON_BLEAK_VERSION = 0.21.1 PYTHON_BLEAK_SOURCE = bleak-$(PYTHON_BLEAK_VERSION).tar.gz PYTHON_BLEAK_SITE = https://files.pythonhosted.org/packages/6a/c0/3aca655fa43b8ff5340d99fac4e67061f53f42f092fc847bdd0559d67846 -PYTHON_BLEAK_SETUP_TYPE = setuptools +PYTHON_BLEAK_SETUP_TYPE = pep517 PYTHON_BLEAK_LICENSE = MIT PYTHON_BLEAK_LICENSE_FILES = LICENSE +PYTHON_BLEAK_DEPENDENCIES = host-python-poetry-core $(eval $(python-package)) From 6b6975a87e842c1a56677bb981f516b4797f56f1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 21:53:24 +0100 Subject: [PATCH 343/345] package/thermald: bump to version 2.5.6 https://github.com/intel/thermal_daemon/blob/v2.5.6/README.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/thermald/thermald.hash | 2 +- package/thermald/thermald.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/thermald/thermald.hash b/package/thermald/thermald.hash index 9693813ca9fd..fff5ae628472 100644 --- a/package/thermald/thermald.hash +++ b/package/thermald/thermald.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 75c165df45b3d09c904d314c8c19789158e9538f46e3d2b606457dc631eb3af5 thermald-2.5.1.tar.gz +sha256 e5a452624f133d71f4aff0bd0c8f8258399a5ae1a7d5aea177fa6a6e33dad1fd thermald-2.5.6.tar.gz sha256 e98be8bc482e038a14bfbc01caf800bbd0024fff275ef14cd999db6560254a8d COPYING diff --git a/package/thermald/thermald.mk b/package/thermald/thermald.mk index fd0246745f8a..9faa47683bec 100644 --- a/package/thermald/thermald.mk +++ b/package/thermald/thermald.mk @@ -4,7 +4,7 @@ # ################################################################################ -THERMALD_VERSION = 2.5.1 +THERMALD_VERSION = 2.5.6 THERMALD_SITE = $(call github,intel,thermal_daemon,v$(THERMALD_VERSION)) # fetched from Github, with no configure script THERMALD_AUTORECONF = YES From 9ff9d5f8861aac2521e2ab72188bc85e1668def9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 22:17:00 +0100 Subject: [PATCH 344/345] package/domoticz: bump to version 2024.4 openzwave dependency is back since https://github.com/domoticz/domoticz/commit/b0eadaa2ec6d6340df7eeba0e6e373b71ba393fc https://github.com/domoticz/domoticz/blob/2024.4/History.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 546177332e8c..ae86a67b79ec 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 9effa792f856d8d9036c53b9ae500ee3bffa1488addf9d6f1fe4bf960f73f740 domoticz-2024.1.tar.gz +sha256 d87113d7cacd0b52b9126fcc1ef24e140a4f7042d5bc6262e86e4b4752f5cf38 domoticz-2024.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 88bad1542782..95d3335adb0b 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOMOTICZ_VERSION = 2024.1 +DOMOTICZ_VERSION = 2024.4 DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt @@ -51,6 +51,16 @@ else DOMOTICZ_CONF_OPTS += -DWITH_LIBUSB=OFF endif +ifeq ($(BR2_PACKAGE_OPENZWAVE),y) +DOMOTICZ_DEPENDENCIES += openzwave + +# Due to the dependency on mosquitto, domoticz depends on +# !BR2_STATIC_LIBS so set USE_STATIC_OPENZWAVE to OFF otherwise +# domoticz will not find the openzwave library as it searches by +# default a static library. +DOMOTICZ_CONF_OPTS += -DUSE_STATIC_OPENZWAVE=OFF +endif + ifeq ($(BR2_PACKAGE_PYTHON3),y) DOMOTICZ_DEPENDENCIES += python3 DOMOTICZ_CONF_OPTS += -DUSE_PYTHON=ON From c4878d530e8bbcf29173b62a725c66ac51849c65 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 24 Mar 2024 19:06:45 +0100 Subject: [PATCH 345/345] package/log4cxx: bump to version 1.1.0 - Drop patch (already in version) - Drop LOG4CXX_IGNORE_CVES as CVE-2023-31038 has been fixed in 1.1.0 - Add unixodbc optional dependency https://logging.apache.org/log4cxx/latest_stable/changelog.html#1.1.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle --- .../0001-Make-ODBC-and-SMTP-opt-in-191.patch | 73 ------------------- package/log4cxx/log4cxx.hash | 4 +- package/log4cxx/log4cxx.mk | 15 ++-- 3 files changed, 11 insertions(+), 81 deletions(-) delete mode 100644 package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch diff --git a/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch b/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch deleted file mode 100644 index a116fcc4915b..000000000000 --- a/package/log4cxx/0001-Make-ODBC-and-SMTP-opt-in-191.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 4900c27cc284ba2f671ae92e6ffb4ab391f9507a Mon Sep 17 00:00:00 2001 -From: Robert Middleton -Date: Mon, 6 Feb 2023 20:39:02 -0500 -Subject: [PATCH] Make ODBC and SMTP opt-in (#191) - -See #189 - -Upstream: afeaab6d0f0107c77dfadcbe3708f170c48d5ed9 -Signed-off-by: Thomas Petazzoni ---- - src/main/include/CMakeLists.txt | 40 ++++++++++++++++++++++++--------- - 1 file changed, 30 insertions(+), 10 deletions(-) - -diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt -index e31443fb..d6835293 100644 ---- a/src/main/include/CMakeLists.txt -+++ b/src/main/include/CMakeLists.txt -@@ -85,22 +85,42 @@ include(CheckIncludeFiles) - include(CheckIncludeFileCXX) - include(CheckLibraryExists) - --if(WIN32) -- CHECK_INCLUDE_FILES(sqlext.h HAS_ODBC) -+option(LOG4CXX_ENABLE_ODBC "Support logging via ODBC" OFF) -+if(LOG4CXX_ENABLE_ODBC) -+ if(WIN32) -+ CHECK_INCLUDE_FILES(sqlext.h HAS_ODBC) -+ else() -+ include(FindPkgConfig) -+ -+ pkg_check_modules( odbc odbc ) -+ if(${odbc_FOUND}) -+ set(HAS_ODBC 1) -+ else() -+ set(HAS_ODBC 0) -+ endif(${odbc_FOUND}) -+ endif(WIN32) -+ -+ if(NOT ${HAS_ODBC}) -+ message(SEND_ERROR "ODBC not found but requested") -+ endif() - else() -- include(FindPkgConfig) -- -- pkg_check_modules( odbc QUIET odbc ) -- if(${odbc_FOUND}) -- set(HAS_ODBC 1) -- endif(${odbc_FOUND}) --endif(WIN32) -+ set(HAS_ODBC 0) -+endif(LOG4CXX_ENABLE_ODBC) -+ -+option(LOG4CXX_ENABLE_ESMTP "Support logging via libesmtp" OFF) -+if(LOG4CXX_ENABLE_ESMTP) -+ CHECK_LIBRARY_EXISTS(esmtp smtp_create_session "" HAS_LIBESMTP) -+ if(NOT HAS_LIBESMTP) -+ message(SEND_ERROR "SMTP support with libesmtp not found but requested") -+ endif() -+else() -+ set(HAS_LIBESMTP 0) -+endif(LOG4CXX_ENABLE_ESMTP) - - CHECK_INCLUDE_FILE_CXX(locale HAS_STD_LOCALE) - CHECK_FUNCTION_EXISTS(mbsrtowcs HAS_MBSRTOWCS) - CHECK_FUNCTION_EXISTS(wcstombs HAS_WCSTOMBS) - CHECK_FUNCTION_EXISTS(fwide HAS_FWIDE) --CHECK_LIBRARY_EXISTS(esmtp smtp_create_session "" HAS_LIBESMTP) - CHECK_FUNCTION_EXISTS(syslog HAS_SYSLOG) - if(UNIX) - set(CMAKE_REQUIRED_LIBRARIES "pthread") --- -2.41.0 - diff --git a/package/log4cxx/log4cxx.hash b/package/log4cxx/log4cxx.hash index 8190f94aa3fd..728d49ee3828 100644 --- a/package/log4cxx/log4cxx.hash +++ b/package/log4cxx/log4cxx.hash @@ -1,4 +1,4 @@ -# From https://www.apache.org/dist/logging/log4cxx/0.13.0/apache-log4cxx-0.13.0.tar.gz.sha512 -sha512 2a5f4fecc0415d942658c588774f0666082c497b6fd49bf64ab3328a997775206788c9b10a8c89208896c57da52fcc12c18d5d11ca1d3bf699e4633b8fcea6e5 apache-log4cxx-0.13.0.tar.gz +# From https://www.apache.org/dist/logging/log4cxx/1.1.0/apache-log4cxx-1.1.0.tar.gz.sha512 +sha512 66a66eab933a6afd0779e3f73f65afa4fb82481208b591fd7c7c86ded805f50abcd9cdf954bdb49e1e7f5198e6c1c4fff8a7e180ff5fff9491f1946e9ba6fe2b apache-log4cxx-1.1.0.tar.gz # Locally computed sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/log4cxx/log4cxx.mk b/package/log4cxx/log4cxx.mk index aee682529c89..8024c96d46f3 100644 --- a/package/log4cxx/log4cxx.mk +++ b/package/log4cxx/log4cxx.mk @@ -4,21 +4,17 @@ # ################################################################################ -LOG4CXX_VERSION = 0.13.0 +LOG4CXX_VERSION = 1.1.0 LOG4CXX_SITE = https://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz LOG4CXX_INSTALL_STAGING = YES LOG4CXX_LICENSE = Apache-2.0 LOG4CXX_LICENSE_FILES = LICENSE LOG4CXX_CPE_ID_VENDOR = apache -# We do not support ODBC functionality -LOG4CXX_IGNORE_CVES = CVE-2023-31038 -# Note: if you want to support odbc, make sure CVE-2023-31038 is fixed LOG4CXX_CONF_OPTS = \ -DAPR_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apr-1-config \ - -DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config \ - -DLOG4CXX_ENABLE_ODBC=OFF + -DAPR_UTIL_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apu-1-config LOG4CXX_DEPENDENCIES = apr apr-util @@ -33,6 +29,13 @@ else LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_LIBESMTP=OFF endif +ifeq ($(BR2_PACKAGE_UNIXODBC),y) +LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_ODBC=ON +LOG4CXX_DEPENDENCIES += unixodbc +else +LOG4CXX_CONF_OPTS += -DLOG4CXX_ENABLE_ODBC=OFF +endif + ifeq ($(BR2_USE_WCHAR),y) LOG4CXX_CONF_OPTS += -DLOG4CXX_WCHAR_T=ON else