From 99e319e3e68266cf449d1b98f32213e0d17026fd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 Apr 2024 12:25:41 +0200 Subject: [PATCH 001/114] package/dropbear: bump version to 2024.84 Drop patch which is included in this release. Changelog: https://matt.ucc.asn.au/dropbear/CHANGES Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 516d57dc9c8dbcd991a4f7888556e28f838ac0ce) Signed-off-by: Peter Korsgaard --- .../0001-Implement-Strict-KEX-mode.patch | 232 ------------------ package/dropbear/dropbear.hash | 2 +- package/dropbear/dropbear.mk | 5 +- 3 files changed, 2 insertions(+), 237 deletions(-) delete mode 100644 package/dropbear/0001-Implement-Strict-KEX-mode.patch diff --git a/package/dropbear/0001-Implement-Strict-KEX-mode.patch b/package/dropbear/0001-Implement-Strict-KEX-mode.patch deleted file mode 100644 index ce7b84861c..0000000000 --- a/package/dropbear/0001-Implement-Strict-KEX-mode.patch +++ /dev/null @@ -1,232 +0,0 @@ -From 6e43be5c7b99dbee49dc72b6f989f29fdd7e9356 Mon Sep 17 00:00:00 2001 -From: Matt Johnston -Date: Mon, 20 Nov 2023 14:02:47 +0800 -Subject: [PATCH] Implement Strict KEX mode - -As specified by OpenSSH with kex-strict-c-v00@openssh.com and -kex-strict-s-v00@openssh.com. - -Upstream: https://github.com/mkj/dropbear/commit/6e43be5c7b99dbee49dc72b6f989f29fdd7e9356 -Signed-off-by: Fabrice Fontaine ---- - src/cli-session.c | 11 +++++++++++ - src/common-algo.c | 6 ++++++ - src/common-kex.c | 26 +++++++++++++++++++++++++- - src/kex.h | 3 +++ - src/process-packet.c | 34 +++++++++++++++++++--------------- - src/ssh.h | 4 ++++ - src/svr-session.c | 3 +++ - 7 files changed, 71 insertions(+), 16 deletions(-) - -diff --git a/cli-session.c b/cli-session.c -index 5981b2470..d261c8f82 100644 ---- a/cli-session.c -+++ b/cli-session.c -@@ -46,6 +46,7 @@ static void cli_finished(void) ATTRIB_NORETURN; - static void recv_msg_service_accept(void); - static void cli_session_cleanup(void); - static void recv_msg_global_request_cli(void); -+static void cli_algos_initialise(void); - - struct clientsession cli_ses; /* GLOBAL */ - -@@ -117,6 +118,7 @@ void cli_session(int sock_in, int sock_out, struct dropbear_progress_connection - } - - chaninitialise(cli_chantypes); -+ cli_algos_initialise(); - - /* Set up cli_ses vars */ - cli_session_init(proxy_cmd_pid); -@@ -487,3 +489,12 @@ void cli_dropbear_log(int priority, const char* format, va_list param) { - fflush(stderr); - } - -+static void cli_algos_initialise(void) { -+ algo_type *algo; -+ for (algo = sshkex; algo->name; algo++) { -+ if (strcmp(algo->name, SSH_STRICT_KEX_S) == 0) { -+ algo->usable = 0; -+ } -+ } -+} -+ -diff --git a/common-algo.c b/common-algo.c -index 378f0ca8e..f9d46ebb6 100644 ---- a/common-algo.c -+++ b/common-algo.c -@@ -307,6 +307,12 @@ algo_type sshkex[] = { - /* Set unusable by svr_algos_initialise() */ - {SSH_EXT_INFO_C, 0, NULL, 1, NULL}, - #endif -+#endif -+#if DROPBEAR_CLIENT -+ {SSH_STRICT_KEX_C, 0, NULL, 1, NULL}, -+#endif -+#if DROPBEAR_SERVER -+ {SSH_STRICT_KEX_S, 0, NULL, 1, NULL}, - #endif - {NULL, 0, NULL, 0, NULL} - }; -diff --git a/common-kex.c b/common-kex.c -index ac8844246..8e33b12a6 100644 ---- a/common-kex.c -+++ b/common-kex.c -@@ -183,6 +183,10 @@ void send_msg_newkeys() { - gen_new_keys(); - switch_keys(); - -+ if (ses.kexstate.strict_kex) { -+ ses.transseq = 0; -+ } -+ - TRACE(("leave send_msg_newkeys")) - } - -@@ -193,7 +197,11 @@ void recv_msg_newkeys() { - - ses.kexstate.recvnewkeys = 1; - switch_keys(); -- -+ -+ if (ses.kexstate.strict_kex) { -+ ses.recvseq = 0; -+ } -+ - TRACE(("leave recv_msg_newkeys")) - } - -@@ -550,6 +558,10 @@ void recv_msg_kexinit() { - - ses.kexstate.recvkexinit = 1; - -+ if (ses.kexstate.strict_kex && !ses.kexstate.donefirstkex && ses.recvseq != 1) { -+ dropbear_exit("First packet wasn't kexinit"); -+ } -+ - TRACE(("leave recv_msg_kexinit")) - } - -@@ -859,6 +871,18 @@ static void read_kex_algos() { - } - #endif - -+ if (!ses.kexstate.donefirstkex) { -+ const char* strict_name; -+ if (IS_DROPBEAR_CLIENT) { -+ strict_name = SSH_STRICT_KEX_S; -+ } else { -+ strict_name = SSH_STRICT_KEX_C; -+ } -+ if (buf_has_algo(ses.payload, strict_name) == DROPBEAR_SUCCESS) { -+ ses.kexstate.strict_kex = 1; -+ } -+ } -+ - algo = buf_match_algo(ses.payload, sshkex, kexguess2, &goodguess); - allgood &= goodguess; - if (algo == NULL || algo->data == NULL) { -diff --git a/kex.h b/kex.h -index 77cf21a37..7fcc3c252 100644 ---- a/kex.h -+++ b/kex.h -@@ -83,6 +83,9 @@ struct KEXState { - - unsigned our_first_follows_matches : 1; - -+ /* Boolean indicating that strict kex mode is in use */ -+ unsigned int strict_kex; -+ - time_t lastkextime; /* time of the last kex */ - unsigned int datatrans; /* data transmitted since last kex */ - unsigned int datarecv; /* data received since last kex */ -diff --git a/process-packet.c b/process-packet.c -index 945416023..133a152d0 100644 ---- a/process-packet.c -+++ b/process-packet.c -@@ -44,6 +44,7 @@ void process_packet() { - - unsigned char type; - unsigned int i; -+ unsigned int first_strict_kex = ses.kexstate.strict_kex && !ses.kexstate.donefirstkex; - time_t now; - - TRACE2(("enter process_packet")) -@@ -54,22 +55,24 @@ void process_packet() { - now = monotonic_now(); - ses.last_packet_time_keepalive_recv = now; - -- /* These packets we can receive at any time */ -- switch(type) { - -- case SSH_MSG_IGNORE: -- goto out; -- case SSH_MSG_DEBUG: -- goto out; -+ if (type == SSH_MSG_DISCONNECT) { -+ /* Allowed at any time */ -+ dropbear_close("Disconnect received"); -+ } - -- case SSH_MSG_UNIMPLEMENTED: -- /* debugging XXX */ -- TRACE(("SSH_MSG_UNIMPLEMENTED")) -- goto out; -- -- case SSH_MSG_DISCONNECT: -- /* TODO cleanup? */ -- dropbear_close("Disconnect received"); -+ /* These packets may be received at any time, -+ except during first kex with strict kex */ -+ if (!first_strict_kex) { -+ switch(type) { -+ case SSH_MSG_IGNORE: -+ goto out; -+ case SSH_MSG_DEBUG: -+ goto out; -+ case SSH_MSG_UNIMPLEMENTED: -+ TRACE(("SSH_MSG_UNIMPLEMENTED")) -+ goto out; -+ } - } - - /* Ignore these packet types so that keepalives don't interfere with -@@ -98,7 +101,8 @@ void process_packet() { - if (type >= 1 && type <= 49 - && type != SSH_MSG_SERVICE_REQUEST - && type != SSH_MSG_SERVICE_ACCEPT -- && type != SSH_MSG_KEXINIT) -+ && type != SSH_MSG_KEXINIT -+ && !first_strict_kex) - { - TRACE(("unknown allowed packet during kexinit")) - recv_unimplemented(); -diff --git a/ssh.h b/ssh.h -index 1b4fec65f..ef3efdca0 100644 ---- a/ssh.h -+++ b/ssh.h -@@ -100,6 +100,10 @@ - #define SSH_EXT_INFO_C "ext-info-c" - #define SSH_SERVER_SIG_ALGS "server-sig-algs" - -+/* OpenSSH strict KEX feature */ -+#define SSH_STRICT_KEX_S "kex-strict-s-v00@openssh.com" -+#define SSH_STRICT_KEX_C "kex-strict-c-v00@openssh.com" -+ - /* service types */ - #define SSH_SERVICE_USERAUTH "ssh-userauth" - #define SSH_SERVICE_USERAUTH_LEN 12 -diff --git a/svr-session.c b/svr-session.c -index 769f0731d..a538e2c5c 100644 ---- a/svr-session.c -+++ b/svr-session.c -@@ -370,6 +370,9 @@ static void svr_algos_initialise(void) { - algo->usable = 0; - } - #endif -+ if (strcmp(algo->name, SSH_STRICT_KEX_C) == 0) { -+ algo->usable = 0; -+ } - } - } - diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index 8f6c49c62b..675715ddec 100644 --- a/package/dropbear/dropbear.hash +++ b/package/dropbear/dropbear.hash @@ -1,5 +1,5 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 bc5a121ffbc94b5171ad5ebe01be42746d50aa797c9549a4639894a16749443b dropbear-2022.83.tar.bz2 +sha256 16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009 dropbear-2024.84.tar.bz2 # License file, locally computed sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 7ac8a38559..440ebd44a2 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2022.83 +DROPBEAR_VERSION = 2024.84 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain @@ -14,9 +14,6 @@ DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) DROPBEAR_CPE_ID_VENDOR = dropbear_ssh_project DROPBEAR_CPE_ID_PRODUCT = dropbear_ssh -# 0001-Implement-Strict-KEX-mode.patch -DROPBEAR_IGNORE_CVES += CVE-2023-48795 - # Disable hardening flags added by dropbear configure.ac, and let # Buildroot add them when the relevant options are enabled. This # prevents dropbear from using SSP support when not available. From 4a23e8d07baecd748e35136c7ccdb1bbd02ded04 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 26 Apr 2024 20:02:17 +0200 Subject: [PATCH 002/114] package/dropbear: bump to version 2024.85 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit 2fbffc610ef9d54b38fefd171fde93de136f7477) Signed-off-by: Peter Korsgaard --- package/dropbear/dropbear.hash | 2 +- package/dropbear/dropbear.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash index 675715ddec..a901656e5d 100644 --- a/package/dropbear/dropbear.hash +++ b/package/dropbear/dropbear.hash @@ -1,5 +1,5 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 16e22b66b333d6b7e504c43679d04ed6ca30f2838db40a21f935c850dfc01009 dropbear-2024.84.tar.bz2 +sha256 86b036c433a69d89ce51ebae335d65c47738ccf90d13e5eb0fea832e556da502 dropbear-2024.85.tar.bz2 # License file, locally computed sha256 a99ce657d790b761c132ee7e0de18edb437ae6361e536d991c6a12f36e770445 LICENSE diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 440ebd44a2..0fcd1fa3f6 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2024.84 +DROPBEAR_VERSION = 2024.85 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 DROPBEAR_LICENSE = MIT, BSD-2-Clause, Public domain From 53e5169e863532455a53ff5c030d6ffa1d230670 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Tue, 9 Jul 2024 14:16:53 +0000 Subject: [PATCH 003/114] .b4-config: configure `b4` for Buildroot `b4` is a commandline tool to make patch-based development easier[1]. It is primarily used for Linux kernel development, but can be configured to support any project that has a public-inbox endpoint. Buildroot has a public-inbox mirror at "https://lore.kernel.org/buildroot/". We configure some basic settings that tell `b4` where to send patches and how to use get-developers. [1] https://b4.docs.kernel.org/en/latest/ Signed-off-by: Brandon Maier Signed-off-by: Arnout Vandecappelle (cherry picked from commit 322213e131fabd6aa6879c4f653415a35c93e63e) Signed-off-by: Peter Korsgaard --- .b4-config | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .b4-config diff --git a/.b4-config b/.b4-config new file mode 100644 index 0000000000..1943458f2f --- /dev/null +++ b/.b4-config @@ -0,0 +1,7 @@ +# Configuration for the `b4` tool +# See https://b4.docs.kernel.org/en/latest/config.html +[b4] + send-series-to = buildroot@buildroot.org + send-auto-cc-cmd = "./utils/get-developers -e -" + +# vim: set filetype=gitconfig: From e61425fd6448b2d46216fabb5936b0383ed1ea96 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 11 Jul 2024 21:27:19 +0200 Subject: [PATCH 004/114] package/ncftp: use correct SPDX license code According to https://spdx.org/licenses/, the correct license code for the "Clarified Artistic License" is ClArtistic. The only other package in Buildroot containing code under this license is google-breakpad, and it is already using the ClArtistic SPDX code. Signed-off-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (cherry picked from commit 2ca698051c50546a70e9f7b625f2ee9a2a6a2840) Signed-off-by: Peter Korsgaard --- package/ncftp/ncftp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ncftp/ncftp.mk b/package/ncftp/ncftp.mk index d380ebae02..789da1f454 100644 --- a/package/ncftp/ncftp.mk +++ b/package/ncftp/ncftp.mk @@ -10,7 +10,7 @@ NCFTP_VERSION = 3.2.6 NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.gz NCFTP_SITE = https://www.ncftp.com/public_ftp/ncftp/older_versions NCFTP_TARGET_BINS = ncftp -NCFTP_LICENSE = Clarified Artistic License +NCFTP_LICENSE = ClArtistic NCFTP_LICENSE_FILES = doc/LICENSE.txt NCFTP_DEPENDENCIES = host-autoconf From 11f75a23099835ac6c59416f6b83e797240e0da7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:27 +0100 Subject: [PATCH 005/114] support/scripts/mkusers: accept user tables without terminating \n Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5d8445138bd466f80dd45dab1b9fb7279f1536eb) Signed-off-by: Peter Korsgaard --- support/scripts/mkusers | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index ee09bbd1f2..08f3344518 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -409,9 +409,8 @@ main() { fi # Read in all the file in memory, exclude empty lines and comments - while read -r line; do - ENTRIES+=( "${line}" ) - done < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) + # mapfile reads all lines, even the last one if it is missing a \n + mapfile -t ENTRIES < <( sed -r -e 's/#.*//; /^[[:space:]]*$/d;' "${USERS_TABLE}" ) # We first create groups whose gid is positive, and then we create groups # whose gid is automatic, so that, if a group is defined both with From 145e8e74068207a89088d716de4dac9264ed62ca Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Mar 2024 00:44:29 +0100 Subject: [PATCH 006/114] support/download/check-hash: accept hash files without terminating \n Lots of people are using broken text editors that 1. do not naturally terminate text files with a final \n as is customary in UNIX text files, and 2. do not respect our .editorconfig settings, which explicitly require adding that final newline. See this nice summary of what a text file is (with references to applicable standards): https://stackoverflow.com/questions/12916352/shell-script-read-missing-last-line/12916758#12916758 So, it is not surprising that read does not read the last "line" of a file, when said "line" does not end with a newline, because it is thus not really a line. Even though we do mandate actual text files, let's be a little bit lax in this respect, because people may write packages, and their hash files, in a br2-external tree, and they may not have our .editorconfig in the directory heierarchy (e.g. if buildroot is a submodule of their br2-external tree, or whatever). mapfile does not suffer from this limitation, though, and correctly reads all lines from a file, even the final line-that-is-not-a-line. mapfile was introduced in bash 4.0, released on 2009-01-20, more than 15 years ago. Debian squeeze, released in 2011 already had bash 4.1. Those are really ancient. So, it means we can indeed expect bash version 4.0 or later; which means mapfile is available. "It should be fine!" Fixes: #15976 Reported-by: masonwardle@gmail.com Signed-off-by: Yann E. MORIN Signed-off-by: Arnout Vandecappelle (cherry picked from commit ac2e6b392791085bc29fa21901265a8eed4ae0ee) Signed-off-by: Peter Korsgaard --- support/download/check-hash | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/support/download/check-hash b/support/download/check-hash index 9db647885a..d18ec8b134 100755 --- a/support/download/check-hash +++ b/support/download/check-hash @@ -78,8 +78,10 @@ nb_checks=0 for h_file in "${h_files[@]}"; do [ -f "${h_file}" ] || continue : $((nb_h_files++)) - # shellcheck disable=SC2094 # we're really reading it only once - while read -r t h f; do + # mapfile reads all lines, even the last one if it is missing a \n + mapfile -t hash_lines <"${h_file}" + for hash_line in "${hash_lines[@]}"; do + read -r t h f <<<"${hash_line}" case "${t}" in ''|'#'*) # Skip comments and empty lines @@ -87,13 +89,12 @@ for h_file in "${h_files[@]}"; do ;; *) if [ "${f}" = "${base}" ]; then - # shellcheck disable=SC2094 # we're only printing the h_file filename check_one_hash "${t}" "${h}" "${file}" "${h_file}" : $((nb_checks++)) fi ;; esac - done <"${h_file}" + done done # shellcheck disable=SC2086 # nb_h_files is a non-empty int From 0e2daaad3e5512bfc28fbe80351e4ed6ad8c6a92 Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Fri, 12 Jul 2024 17:17:44 +0200 Subject: [PATCH 007/114] package/boost: cleanup HOST_BOOST_FLAGS - fix alphabetical ordering - put one module per line - add comment explaining why options are enabled Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5c20804afa42cb2efd57a4a333841290d35d9df6) Signed-off-by: Peter Korsgaard --- package/boost/boost.mk | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/package/boost/boost.mk b/package/boost/boost.mk index 9b1baec5bf..bb73edfda6 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -13,12 +13,39 @@ BOOST_LICENSE_FILES = LICENSE_1_0.txt BOOST_CPE_ID_VENDOR = boost # keep host variant as minimal as possible +# regex & system are needed by host-riscv-isa-sim HOST_BOOST_FLAGS = --without-icu --with-toolset=gcc \ - --without-libraries=$(subst $(space),$(comma),atomic chrono context \ - contract container coroutine date_time exception fiber filesystem graph \ - graph_parallel iostreams json locale log math mpi nowide program_options \ - python random serialization stacktrace test thread timer \ - type_erasure url wave) + --without-libraries=$(subst $(space),$(comma),\ + atomic \ + chrono container \ + context \ + contract \ + coroutine \ + date_time \ + exception \ + fiber \ + filesystem \ + graph \ + graph_parallel \ + iostreams \ + json \ + locale \ + log \ + math \ + mpi \ + nowide \ + program_options \ + python \ + random \ + serialization \ + stacktrace \ + test \ + thread \ + timer \ + type_erasure \ + url \ + wave\ + ) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) From cd3375a3f2563bed31e89905b7278eeaddab7c3a Mon Sep 17 00:00:00 2001 From: Michael Nosthoff Date: Thu, 11 Jul 2024 23:03:41 +0200 Subject: [PATCH 008/114] package/boost: cleanup boost-context/fiber/math boost-context - requires C++11 (gcc 4.8) since 1.61 see [0] - dropped the dependency on (boost) thread in 1.77 see [1] boost-fiber - needed C++11 since it's creation in 1.61 [2] boost-math - add comment for gcc version [0] https://www.boost.org/doc/libs/1_82_0/libs/context/doc/html/context/requirements.html [1] https://github.com/boostorg/context/commit/8425e830eab0ad550db937027392c4b4a54df695 [2] https://www.boost.org/doc/libs/1_62_0/libs/fiber/doc/html/fiber/overview.html Signed-off-by: Michael Nosthoff Signed-off-by: Arnout Vandecappelle (cherry picked from commit 16abf80368b660b4ec59778ca5060529b77a42c5) Signed-off-by: Peter Korsgaard --- package/boost/Config.in | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/package/boost/Config.in b/package/boost/Config.in index 60cc0a11a2..908a53fea0 100644 --- a/package/boost/Config.in +++ b/package/boost/Config.in @@ -50,13 +50,14 @@ config BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS config BR2_PACKAGE_BOOST_CONTEXT bool "boost-context" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ - || BR2_TOOLCHAIN_GCC_AT_LEAST_6 # boost-thread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - select BR2_PACKAGE_BOOST_THREAD if !BR2_TOOLCHAIN_GCC_AT_LEAST_6 help C++11 context switching library. +comment "boost-context needs a toolchain w/ C++11, gcc>=4.8" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + config BR2_PACKAGE_BOOST_CONTRACT bool "boost-contract" # pthread_condattr_setclock @@ -72,16 +73,20 @@ config BR2_PACKAGE_BOOST_COROUTINE bool "boost-coroutine" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-thread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # boost-context depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context, boost-thread select BR2_PACKAGE_BOOST_CHRONO select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_BOOST_THREAD help - deprecated coroutine library, the non-depricated coroutine2 + deprecated coroutine library, the non-deprecated coroutine2 library is a header-only library and does not need to be selected. +comment "boost-coroutine needs a toolchain w/ C++11, gcc>=4.8" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + comment "boost-coroutine needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS @@ -109,21 +114,20 @@ config BR2_PACKAGE_BOOST_FIBER depends on !BR2_MIPS_CPU_MIPS32 && !BR2_MIPS_CPU_MIPS64 depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-filesystem depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-context + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 select BR2_PACKAGE_BOOST_CONTEXT select BR2_PACKAGE_BOOST_FILESYSTEM select BR2_PACKAGE_BOOST_SYSTEM help C++11 userland threads library. -comment "boost-fiber needs a toolchain w/ NPTL" +comment "boost-fiber needs a toolchain w/ NPTL, C++11, gcc>=4.8" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL + depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 comment "boost-fiber needs a toolchain not affected by GCC bug 64735" depends on BR2_PACKAGE_BOOST_CONTEXT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS \ - || BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 config BR2_PACKAGE_BOOST_FILESYSTEM @@ -242,6 +246,9 @@ config BR2_PACKAGE_BOOST_MATH Octonions, like quaternions, are a relative of complex numbers. +comment "boost-math needs a toolchain w/ C++14, gcc>=5.0" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 + config BR2_PACKAGE_BOOST_MPI bool "boost-mpi" help From 950e1f47d953197e774f48c84d87688c5aeb4377 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 19 Jun 2024 09:32:52 +0200 Subject: [PATCH 009/114] package/attr: add missing libgen.h header Resolves the following error when building against MUSL: tools/attr.c: In function 'main': tools/attr.c:69:20: error: implicit declaration of function 'basename' [-Wimplicit-function-declaration] 69 | progname = basename(argv[0]); | ^~~~~~~~ tools/attr.c:69:18: error: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 69 | progname = basename(argv[0]); | ^ Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=8a80d895dfd779373363c3a4b62ecce5a549efb2 Fixes: http://autobuild.buildroot.net/results/c61206968eda9913e37e95a61dc3e10399503fcd/ Signed-off-by: Yegor Yefremov [Romain: use upstream patch] Signed-off-by: Romain Naour (cherry picked from commit fa241685e7f92311f5fd50ce17c1541748fe285b) Signed-off-by: Peter Korsgaard --- ...-missing-libgen.h-include-for-basena.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch diff --git a/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch b/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch new file mode 100644 index 0000000000..304177257c --- /dev/null +++ b/package/attr/0003-tools-attr.c-Add-missing-libgen.h-include-for-basena.patch @@ -0,0 +1,32 @@ +From 8a80d895dfd779373363c3a4b62ecce5a549efb2 Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" +Date: Sat, 30 Mar 2024 10:17:10 +0100 +Subject: [PATCH] tools/attr.c: Add missing libgen.h include for basename(3) + +Fixes compilation issue with musl and modern C99 compilers. + +See: https://bugs.gentoo.org/926294 + +Upstream: https://git.savannah.nongnu.org/cgit/attr.git/commit/?id=8a80d895dfd779373363c3a4b62ecce5a549efb2 + +Signed-off-by: Yegor Yefremov +Signed-off-by: Romain Naour +--- + tools/attr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tools/attr.c b/tools/attr.c +index f12e4af..6a3c1e9 100644 +--- a/tools/attr.c ++++ b/tools/attr.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include + +-- +2.45.0 + From c657ece0cd12e7394f5f5023df6dfe103c9a855e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 8 Feb 2024 21:15:59 +0100 Subject: [PATCH 010/114] support/testing: add attr runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 2da40a2fd7a0007ff1a51bc957980f516746a6ad) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_attr.py | 75 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 support/testing/tests/package/test_attr.py diff --git a/DEVELOPERS b/DEVELOPERS index 2f53d26adc..2db99e55e7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1763,6 +1763,7 @@ F: support/testing/tests/package/test_acl.py 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_attr.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 diff --git a/support/testing/tests/package/test_attr.py b/support/testing/tests/package/test_attr.py new file mode 100644 index 0000000000..1b43f7daf6 --- /dev/null +++ b/support/testing/tests/package/test_attr.py @@ -0,0 +1,75 @@ +import os + + +import infra.basetest + + +class TestAttr(infra.basetest.BRTest): + # Note: this test uses extended attributes (xattr). We use a ext4 + # rootfs (which fully supports xattrs). Note that tmpfs has + # partial support of xattrs, and cpio initrd has not. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_ATTR=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + disk_file = os.path.join(self.builddir, "images", "rootfs.ext4") + self.emulator.boot(arch="armv5", + kernel="builtin", + kernel_cmdline=["rootwait", "root=/dev/sda"], + options=["-drive", f"file={disk_file},if=scsi,format=raw"]) + self.emulator.login() + + # Check the programs can execute. + self.assertRunOk("getfattr --version") + self.assertRunOk("setfattr --version") + + test_file = "/root/file.txt" + attr_name = "buildroot" + attr_value = "is-great" + + # Create a test file. + self.assertRunOk(f"echo 'Hello Buildroot!' > {test_file}") + + # Set an extended attribute. + cmd = f"setfattr -n user.{attr_name} -v {attr_value} {test_file}" + self.assertRunOk(cmd) + + # Read back the attribute value. We add an extra "echo" to add + # a new line. getfattr --only-values prints raw attribute + # values and lack of a new line. + cmd = "getfattr" + cmd += f" -n user.{attr_name} --absolute-names --only-values" + cmd += f" {test_file} && echo" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], attr_value) + + # We read back the attribute value again, but with the "attr" + # command this time. + cmd = f"attr -q -g {attr_name} {test_file} && echo" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertEqual(out[0], attr_value) + + # List extended attributes with "attr", and check we see our + # test attribute. + cmd = f"attr -l {test_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertIn(attr_name, "\n".join(out)) + + # Remove the test attribute with setfattr. + cmd = f"setfattr -x user.{attr_name} {test_file}" + self.assertRunOk(cmd) + + # We check the test attribute is no longer listed by the attr + # command. + cmd = f"attr -l {test_file}" + out, ret = self.emulator.run(cmd) + self.assertEqual(ret, 0) + self.assertNotIn(attr_name, "\n".join(out)) From e255cb1c264a24eec0d6a1207dda8690871215ae Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 01:00:57 +0100 Subject: [PATCH 011/114] support/testing: add python-msgpack runtime test Signed-off-by: Marcus Hoffmann Signed-off-by: Arnout Vandecappelle (cherry picked from commit d429d5d399acc9921a9a86f4ae3d589d599605e4) Signed-off-by: Peter Korsgaard --- .../testing/tests/package/sample_python_msgpack.py | 5 +++++ support/testing/tests/package/test_python_msgpack.py | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 support/testing/tests/package/sample_python_msgpack.py create mode 100644 support/testing/tests/package/test_python_msgpack.py diff --git a/support/testing/tests/package/sample_python_msgpack.py b/support/testing/tests/package/sample_python_msgpack.py new file mode 100644 index 0000000000..1940f70821 --- /dev/null +++ b/support/testing/tests/package/sample_python_msgpack.py @@ -0,0 +1,5 @@ +import msgpack + +packaed = msgpack.packb([1, 2, 3], use_bin_type=True) + +assert msgpack.unpackb(packaed, raw=False) == [1, 2, 3] diff --git a/support/testing/tests/package/test_python_msgpack.py b/support/testing/tests/package/test_python_msgpack.py new file mode 100644 index 0000000000..e5876e400d --- /dev/null +++ b/support/testing/tests/package/test_python_msgpack.py @@ -0,0 +1,12 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3MsgPack(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_MSGPACK=y + """ + sample_scripts = ["tests/package/sample_python_msgpack.py"] + timeout = 40 From b250a2db630898f23300eaca3ce02b6d0832deef Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 14 Jul 2024 23:35:30 +0200 Subject: [PATCH 012/114] support/testing: fs: new btrfs runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 009f9106d991c9adbf8e57869d4355e0f71da31b) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/fs/test_btrfs.py | 56 +++++++++++++++++++ .../tests/fs/test_btrfs/linux-btrfs.fragment | 1 + 3 files changed, 59 insertions(+) create mode 100644 support/testing/tests/fs/test_btrfs.py create mode 100644 support/testing/tests/fs/test_btrfs/linux-btrfs.fragment diff --git a/DEVELOPERS b/DEVELOPERS index 2db99e55e7..3a05e72cd5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1752,6 +1752,8 @@ F: package/z3/ F: package/zynaddsubfx/ F: support/testing/tests/boot/test_optee_os.py F: support/testing/tests/boot/test_optee_os/ +F: support/testing/tests/fs/test_btrfs.py +F: support/testing/tests/fs/test_btrfs/ F: support/testing/tests/package/sample_python_distro.py F: support/testing/tests/package/sample_python_gnupg.py F: support/testing/tests/package/sample_python_hwdata.py diff --git a/support/testing/tests/fs/test_btrfs.py b/support/testing/tests/fs/test_btrfs.py new file mode 100644 index 0000000000..90b868a955 --- /dev/null +++ b/support/testing/tests/fs/test_btrfs.py @@ -0,0 +1,56 @@ +import os + +import infra.basetest + + +class TestBtrfs(infra.basetest.BRTest): + kern_frag = \ + infra.filepath("tests/fs/test_btrfs/linux-btrfs.fragment") + btrfs_label = "BR_TEST" + config = \ + f""" + 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.6.39" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="{kern_frag}" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_PACKAGE_BTRFS_PROGS=y + BR2_TARGET_ROOTFS_BTRFS=y + BR2_TARGET_ROOTFS_BTRFS_LABEL="{btrfs_label}" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + disk = os.path.join(self.builddir, "images", "rootfs.btrfs") + kern = os.path.join(self.builddir, "images", "Image") + bootargs = ["root=/dev/vda", "console=ttyAMA0"] + qemu_opts = ["-M", "virt", "-cpu", "cortex-a57", "-m", "256M", + "-drive", f"file={disk},if=virtio,format=raw"] + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=bootargs, + options=qemu_opts) + self.emulator.login() + + # We check our root filesystem is in btrfs format. + cmd = "mount | grep '/dev/root on / type btrfs'" + self.assertRunOk(cmd) + + # We show the root filesystem info with btrfs-progs, using the + # target btrfs-progs. + self.assertRunOk("btrfs filesystem show /") + + # We query the label and check it is the one from the + # Buildroot config. + out, ret = self.emulator.run("btrfs filesystem label /") + self.assertEqual(ret, 0) + self.assertEqual(out[0], self.btrfs_label) + + # We try to write data on the root filesystem. + self.assertRunOk("echo 'Hello Buildroot' > /root/file.txt") + self.assertRunOk("sync") diff --git a/support/testing/tests/fs/test_btrfs/linux-btrfs.fragment b/support/testing/tests/fs/test_btrfs/linux-btrfs.fragment new file mode 100644 index 0000000000..605c1837e1 --- /dev/null +++ b/support/testing/tests/fs/test_btrfs/linux-btrfs.fragment @@ -0,0 +1 @@ +CONFIG_BTRFS_FS=y From d0bd15493fa18dfedaed80a0e7cb69701c207916 Mon Sep 17 00:00:00 2001 From: Aleksandr Makarov Date: Fri, 12 Jul 2024 22:00:16 +0300 Subject: [PATCH 013/114] package/libest: Add support for openssl v3 libest uses functions that are no longer available in OpenSSL 3.0. Add a wrapper that calls the proper replacements depending on the version. Fixes: http://autobuild.buildroot.net/results/89024d6c1f10959282470b120d332fb32922b3b6 Signed-off-by: Aleksandr Makarov [Arnout: add Upstream: tag to patches] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 8dc7445056d1c21e4e4205cfcd92c0b539597e12) Signed-off-by: Peter Korsgaard --- ...ix-error-implicit-declaration-of-fun.patch | 64 +++++ ...libest-Add-OpenSSL-3.0-compatibility.patch | 225 ++++++++++++++++++ 2 files changed, 289 insertions(+) create mode 100644 package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch create mode 100644 package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch diff --git a/package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch b/package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch new file mode 100644 index 0000000000..6fd952170e --- /dev/null +++ b/package/libest/0001-package-libest-fix-error-implicit-declaration-of-fun.patch @@ -0,0 +1,64 @@ +From 28c65fd9dff2f30438b98f0b71f387468259a2c3 Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Fri, 12 Jul 2024 21:07:10 +0300 +Subject: [PATCH] =?UTF-8?q?package/libest:=20fix=20error:=20implicit?= + =?UTF-8?q?=20declaration=20of=20function=20=E2=80=98ERR=5Ferror=5Fstring?= + =?UTF-8?q?=E2=80=99?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Added necessary header includes to fix 'implicit declaration' errors which occur when +using -Wimplicit-function-declaration flag. + +Upstream: https://github.com/cisco/libest/pull/132 +Signed-off-by: Aleksandr Makarov +--- + src/est/est.c | 4 +++- + src/est/est_client.c | 1 + + src/est/est_server_http.c | 2 ++ + 3 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/est/est.c b/src/est/est.c +index 8a65f87..24474c0 100644 +--- a/src/est/est.c ++++ b/src/est/est.c +@@ -42,7 +42,9 @@ + #include + #endif /* DISABLE_BACKTRACE*/ + #endif /* WIN32*/ +- ++#include ++#include ++#include + #ifndef ENABLE_CLIENT_ONLY + static char hex_chpw[] = {0x06, 0x09, 0x2A, 0x86, 0x48, 0x86, + 0xF7, 0x0D, 0x01, 0x09, 0x07}; +diff --git a/src/est/est_client.c b/src/est/est_client.c +index 8dff9d9..5c25d4f 100644 +--- a/src/est/est_client.c ++++ b/src/est/est_client.c +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + #include "est.h" + #include "est_locl.h" + #include "est_ossl_util.h" +diff --git a/src/est/est_server_http.c b/src/est/est_server_http.c +index 2bd08d5..ce1cece 100644 +--- a/src/est/est_server_http.c ++++ b/src/est/est_server_http.c +@@ -42,6 +42,8 @@ + #include + #include + #include ++#include ++#include + #if defined(_WIN32) + #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005 + #else +-- +2.40.1 + diff --git a/package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch b/package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch new file mode 100644 index 0000000000..a4c74e424a --- /dev/null +++ b/package/libest/0002-package-libest-Add-OpenSSL-3.0-compatibility.patch @@ -0,0 +1,225 @@ +From ad5ce7ff1cae92c151dc6f350ef943106ddd852f Mon Sep 17 00:00:00 2001 +From: Aleksandr Makarov +Date: Fri, 12 Jul 2024 21:07:36 +0300 +Subject: [PATCH] package/libest: Add OpenSSL 3.0 compatibility + +The functions `FIPS_mode` and `FIPS_mode_set` are deprecated in OpenSSL 3.0, replaced by +`EVP_default_properties_is_fips_enabled` and `EVP_default_properties_enable_fips` respectively. + +This commit introduces wrappers for these new EVP APIs to maintain compatibility with OpenSSL 3.0, +while ensuring continued support for older versions of OpenSSL. + +- Implemented `is_fips_enabled` wrapper around `EVP_default_properties_is_fips_enabled` +- Implemented `enable_fips` wrapper around `EVP_default_properties_enable_fips` +- Added conditional compilation to support both new and legacy OpenSSL versions + +Upstream: https://github.com/cisco/libest/pull/132 +Signed-off-by: Aleksandr Makarov +--- + example/client-brski/estclient-brski.c | 2 +- + example/client/estclient.c | 2 +- + example/proxy/estproxy.c | 2 +- + example/server/estserver.c | 2 +- + java/jni/client.c | 2 +- + src/est/est_client.c | 12 ++++++------ + src/est/est_ossl_util.c | 18 ++++++++++++++++++ + src/est/est_ossl_util.h | 2 ++ + src/est/est_server.c | 2 +- + test/UT/US1864/us1864.c | 4 ++-- + 10 files changed, 34 insertions(+), 14 deletions(-) + +diff --git a/example/client-brski/estclient-brski.c b/example/client-brski/estclient-brski.c +index 9e63af5..6e03052 100644 +--- a/example/client-brski/estclient-brski.c ++++ b/example/client-brski/estclient-brski.c +@@ -388,7 +388,7 @@ int main (int argc, char **argv) + break; + case 'f': + /* Turn FIPS on if requested and exit if failure */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (!set_fips_return) { + printf("\nERROR setting FIPS MODE ON ...\n"); + ERR_load_crypto_strings(); +diff --git a/example/client/estclient.c b/example/client/estclient.c +index a8a2d6f..75b1272 100644 +--- a/example/client/estclient.c ++++ b/example/client/estclient.c +@@ -1280,7 +1280,7 @@ int main (int argc, char **argv) + break; + case 'f': + /* Turn FIPS on if requested and exit if failure */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (!set_fips_return) { + printf("\nERROR setting FIPS MODE ON ...\n"); + ERR_load_crypto_strings(); +diff --git a/example/proxy/estproxy.c b/example/proxy/estproxy.c +index 114bd65..6dbdbda 100644 +--- a/example/proxy/estproxy.c ++++ b/example/proxy/estproxy.c +@@ -593,7 +593,7 @@ int main (int argc, char **argv) + /* + * Turn FIPS on if user requested it and exit if failure + */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (set_fips_return != 1) { + set_fips_error = ERR_get_error(); + printf("\nERROR WHILE SETTING FIPS MODE ON exiting ....\n"); +diff --git a/example/server/estserver.c b/example/server/estserver.c +index 3539dc4..90886cf 100644 +--- a/example/server/estserver.c ++++ b/example/server/estserver.c +@@ -2285,7 +2285,7 @@ int main (int argc, char **argv) + /* turn FIPS on if user requested it + * and exit if failure. + */ +- set_fips_return = FIPS_mode_set(1); ++ set_fips_return = est_enable_fips(1); + if (set_fips_return != 1) { + set_fips_error = ERR_get_error(); + printf("\nERROR WHILE SETTING FIPS MODE ON exiting ....\n"); +diff --git a/java/jni/client.c b/java/jni/client.c +index c5bc28e..f58d5c0 100644 +--- a/java/jni/client.c ++++ b/java/jni/client.c +@@ -179,7 +179,7 @@ static int jni_est_client_X509_REQ_sign (X509_REQ *x, EVP_PKEY *pkey, const EVP_ + */ + JNIEXPORT jint JNICALL Java_com_cisco_c3m_est_ESTClient_enable_1fips( + JNIEnv *env, jclass obj) { +- if (!FIPS_mode() && !FIPS_mode_set(1)) { ++ if (!est_is_fips_enabled() && !est_enable_fips(1)) { + ERR_print_errors_fp(stderr); + return -1; + } else { +diff --git a/src/est/est_client.c b/src/est/est_client.c +index 5c25d4f..63069af 100644 +--- a/src/est/est_client.c ++++ b/src/est/est_client.c +@@ -3183,7 +3183,7 @@ EST_ERROR est_client_enroll_internal (EST_CTX *ctx, char *cn, int *pkcs7_len, in + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -3594,7 +3594,7 @@ EST_ERROR est_client_reenroll (EST_CTX *ctx, X509 *cert, int *pkcs7_len, EVP_PKE + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -3680,7 +3680,7 @@ static EST_ERROR est_client_enroll_csr_internal (EST_CTX *ctx, X509_REQ *csr, in + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -5872,7 +5872,7 @@ static EST_ERROR est_client_brski_send_get_voucher (EST_CTX *ctx, int *cacert_le + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -6366,7 +6366,7 @@ EST_ERROR est_client_brski_send_voucher_status (EST_CTX *ctx, EST_BRSKI_STATUS_V + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +@@ -6535,7 +6535,7 @@ EST_ERROR est_client_brski_send_enroll_status (EST_CTX *ctx, EST_BRSKI_STATUS_VA + * HTTPS digest mode requires the use of MD5. Make sure we're not + * in FIPS mode and can use MD5 + */ +- if (ctx->auth_mode == AUTH_DIGEST && (FIPS_mode())){ ++ if (ctx->auth_mode == AUTH_DIGEST && (est_is_fips_enabled())){ + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + rv = EST_ERR_BAD_MODE; + goto err; +diff --git a/src/est/est_ossl_util.c b/src/est/est_ossl_util.c +index daa54f2..0887daa 100644 +--- a/src/est/est_ossl_util.c ++++ b/src/est/est_ossl_util.c +@@ -500,3 +500,21 @@ char *est_find_ser_num_in_subj(X509 *cert) + return(ser_num_str); + } + #endif ++ ++int est_is_fips_enabled() ++{ ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++ return EVP_default_properties_is_fips_enabled(NULL); ++#else ++ return FIPS_mode(); ++#endif ++} ++ ++int est_enable_fips(int enable) ++{ ++#if OPENSSL_VERSION_NUMBER >= 0x30000000L ++ return EVP_default_properties_enable_fips(NULL, enable); ++#else ++ return FIPS_mode_set(enable); ++#endif ++} +diff --git a/src/est/est_ossl_util.h b/src/est/est_ossl_util.h +index 68ad290..2389e45 100644 +--- a/src/est/est_ossl_util.h ++++ b/src/est/est_ossl_util.h +@@ -44,4 +44,6 @@ LIBEST_TEST_API void ossl_dump_ssl_errors(void); + EST_ERROR ossl_init_cert_store(X509_STORE *store, + unsigned char *raw1, int size1); + ++int est_is_fips_enabled(); ++int est_enable_fips(int); + #endif +diff --git a/src/est/est_server.c b/src/est/est_server.c +index d047b48..979ae53 100644 +--- a/src/est/est_server.c ++++ b/src/est/est_server.c +@@ -3355,7 +3355,7 @@ EST_ERROR est_server_set_auth_mode (EST_CTX *ctx, EST_HTTP_AUTH_MODE amode) + /* + * Since HTTP digest auth uses MD5, make sure we're not in FIPS mode. + */ +- if (FIPS_mode()) { ++ if (est_is_fips_enabled()) { + EST_LOG_ERR("HTTP digest auth not allowed while in FIPS mode"); + return (EST_ERR_BAD_MODE); + } +diff --git a/test/UT/US1864/us1864.c b/test/UT/US1864/us1864.c +index 3e41cd7..1f57494 100644 +--- a/test/UT/US1864/us1864.c ++++ b/test/UT/US1864/us1864.c +@@ -218,12 +218,12 @@ static void us1864_test1 (void) + /* + * Make sure we don't allow DIGEST mode when in FIPS mode + */ +- if (!FIPS_mode_set(1)) { ++ if (!est_enable_fips(1)) { + printf("FIPS mode not supported, skipping test to prevent digest auth when in FIPS mode"); + } else { + est_rv = est_server_set_auth_mode(ctx, AUTH_DIGEST); + CU_ASSERT(est_rv == EST_ERR_BAD_MODE); +- FIPS_mode_set(0); ++ est_enable_fips(0); + } + + X509_free(x); +-- +2.40.1 + From d592786c37fe99162e65ce4c3b8322a281e68cbf Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 13:56:49 +0100 Subject: [PATCH 014/114] support/testing: add python-asn1crypto runtime test Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 2fe638af2632424b826843675311f9a258a57b71) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 ++ .../tests/package/sample_python_asn1crypto.py | 11 +++++++++++ .../testing/tests/package/test_python_asn1crypto.py | 13 +++++++++++++ 3 files changed, 26 insertions(+) create mode 100644 support/testing/tests/package/sample_python_asn1crypto.py create mode 100644 support/testing/tests/package/test_python_asn1crypto.py diff --git a/DEVELOPERS b/DEVELOPERS index 3a05e72cd5..4325a712a3 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2111,6 +2111,8 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/selinux-python/ +F: support/testing/tests/package/sample_python_asn1crypto.py +F: support/testing/tests/package/test_python_asn1crypto.py F: utils/config F: utils/diffconfig diff --git a/support/testing/tests/package/sample_python_asn1crypto.py b/support/testing/tests/package/sample_python_asn1crypto.py new file mode 100644 index 0000000000..0b10487572 --- /dev/null +++ b/support/testing/tests/package/sample_python_asn1crypto.py @@ -0,0 +1,11 @@ +from asn1crypto import pem, x509 + + +with open('/etc/ssl/certs/ISRG_Root_X2.pem', 'rb') as f: + der_bytes = f.read() + if pem.detect(der_bytes): + type_name, headers, der_bytes = pem.unarmor(der_bytes) + +cert = x509.Certificate.load(der_bytes) + +assert cert.subject.native["common_name"] == "ISRG Root X2" diff --git a/support/testing/tests/package/test_python_asn1crypto.py b/support/testing/tests/package/test_python_asn1crypto.py new file mode 100644 index 0000000000..97df3d3ac8 --- /dev/null +++ b/support/testing/tests/package/test_python_asn1crypto.py @@ -0,0 +1,13 @@ +from tests.package.test_python import TestPythonPackageBase + + +class TestPythonPy3Asn1Crypto(TestPythonPackageBase): + __test__ = True + config = TestPythonPackageBase.config + \ + """ + BR2_PACKAGE_CA_CERTIFICATES=y + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_ASN1CRYPTO=y + """ + sample_scripts = ["tests/package/sample_python_asn1crypto.py"] + timeout = 40 From d2865a73fa330c77cd099329ef6b4f327b68ce2b Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 16 Jul 2024 11:43:05 +0200 Subject: [PATCH 015/114] package/nodejs: security bump to v20.15.1 Release Notes: https://nodejs.org/en/blog/release/v20.15.1 Fixes the following CVE's: CVE-2024-36138 - Bypass incomplete fix of CVE-2024-27980 (High) CVE-2024-22020 - Bypass network import restriction via data URL (Medium) CVE-2024-22018 - fs.lstat bypasses permission model (Low) CVE-2024-36137 - fs.fchown/fchmod bypasses permission model (Low) CVE-2024-37372 - Permission model improperly processes UNC paths (Low) Also these additional CVE's were fixed in the v20.12.1 and v20.12.2 releases [1][2]: CVE-2024-27983 - Assertion failed in node::http2::Http2Session::~Http2Session() leads to HTTP/2 server crash- (High) CVE-2024-27982 - HTTP Request Smuggling via Content Length Obfuscation - (Medium) CVE-2024-27980 - Command injection via args parameter of child_process.spawn without shell option enabled on Windows NodeJS tests are passing: $ ./support/testing/run-tests -o ./outputs/ -k tests.package.test_nodejs -d dl 12:02:58 TestNodeJSModuleHostSrc Starting 12:02:58 TestNodeJSModuleHostSrc Building 13:17:15 TestNodeJSModuleHostSrc Building done 13:17:23 TestNodeJSModuleHostSrc Cleaning up .13:17:23 TestNodeJSModuleHostBin Starting 13:17:23 TestNodeJSModuleHostBin Building 14:06:15 TestNodeJSModuleHostBin Building done 14:06:20 TestNodeJSModuleHostBin Cleaning up .14:06:20 TestNodeJSBasic Starting 14:06:20 TestNodeJSBasic Building 14:55:40 TestNodeJSBasic Building done 14:55:45 TestNodeJSBasic Cleaning up LICENSE hash changed due to changes in vendored components: * copyright year update and adding spdx identifier [1] [1] https://nodejs.org/en/blog/release/v20.12.1 [2] https://nodejs.org/en/blog/release/v20.12.2 [3] https://github.com/nodejs/node/commit/d5a316f5ea3fade3140c2ae35c144b500fb5d758 Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit bffb6a2339bbfe28a0ca2399716c3966af4a623c) 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 2cbbf766f5..61bda55098 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,8 +1,8 @@ -# From https://nodejs.org/dist/v20.12.0/SHASUMS256.txt.asc -sha256 007ca2699cf6e84290e5bed844ed66ef9d707d23561dfaf117212b7dce216ba7 node-v20.12.0-linux-arm64.tar.xz -sha256 668fb421a24be596c98f00a31049fbf6ada14d221b7382e0f1caa55ab421431a node-v20.12.0-linux-armv7l.tar.xz -sha256 78dc3b7ad993c332684802e35c1f0de2b76193d13394bc89e3bab216828587c7 node-v20.12.0-linux-ppc64le.tar.xz -sha256 0a126adf5b6a5eb11a37bad76a0c626a18f20b6811322e68aae0e3cf9bf580bd node-v20.12.0-linux-x64.tar.xz -sha256 76e5346cebfd581528f699f764f4d1a6e87cb818b696708f235ddcb625a0f78d node-v20.12.0.tar.xz +# From https://nodejs.org/dist/v20.15.1/SHASUMS256.txt.asc +sha256 10d47a46ef208b3e4b226e4d595a82659123b22397ed77b7975d989114ec317e node-v20.15.1-linux-arm64.tar.xz +sha256 7bc120efdd8018f6915471b963d9b80adf4ed406d6dc9edb4ae944b85f505c4c node-v20.15.1-linux-armv7l.tar.xz +sha256 b33e684802251397ad62ad3f8a1836267ee8b7723f87f669470018ad0035287b node-v20.15.1-linux-ppc64le.tar.xz +sha256 26700f8d3e78112ad4a2618a9c8e2816e38a49ecf0213ece80e54c38cb02563f node-v20.15.1-linux-x64.tar.xz +sha256 fdd53a5729d936691a2a1151046fb4897721cb8b0fca2af957823a9b40fe0c34 node-v20.15.1.tar.xz # Locally calculated -sha256 d3a9fbfe0a1fb78627ee296cd5ca5b498822d4d1c5da3b8e8100c41bd7b791fd LICENSE +sha256 49cd410e0fe6a8879a40d0764092d1e6114cc85fe41d4efed990d028eec25582 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 9ed51fbe9b..104d2cf258 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.12.0 +NODEJS_COMMON_VERSION = 20.15.1 NODEJS_COMMON_SOURCE = node-v$(NODEJS_COMMON_VERSION).tar.xz NODEJS_COMMON_SITE = http://nodejs.org/dist/v$(NODEJS_COMMON_VERSION) From 574d6b128830fa7e6992d4829e5cf4bab23534ca Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 17 Jul 2024 17:12:54 +0200 Subject: [PATCH 016/114] package/uclibc: add patch for libucontext usage *ucontext functions are only implemented for a subset of uClibc supported architectures. To allow the external library libucontext to be used this small patch is required. Tested for riscv64. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit f761a8c4516d88d70ae6f5d192fdb99cafa761a6) Signed-off-by: Peter Korsgaard --- .../0001-allow-to-use-sys-ucontext.h.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/uclibc/0001-allow-to-use-sys-ucontext.h.patch diff --git a/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch b/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch new file mode 100644 index 0000000000..b6bd5602d9 --- /dev/null +++ b/package/uclibc/0001-allow-to-use-sys-ucontext.h.patch @@ -0,0 +1,35 @@ +From 903da45dde43836e35a295226c5b1efccd413c08 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 17 Jul 2024 15:41:40 +0200 +Subject: [PATCH] allow to use + +For architectures without ucontext implementation it is possible +to use libucontext with this small adaptation. + +Signed-off-by: Waldemar Brodkorb +Upstream: https://mailman.openadk.org/mailman3/hyperkitty/list/devel@uclibc-ng.org/thread/MZCPGG56TL7SVOZY2L3AGHLREJ76BYZE/ +--- + include/ucontext.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/ucontext.h b/include/ucontext.h +index 4ce114ef1..76b4f375e 100644 +--- a/include/ucontext.h ++++ b/include/ucontext.h +@@ -23,11 +23,11 @@ + + #include + +-#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ +- + /* Get machine dependent definition of data structures. */ + #include + ++#ifdef __UCLIBC_HAS_CONTEXT_FUNCS__ ++ + __BEGIN_DECLS + + /* Get user context and store it in variable pointed to by UCP. */ +-- +2.30.2 + From 6a27d4667dc6d1997fe7023375c9ad7e855a8e35 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 12 Jun 2024 19:06:03 +0200 Subject: [PATCH 017/114] package/libgtk3: bump to version 3.24.42 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit d40e57e945e8348f74d0228e00c9424ce3bfb68a) Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index 0fa4873443..a1d8b1694d 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.41.sha256sum -sha256 47da61487af3087a94bc49296fd025ca0bc02f96ef06c556e7c8988bd651b6fa gtk+-3.24.41.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.42.sha256sum +sha256 50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2 gtk+-3.24.42.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 7e5882f830..547fd194a5 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).41 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).42 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From cd8402978f4562891ed47fb068b88d5d754797e4 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 17 Jul 2024 19:02:56 +0200 Subject: [PATCH 018/114] package/libgtk3: security bump to version 3.24.43 fix CVE-2024-6655 (Library injection from CWD) Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit c51f9881d6737ba63ae4ce6f1ea436eeec364e09) Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.hash | 4 ++-- package/libgtk3/libgtk3.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libgtk3/libgtk3.hash b/package/libgtk3/libgtk3.hash index a1d8b1694d..6a682a7412 100644 --- a/package/libgtk3/libgtk3.hash +++ b/package/libgtk3/libgtk3.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.42.sha256sum -sha256 50f89f615092d4dd01bbd759719f8bd380e5f149f6fd78a94725e2de112377e2 gtk+-3.24.42.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.43.sha256sum +sha256 7e04f0648515034b806b74ae5d774d87cffb1a2a96c468cb5be476d51bf2f3c7 gtk+-3.24.43.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 547fd194a5..d6d7c64a54 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGTK3_VERSION_MAJOR = 3.24 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).42 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).43 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From cc03fb2d1a83a89b4754c08430fb5a524d204507 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gero=20Schw=C3=A4ricke?= Date: Wed, 3 Apr 2024 21:30:38 +0000 Subject: [PATCH 019/114] docs/manual: promote using fixed version for kernel headers when contributing a board MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the default (newest) kernel headers series changes the build can break. Example error message: Incorrect selection of kernel headers: expected 6.8.x, got 6.5.x In the above case the defconfig used: BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.9" The kernel headers were not specified, so the build defaulted to using the kernel sources as header source and the default (newest) header series. From .config: BR2_KERNEL_HEADERS_AS_KERNEL=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_8=y Signed-off-by: Gero Schwäricke Signed-off-by: Arnout Vandecappelle (cherry picked from commit eb519ad7cc716347dbf0f9707ff282a97b21f623) Signed-off-by: Peter Korsgaard --- docs/manual/adding-board-support.adoc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/manual/adding-board-support.adoc b/docs/manual/adding-board-support.adoc index 9501262086..be7699668d 100644 --- a/docs/manual/adding-board-support.adoc +++ b/docs/manual/adding-board-support.adoc @@ -32,7 +32,11 @@ Always use fixed versions or commit hashes for the different components, not the "latest" version. For example, set +BR2_LINUX_KERNEL_CUSTOM_VERSION=y+ and +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE+ to the kernel version you tested -with. +with. If you are using the buildroot toolchain +BR2_TOOLCHAIN_BUILDROOT+ +(which is the default), additionally ensure that the same kernel headers +are used (+BR2_KERNEL_HEADERS_AS_KERNEL+, which is also the default) and +set the custom kernel headers series to match your kernel version +(+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_*+). It is recommended to use as much as possible upstream versions of the Linux kernel and bootloaders, and to use as much as possible default From feeb6ea3690f73eb3748c1970a69e1b53db03c9e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 14:29:08 +0200 Subject: [PATCH 020/114] package/mpir: fix build with host gcc >= 14 Fix the following build failure with host gcc >= 14 which enables -Werror=implicit-function-declaration (https://gcc.gnu.org/gcc-14/porting_to.html): configure:9998: checking build system compiler /usr/bin/gcc configure:10011: /usr/bin/gcc conftest.c conftest.c: In function 'main': conftest.c:4:3: error: implicit declaration of function 'exit' [-Wimplicit-function-declaration] 4 | exit(0); | ^~~~ conftest.c:1:1: note: include '' or provide a declaration of 'exit' +++ |+#include 1 | int conftest.c:4:3: warning: incompatible implicit declaration of built-in function 'exit' [-Wbuiltin-declaration-mismatch] 4 | exit(0); | ^~~~ conftest.c:4:3: note: include '' or provide a declaration of 'exit' configure:10014: $? = 1 configure:10021: result: no configure:10026: error: Specified CC_FOR_BUILD doesn't seem to work Fixes: - http://autobuild.buildroot.org/results/3ab381f06d5dc030039b6f6f8d19feb55cf3367d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3bb426628c19f04cbad6821c1a68f008043d7808) Signed-off-by: Peter Korsgaard --- ...-Fix-configure-failures-with-Xcode12.patch | 116 ++++++++++++++++++ package/mpir/mpir.mk | 2 + 2 files changed, 118 insertions(+) create mode 100644 package/mpir/0002-Fix-configure-failures-with-Xcode12.patch diff --git a/package/mpir/0002-Fix-configure-failures-with-Xcode12.patch b/package/mpir/0002-Fix-configure-failures-with-Xcode12.patch new file mode 100644 index 0000000000..453515f926 --- /dev/null +++ b/package/mpir/0002-Fix-configure-failures-with-Xcode12.patch @@ -0,0 +1,116 @@ +From bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb Mon Sep 17 00:00:00 2001 +From: Mitchell Blank Jr +Date: Mon, 21 Dec 2020 12:05:19 +0000 +Subject: [PATCH] Fix configure failures with Xcode12 + +Changes are needed becuase Xcode12 includes a default of +-Werror,-Wimplicit-function-declaration which means that +even something like calling "exit(0);" is a compile failure +if you haven't done a "#include " first (as C99 +requires, but most other compilers will just warn about) + +I don't know if the "long long reliability test 2" test which +tries to provoke a crash on a particular gcc 3.3 build still +does what it was originally intended to do with my change. +Of course, I doubt anyone has tried to use that compiler in +years. + +Fixes #290 + +Upstream: https://github.com/wbhart/mpir/commit/bbc43ca6ae0bec4f64e69c9cd4c967005d6470eb +Signed-off-by: Fabrice Fontaine +--- + acinclude.m4 | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 91c35bc23..620a629ef 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -589,9 +589,9 @@ extern + #endif + __inline__ t1 e(t2 rp,t2 up,int n,t1 v0) + {t1 c,x,r;int i;if(v0){c=1;for(i=1;iconftest.c <conftest.c < + int + main () + { +- exit(0); ++ return 0; + } + double d; + double diff --git a/package/mpir/mpir.mk b/package/mpir/mpir.mk index 5dbd760aa1..46cd35e436 100644 --- a/package/mpir/mpir.mk +++ b/package/mpir/mpir.mk @@ -11,6 +11,8 @@ MPIR_LICENSE = LGPL-3.0+ MPIR_LICENSE_FILES = COPYING.LIB MPIR_INSTALL_STAGING = YES MPIR_DEPENDENCIES = gmp host-yasm +# 0002-Fix-configure-failures-with-Xcode12.patch +MPIR_AUTORECONF = YES ifeq ($(BR2_MIPS_NABI32),y) MPIR_CONF_OPTS += ABI=n32 From ae32afab9b234a78d9b3a4015ea733c53e5d05b9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 20 Jul 2024 21:01:40 +0200 Subject: [PATCH 021/114] package/libcoap: enable required libopenssl options libcoap unconditionally calls the (deprecated) ENGINE_* logic in libopenssl resulting in a build failure when !BR2_PACKAGE_LIBOPENSSL_ENGINES since commit 623d3bbe43e9193aa8e3395367d01af59071b859 libcoap also unconditionally uses PSK Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/6bd3e1390cbbc59b9b3d030c2a401e45e9d173da - http://autobuild.buildroot.org/results/f243209454feed4f33f759786c2023c576a2cd3d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 33d25f08f97450cea7a415582dc2110b2bc828c2) Signed-off-by: Peter Korsgaard --- package/libcoap/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/libcoap/Config.in b/package/libcoap/Config.in index 6e0c1905bc..950aee5279 100644 --- a/package/libcoap/Config.in +++ b/package/libcoap/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_LIBCOAP bool "libcoap" + select BR2_PACKAGE_LIBOPENSSL_ENABLE_PSK if BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help libcoap is a C implementation of a lightweight application-protocol for devices that are constrained their From fdbbe21c87e69835418b046b11cc876dbea58556 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:27:51 +0200 Subject: [PATCH 022/114] package/libupnp: bump to version 1.4.19 https://github.com/pupnp/pupnp/blob/release-1.14.19/ChangeLog Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 3a4bd98d11550081db622327fd8cab570c0ad077) Signed-off-by: Peter Korsgaard --- package/libupnp/libupnp.hash | 2 +- package/libupnp/libupnp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libupnp/libupnp.hash b/package/libupnp/libupnp.hash index 6fd4678c0d..86437a7339 100644 --- a/package/libupnp/libupnp.hash +++ b/package/libupnp/libupnp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 16a7cee93ce2868ae63ab1a8164dc7de43577c59983b9f61293a310d6888dceb libupnp-1.14.18.tar.bz2 +sha256 b6423c573b758d09539f5e6c4712c1a9fd35dccf835f81d99473d50a50ad49b0 libupnp-1.14.19.tar.bz2 sha256 c8b99423cad48bb44e2cf52a496361404290865eac259a82da6d1e4331ececb3 COPYING diff --git a/package/libupnp/libupnp.mk b/package/libupnp/libupnp.mk index 61e52c095a..cd148d14d0 100644 --- a/package/libupnp/libupnp.mk +++ b/package/libupnp/libupnp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUPNP_VERSION = 1.14.18 +LIBUPNP_VERSION = 1.14.19 LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 LIBUPNP_SITE = \ http://downloads.sourceforge.net/project/pupnp/release-$(LIBUPNP_VERSION) From 1eb219ffcebb8a98604e4b6692e72826d9304d9d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:41:18 +0200 Subject: [PATCH 023/114] package/libxslt: bump to version 1.1.42 https://gitlab.gnome.org/GNOME/libxslt/-/blob/v1.1.42/NEWS Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit f3461d083b53ac262dd31e2b93281cecdc8d3147) Signed-off-by: Peter Korsgaard --- package/libxslt/libxslt.hash | 4 ++-- package/libxslt/libxslt.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxslt/libxslt.hash b/package/libxslt/libxslt.hash index 7597e7954d..dd67940c8a 100644 --- a/package/libxslt/libxslt.hash +++ b/package/libxslt/libxslt.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.39.sha256sum -sha256 2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0 libxslt-1.1.39.tar.xz +# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.42.sha256sum +sha256 85ca62cac0d41fc77d3f6033da9df6fd73d20ea2fc18b0a3609ffb4110e1baeb libxslt-1.1.42.tar.xz # Hash for license file: sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 8098937ef3..b5bb22f9ae 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.39 +LIBXSLT_VERSION = 1.1.42 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES From d6b21427736be914c181a5599f82f26949640790 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 19 Jul 2024 23:46:10 +0200 Subject: [PATCH 024/114] package/ksmbd-tools: bump to version 3.5.2 https://github.com/cifsd-team/ksmbd-tools/releases/tag/3.5.2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b409766234a3aabb33918b935b58704822345e9e) Signed-off-by: Peter Korsgaard --- package/ksmbd-tools/ksmbd-tools.hash | 2 +- package/ksmbd-tools/ksmbd-tools.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ksmbd-tools/ksmbd-tools.hash b/package/ksmbd-tools/ksmbd-tools.hash index c3e6ebefe5..3367886d55 100644 --- a/package/ksmbd-tools/ksmbd-tools.hash +++ b/package/ksmbd-tools/ksmbd-tools.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ab377b3044c48382303f3f7ec95f2e1a17592c774d70b2a11f32952099dbb214 ksmbd-tools-3.5.1.tar.gz +sha256 5da7fb4cb4368f9abf56f6f9fbc17b25e387876bed9ff7ee0d6f1140ef07c8d7 ksmbd-tools-3.5.2.tar.gz sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/ksmbd-tools/ksmbd-tools.mk b/package/ksmbd-tools/ksmbd-tools.mk index c56c6e10bb..261eddad7c 100644 --- a/package/ksmbd-tools/ksmbd-tools.mk +++ b/package/ksmbd-tools/ksmbd-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -KSMBD_TOOLS_VERSION = 3.5.1 +KSMBD_TOOLS_VERSION = 3.5.2 KSMBD_TOOLS_SITE = https://github.com/cifsd-team/ksmbd-tools/releases/download/$(KSMBD_TOOLS_VERSION) KSMBD_TOOLS_LICENSE = GPL-2.0+ KSMBD_TOOLS_LICENSE_FILES = COPYING From f7fc0d190445f669c34426409beda6b4c4f0de32 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Jul 2024 13:45:57 +0200 Subject: [PATCH 025/114] support/testing: add mawk runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit f04a95f79f087869a44ea3d63d55ce7b27b8e922) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_mawk.py | 114 +++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 support/testing/tests/package/test_mawk.py diff --git a/DEVELOPERS b/DEVELOPERS index 4325a712a3..3899f4aef9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1829,6 +1829,7 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_mawk.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ F: support/testing/tests/package/test_micropython.py diff --git a/support/testing/tests/package/test_mawk.py b/support/testing/tests/package/test_mawk.py new file mode 100644 index 0000000000..5caf77c116 --- /dev/null +++ b/support/testing/tests/package/test_mawk.py @@ -0,0 +1,114 @@ +import os + +import infra.basetest + + +class TestMawk(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_MAWK=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def basic_mawk_tests(self): + # Check the program can execute + self.assertRunOk("mawk --version") + + # Check "mawk" can return a specific exit code + code = 123 + cmd = "mawk 'BEGIN { exit(" + str(code) + "); }'" + _, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, code) + + # Run a basic print program + test_string = "Hello Buildroot" + cmd = "mawk 'BEGIN {print \"" + test_string + "\"; }'" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0], test_string) + + def create_test_data(self): + # Create some test data + entries = ["one", "two", "three", "four"] + for entry in entries: + self.assertRunOk(f"echo {entry} >> data1.txt") + + def add_line_numbers(self): + # Add line numbers with mawk + cmd = "mawk '{ print NR \"\\t\" $1; }' data1.txt > data2.txt" + self.assertRunOk(cmd) + + def sum_column(self): + # Check the sum of the first column is 1+2+3+4 == 10 + awk_prg = "BEGIN { SUM = 0; } { SUM = SUM + $1; } END { print SUM; }" + cmd = f"mawk '{awk_prg}' data2.txt" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(int(output[0]), 10) + + def uppercase_column(self): + # Extract only column 2 and convert it to upper case + cmd = "mawk '{ print toupper($2); }' data2.txt > data3.txt" + self.assertRunOk(cmd) + + # Prepare the same output using "data1.txt" and the "tr" command, + # for verification + cmd = "tr a-z A-Z < data1.txt > data3-tr.txt" + self.assertRunOk(cmd) + + # "mawk" and "tr" output are expected to be the same + self.assertRunOk("cmp data3.txt data3-tr.txt") + + def mawk_head(self): + # Show the first 2 lines of a file + cmd = "mawk 'NR <= 2 { print $0; }' data2.txt > data4.txt" + self.assertRunOk(cmd) + + # Prepare the same output using the "head" command + cmd = "head -2 data2.txt > data4-head.txt" + self.assertRunOk(cmd) + + # "mawk" and "tr" output are expected to be the same + self.assertRunOk("cmp data4.txt data4-head.txt") + + def mawk_specific(self): + # Use the "-W dump" mawk specific option. + # See: https://invisible-island.net/mawk/manpage/mawk.html + # We create an arbitrary awk program with an integer and + # string constant. We then check those constants are in the + # mawk "assembler" output. + awk_int = 12345 + awk_str = "Buildroot" + awk_expr = f"print ($1 + {awk_int}) \"{awk_str}\";" + awk_prg = "BEGIN { " + awk_expr + " }" + cmd = f"mawk -W dump '{awk_prg}'" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + out_str = "\n".join(output) + self.assertIn(str(awk_int), out_str) + self.assertIn(awk_str, out_str) + + def mawk_numeric(self): + value = 1234 + squared_value = value * value + cmd = "mawk 'BEGIN { print sqrt(" + str(squared_value) + "); }'" + output, exit_code = self.emulator.run(cmd) + self.assertEqual(exit_code, 0) + self.assertEqual(int(output[0]), value) + + 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() + + self.basic_mawk_tests() + self.create_test_data() + self.add_line_numbers() + self.sum_column() + self.uppercase_column() + self.mawk_head() + self.mawk_specific() + self.mawk_numeric() From fdce4439ae919c5b92c7db2191b637491de870dc Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 20 Jul 2024 19:38:34 +0200 Subject: [PATCH 026/114] support/testing: add gpsd runtime testing Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 9c8f6dc5e4d7244b493e290c055202cadc9a12cb) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_gpsd.py | 56 +++++++++++++++++++ .../rootfs-overlay/root/udp-nmea.log | 6 ++ 3 files changed, 64 insertions(+) create mode 100644 support/testing/tests/package/test_gpsd.py create mode 100644 support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log diff --git a/DEVELOPERS b/DEVELOPERS index 3899f4aef9..1b9fdd7b1c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1798,6 +1798,8 @@ F: support/testing/tests/package/test_gnuplot.py F: support/testing/tests/package/test_gnuplot/ F: support/testing/tests/package/test_gnuradio.py F: support/testing/tests/package/test_gnuradio/ +F: support/testing/tests/package/test_gpsd.py +F: support/testing/tests/package/test_gpsd/ F: support/testing/tests/package/test_gzip.py F: support/testing/tests/package/test_highway.py F: support/testing/tests/package/test_hwloc.py diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py new file mode 100644 index 0000000000..deed586c17 --- /dev/null +++ b/support/testing/tests/package/test_gpsd.py @@ -0,0 +1,56 @@ +import os +import time + +import infra.basetest + + +class TestGpsd(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_gpsd/rootfs-overlay") + # This test is using the gpsfake Python script. + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_GPSD=y + BR2_PACKAGE_PYTHON3=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + 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() + + # We check the program can execute. + self.assertRunOk("gpsd --version") + + # Since gpsd needs a real GPS device, we stop the service. + self.assertRunOk("/etc/init.d/S50gpsd stop") + + # We start the "gpsfake" GPS emulator instead. + cmd = "gpsfake" + cmd += " --slow --cycle 0.1 --quiet" + cmd += "/root/udp-nmea.log &> /dev/null &" + self.assertRunOk(cmd) + + # Wait a bit, to let the gpsfake and gpsd to settle... + time.sleep(3 * self.timeout_multiplier) + + # List the GPS devices. We should see our local UDP test GPS. + out, ret = self.emulator.run("gpsctl") + self.assertEqual(ret, 0) + self.assertTrue(out[0].startswith("udp://127.0.0.1")) + self.assertIn("NMEA0183", out[0]) + + # Collect some of our fake GPS data, and check we got the + # coordinates from our test data file. + # Our expected coordinates are: + # https://www.openstreetmap.org/#map=19/43.60439/1.44336 + out, ret = self.emulator.run("gpscsv --header 0 --count 3") + self.assertEqual(ret, 0) + _, gps_lat, gps_long, _ = out[0].split(",") + self.assertAlmostEqual(float(gps_lat), 43.60439) + self.assertAlmostEqual(float(gps_long), 1.44336) diff --git a/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log b/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log new file mode 100644 index 0000000000..f3730da7c5 --- /dev/null +++ b/support/testing/tests/package/test_gpsd/rootfs-overlay/root/udp-nmea.log @@ -0,0 +1,6 @@ +# Name: NMEA 0183 messages for gpsd Buildroot test +# Transport: UDP +# For packet format, see: +# https://gpsd.gitlab.io/gpsd/NMEA.html +$GPGGA,123456.789,4336.2634,N,0126.6016,E,1,04,1.7,143.5,M,,,,*3A +$GPZDA,123456.789,20,07,2024,2,00*64 From 37d82d410e3532b867749d29d9c52f80ac6b43f2 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 23 Jul 2024 00:39:22 +0200 Subject: [PATCH 027/114] support/testing: package: gpsd: fix gpsfake command line The gpsfake command line has a typo (a missing space), which makes the next gpsctl command to always fail. This commit fixes the issue by adding the missing space. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7391792948 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 49156a0fa4a48d5d80f03c3854f631f312b486d4) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_gpsd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py index deed586c17..7ca5973981 100644 --- a/support/testing/tests/package/test_gpsd.py +++ b/support/testing/tests/package/test_gpsd.py @@ -33,7 +33,7 @@ def test_run(self): # We start the "gpsfake" GPS emulator instead. cmd = "gpsfake" cmd += " --slow --cycle 0.1 --quiet" - cmd += "/root/udp-nmea.log &> /dev/null &" + cmd += " /root/udp-nmea.log &> /dev/null &" self.assertRunOk(cmd) # Wait a bit, to let the gpsfake and gpsd to settle... From 29db3dd6e5d51d2450c29accbee55091b2f82036 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Fri, 19 Jul 2024 16:17:59 +0200 Subject: [PATCH 028/114] package/micropython: change URL to HTTPS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni (cherry picked from commit ade6e41831c2b1f82028dda9744c6b64907e20ef) 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 849a5452f4..b466fbaf2d 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_MICROPYTHON 3 programming language that is optimised to run on a microcontroller. - http://micropython.org + https://micropython.org if BR2_PACKAGE_MICROPYTHON From 8faac43daaae56694f66d1bd4da6fb273c9f4eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Fri, 19 Jul 2024 16:18:00 +0200 Subject: [PATCH 029/114] package/micropython: adjust name in description MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the name from "Micro Python" (two words) to "MicroPython" (camelcase), to match the official website and documentation. Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni (cherry picked from commit 161c25aee11650a4a6b22ca2a88fa0f84ee6b357) 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 b466fbaf2d..f532b3bdb5 100644 --- a/package/micropython/Config.in +++ b/package/micropython/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_MICROPYTHON depends on BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_STATIC_LIBS help - Micro Python is a lean and fast implementation of the Python + MicroPython is a lean and fast implementation of the Python 3 programming language that is optimised to run on a microcontroller. From a66190e5ec74306c2955699b7fc49dc0532a557f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 17:00:11 +0200 Subject: [PATCH 030/114] package/unbound: select BR2_PACKAGE_LIBOPENSSL_ENGINES unbound unconditionally calls the (deprecated) ENGINE_* logic in libopenssl resulting in a build failure when !BR2_PACKAGE_LIBOPENSSL_ENGINES since commit 623d3bbe43e9193aa8e3395367d01af59071b859: sldns/keyraw.c:167:35: error: 'ENGINE_METHOD_ALL' undeclared (first use in this function) 167 | if(!ENGINE_set_default(e, ENGINE_METHOD_ALL)) { | ^~~~~~~~~~~~~~~~~ Fixes: 623d3bbe43e9193aa8e3395367d01af59071b859 - http://autobuild.buildroot.org/results/b7782f5ba54543df53a835552632f58d4ad6c082 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit ec7ae882e048ce4ca5c2b72cb884b8d1ef33c6cc) Signed-off-by: Peter Korsgaard --- package/unbound/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/unbound/Config.in b/package/unbound/Config.in index ae2ebfd975..c8d697113c 100644 --- a/package/unbound/Config.in +++ b/package/unbound/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_UNBOUND depends on !BR2_STATIC_LIBS select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBEVENT + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_OPENSSL help Unbound is a validating, recursive, and caching DNS resolver. From af77cafb8ca077eb61c57a4bbf1b8d0032d33570 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 17:01:16 +0200 Subject: [PATCH 031/114] package/unbound: security bump to version 1.20.0 This release has a fix for the DNSBomb issue CVE-2024-33655. This has a low severity for Unbound, since it makes Unbound complicit in targeting others, but does not affect Unbound so much. This security release also fixes CVE-2024-1931. https://nlnetlabs.nl/news/2024/May/08/unbound-1.20.0-released https://nlnetlabs.nl/news/2024/Mar/14/unbound-1.19.3-released https://nlnetlabs.nl/news/2024/Mar/07/unbound-1.19.2-released Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 7ce07b7b29d08e09f52ca81c9d25728726c87d57) Signed-off-by: Peter Korsgaard --- 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 843026abc7..96ee80b0ec 100644 --- a/package/unbound/unbound.hash +++ b/package/unbound/unbound.hash @@ -1,5 +1,5 @@ -# From https://nlnetlabs.nl/downloads/unbound/unbound-1.19.1.tar.gz.sha256 -sha256 bc1d576f3dd846a0739adc41ffaa702404c6767d2b6082deb9f2f97cbb24a3a9 unbound-1.19.1.tar.gz +# From https://nlnetlabs.nl/downloads/unbound/unbound-1.20.0.tar.gz.sha256 +sha256 56b4ceed33639522000fd96775576ddf8782bb3617610715d7f1e777c5ec1dbf unbound-1.20.0.tar.gz # Locally calculated sha256 8eb9a16cbfb8703090bbfa3a2028fd46bb351509a2f90dc1001e51fbe6fd45db LICENSE diff --git a/package/unbound/unbound.mk b/package/unbound/unbound.mk index 5128d0e420..ff0262bef1 100644 --- a/package/unbound/unbound.mk +++ b/package/unbound/unbound.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNBOUND_VERSION = 1.19.1 +UNBOUND_VERSION = 1.20.0 UNBOUND_SITE = https://www.unbound.net/downloads UNBOUND_INSTALL_STAGING = YES UNBOUND_DEPENDENCIES = host-pkgconf expat libevent openssl From 4186350b9daab4b73d85597238851d45d32dd2c1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jun 2024 00:26:57 +0200 Subject: [PATCH 032/114] package/apr-util: needs engine support when built with libopenssl Buildroot commit 623d3bbe43e9193aa8e3395367d01af59071b859 disables engine support when BR2_PACKAGE_LIBOPENSSL_ENGINES is not set. Fixes: http://autobuild.buildroot.net/results/e472618ca9ff4a3cf460f607a8dfa317832ca622/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 3d46d9760b97f1782f0f1f617682c18864b5e2b2) Signed-off-by: Peter Korsgaard --- package/apr-util/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in index c1a967bdec..f7c119db48 100644 --- a/package/apr-util/Config.in +++ b/package/apr-util/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_APR_UTIL depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help The utility library for the apache runtime project From d6079d7a4b41df82864e9d60a0b72968479c693f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jul 2024 23:16:28 +0200 Subject: [PATCH 033/114] package/apr-util: requires DES in openssl Enable DES in openssl to avoid the following build failure raised since commit a83d41867c8d69a77d5cd0a665aa216af5340359: crypto/apr_crypto_openssl.c: In function 'crypto_cipher_mechanism': crypto/apr_crypto_openssl.c:385:27: error: implicit declaration of function 'EVP_des_ede3_cbc'; did you mean 'NID_des_ede3_cbc'? [-Wimplicit-function-declaration] 385 | key->cipher = EVP_des_ede3_cbc(); | ^~~~~~~~~~~~~~~~ | NID_des_ede3_cbc Fixes: a83d41867c8d69a77d5cd0a665aa216af5340359 - http://autobuild.buildroot.org/results/4b1088a705f8564f85e629316f5cfc92953f0047 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (cherry picked from commit 8bb67c230b9d32d91bc85e5563f3453cb50d7a38) Signed-off-by: Peter Korsgaard --- package/apr-util/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/apr-util/Config.in b/package/apr-util/Config.in index f7c119db48..06b6c2684c 100644 --- a/package/apr-util/Config.in +++ b/package/apr-util/Config.in @@ -5,6 +5,7 @@ config BR2_PACKAGE_APR_UTIL depends on BR2_USE_MMU # apr select BR2_PACKAGE_APR select BR2_PACKAGE_EXPAT + select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL help The utility library for the apache runtime project From 842401fca0cd2c4dc6865da553a8141ac9968284 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 21 Jul 2024 22:57:31 +0200 Subject: [PATCH 034/114] support/testing: add nmap runtime test Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 5510d2890fc628bf08805f83e3430d759c15a8ec) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_nmap.py | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 support/testing/tests/package/test_nmap.py diff --git a/DEVELOPERS b/DEVELOPERS index 1b9fdd7b1c..a54d973018 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1846,6 +1846,7 @@ F: support/testing/tests/package/test_netsnmp/ F: support/testing/tests/package/test_nftables.py F: support/testing/tests/package/test_nftables/ F: support/testing/tests/package/test_ngrep.py +F: support/testing/tests/package/test_nmap.py F: support/testing/tests/package/test_ntp.py F: support/testing/tests/package/test_ntp/ F: support/testing/tests/package/test_numactl.py diff --git a/support/testing/tests/package/test_nmap.py b/support/testing/tests/package/test_nmap.py new file mode 100644 index 0000000000..92b085ece9 --- /dev/null +++ b/support/testing/tests/package/test_nmap.py @@ -0,0 +1,42 @@ +import os +import time + +import infra.basetest + + +class TestNmap(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_NMAP=y + BR2_PACKAGE_NMAP_NCAT=y + BR2_PACKAGE_NMAP_NMAP=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + 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("nmap --version") + + # We open few ports, using the nmap netcat "nc" commands. + ports = [21, 23, 25, 80] + for port in ports: + cmd = f"nc -l -p {port} /dev/null &" + self.assertRunOk(cmd) + + time.sleep(1 * self.timeout_multiplier) + + # We run a local port scan. We should see in the output the + # ports we previously opened. + out, ret = self.emulator.run("nmap -n -sS 127.0.0.1", timeout=20) + self.assertEqual(ret, 0) + nmap_out = "\n".join(out) + for port in ports: + self.assertRegex(nmap_out, f"{port}/tcp *open") From a9d61f75875423014f796a668ffd144ad6e1fab7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 22 Jul 2024 12:20:44 +0200 Subject: [PATCH 035/114] package/ruby: update to 3.3.4 Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 89c9c131fe96235768bdb68fd67a3fc3626b8a39) Signed-off-by: Peter Korsgaard --- package/ruby/ruby.hash | 4 ++-- package/ruby/ruby.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ruby/ruby.hash b/package/ruby/ruby.hash index 4ac6200bca..3831e701fb 100644 --- a/package/ruby/ruby.hash +++ b/package/ruby/ruby.hash @@ -1,5 +1,5 @@ -# https://www.ruby-lang.org/en/news/2024/04/23/ruby-3-3-1-released/ -sha512 c58e9be9b5ab48191fbf7d67e13f0ec42ee71ed338170e0f7b246708e9cfc617ce65098f5ce7ab32d4305e785642d3e44253462104d5b9c4abcb1a4113f48347 ruby-3.3.1.tar.xz +# https://www.ruby-lang.org/en/news/2024/07/09/ruby-3-3-4-released/ +sha512 b26461a13ff82a08a282f10108028bb2a2e4a28da6182a291062fc54089c6655d79c22cc69d59156f9b11cb10a17fe8c69d489343fbae123a45f03361b95c9eb ruby-3.3.4.tar.xz # License files, Locally calculated sha256 e849b28d324423e636a3e6bc5d583cdaf4bd046c2b20872c53886b612d01a4a1 LEGAL diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index fcc637c5ea..08ecbf5941 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -5,7 +5,7 @@ ################################################################################ RUBY_VERSION_MAJOR = 3.3 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).1 +RUBY_VERSION = $(RUBY_VERSION_MAJOR).4 RUBY_VERSION_EXT = 3.3.0 RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz From 1b5301c1d7d1bfef060a24ec520adfba4f8224db Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jul 2024 12:48:59 +0200 Subject: [PATCH 036/114] package/apr: fix musl build strerror_r on musl always returns an int since its addition back in 2011 with https://git.musl-libc.org/cgit/musl/commit/src/string/strerror_r.c?id=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01 As a result, setting ac_cv_strerror_r_rc_int to no results in the following build failure since bump to version 1.7.2 in commit 783cd8d90d37b5e0b59d6f0bfca6667855b2b9e1: misc/unix/errorcodes.c: In function 'native_strerror': misc/unix/errorcodes.c:385:9: error: assignment to 'const char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] 385 | msg = strerror_r(statcode, buf, bufsize); | ^ Fixes: 783cd8d90d37b5e0b59d6f0bfca6667855b2b9e1 - http://autobuild.buildroot.org/results/9a42a4427ff64d47da61c731abb99d7585781cdd Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 6f34e68217264fb62c48ce28c48bf759b30fef0e) Signed-off-by: Peter Korsgaard --- package/apr/apr.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/apr/apr.mk b/package/apr/apr.mk index bdc5e915c6..d86431e5d3 100644 --- a/package/apr/apr.mk +++ b/package/apr/apr.mk @@ -39,7 +39,7 @@ APR_CONF_ENV = \ ac_cv_sizeof_struct_iovec=8 \ ac_cv_sizeof_pid_t=4 \ ac_cv_struct_rlimit=yes \ - ac_cv_strerror_r_rc_int=no \ + ac_cv_strerror_r_rc_int=$(if $(BR2_TOOLCHAIN_USES_MUSL),yes,no) \ ac_cv_o_nonblock_inherited=no \ apr_cv_mutex_recursive=yes \ apr_cv_epoll=yes \ From 6d0bfa6b8f90621d5315fecfcc005eff3dbbf715 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 21 Jul 2024 19:09:12 +0200 Subject: [PATCH 037/114] support/testing: add iproute2 runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 91738f5093f80eeda8637b9a73636539d6937475) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + .../testing/tests/package/test_iproute2.py | 77 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 support/testing/tests/package/test_iproute2.py diff --git a/DEVELOPERS b/DEVELOPERS index a54d973018..f209f8b7af 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1806,6 +1806,7 @@ F: support/testing/tests/package/test_hwloc.py F: support/testing/tests/package/test_iozone.py F: support/testing/tests/package/test_iperf.py F: support/testing/tests/package/test_iperf3.py +F: support/testing/tests/package/test_iproute2.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 diff --git a/support/testing/tests/package/test_iproute2.py b/support/testing/tests/package/test_iproute2.py new file mode 100644 index 0000000000..91d9006e23 --- /dev/null +++ b/support/testing/tests/package/test_iproute2.py @@ -0,0 +1,77 @@ +import os + +import infra.basetest + + +class TestIpRoute2(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_IPROUTE2=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + 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. This also check we are + # actually using the version from the iproute2 package, rather + # than the BusyBox version (which does not understand this + # option). + self.assertRunOk("ip -Version") + + # We run simple invocations of iproute2 tools. + self.assertRunOk("ifstat") + self.assertRunOk("ip link show dev lo") + + # Buildroot is supposed to have setup the loopback "lo" + # interface. We should be able to ping any address in + # the 127.0.0.0/8 subnet. + addrs = ["127.0.0.1", "127.0.1.2", "127.1.2.3"] + ping_cmd = "ping -c 3 -i 0.2" + for addr in addrs: + self.assertRunOk(f"{ping_cmd} {addr}") + + # We now change this 127.0.0.1/8 to a /16. + self.assertRunOk("ip addr del 127.0.0.1/8 dev lo") + self.assertRunOk("ip addr add 127.0.0.1/16 dev lo") + + # The IPs in the 127.0.0.0/16 subnet are still supposed to + # ping... + addrs = ["127.0.0.1", "127.0.1.2"] + for addr in addrs: + self.assertRunOk(f"{ping_cmd} {addr}") + # ...but the IP outside is supposed to fail. + _, ret = self.emulator.run(f"{ping_cmd} 127.1.2.3") + self.assertNotEqual(ret, 0) + + # We add a prohibited route. + self.assertRunOk("ip route add prohibit 127.0.1.0/24") + + # Now, only 127.0.0.1 is supposed to ping... + self.assertRunOk(f"{ping_cmd} 127.0.0.1") + # ...while the other IPs expected to fail. + addrs = ["127.0.1.2", "127.1.2.3"] + for addr in addrs: + _, ret = self.emulator.run(f"{ping_cmd} {addr}") + self.assertNotEqual(ret, 0) + + # We should be able to see our prohibited route. + out, ret = self.emulator.run("ip route list") + self.assertEqual(ret, 0) + self.assertEqual(out[0].strip(), "prohibit 127.0.1.0/24") + + # We create a new network namespace, and create a new shell + # process in it. + self.assertRunOk("ip netns add br-test") + self.assertRunOk("ip netns exec br-test /bin/sh") + + # Since we are in a new namespace, we should no longer see the + # prohibited route. The route list output should be empty. + out, ret = self.emulator.run("ip route list") + self.assertEqual(ret, 0) + self.assertEqual(len(out), 0) From 379fbed1a6c33d98eff0692d4db4043dac07fae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Mon, 22 Jul 2024 18:57:16 +0200 Subject: [PATCH 038/114] package/zfs: fix uClibc support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This update addresses the issue of uClibc support by skipping ZFS tests that require SEEK_DATA support. This is a work-in-progress patch while we wait for an upstream fix. Current upstream efforts can be followed here: https://github.com/openzfs/zfs/pull/16169 Context: - OpenZFS includes a test for a bug that occurs when copying a large number of PUNCHED files. - OpenZFS has backported this test to v2.2.x. - uClibc does not support SEEK_DATA and SEEK_HOLE. - The ZFS test `cp_stress` can not be compiled using uClibc. This commit fix: - https://gitlab.com/buildroot.org/buildroot/-/jobs/7391793226 Signed-off-by: José Luis Salvador Rufo Signed-off-by: Thomas Petazzoni (cherry picked from commit f17fa2c905845c5a9c5aa55866cd44af176e558a) Signed-off-by: Peter Korsgaard --- ...s-ignore-if-SEEK_DATA-is-not-defined.patch | 162 ++++++++++++++++++ package/zfs/zfs.mk | 2 +- 2 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch diff --git a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch b/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch new file mode 100644 index 0000000000..f47c615d10 --- /dev/null +++ b/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch @@ -0,0 +1,162 @@ +From 93e7f8889072047276da11fe6a525d3f0ea16205 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= + +Date: Sat, 11 May 2024 22:40:12 +0200 +Subject: [PATCH] tests/cp_files: ignore if SEEK_DATA is not defined +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Not all C libraries support SEEK_DATA (e.g., uClibc). Skip the test case +cp_files if SEEK_DATA is not defined. + +Signed-off-by: José Luis Salvador Rufo +Upstream: https://github.com/openzfs/zfs/pull/16169 +--- + config/user-unistd.m4 | 24 ++++++++++++++++++++++++ + config/user.m4 | 1 + + config/zfs-build.m4 | 1 + + tests/test-runner/bin/zts-report.py.in | 1 + + tests/zfs-tests/Makefile.am | 2 ++ + tests/zfs-tests/cmd/Makefile.am | 6 +++++- + tests/zfs-tests/tests/Makefile.am | 14 +++++++++----- + 7 files changed, 43 insertions(+), 6 deletions(-) + create mode 100644 config/user-unistd.m4 + +diff --git a/config/user-unistd.m4 b/config/user-unistd.m4 +new file mode 100644 +index 000000000..302bc0bde +--- /dev/null ++++ b/config/user-unistd.m4 +@@ -0,0 +1,24 @@ ++dnl # ++dnl # Check for SEEK_DATA - only used for cp_files/seekflood test case. ++dnl # ++AC_DEFUN([ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA], [ ++ AC_MSG_CHECKING(whether host toolchain supports SEEK_DATA) ++ ++ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ++ #ifndef _GNU_SOURCE ++ #define _GNU_SOURCE ++ #endif ++ #include ++ #if defined(SEEK_DATA) ++ int ok; ++ #else ++ error fail ++ #endif ++ ]])], [ ++ user_unistd_seek_data=yes ++ AC_MSG_RESULT([yes]) ++ ], [ ++ user_unistd_seek_data=no ++ AC_MSG_RESULT([no]) ++ ]) ++]) +diff --git a/config/user.m4 b/config/user.m4 +index 6ec27a5b2..2326a44be 100644 +--- a/config/user.m4 ++++ b/config/user.m4 +@@ -23,6 +23,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ + ZFS_AC_CONFIG_USER_LIBAIO + ZFS_AC_CONFIG_USER_LIBATOMIC + ZFS_AC_CONFIG_USER_LIBFETCH ++ ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA + ZFS_AC_CONFIG_USER_AIO_H + ZFS_AC_CONFIG_USER_CLOCK_GETTIME + ZFS_AC_CONFIG_USER_PAM +diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 +index bb5a85d81..578692676 100644 +--- a/config/zfs-build.m4 ++++ b/config/zfs-build.m4 +@@ -294,6 +294,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [ + [test "x$qatsrc" != x ]) + AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ]) + AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ]) ++ AM_CONDITIONAL([WANT_UNISTD_SEEK_DATA], [test "x$user_unistd_seek_data" = xyes ]) + AM_CONDITIONAL([PAM_ZFS_ENABLED], [test "x$enable_pam" = xyes]) + ]) + +diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in +index ecc50f487..3a00345ed 100755 +--- a/tests/test-runner/bin/zts-report.py.in ++++ b/tests/test-runner/bin/zts-report.py.in +@@ -162,6 +162,7 @@ known = { + ['FAIL', rewind_reason], + 'cli_user/misc/zfs_share_001_neg': ['SKIP', na_reason], + 'cli_user/misc/zfs_unshare_001_neg': ['SKIP', na_reason], ++ 'cp_files/cp_stress': ['SKIP', 16169], + 'pool_checkpoint/checkpoint_discard_busy': ['SKIP', 12053], + 'privilege/setup': ['SKIP', na_reason], + 'refreserv/refreserv_004_pos': ['FAIL', known_reason], +diff --git a/tests/zfs-tests/Makefile.am b/tests/zfs-tests/Makefile.am +index 3dd1a6452..8ae790057 100644 +--- a/tests/zfs-tests/Makefile.am ++++ b/tests/zfs-tests/Makefile.am +@@ -13,8 +13,10 @@ scripts_zfs_tests_functional_hkdf_PROGRAMS = %D%/tests/functional/hkdf/hkdf_test + %C%_tests_functional_hkdf_hkdf_test_LDADD = \ + libzpool.la + ++if WANT_UNISTD_SEEK_DATA + scripts_zfs_tests_functional_cp_filesdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/cp_files + scripts_zfs_tests_functional_cp_files_PROGRAMS = %D%/tests/functional/cp_files/seekflood ++endif + + if BUILD_LINUX + scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile +diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am +index 23848a82f..69bba3039 100644 +--- a/tests/zfs-tests/cmd/Makefile.am ++++ b/tests/zfs-tests/cmd/Makefile.am +@@ -5,7 +5,6 @@ scripts_zfs_tests_bin_PROGRAMS = %D%/chg_usr_exec + scripts_zfs_tests_bin_PROGRAMS += %D%/clonefile + scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_cached + scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_write +-scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files + scripts_zfs_tests_bin_PROGRAMS += %D%/ctime + scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update + scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write +@@ -16,6 +15,11 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/truncate_test + scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket + + ++if WANT_UNISTD_SEEK_DATA ++scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files ++endif ++ ++ + scripts_zfs_tests_bin_PROGRAMS += %D%/badsend + %C%_badsend_LDADD = \ + libzfs_core.la \ +diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am +index cc66d762f..1e9f06a7e 100644 +--- a/tests/zfs-tests/tests/Makefile.am ++++ b/tests/zfs-tests/tests/Makefile.am +@@ -1394,11 +1394,6 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ + functional/compression/l2arc_encrypted.ksh \ + functional/compression/l2arc_encrypted_no_compressed_arc.ksh \ + functional/compression/setup.ksh \ +- functional/cp_files/cleanup.ksh \ +- functional/cp_files/cp_files_001_pos.ksh \ +- functional/cp_files/cp_files_002_pos.ksh \ +- functional/cp_files/cp_stress.ksh \ +- functional/cp_files/setup.ksh \ + functional/crtime/cleanup.ksh \ + functional/crtime/crtime_001_pos.ksh \ + functional/crtime/setup.ksh \ +@@ -2108,3 +2103,12 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ + functional/idmap_mount/idmap_mount_003.ksh \ + functional/idmap_mount/idmap_mount_004.ksh \ + functional/idmap_mount/idmap_mount_005.ksh ++ ++if WANT_UNISTD_SEEK_DATA ++nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ ++ functional/cp_files/cleanup.ksh \ ++ functional/cp_files/cp_files_001_pos.ksh \ ++ functional/cp_files/cp_files_002_pos.ksh \ ++ functional/cp_files/cp_stress.ksh \ ++ functional/cp_files/setup.ksh ++endif +-- +2.45.2 + diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index fa6d282f8c..e0fa392670 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -12,7 +12,7 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs -# 0001-config-user-check-for-aio.h.patch +# 0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch ZFS_AUTORECONF = YES ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux From d2a0b6bfbd1234d20f18c27de78e113c2d5bdf62 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 21 Apr 2024 13:31:20 +0200 Subject: [PATCH 039/114] support/testing: add 4th runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit b09ae4f0454105afd2b41b2a49f4682d9ee57769) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_4th.py | 55 +++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 support/testing/tests/package/test_4th.py diff --git a/DEVELOPERS b/DEVELOPERS index f209f8b7af..9b6ea33233 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1761,6 +1761,7 @@ F: support/testing/tests/package/sample_python_midiutil.py F: support/testing/tests/package/sample_python_ml_dtypes.py F: support/testing/tests/package/sample_python_pyalsa.py F: support/testing/tests/package/sample_python_spake2.py +F: support/testing/tests/package/test_4th.py F: support/testing/tests/package/test_acl.py F: support/testing/tests/package/test_acpica.py F: support/testing/tests/package/test_acpica/ diff --git a/support/testing/tests/package/test_4th.py b/support/testing/tests/package/test_4th.py new file mode 100644 index 0000000000..c020c825b3 --- /dev/null +++ b/support/testing/tests/package/test_4th.py @@ -0,0 +1,55 @@ +import os +from math import sqrt + +import infra.basetest + + +class Test4th(infra.basetest.BRTest): + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + """ + BR2_PACKAGE_4TH=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + 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() + + # We set the DIR4TH variable where 4th demos and libraries are + # installed. + self.assertRunOk("export DIR4TH=/usr/share/4th/") + + # We run a simple "hello world" demo. + out, ret = self.emulator.run("4th cxq demo/hello.4th") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello world!") + + # We run a demo doing some square root maths. + out, ret = self.emulator.run("4th cxq demo/squares.4th") + self.assertEqual(ret, 0) + self.assertTrue(len(out) > 1) + for line in out[1:]: + columns = line.split() + value = float(columns[0]) + value_sqrt = float(columns[1]) + result_check = sqrt(value) + self.assertAlmostEqual(value_sqrt, result_check, delta=0.1) + + # We run a word count demo and the 4th source file. We save + # the word count for a later check. + out, ret = self.emulator.run("4th cxq wc.4th /usr/share/4th/wc.4th") + self.assertEqual(ret, 0) + wc_out = out[0].split() + + # We run the same command using system "wc" command. We expect + # the same numbers. + out, ret = self.emulator.run("wc /usr/share/4th/wc.4th") + self.assertEqual(ret, 0) + self.assertEqual(out[0].split(), wc_out) + + # We run a slightly more complex computation example. + self.assertRunOk("4th cxq fractals.4th") From fe60ac7a779c7cc958eb2046834ce481cc65deee Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Tue, 14 May 2024 12:36:29 +0200 Subject: [PATCH 040/114] package/hostapd: drop duplicate host-pkgconf dependency host-pkgconf already defined as dependency in package ingress. Signed-off-by: Joachim Wiberg Signed-off-by: Thomas Petazzoni (cherry picked from commit 2dc37e5c5b216b2e93f05c015a16a52b9402693f) Signed-off-by: Peter Korsgaard --- package/hostapd/hostapd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk index 8981d9247e..5756510e1d 100644 --- a/package/hostapd/hostapd.mk +++ b/package/hostapd/hostapd.mk @@ -25,7 +25,7 @@ HOSTAPD_CONFIG_DISABLE = # Try to use openssl if it's already available ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -HOSTAPD_DEPENDENCIES += host-pkgconf libopenssl +HOSTAPD_DEPENDENCIES += libopenssl HOSTAPD_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/' else From 4aff9fae454495d071829cbe651643b2fcc94a96 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Thu, 27 Jun 2024 22:53:32 +0200 Subject: [PATCH 041/114] package/am335x-pru-package: fix download issue am335x-pru-package is downloaded with the github helper, so the tarball is generated "on-the-fly" by github. It looks like the process to generate those tarballs has changed, again. The hash for the archive has recently changed. The delta is in the way directories are stored in the tarball: it looks like the "basename" of the directory path has been split off from the "dirname", into a separate field: @@ -270078,8 +270078,8 @@ 0041efd0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041efe0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041eff0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -0041f000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -0041f010 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +0041f000 50 52 55 5f 50 52 55 74 6f 50 52 55 5f 49 6e 74 |PRU_PRUtoPRU_Int| +0041f010 65 72 72 75 70 74 2f 00 00 00 00 00 00 00 00 00 |errupt/.........| 0041f020 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f030 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f040 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| @@ -270104,8 +270104,8 @@ 0041f170 34 61 64 35 37 63 63 31 39 35 66 32 38 62 66 35 |4ad57cc195f28bf5| 0041f180 65 35 38 35 63 33 64 34 34 36 61 62 61 36 65 65 |e585c3d446aba6ee| 0041f190 37 30 39 36 2f 70 72 75 5f 73 77 2f 65 78 61 6d |7096/pru_sw/exam| -0041f1a0 70 6c 65 5f 61 70 70 73 2f 50 52 55 5f 50 52 55 |ple_apps/PRU_PRU| -0041f1b0 74 6f 50 52 55 5f 49 6e 74 65 72 72 75 70 74 00 |toPRU_Interrupt.| +0041f1a0 70 6c 65 5f 61 70 70 73 00 00 00 00 00 00 00 00 |ple_apps........| +0041f1b0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1c0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1d0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 0041f1e0 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| Switch to using a git download, which uses our reproducible way of generating archives. Once extracted, the files have been verified to be identical to the ones in the archive on s.b.o. Signed-off-by: Yann E. MORIN Cc: Frank Hunleth Signed-off-by: Thomas Petazzoni (cherry picked from commit 5206e1dba2ccb8e65fc960362017c72799b0e5df) [Peter adjust filename/hash for 2024.02.x] Signed-off-by: Peter Korsgaard --- package/am335x-pru-package/am335x-pru-package.hash | 2 +- package/am335x-pru-package/am335x-pru-package.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/am335x-pru-package/am335x-pru-package.hash b/package/am335x-pru-package/am335x-pru-package.hash index ad386fe04b..a6fc8109af 100644 --- a/package/am335x-pru-package/am335x-pru-package.hash +++ b/package/am335x-pru-package/am335x-pru-package.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2a902f825ccc1885c5dccd83e1ccee104aa30e601c9964a24f49459f76f674b9 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096.tar.gz +sha256 065807a896717a112a8630883ae87271a7586db7c72f21ec3572f76dd77ec34b am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096-br1.tar.gz sha256 f0fcdf9b2090896389eb4b784f23be96d5544c5ce5282d84f82ae9a8e8331beb pru_sw/utils/LICENCE.txt diff --git a/package/am335x-pru-package/am335x-pru-package.mk b/package/am335x-pru-package/am335x-pru-package.mk index 24a5df4815..9c65ee1387 100644 --- a/package/am335x-pru-package/am335x-pru-package.mk +++ b/package/am335x-pru-package/am335x-pru-package.mk @@ -5,7 +5,8 @@ ################################################################################ AM335X_PRU_PACKAGE_VERSION = 5f374ad57cc195f28bf5e585c3d446aba6ee7096 -AM335X_PRU_PACKAGE_SITE = $(call github,beagleboard,am335x_pru_package,$(AM335X_PRU_PACKAGE_VERSION)) +AM335X_PRU_PACKAGE_SITE = https://github.com/beagleboard/am335x_pru_package +AM335X_PRU_PACKAGE_SITE_METHOD = git AM335X_PRU_PACKAGE_LICENSE = BSD-3-Clause AM335X_PRU_PACKAGE_LICENSE_FILES = pru_sw/utils/LICENCE.txt AM335X_PRU_PACKAGE_DEPENDENCIES = host-am335x-pru-package From 7e9676c22a9f36a889a14852185274a3c3079b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=A1vio=20Tapaj=C3=B3s?= Date: Fri, 23 Feb 2024 17:13:53 -0300 Subject: [PATCH 042/114] =?UTF-8?q?DEVELOPERS:=20add=20Fl=C3=A1vio=20Tapaj?= =?UTF-8?q?=C3=B3s=20for=20python-paho-mqtt?= 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 (cherry picked from commit a10979754ffbf41b2fb09da934213b60065c26ad) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index 9b6ea33233..def588d1ef 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1071,6 +1071,7 @@ F: package/python-pymodbus/ N: Flávio Tapajós F: configs/asus_tinker-s_rk3288_defconfig F: board/asus/tinker-s/ +F: package/python-paho-mqtt/ F: package/python-sqlalchemy/ F: package/rsyslog/ From c07502e827de7ce9ae4457d113c35ad0fba66355 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Tue, 13 Feb 2024 13:37:52 +0100 Subject: [PATCH 043/114] package/python-can/Config.in: sort selects Sort python builtin modules before external python libs. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit 0d582054e131bb6e13d27b2bdfc76a1a30067775) Signed-off-by: Peter Korsgaard --- package/python-can/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index a00c9263cf..61955a2b00 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" select BR2_PACKAGE_PYTHON3_SQLITE # runtime + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_TYPING_EXTENSIONS # runtime select BR2_PACKAGE_PYTHON_WRAPT # runtime - select BR2_PACKAGE_PYTHON3_ZLIB help This module provides controller area network support for Python. From 1ba78a69fd34f99282f47b78891e98d7c9c62b2f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 23 Jul 2024 19:28:15 +0300 Subject: [PATCH 044/114] package/uuu: update upstream link NXP repositories moved to a new location. The old URL redirects to the new one. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni (cherry picked from commit 3f31c4ef33eff191fc17cd0f8aa4d3d4ad9ed2c4) Signed-off-by: Peter Korsgaard --- package/uuu/Config.in.host | 2 +- package/uuu/uuu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/uuu/Config.in.host b/package/uuu/Config.in.host index 0ed064feb6..99f20ee070 100644 --- a/package/uuu/Config.in.host +++ b/package/uuu/Config.in.host @@ -12,7 +12,7 @@ config BR2_PACKAGE_HOST_UUU sudo sh -c "uuu -udev >> /etc/udev/rules.d/70-uuu.rules" sudo udevadm control --reload - https://github.com/NXPmicro/mfgtools + https://github.com/nxp-imx/mfgtools comment "host uuu needs a toolchain w/ host gcc >= 4.9" depends on !BR2_HOST_GCC_AT_LEAST_4_9 diff --git a/package/uuu/uuu.mk b/package/uuu/uuu.mk index b6611dc3d4..d9e4e148a7 100644 --- a/package/uuu/uuu.mk +++ b/package/uuu/uuu.mk @@ -6,7 +6,7 @@ UUU_VERSION = 1.5.177 UUU_SOURCE = uuu_source-uuu_$(UUU_VERSION).tar.gz -UUU_SITE = https://github.com/NXPmicro/mfgtools/releases/download/uuu_$(UUU_VERSION) +UUU_SITE = https://github.com/nxp-imx/mfgtools/releases/download/uuu_$(UUU_VERSION) UUU_LICENSE = BSD 3-Clause "New" or "Revised" License UUU_LICENSE_FILES = LICENSE HOST_UUU_DEPENDENCIES = \ From e62c13c91ee988d2b057fda5f57b971b3a2daee9 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 23 Jul 2024 18:30:25 +0200 Subject: [PATCH 045/114] board/qemu/arm-vexpress-tz: fix typos in readme file Fix typos in QEMU arm-vexpress-tz readme file where 'i.e.' occurrences should be replaced with 'e.g.'. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni (cherry picked from commit bfa3c1932fd5127b73eae1549a84b9c4125e3e0a) Signed-off-by: Peter Korsgaard --- board/qemu/arm-vexpress-tz/readme.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/board/qemu/arm-vexpress-tz/readme.txt b/board/qemu/arm-vexpress-tz/readme.txt index 3e84fe6391..920777afd4 100644 --- a/board/qemu/arm-vexpress-tz/readme.txt +++ b/board/qemu/arm-vexpress-tz/readme.txt @@ -26,7 +26,7 @@ If you want to emulate more cores, use "-smp {1|2|3|4}" to select the number of cores. Note: "-netdev user,id=vmnic -device virtio-net-device,netdev=vmnic" -brings network support that is used i.e. in OP-TEE regression tests. +brings network support that is used e.g. in OP-TEE regression tests. -- Boot Details -- @@ -38,7 +38,7 @@ non-secure bootloader (BL33 stage). QEMU natively hosts and loads in RAM the QEMU ARM target device tree. OP-TEE reads and modifies its content according to OP-TEE configuration. -Enable TF-A traces from LOG_LEVEL (I.e LOG_LEVEL=40) from +Enable TF-A traces from LOG_LEVEL (e.g. LOG_LEVEL=40) from BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES. @@ -53,7 +53,7 @@ serial interface. The OP-TEE OS uses the QEMU second serial interface. To get the OP-TEE OS traces, append a second -serial argument after --serial stdio in the QEMU command line. I.e, the following enables 2 serial +-serial stdio in the QEMU command line. E.g., the following enables 2 serial consoles over telnet connections: cd output/images && ../host/bin/qemu-system-arm \ From f0a7810423a369f2b1a76d605c43aee752958061 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 22:53:06 +0200 Subject: [PATCH 046/114] package/speex: ARM5E needs ARM mode Add a dependency on ARM mode for ARM5E to fix the following build failure on Cortex-M3 which only supports Thumb2 mode: /tmp/ccJHSu7y.s:158: Error: selected processor does not support `smulbb r1,r6,lr' in Thumb mode Fixes: - http://autobuild.buildroot.org/results/1575da3a8ea2bcde7fa9885df317a12d5c36918f Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 28be64c1e0ad0ba014257cda116c2f07236d0d4b) Signed-off-by: Peter Korsgaard --- package/speex/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/speex/Config.in b/package/speex/Config.in index c4e3df5dcd..134e6e4b35 100644 --- a/package/speex/Config.in +++ b/package/speex/Config.in @@ -18,6 +18,7 @@ config BR2_PACKAGE_SPEEX_ARM4 config BR2_PACKAGE_SPEEX_ARM5E bool default y - depends on BR2_arm && !BR2_PACKAGE_SPEEX_ARM4 + depends on BR2_arm && BR2_ARM_CPU_HAS_ARM && \ + !BR2_PACKAGE_SPEEX_ARM4 endif From 7fb8297df405da4affcb68c7647a41487b7d129e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 14:01:40 +0200 Subject: [PATCH 047/114] package/procps-ng: security bump to version 4.0.4 - Fixes CVE-2023-4016 - Drop all patches (already in version) and so also drop autoreconf - This bump will also fix the following build failure with gcc >= 14: pgrep.c: In function 'main': pgrep.c:1066:37: error: implicit declaration of function 'pidfd_open'; did you mean 'fdopen'? [-Wimplicit-function-declaration] 1066 | int pidfd = pidfd_open(procs[i].num, 0); | ^~~~~~~~~~ | fdopen https://gitlab.com/procps-ng/procps/-/blob/v4.0.4/NEWS Fixes: - http://autobuild.buildroot.org/results/bd7b49123905c580842a3dd3b7a338d5aedf55d7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit d79f40dbbe98983bc657d4c82d46b38b8283351b) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 3 - .../0001-configure-Add--disable-w.patch | 93 ------------------- ...ssing-nl_langinfo-on-certain-configs.patch | 34 ------- .../procps-ng/0003-fix-pifd_open-check.patch | 59 ------------ package/procps-ng/procps-ng.hash | 8 +- package/procps-ng/procps-ng.mk | 4 +- 6 files changed, 5 insertions(+), 196 deletions(-) delete mode 100644 package/procps-ng/0001-configure-Add--disable-w.patch delete mode 100644 package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch delete mode 100644 package/procps-ng/0003-fix-pifd_open-check.patch diff --git a/.checkpackageignore b/.checkpackageignore index dfe71f1505..2582cf706a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1011,9 +1011,6 @@ package/pptp-linux/0002-fix-parallel-build.patch Upstream package/prboom/0001-libpng-1.4.patch Upstream package/prboom/0002-configure-remove-predefined-O2-optimization-flag.patch Upstream package/prelink-cross/0001-src-rtld-dl-tls.c-Fix-TLS-offsets-computation-for-s3.patch Upstream -package/procps-ng/0001-configure-Add--disable-w.patch Upstream -package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch Upstream -package/procps-ng/0003-fix-pifd_open-check.patch Upstream package/procps-ng/S02sysctl Variables package/proftpd/S50proftpd Indent Shellcheck Variables package/prosody/0001-enable-syslog.patch Upstream diff --git a/package/procps-ng/0001-configure-Add--disable-w.patch b/package/procps-ng/0001-configure-Add--disable-w.patch deleted file mode 100644 index 8a699df5a6..0000000000 --- a/package/procps-ng/0001-configure-Add--disable-w.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 1524a625e693b956ce0b5091c9f89f24fb7e8614 Mon Sep 17 00:00:00 2001 -From: "Issam E. Maghni" -Date: Fri, 23 Apr 2021 15:58:36 -0400 -Subject: [PATCH] configure: Add --disable-w - -[Retrieved (and backported) from: -https://gitlab.com/procps-ng/procps/-/commit/1524a625e693b956ce0b5091c9f89f24fb7e8614] -Signed-off-by: Fabrice Fontaine ---- - Makefile.am | 21 +++++++++++++++------ - configure.ac | 6 ++++++ - 2 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index de15e137..d2356872 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -47,8 +47,7 @@ bin_PROGRAMS = \ - pwdx \ - tload \ - uptime \ -- vmstat \ -- w -+ vmstat - if BUILD_PWAIT - bin_PROGRAMS += pwait - endif -@@ -60,8 +59,7 @@ usrbin_exec_PROGRAMS += \ - pkill \ - pmap \ - uptime \ -- vmstat \ -- w -+ vmstat - endif - - lib_LTLIBRARIES = \ -@@ -74,7 +72,6 @@ dist_man_MANS = \ - pmap.1 \ - uptime.1 \ - vmstat.8 \ -- w.1 \ - ps/procps.1 - - if !CYGWIN -@@ -137,6 +134,19 @@ else - EXTRA_DIST += kill.1 - endif - -+if BUILD_W -+if CYGWIN -+usrbin_exec_PROGRAMS += w -+else -+bin_PROGRAMS += w -+endif -+ -+dist_man_MANS += w.1 -+w_SOURCES = w.c lib/fileutils.c -+else -+ EXTRA_DIST += w.1 -+endif -+ - if WITH_NCURSES - if !CYGWIN - bin_PROGRAMS += \ -@@ -213,7 +223,6 @@ endif - tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c - uptime_SOURCES = uptime.c lib/fileutils.c - vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c --w_SOURCES = w.c lib/fileutils.c - - # proc/libprocps.la - -diff --git a/configure.ac b/configure.ac -index 750c0fbb..3e83fb88 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -234,6 +234,12 @@ AC_ARG_ENABLE([kill], - [], [enable_kill=yes] - ) - AM_CONDITIONAL(BUILD_KILL, test "x$enable_kill" = xyes) -+AC_ARG_ENABLE([w], -+ AS_HELP_STRING([--disable-w], [do not build w]), -+ [], [enable_w=yes] -+) -+AM_CONDITIONAL(BUILD_W, test "x$enable_w" = xyes) -+ - AM_CONDITIONAL(LINUX, test "x$host_os" = xlinux-gnu) - AM_CONDITIONAL(CYGWIN, test "x$host_os" = xcygwin) - --- -GitLab - diff --git a/package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch b/package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch deleted file mode 100644 index f3e2b126a6..0000000000 --- a/package/procps-ng/0002-escape-c-Fix-missing-nl_langinfo-on-certain-configs.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2763b9880a7aab569694d6ee3170dd7341a26b84 Mon Sep 17 00:00:00 2001 -From: "Issam E. Maghni" -Date: Fri, 23 Apr 2021 16:53:39 -0400 -Subject: [PATCH] escape.c: Fix missing nl_langinfo on certain configs - -[Retrieved from: -https://gitlab.com/procps-ng/procps/-/commit/2763b9880a7aab569694d6ee3170dd7341a26b84] -Signed-off-by: Fabrice Fontaine ---- - proc/escape.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/proc/escape.c b/proc/escape.c -index 2e8fb7dd..cf4a80de 100644 ---- a/proc/escape.c -+++ b/proc/escape.c -@@ -24,13 +24,13 @@ - #include "procps.h" - #include "escape.h" - #include "readproc.h" -+#include "nls.h" - - #if (__GNU_LIBRARY__ >= 6) && (!defined(__UCLIBC__) || defined(__UCLIBC_HAS_WCHAR__)) - # include - # include - # include /* MB_CUR_MAX */ - # include --# include - #endif - - #define SECURE_ESCAPE_ARGS(dst, bytes, cells) do { \ --- -GitLab - diff --git a/package/procps-ng/0003-fix-pifd_open-check.patch b/package/procps-ng/0003-fix-pifd_open-check.patch deleted file mode 100644 index 7152901e70..0000000000 --- a/package/procps-ng/0003-fix-pifd_open-check.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0cce3e981540c28d2f703b9ab16c04d0df8fa03d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 3 Nov 2022 18:24:53 +0100 -Subject: [PATCH] fix pifd_open check - -Replace AC_CHECK_FUNC by AC_CHECK_FUNCS otherwise HAVE_PIDFD_OPEN will -never be defined resulting in the following build failure if pidfd_open -is available but __NR_pidfd_open is not available: - -pgrep.c: In function 'pidfd_open': -pgrep.c:748:17: error: '__NR_pidfd_open' undeclared (first use in this function); did you mean 'pidfd_open'? - 748 | return syscall(__NR_pidfd_open, pid, flags); - | ^~~~~~~~~~~~~~~ - | pidfd_open - -This build failure is raised since the addition of pwait in version -3.3.17 and -https://gitlab.com/procps-ng/procps/-/commit/c8384e682c1cfb3b2dc797e0f8a3cbaaccf7a3da - -Fixes: - - http://autobuild.buildroot.org/results/f23a5156e641b2ebdd673973dec0f9c87760c688 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.com/procps-ng/procps/-/merge_requests/166] ---- - configure.ac | 2 +- - src/pgrep.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 629881a6..1a3ccdb8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -160,7 +160,7 @@ AC_TRY_COMPILE([#include ], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - --AC_CHECK_FUNC([pidfd_open], [enable_pwait=yes], [ -+AC_CHECK_FUNCS([pidfd_open], [enable_pwait=yes], [ - AC_MSG_CHECKING([for __NR_pidfd_open]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE([ - #include -diff --git a/pgrep.c b/pgrep.c -index c4ad5da3..29cfedf7 100644 ---- a/pgrep.c -+++ b/pgrep.c -@@ -38,7 +38,7 @@ - #include - #include - --#if defined(ENABLE_PWAIT) && !defined(HAVE_PIDFD_OPEN) -+#if defined(ENABLE_PWAIT) - #include - #include - #endif --- -2.35.1 - diff --git a/package/procps-ng/procps-ng.hash b/package/procps-ng/procps-ng.hash index 09f2ebd0cb..0d9cd9a835 100644 --- a/package/procps-ng/procps-ng.hash +++ b/package/procps-ng/procps-ng.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/procps-ng/files/Production/ -md5 d60613e88c2f442ebd462b5a75313d56 procps-ng-3.3.17.tar.xz -sha1 a52952e8bc6aaab812176c00d25adc4d4e1552e2 procps-ng-3.3.17.tar.xz +md5 2f747fc7df8ccf402d03e375c565cf96 procps-ng-4.0.4.tar.xz +sha1 2b859acd7060e9898ac457dbd26dbebf563cc44b procps-ng-4.0.4.tar.xz # Locally calculated after checking signature -# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-3.3.17.tar.xz.asc -sha256 4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4 procps-ng-3.3.17.tar.xz +# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-4.0.4.tar.xz.asc +sha256 22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e procps-ng-4.0.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 COPYING.LIB diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index ba8958d146..c5675e2ee6 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -4,15 +4,13 @@ # ################################################################################ -PROCPS_NG_VERSION = 3.3.17 +PROCPS_NG_VERSION = 4.0.4 PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB PROCPS_NG_CPE_ID_VALID = YES PROCPS_NG_INSTALL_STAGING = YES -# We're patching configure.ac -PROCPS_NG_AUTORECONF = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) From ae878fea3d5e50847c7a39a2ac87071bfeaf8fda Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Jul 2024 10:53:02 +0200 Subject: [PATCH 048/114] package/btrfs-progs: don't install host udev files Pass an empty value for udevdir to avoid the following host build failure on one of the autobuilders: /usr/bin/install -c -m755 -d /usr/lib/udev/rules.d /usr/bin/install -c -m644 64-btrfs-dm.rules 64-btrfs-zoned.rules /usr/lib/udev/rules.d /usr/bin/install: cannot create regular file '/usr/lib/udev/rules.d/64-btrfs-dm.rules': Permission denied /usr/bin/install: cannot create regular file '/usr/lib/udev/rules.d/64-btrfs-zoned.rules': Permission denied This build failure can be raised since the addition of the host variant in commit ed69859a7261ee86e71aa666d30a28e374769e15. udev rules were added by upstream in 2016 by https://github.com/kdave/btrfs-progs/commit/62c0666378eb70285b6a3052bf4144d2132a5891 Fixes: ed69859a7261ee86e71aa666d30a28e374769e15 - http://autobuild.buildroot.org/results/c46238afe8d23cf4bff4e7290a5eaebd0640eb6e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 8ce17e304b02c6969e4fd51f0bde97798d49eb3b) Signed-off-by: Peter Korsgaard --- package/btrfs-progs/btrfs-progs.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 9bf50ccfda..1e4c7767f0 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -59,5 +59,7 @@ HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-python \ --disable-convert +HOST_BTRFS_PROGS_INSTALL_OPTS = udevdir= install + $(eval $(autotools-package)) $(eval $(host-autotools-package)) From b31bf8212475ef7bc5c92cab81e070730baf600e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 24 Jul 2024 18:38:06 +0200 Subject: [PATCH 049/114] package/libressl: fix powerpc64 build Fix the following build failure with powerpc64 raised since bump to version 3.8.2 in commit 21eca49ed5110872407b76ab9337d2877c4cda24: In file included from /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/rc4/rc4_enc.c:61: /home/autobuild/autobuild/instance-23/output-1/build/libressl-3.8.4/crypto/../include/openssl/rc4.h:75:9: error: unknown type name 'RC4_INT' 75 | RC4_INT x, y; | ^~~~~~~ Fixes: 21eca49ed5110872407b76ab9337d2877c4cda24 - http://autobuild.buildroot.org/results/2533f8f642f435b40ce687b6df482c51a3fa0250 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit ee00cfd09e4ffa97019c4e9384cc761995912e28) Signed-off-by: Peter Korsgaard --- ...ists-txt-Fix-HOST-variable-for-ppc64.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch diff --git a/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch b/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch new file mode 100644 index 0000000000..8da8fedae2 --- /dev/null +++ b/package/libressl/0004-CMakeLists-txt-Fix-HOST-variable-for-ppc64.patch @@ -0,0 +1,26 @@ +From e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Fri, 19 Jul 2024 11:41:46 +0200 +Subject: [PATCH] CMakeLists.txt: Fix HOST variable for ppc64 + +The code here defined HOST_PPC64, but the rest of the build system expects HOST_POWERPC64. + +Upstream: https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d +Signed-off-by: Fabrice Fontaine +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c496ad97b5..670aa9a1a0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -373,7 +373,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "mips") + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "powerpc") + set(HOST_POWERPC true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") +- set(HOST_PPC64 true) ++ set(HOST_POWERPC64 true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "riscv64") + set(HOST_RISCV64 true) + elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "sparc64") From b85e841e1df829dd714798425fbc14af8c016349 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 25 Jul 2024 11:22:09 +0200 Subject: [PATCH 050/114] package/lrzsz: drop unused LRZSZ_POST_CONFIGURE_HOOKS As already done for LRZSZ_BUILD_HOOKS in commit 5fde4abc8d67ac2317b1de7a1b4cde8091f4e3c7, drop bogus LRZSZ_POST_CONFIGURE_HOOKS as this hook added in 2010 is also never called Fixes: 4f3f291a3bfc1893cbfb4d9803c35a4f6752784d Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit e7c0125754f12acd18fa29a9ea21e7ca371ffc83) Signed-off-by: Peter Korsgaard --- package/lrzsz/lrzsz.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/lrzsz/lrzsz.mk b/package/lrzsz/lrzsz.mk index d9be23540e..7247a4bd59 100644 --- a/package/lrzsz/lrzsz.mk +++ b/package/lrzsz/lrzsz.mk @@ -13,11 +13,6 @@ LRZSZ_CPE_ID_VALID = YES LRZSZ_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) LRZSZ_CONF_ENV = LIBS=$(TARGET_NLS_LIBS) -define LRZSZ_POST_CONFIGURE_HOOKS - $(SED) "s/-lnsl//;" $(@D)/src/Makefile - $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(@D)/config.h -endef - define LRZSZ_INSTALL_TARGET_CMDS $(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz $(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz From d6ccd591137bc226158c8186c115f0a10e46c118 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:49:58 +0200 Subject: [PATCH 051/114] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 9}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b5e2f8287a73f33ac82da78f4b75c6289612510e) [Peter: drop 6.9.x bump] 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 ddaaa8d2a7..f0ae89bcc7 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.37" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.41" 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 376de08642..bae766e0e5 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 f3976e77708694fe4a1f8d1307c315c8a36cbc58f038a38e006b91e29a1f3214 linux-6.6.37.tar.xz -sha256 890b845f36452328716e62dd893b634584f607cdd44b4e685392d302d3be41af linux-6.1.97.tar.xz +sha256 9ec99c578158ab85d99b37791a76643d2ea4c3f72ecbef7b5eb6d60f3de032ef linux-6.6.41.tar.xz +sha256 b9aa6ec1a00f234d6c6f2d428fbb0a6bf459606c259263df978f86685b65a8b9 linux-6.1.100.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 91bfc0ea152ce7b102a0b79d35a7c92843874ebf085c99d2ba8b4d85e62b1a7c linux-5.15.162.tar.xz -sha256 da1dd47febac4f7856654038a47703666da3afba348b8e96e39584e0972e2725 linux-5.10.221.tar.xz -sha256 b298436b26395b5c3ace6963836ba70d57cd61e01cff254b0e5443636c324a5e linux-5.4.279.tar.xz +sha256 025fc7d8b1560cf456ccae50591fe1ca21c990645df9791aed25820fe78db302 linux-5.15.163.tar.xz +sha256 7b2d06803b5abb03c85f171100ca9d7acd6ba245036fe9a16eb998f088b150cb linux-5.10.222.tar.xz +sha256 a976c67eb8270cac310faf1acc61305d1f9967955aca38fbdfcb0bc77d033d42 linux-5.4.280.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 062b70cc132378e1c685df44ddf7e05bab4752b690ada17b080655a63f993581 linux-4.19.317.tar.xz +sha256 0d5fa562a3c53f524f02fc11abe502c01096df73dd27d57736875e8590007493 linux-4.19.318.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 a71eeb141b..4f485d5188 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.317" if BR2_KERNEL_HEADERS_4_19 - default "5.4.279" if BR2_KERNEL_HEADERS_5_4 - default "5.10.221" if BR2_KERNEL_HEADERS_5_10 - default "5.15.162" if BR2_KERNEL_HEADERS_5_15 - default "6.1.97" if BR2_KERNEL_HEADERS_6_1 - default "6.6.37" if BR2_KERNEL_HEADERS_6_6 + default "4.19.318" if BR2_KERNEL_HEADERS_4_19 + default "5.4.280" if BR2_KERNEL_HEADERS_5_4 + default "5.10.222" if BR2_KERNEL_HEADERS_5_10 + default "5.15.163" if BR2_KERNEL_HEADERS_5_15 + default "6.1.100" if BR2_KERNEL_HEADERS_6_1 + default "6.6.41" 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 f34d38cdb5790e665d0e4d7f14a78356c9fbd767 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:50:53 +0200 Subject: [PATCH 052/114] package/apache: security bump version to 2.4.62 Fixes CVE-2024-40725 & CVE-2024-40898. Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.62 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit bac05f9b21219a209484b7df8d3b89f5d90feb99) Signed-off-by: Peter Korsgaard --- package/apache/apache.hash | 6 +++--- package/apache/apache.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/apache/apache.hash b/package/apache/apache.hash index 2ed9c17f9a..b281b4beab 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.61.tar.bz2.{sha256,sha512} -sha256 ea8ba86fd95bd594d15e46d25ac5bbda82ae0c9122ad93998cc539c133eaceb6 httpd-2.4.61.tar.bz2 -sha512 00656220ecc2b80788f539536553f0a3a57602fb981be22e63af87d0f98ffe5da3056e722ce52ae8cf9c2111ad1922b3aaea1fd7d69d0ed76795199203d593ff httpd-2.4.61.tar.bz2 +# From https://downloads.apache.org/httpd/httpd-2.4.62.tar.bz2.{sha256,sha512} +sha256 674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec httpd-2.4.62.tar.bz2 +sha512 7db1876805d5c0f60f49bcb51f75cdf567120f2ff6349e68f084e9a86ae38265d9f1c67e7fca0082c9db136f3c408a88501ee11f26b1b68724ba240867171d77 httpd-2.4.62.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 0319a96815..0a0a0b3de4 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.61 +APACHE_VERSION = 2.4.62 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://dlcdn.apache.org/httpd APACHE_LICENSE = Apache-2.0 From 79dc5bc96c743da646f7fee48baf1065e868e4b1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:51:43 +0200 Subject: [PATCH 053/114] package/openvpn: bump version to 2.6.12 Release notes: https://sourceforge.net/p/openvpn/mailman/message/58796813/ Changelog: https://github.com/OpenVPN/openvpn/blob/release/2.6/ChangeLog https://github.com/OpenVPN/openvpn/blob/release/2.6/Changes.rst Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 3da0a950e02932c81e516d818a5b3731134376d6) Signed-off-by: Peter Korsgaard --- 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 a4ba458bd8..7ba3ea3f20 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 d60adf413d37e11e6e63531cacf2655906756046b4edffe88a13b9e2fec40d5e openvpn-2.6.11.tar.gz +sha256 1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929 openvpn-2.6.12.tar.gz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 3b39d62519..4bf5b54656 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.6.11 +OPENVPN_VERSION = 2.6.12 OPENVPN_SITE = https://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf libcap-ng OPENVPN_LICENSE = GPL-2.0 From b9e9e91b70cdb8422d7c4952df294b775d62b34e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 25 Jul 2024 21:52:18 +0200 Subject: [PATCH 054/114] package/fetchmail: bump version to 6.4.39 Release notes: https://sourceforge.net/p/fetchmail/mailman/message/58797299/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 5226e5f664e1ef59654fc70be94064f1614a9c25) Signed-off-by: Peter Korsgaard --- package/fetchmail/fetchmail.hash | 4 ++-- package/fetchmail/fetchmail.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fetchmail/fetchmail.hash b/package/fetchmail/fetchmail.hash index 3c0403fa78..12612ecc48 100644 --- a/package/fetchmail/fetchmail.hash +++ b/package/fetchmail/fetchmail.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/p/fetchmail/mailman/message/58731594/ -sha256 a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905be609d9 fetchmail-6.4.38.tar.xz +# From https://sourceforge.net/p/fetchmail/mailman/message/58797299/ +sha256 75109a1f307b538155fa05f5ef298e8298cb4deae95aed24c16b38d36ff0a186 fetchmail-6.4.39.tar.xz # Locally computed: sha256 6d87443b61041067a5eddb2cabf8aebff15b8b40771ad6b5e4754e607ec21b39 COPYING diff --git a/package/fetchmail/fetchmail.mk b/package/fetchmail/fetchmail.mk index c74b259698..a9239d0855 100644 --- a/package/fetchmail/fetchmail.mk +++ b/package/fetchmail/fetchmail.mk @@ -5,7 +5,7 @@ ################################################################################ FETCHMAIL_VERSION_MAJOR = 6.4 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).38 +FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).39 FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz FETCHMAIL_SITE = https://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) FETCHMAIL_LICENSE = GPL-2.0; some exceptions are mentioned in COPYING From a283ca002a7796a4ac157be50a230f678a827c35 Mon Sep 17 00:00:00 2001 From: Martin Wetterwald Date: Thu, 25 Jul 2024 19:37:09 +0200 Subject: [PATCH 055/114] package/tinyssh: fix static-only build When using BR2_STATIC_LIBS=y, tinysshd's build was successful, but the binary didn't work on the final target: this is because a dynamically linked ELF was produced, on a target having no dynamic loader at all. Using $(TARGET_CONFIGURE_OPTS) propagates all the options and not only "CC", resulting in a correct static binary able to run on the target. Without the patch: > tinysshd: ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), > dynamically linked, interpreter /lib/ld-musl-armhf.so.1, stripped With the patch: > tinysshd: ELF 32-bit LSB executable, ARM, EABI5 version 1 (SYSV), > statically linked, stripped Fixes: a7b3de8a3b1b446c081593192c3acb847f6f5f05 Signed-off-by: Martin Wetterwald Signed-off-by: Thomas Petazzoni (cherry picked from commit 90e22ff48bb5705c146a64b75556157667b551d3) Signed-off-by: Peter Korsgaard --- package/tinyssh/tinyssh.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/tinyssh/tinyssh.mk b/package/tinyssh/tinyssh.mk index 80b6ccb850..e92ac628f2 100644 --- a/package/tinyssh/tinyssh.mk +++ b/package/tinyssh/tinyssh.mk @@ -10,7 +10,7 @@ TINYSSH_LICENSE = CC0-1.0 TINYSSH_LICENSE_FILES = LICENCE define TINYSSH_BUILD_CMDS - $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" $(MAKE) -C $(@D) cross-compile + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) cross-compile endef define TINYSSH_INSTALL_TARGET_CMDS From e8f185ec2caf258e4c0275a38a843180f9308a50 Mon Sep 17 00:00:00 2001 From: Dmitry Chestnykh Date: Thu, 25 Jul 2024 11:27:03 +0300 Subject: [PATCH 056/114] package/uclibc-ng-test: fix build with the musl C library Musl doesn't provide sys/asm.h header so we should add some defines inside mips-specific header file to avoid build errors. Fixes: http://autobuild.buildroot.net/results/af7a1d00930485f87f77762b34cae01873a8cd41/ Signed-off-by: Dmitry Chestnykh Signed-off-by: Thomas Petazzoni (cherry picked from commit b5c1ead57e93b32c900b58f4fd22259313fc5c0d) Signed-off-by: Peter Korsgaard --- .../0001-Fix-error-absent-sys-asm-h.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch diff --git a/package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch b/package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch new file mode 100644 index 0000000000..5c8cd3f463 --- /dev/null +++ b/package/uclibc-ng-test/0001-Fix-error-absent-sys-asm-h.patch @@ -0,0 +1,59 @@ +From a99d5bdb51bdab92a303c508b2b938ee0789d614 Mon Sep 17 00:00:00 2001 +From: Dmitry Chestnykh +Date: Thu, 25 Jul 2024 09:15:11 +0300 +Subject: [PATCH] Fix errors due to absent sys/asm.h in mips64 musl build + +Upstream: https://patchwork.ozlabs.org/project/uclibc-ng/patch/20240725081519.611076-1-dm.chestnykh@gmail.com/ +Signed-off-by: Dmitry Chestnykh +--- + test/tls/tls-macros-mips.h | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +diff --git a/test/tls/tls-macros-mips.h b/test/tls/tls-macros-mips.h +index eed0938..bd4c5c4 100644 +--- a/test/tls/tls-macros-mips.h ++++ b/test/tls/tls-macros-mips.h +@@ -1,7 +1,40 @@ + /* Macros to support TLS testing in times of missing compiler support. */ + + #include ++#if defined(__has_include) && __has_include() + #include ++#else ++ ++#define __STRING(x) #x ++ ++#if ((_MIPS_SIM == _MIPS_SIM_ABI32 || _MIPS_SIM == _ABI32) && _MIPS_SZPTR == 32) ++#define PTR_ADDIU addiu ++#define PTR_L lw ++#endif ++ ++#if _MIPS_SIM == _MIPS_SIM_NABI32 || _MIPS_SIM == _NABI32 ++ ++#if !defined __mips_isa_rev || __mips_isa_rev < 6 ++#define PTR_ADDU add ++#define PTR_ADDIU addi ++#else ++#define PTR_ADDU addu ++#define PTR_ADDIU addiu ++#endif ++ ++#define PTR_L lw ++#endif ++ ++#if ((_MIPS_SIM == _MIPS_SIM_ABI32 || _MIPS_SIM == _ABI32) && _MIPS_SZPTR == 64) \ ++ || _MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _ABIN32 ++ ++#define PTR_ADDU daddu ++#define PTR_ADDIU daddiu ++#define PTR_L ld ++ ++#endif ++ ++#endif + + #define __STRING2(X) __STRING(X) + #define ADDU __STRING2(PTR_ADDU) +-- +2.45.2 + From 51fa453efd639a3500f105f821482bf541d22f76 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 22 May 2024 09:02:25 +0200 Subject: [PATCH 057/114] package/elfutils: update the patches to be applied with fuzz 0 This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (cherry picked from commit f5226cd6b72a7b47edbc3220b3e1279526c75b31) Signed-off-by: Peter Korsgaard --- ...lly-make-Werror-conditional-to-BUILD_WERROR.patch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch index 565a3c1bbb..f35c2d48aa 100644 --- a/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch +++ b/package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch @@ -1,4 +1,4 @@ -From 2688a0238eaf825d6659c16c012db0c16f07e197 Mon Sep 17 00:00:00 2001 +From 064b74d5e19847794072781405eafe8dfbfca331 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Mon, 29 May 2017 23:24:42 +0300 Subject: [PATCH] Really make -Werror conditional to BUILD_WERROR @@ -13,26 +13,28 @@ cc1: all warnings being treated as errors [Vincent: tweak patch for 0.166] [Bernd: rebased patch for 0.177 & 0.189] +[Dario: make the patch to be applied with fuzz factor 0] Signed-off-by: "Yann E. MORIN" Signed-off-by: Vicente Olivert Riera Signed-off-by: Bernd Kuhls +Signed-off-by: Dario Binacchi --- config/eu.am | 1 - 1 file changed, 1 deletion(-) diff --git a/config/eu.am b/config/eu.am -index c2cc349ce876..99b368e09060 100644 +index e6c241f9d88a..cad1baa27a5f 100644 --- a/config/eu.am +++ b/config/eu.am -@@ -73,7 +73,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ +@@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \ $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \ $(USE_AFTER_FREE3_WARNING) \ - $(if $($(*F)_no_Werror),,-Werror) \ $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $(if $($(*F)_no_Wpacked_not_aligned),-Wno-packed-not-aligned,) \ + $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \ -- -2.17.1 +2.43.0 From e9450112209e7df0599b0919bddd340ad7746cac Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 25 Jul 2024 10:06:41 +0200 Subject: [PATCH 058/114] package/elfutils: fix build on microblaze Fix the following build failure on microblaze: dwelf_elf_begin.c:62:1: error: symver is only supported on ELF platforms 62 | OLD_VERSION (dwelf_elf_begin, ELFUTILS_0.175) | ^~~~~~~~~~~ dwelf_elf_begin.c:62:1: error: symver is only supported on ELF platforms Fixes: - http://autobuild.buildroot.org/results/5ca2aa5c76415690ad4a85837ba47e7bcfbdbcbc Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni (cherry picked from commit 8ef2bb44379e4763682199ad2ecfd23d51cbacc0) Signed-off-by: Peter Korsgaard --- package/elfutils/elfutils.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 4d8cc43342..8738af7751 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -45,6 +45,10 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) ELFUTILS_CONF_OPTS += --disable-symbol-versioning endif +ifeq ($(BR2_microblaze),y) +ELFUTILS_CONF_OPTS += --disable-symbol-versioning +endif + # disable for now, needs "distro" support ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod HOST_ELFUTILS_CONF_OPTS += --disable-libdebuginfod --disable-debuginfod From f09130cb49847dfbebd9f029db80e4f050733583 Mon Sep 17 00:00:00 2001 From: Danomi Manchego Date: Fri, 26 Jul 2024 05:46:03 -0400 Subject: [PATCH 059/114] package/libpwquality: fix PAM module path The libpwquality package provides the pam_pwquality PAM module - the replacement for pam_cracklib that was dropped from linux-pam back in version 1.5.0. However, it currently installs it to the wrong place, so passwd and friends fail to find it. This commit sets the security directory path to /lib/security to match the corresponding setting in linux-pam.mk. Note that libpwquality has *always* installed pam_pwquality in the wrong place, since version 1.3.0 was added to buildroot in 2017 in commit 462040443ca943694fc59ec8380c82f8bf9aaddc. However, back then, linux-pam version 1.3.0 still provided pam_cracklib for advanced password checking. Linux-pam deprecated pam_cracklib in 1.4.0 but still built it for us when linux-pam.mk set --enable-cracklib. Linux-PAM deleted pam_cracklib altogether in 1.5.0, so it was not until our update to linux-pam-1.5.1 in commit 276f1e0a896698abec85500a86686bf72c79eb91 that pam_cracklib became unavailable. After that point, pam_pwquality was the only alternative for PAM-based password checking. Signed-off-by: Danomi Manchego Signed-off-by: Thomas Petazzoni (cherry picked from commit 541eb8bf7db553708ff2286995ce94b38fc8d537) Signed-off-by: Peter Korsgaard --- package/libpwquality/libpwquality.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libpwquality/libpwquality.mk b/package/libpwquality/libpwquality.mk index f12e583b2d..ba62cdfb09 100644 --- a/package/libpwquality/libpwquality.mk +++ b/package/libpwquality/libpwquality.mk @@ -23,7 +23,7 @@ LIBPWQUALITY_CONF_OPTS += --disable-python-bindings endif ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -LIBPWQUALITY_CONF_OPTS += --enable-pam +LIBPWQUALITY_CONF_OPTS += --enable-pam --with-securedir=/lib/security LIBPWQUALITY_DEPENDENCIES += linux-pam else LIBPWQUALITY_CONF_OPTS += --disable-pam From 3cd0c938b5643a73f17849880cddfc3755ae0284 Mon Sep 17 00:00:00 2001 From: "Fiona Klute (WIWA)" Date: Fri, 26 Jul 2024 18:01:52 +0200 Subject: [PATCH 060/114] package/busybox: fix menuconfig with GCC 14 GCC 14 errors out on the implicit return type of "main() {}". The patch also removes the /dev/null redirection of GCC stderr that hid the actual problem. Signed-off-by: Fiona Klute (WIWA) Reviewed-by: Brandon Maier Tested-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 6caf350c1a9f5c6907d109e1c55fe420ec1aebd6) Signed-off-by: Peter Korsgaard --- ...-failing-saying-ncurses-is-not-found.patch | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch diff --git a/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch b/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch new file mode 100644 index 0000000000..4651d8c2c9 --- /dev/null +++ b/package/busybox/0009-menuconfig-gcc-failing-saying-ncurses-is-not-found.patch @@ -0,0 +1,38 @@ +From ctxnop@gmail.com Sun Jul 21 12:10:52 2024 +From: ctxnop@gmail.com (Nop) +Date: Sun, 21 Jul 2024 14:10:52 +0200 +Subject: [PATCH] menuconfig: GCC failing saying ncurses is not found + +Newer GCC increased diagnostics levels resulting in considering the +test code to be invalid. The resulting message was misleading, saying +that ncurses was not found, while the check failed for an unrelated +reason which was hidden because GCC stderr was redirected to +/dev/null. + +Signed-off-by: ctxnop +Upstream: http://lists.busybox.net/pipermail/busybox/2024-July/090840.html +[Fiona: rephrased commit message for clarity] +Signed-off-by: Fiona Klute (WIWA) +--- + scripts/kconfig/lxdialog/check-lxdialog.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh +b/scripts/kconfig/lxdialog/check-lxdialog.sh +index 5075ebf2d..c644d1d48 100755 +--- a/scripts/kconfig/lxdialog/check-lxdialog.sh ++++ b/scripts/kconfig/lxdialog/check-lxdialog.sh +@@ -45,9 +45,9 @@ trap "rm -f $tmp" 0 1 2 3 15 + + # Check if we can link to ncurses + check() { +- $cc -x c - -o $tmp 2>/dev/null <<'EOF' ++ $cc -x c - -o $tmp <<'EOF' + #include CURSES_LOC +-main() {} ++int main() { return 0; } + EOF + if [ $? != 0 ]; then + echo " *** Unable to find the ncurses libraries or the" 1>&2 +-- +2.45.2 From 74d098ed1b54cab9ebc47b62f2b146d4863b861c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 28 Jul 2024 18:34:10 +0200 Subject: [PATCH 061/114] package/gdb: move GDB 14.x patches to the right folder Commit bfefed17a9e5a421b3217685003d3b22c99de4ab ("package/gdb: bump 14.x series from 14.1 to 14.2"), which upgraded the GDB 14.x series from 14.1 to 14.2 forgot to rename the directory containing the patches, causing them to no longer be applied. The patches still apply properly with no change, so renaming the directory is sufficient. http://autobuild.buildroot.net/results/b8c6af95b244272220c63847e7cc929c9c58eee4/ Signed-off-by: Thomas Petazzoni (cherry picked from commit 076f345accb811add37c96705ea1602a8a3b06a1) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 18 +++++++++--------- ...ne-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch | 0 ...e-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch | 0 .../0003-use-asm-sgidefs.h.patch | 0 .../0004-gdbserver-fix-build-for-m68k.patch | 0 ...-fork-inferior-include-linux-ptrace.h.patch | 0 ...-getrandom-compile-for-uclibc-v1.0.35.patch | 0 .../0007-fix-musl-build-on-riscv.patch | 0 ...8-gdbserver-Makefile.in-fix-NLS-build.patch | 0 .../0009-gdb-Fix-native-build-on-xtensa.patch | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename package/gdb/{14.1 => 14.2}/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch (100%) rename package/gdb/{14.1 => 14.2}/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch (100%) rename package/gdb/{14.1 => 14.2}/0003-use-asm-sgidefs.h.patch (100%) rename package/gdb/{14.1 => 14.2}/0004-gdbserver-fix-build-for-m68k.patch (100%) rename package/gdb/{14.1 => 14.2}/0005-nat-fork-inferior-include-linux-ptrace.h.patch (100%) rename package/gdb/{14.1 => 14.2}/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch (100%) rename package/gdb/{14.1 => 14.2}/0007-fix-musl-build-on-riscv.patch (100%) rename package/gdb/{14.1 => 14.2}/0008-gdbserver-Makefile.in-fix-NLS-build.patch (100%) rename package/gdb/{14.1 => 14.2}/0009-gdb-Fix-native-build-on-xtensa.patch (100%) diff --git a/.checkpackageignore b/.checkpackageignore index 2582cf706a..15ef1ace68 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -443,15 +443,15 @@ package/gdb/13.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream package/gdb/13.2/0007-fix-musl-build-on-riscv.patch Upstream package/gdb/13.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream package/gdb/13.2/0009-gdb-Fix-native-build-on-xtensa.patch Upstream -package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream -package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream -package/gdb/14.1/0003-use-asm-sgidefs.h.patch Upstream -package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch Upstream -package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream -package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream -package/gdb/14.1/0007-fix-musl-build-on-riscv.patch Upstream -package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream -package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch Upstream +package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch Upstream +package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch Upstream +package/gdb/14.2/0003-use-asm-sgidefs.h.patch Upstream +package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch Upstream +package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch Upstream +package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch Upstream +package/gdb/14.2/0007-fix-musl-build-on-riscv.patch Upstream +package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch Upstream +package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch Upstream package/gengetopt/0001-configure.ac-add-disable-doc-option.patch Upstream package/genpart/0001-fix-return-code.patch Upstream package/genromfs/0001-build-system.patch Sob Upstream diff --git a/package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch b/package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch similarity index 100% rename from package/gdb/14.1/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch rename to package/gdb/14.2/0001-ppc-ptrace-Define-pt_regs-uapi_pt_regs-on-GLIBC-syst.patch diff --git a/package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch b/package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch similarity index 100% rename from package/gdb/14.1/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch rename to package/gdb/14.2/0002-sh-ptrace-Define-pt_-dsp-regs-uapi_pt_-dsp-regs-on-G.patch diff --git a/package/gdb/14.1/0003-use-asm-sgidefs.h.patch b/package/gdb/14.2/0003-use-asm-sgidefs.h.patch similarity index 100% rename from package/gdb/14.1/0003-use-asm-sgidefs.h.patch rename to package/gdb/14.2/0003-use-asm-sgidefs.h.patch diff --git a/package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch b/package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch similarity index 100% rename from package/gdb/14.1/0004-gdbserver-fix-build-for-m68k.patch rename to package/gdb/14.2/0004-gdbserver-fix-build-for-m68k.patch diff --git a/package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch b/package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch similarity index 100% rename from package/gdb/14.1/0005-nat-fork-inferior-include-linux-ptrace.h.patch rename to package/gdb/14.2/0005-nat-fork-inferior-include-linux-ptrace.h.patch diff --git a/package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch b/package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch similarity index 100% rename from package/gdb/14.1/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch rename to package/gdb/14.2/0006-Fix-getrandom-compile-for-uclibc-v1.0.35.patch diff --git a/package/gdb/14.1/0007-fix-musl-build-on-riscv.patch b/package/gdb/14.2/0007-fix-musl-build-on-riscv.patch similarity index 100% rename from package/gdb/14.1/0007-fix-musl-build-on-riscv.patch rename to package/gdb/14.2/0007-fix-musl-build-on-riscv.patch diff --git a/package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch b/package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch similarity index 100% rename from package/gdb/14.1/0008-gdbserver-Makefile.in-fix-NLS-build.patch rename to package/gdb/14.2/0008-gdbserver-Makefile.in-fix-NLS-build.patch diff --git a/package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch b/package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch similarity index 100% rename from package/gdb/14.1/0009-gdb-Fix-native-build-on-xtensa.patch rename to package/gdb/14.2/0009-gdb-Fix-native-build-on-xtensa.patch From 44d86a7b53225341fc17a39e8a712864bc6b43a5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 10:01:00 +0200 Subject: [PATCH 062/114] DEVELOPERS: add Bernd Kuhls for openvpn Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 8f1c2ad8c66eaf2be11d6621ae414709f37d893e) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index def588d1ef..5f570de8ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -448,6 +448,7 @@ F: package/mpg123/ F: package/ntp/ F: package/nut/ F: package/onevpl-intel-gpu/ +F: package/openvpn/ F: package/opus/ F: package/pciutils/ F: package/perl-crypt-openssl-guess/ From 52ef35cd0c1df14e2074c062d4d9be68473d9f4d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 12 Jun 2024 21:23:17 +0200 Subject: [PATCH 063/114] package/libcurl: bump version to 8.8.0 Changelog: https://curl.se/changes.html#8_8_0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 50bdb2a3b7ace71065dc0b8a81bebc173f84a8c4) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.hash | 4 ++-- package/libcurl/libcurl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 7fcad973c3..7ba45b79d7 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.7.1.tar.xz.asc +# https://curl.se/download/curl-8.8.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 6fea2aac6a4610fbd0400afb0bcddbe7258a64c63f1f68e5855ebc0c659710cd curl-8.7.1.tar.xz +sha256 0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400 curl-8.8.0.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 99320c1315..172dd22071 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.7.1 +LIBCURL_VERSION = 8.8.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From ce25286b993167fc6fb10b13723c4d6f245f66c2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 28 Jun 2024 17:24:17 +0300 Subject: [PATCH 064/114] package/libcurl: fix build with mbedtls Add upstream patch to fix compatibility with mbedtls version 2.28.x, which is broken since commit 50bdb2a3b7 (package/libcurl: bump version to 8.8.0). Fixes: http://autobuild.buildroot.net/results/66ba878386e4e478645edb6a282e82820b8dad7f http://autobuild.buildroot.net/results/7a4d9595197cf23080a23dfe9bc0e60b8145af6e http://autobuild.buildroot.net/results/9add7283813388daa95b16ef76acb3c4e9ea7c2f [Peter: mention when this issue was introduced] Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard (cherry picked from commit d611acf8e9f9d598f001fec65c974b0c3f20a1f6) Signed-off-by: Peter Korsgaard --- ...-mbedtls-check-version-for-cipher-id.patch | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch diff --git a/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch b/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch new file mode 100644 index 0000000000..b7d674acfe --- /dev/null +++ b/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch @@ -0,0 +1,56 @@ +From 0c4b4c1e93c8e869af230090f32346fdfd548f21 Mon Sep 17 00:00:00 2001 +From: Stefan Eissing +Date: Wed, 22 May 2024 14:44:56 +0200 +Subject: [PATCH] mbedtls: check version for cipher id + +mbedtls_ssl_get_ciphersuite_id_from_ssl() seems to have been added in +mbedtls 3.2.0. Check for that version. + +Closes #13749 + +Signed-off-by: Baruch Siach +Upstream: https://github.com/curl/curl/commit/0c4b4c1e93c8e869af230090f32346fdfd548f21 +--- + lib/vtls/mbedtls.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c +index ec0b10dd9a9f..98a4ea01b183 100644 +--- a/lib/vtls/mbedtls.c ++++ b/lib/vtls/mbedtls.c +@@ -902,8 +902,6 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) + (struct mbed_ssl_backend_data *)connssl->backend; + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + const mbedtls_x509_crt *peercert; +- char cipher_str[64]; +- uint16_t cipher_id; + #ifndef CURL_DISABLE_PROXY + const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)? + data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY]: +@@ -932,11 +930,18 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) + return CURLE_SSL_CONNECT_ERROR; + } + +- cipher_id = (uint16_t) +- mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); +- mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); +- infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); +- ++#if MBEDTLS_VERSION_NUMBER >= 0x03020000 ++ { ++ char cipher_str[64]; ++ uint16_t cipher_id; ++ cipher_id = (uint16_t) ++ mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); ++ mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); ++ infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); ++ } ++#else ++ infof(data, "mbedTLS: Handshake complete"); ++#endif + ret = mbedtls_ssl_get_verify_result(&backend->ssl); + + if(!conn_config->verifyhost) +-- +2.43.0 + From c38cb8488e9ff19d05833aff5b144f558f325fb0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 09:52:47 +0200 Subject: [PATCH 065/114] package/libcurl: security bump to version 8.9.0 Removed patch which is included in this release. Changelog: https://curl.se/changes.html#8_9_0 Fixes CVE-2024-6197: https://curl.se/docs/CVE-2024-6197.html CVE-2024-6874 (Apple-only): https://curl.se/docs/CVE-2024-6874.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit e6816ece5b425fce6fc3e080178ff04060b8ef08) Signed-off-by: Peter Korsgaard --- ...-mbedtls-check-version-for-cipher-id.patch | 56 ------------------- package/libcurl/libcurl.hash | 4 +- package/libcurl/libcurl.mk | 2 +- 3 files changed, 3 insertions(+), 59 deletions(-) delete mode 100644 package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch diff --git a/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch b/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch deleted file mode 100644 index b7d674acfe..0000000000 --- a/package/libcurl/0001-mbedtls-check-version-for-cipher-id.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0c4b4c1e93c8e869af230090f32346fdfd548f21 Mon Sep 17 00:00:00 2001 -From: Stefan Eissing -Date: Wed, 22 May 2024 14:44:56 +0200 -Subject: [PATCH] mbedtls: check version for cipher id - -mbedtls_ssl_get_ciphersuite_id_from_ssl() seems to have been added in -mbedtls 3.2.0. Check for that version. - -Closes #13749 - -Signed-off-by: Baruch Siach -Upstream: https://github.com/curl/curl/commit/0c4b4c1e93c8e869af230090f32346fdfd548f21 ---- - lib/vtls/mbedtls.c | 19 ++++++++++++------- - 1 file changed, 12 insertions(+), 7 deletions(-) - -diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c -index ec0b10dd9a9f..98a4ea01b183 100644 ---- a/lib/vtls/mbedtls.c -+++ b/lib/vtls/mbedtls.c -@@ -902,8 +902,6 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) - (struct mbed_ssl_backend_data *)connssl->backend; - struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); - const mbedtls_x509_crt *peercert; -- char cipher_str[64]; -- uint16_t cipher_id; - #ifndef CURL_DISABLE_PROXY - const char * const pinnedpubkey = Curl_ssl_cf_is_proxy(cf)? - data->set.str[STRING_SSL_PINNEDPUBLICKEY_PROXY]: -@@ -932,11 +930,18 @@ mbed_connect_step2(struct Curl_cfilter *cf, struct Curl_easy *data) - return CURLE_SSL_CONNECT_ERROR; - } - -- cipher_id = (uint16_t) -- mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); -- mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); -- infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); -- -+#if MBEDTLS_VERSION_NUMBER >= 0x03020000 -+ { -+ char cipher_str[64]; -+ uint16_t cipher_id; -+ cipher_id = (uint16_t) -+ mbedtls_ssl_get_ciphersuite_id_from_ssl(&backend->ssl); -+ mbed_cipher_suite_get_str(cipher_id, cipher_str, sizeof(cipher_str), true); -+ infof(data, "mbedTLS: Handshake complete, cipher is %s", cipher_str); -+ } -+#else -+ infof(data, "mbedTLS: Handshake complete"); -+#endif - ret = mbedtls_ssl_get_verify_result(&backend->ssl); - - if(!conn_config->verifyhost) --- -2.43.0 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index 7ba45b79d7..fa325efd7d 100644 --- a/package/libcurl/libcurl.hash +++ b/package/libcurl/libcurl.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://curl.se/download/curl-8.8.0.tar.xz.asc +# https://curl.se/download/curl-8.9.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 0f58bb95fc330c8a46eeb3df5701b0d90c9d9bfcc42bd1cd08791d12551d4400 curl-8.8.0.tar.xz +sha256 ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412 curl-8.9.0.tar.xz sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 172dd22071..966885aeda 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.8.0 +LIBCURL_VERSION = 8.9.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From d46b2f5feaf3926a47b664188668a812b6662003 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 28 Jul 2024 17:46:17 +0200 Subject: [PATCH 066/114] support/testing/infra/emulator.py: add host load info in run log Runtime tests running on test runners are subject to a high variability in term of performance and timing. Most or the runtime test commands are executed with a timeout, in pexpect. Slow or very loaded test runners can use the timeout_multiplier to globally increase those timeouts. Some runtime test commands sometimes needs to poll or query a state, rather than having purely sequential actions. It is sometimes hard to know, from the test writer point of view, the maximum timeout to set, or if a retry logic is needed. In order to help debugging runtime tests failing due very slow execution, this commit adds extra information on the host test runner about its load in the run log. Relevant information are: number of cpus, the load average at the moment the emulator is started and the current timeout_multiplier. Note: this change was discussed in: https://lists.buildroot.org/pipermail/buildroot/2024-July/759119.html Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 7a6edbc7b9166c799b43cf9a9b78422c8e20ccc0) Signed-off-by: Peter Korsgaard --- support/testing/infra/emulator.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 624740fcb1..2106d0e99b 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -2,6 +2,8 @@ import infra +import os + class Emulator(object): @@ -73,6 +75,11 @@ def boot(self, arch, kernel=None, kernel_cmdline=None, options=None): if kernel_cmdline: qemu_cmd += ["-append", " ".join(kernel_cmdline)] + self.logfile.write(f"> host cpu count: {os.cpu_count()}\n") + ldavg = os.getloadavg() + ldavg_str = f"{ldavg[0]:.2f}, {ldavg[1]:.2f}, {ldavg[2]:.2f}" + self.logfile.write(f"> host loadavg: {ldavg_str}\n") + self.logfile.write(f"> timeout multiplier: {self.timeout_multiplier}\n") self.logfile.write("> starting qemu with '%s'\n" % " ".join(qemu_cmd)) self.qemu = pexpect.spawn(qemu_cmd[0], qemu_cmd[1:], timeout=5 * self.timeout_multiplier, From b13a25259f192ad62b47cf133f61e6f880f1dd9a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Jul 2024 19:58:05 +0200 Subject: [PATCH 067/114] DEVELOPERS: remove Bernd Kuhls from libks I am not using this package anymore. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c79ec67bc8763f8d630f51ffbcaf0bb6bfb71236) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 5f570de8ae..d1c4c6ece0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -411,7 +411,6 @@ F: package/libglu/ F: package/libhdhomerun/ F: package/libheif/ F: package/libilbc/ -F: package/libks/ F: package/libldns/ F: package/libmicrohttpd/ F: package/libminiupnpc/ From 793946286cf8593e6a7e64ac60bf2ca930acf675 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 27 Jul 2024 18:57:15 +0200 Subject: [PATCH 068/114] package/open-iscsi: open-isns is optional, not mandatory open-isns is optional, not mandatory, since bump to version 2.1.9 in commit 2314928cf828ff02939b9c0041964c3ee2dd907d and https://github.com/open-iscsi/open-iscsi/commit/713524df809396e11f42d7691bd8ead2ffc1ca6b Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 948b1830423421e087f6aa4923a37ce077ed5904) Signed-off-by: Peter Korsgaard --- package/open-iscsi/Config.in | 1 - package/open-iscsi/open-iscsi.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/open-iscsi/Config.in b/package/open-iscsi/Config.in index e55bbfd867..01d83615c9 100644 --- a/package/open-iscsi/Config.in +++ b/package/open-iscsi/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPEN_ISCSI depends on !BR2_STATIC_LIBS # kmod select BR2_PACKAGE_KMOD select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_OPEN_ISNS select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT help diff --git a/package/open-iscsi/open-iscsi.mk b/package/open-iscsi/open-iscsi.mk index d1f40d3e20..1266db3d3f 100644 --- a/package/open-iscsi/open-iscsi.mk +++ b/package/open-iscsi/open-iscsi.mk @@ -9,10 +9,17 @@ OPEN_ISCSI_SITE = $(call github,open-iscsi,open-iscsi,$(OPEN_ISCSI_VERSION)) OPEN_ISCSI_LICENSE = GPL-2.0+, GPL-3.0+, LGPL-3.0+ OPEN_ISCSI_LICENSE_FILES = COPYING README libopeniscsiusr/COPYING OPEN_ISCSI_CPE_ID_VALID = YES -OPEN_ISCSI_DEPENDENCIES = kmod open-isns openssl util-linux +OPEN_ISCSI_DEPENDENCIES = kmod openssl util-linux OPEN_ISCSI_CONF_OPTS = -Ddbroot=/var/lib/iscsi +ifeq ($(BR2_PACKAGE_OPEN_ISNS),y) +OPEN_ISCSI_DEPENDENCIES += open-isns +OPEN_ISCSI_CONF_OPTS += -Disns=enabled +else +OPEN_ISCSI_CONF_OPTS += -Disns=disabled +endif + ifeq ($(BR2_PACKAGE_SYSTEMD),y) OPEN_ISCSI_DEPENDENCIES += systemd OPEN_ISCSI_CONF_OPTS += -Dno_systemd=false From 0f1290e907013abf9fb7847b8cfc7e9954cad60a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 27 Jul 2024 19:48:23 +0200 Subject: [PATCH 069/114] package/intel-microcode: security bump version to 20240531 Release notes: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240312 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240514 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20240531 20240312 fixes CVE-2023-39368: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00972.html CVE-2023-38575: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00982.html CVE-2023-28746: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00898.html CVE-2023-22655: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00960.html CVE-2023-43490: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01045.html 20240514 fixes CVE-2023-45733: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01051.html CVE-2023-46103: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01052.html CVE-2023-45745: https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-01036.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 6eef18e6b06ab9daf79e09da5f12cd9070cabbc4) Signed-off-by: Peter Korsgaard --- package/intel-microcode/intel-microcode.hash | 2 +- package/intel-microcode/intel-microcode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-microcode/intel-microcode.hash b/package/intel-microcode/intel-microcode.hash index 742332d552..742be5ae79 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cee26f311f7e2c039dd48cd30f995183bde9b98fb4c3039800e2ddaf5c090e55 intel-microcode-20231114.tar.gz +sha256 c29eb35fdbd39e3ed8587e6f0b1275cc03265f230c2fcaf88e2a1556451e773f intel-microcode-20240531.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index a159baa93d..6862565bc8 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20231114 +INTEL_MICROCODE_VERSION = 20240531 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION)) INTEL_MICROCODE_LICENSE = PROPRIETARY INTEL_MICROCODE_LICENSE_FILES = license From 44df2369d302d665f5481c7917f22abd1e3618c5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Jul 2024 09:51:59 +0200 Subject: [PATCH 070/114] {linux, linux-headers}: bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 6, 9, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit e08708451be9e964b5a8e3a5a6f0959ad5e7c6a0) [Peter: Drop 6.9.x / 6.10.x bump] 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 f0ae89bcc7..844fcb3a6b 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.41" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.43" 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 bae766e0e5..4f4d6a22e8 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 9ec99c578158ab85d99b37791a76643d2ea4c3f72ecbef7b5eb6d60f3de032ef linux-6.6.41.tar.xz -sha256 b9aa6ec1a00f234d6c6f2d428fbb0a6bf459606c259263df978f86685b65a8b9 linux-6.1.100.tar.xz +sha256 0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e linux-6.6.43.tar.xz +sha256 1ba5f93b411ead7587fe48b2eec6c656f6796d31f5e406d236913c77512497ec linux-6.1.102.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 025fc7d8b1560cf456ccae50591fe1ca21c990645df9791aed25820fe78db302 linux-5.15.163.tar.xz -sha256 7b2d06803b5abb03c85f171100ca9d7acd6ba245036fe9a16eb998f088b150cb linux-5.10.222.tar.xz -sha256 a976c67eb8270cac310faf1acc61305d1f9967955aca38fbdfcb0bc77d033d42 linux-5.4.280.tar.xz +sha256 ec6098faed64b8a47ba1772e812a6eb444385f7aa3c60d3e4739ab2fd3b29186 linux-5.15.164.tar.xz +sha256 ca09d86a6b79706c33382d3f8606f476eb07918417a87fb1815f6a4aa81f2ba1 linux-5.10.223.tar.xz +sha256 44a0c3e76031f7513ce43e22e2a9dcbf7d6a6dee065dca9b8001843a075272b2 linux-5.4.281.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 0d5fa562a3c53f524f02fc11abe502c01096df73dd27d57736875e8590007493 linux-4.19.318.tar.xz +sha256 544ddc7339cf1b1d1ead1992e67d11a0834ad3bc77faa063e06b5d18c682eb30 linux-4.19.319.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 4f485d5188..62f10b1827 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.318" if BR2_KERNEL_HEADERS_4_19 - default "5.4.280" if BR2_KERNEL_HEADERS_5_4 - default "5.10.222" if BR2_KERNEL_HEADERS_5_10 - default "5.15.163" if BR2_KERNEL_HEADERS_5_15 - default "6.1.100" if BR2_KERNEL_HEADERS_6_1 - default "6.6.41" if BR2_KERNEL_HEADERS_6_6 + default "4.19.319" if BR2_KERNEL_HEADERS_4_19 + default "5.4.281" if BR2_KERNEL_HEADERS_5_4 + default "5.10.223" if BR2_KERNEL_HEADERS_5_10 + default "5.15.164" if BR2_KERNEL_HEADERS_5_15 + default "6.1.102" if BR2_KERNEL_HEADERS_6_1 + default "6.6.43" 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 08fe7fb96b159dadd9b2a2144ebbe0215583c667 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 29 Jul 2024 16:19:08 +0000 Subject: [PATCH 071/114] package/pkg-kconfig: fix *-savedefconfig under ppd The 'linux-savedefconfig' target fails with the below error when PER_PACKAGE_DIRECTORIES is enabled and the 'host-finalize' target hasn't run yet. scripts/Kconfig.include:39: C compiler '.../buildroot/output/host/bin/arm-buildroot-linux-gnueabihf-gcc' not found The 'PPD' variable isn't defined for this target, so 'BR_PATH' falls back to the final host directory. Reported-by: Nathaniel Roach Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit de11afaa3458eae781582e61e0de6a91e9e48d0e) Signed-off-by: Peter Korsgaard --- package/pkg-kconfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index f4f35bf96a..6bf3d6b4be 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -270,6 +270,7 @@ $(1)-check-configuration-done: ifeq ($$($(2)_KCONFIG_SUPPORTS_DEFCONFIG),YES) .PHONY: $(1)-savedefconfig +$(1)-savedefconfig: PKG=$(2) $(1)-savedefconfig: $(1)-check-configuration-done $$(call kconfig-package-savedefconfig,$(2)) endif From 07b54bed071fc49f12da0b85abb8ec663438829d Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 29 Jul 2024 16:19:09 +0000 Subject: [PATCH 072/114] package/pkg-kconfig: fix *-diff-config under ppd The 'linux-diff-config' target fails with the below error when PER_PACKAGE_DIRECTORIES is enabled and the 'host-finalize' target hasn't run yet. scripts/Kconfig.include:39: C compiler '.../buildroot/output/host/bin/arm-buildroot-linux-gnueabihf-gcc' not found The 'PPD' variable isn't defined for this target, so 'BR_PATH' falls back to the final host directory. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 641084bfb37856f79db86d9dbd6638ec70fc9681) Signed-off-by: Peter Korsgaard --- package/pkg-kconfig.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 6bf3d6b4be..684342bcef 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -301,6 +301,7 @@ endif # defconfig + fragments (if any) and the current configuration. # Note: it preserves the timestamp of the current configuration when moving it # around. +$(1)-diff-config: PKG=$(2) $(1)-diff-config: $(1)-check-configuration-done $$(Q)cp -a $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_DIR)/.config.dc.bak $$(call kconfig-package-merge-config,$(2),$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG),\ From 49f95629605ab60133ea9f7ba0f77c8bf29c8942 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Mon, 29 Jul 2024 16:19:10 +0000 Subject: [PATCH 073/114] package/pkg-kconfig: cleanup savedefconfig MAKE The kconfig infra defines a 'PKG_KCONFIG_MAKE' var that wraps all the standard kconfig options. Switch to this so we aren't duplicating the logic. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit 009d31b438b2c402fa959a9041f5cc9b050a1f8f) Signed-off-by: Peter Korsgaard --- package/pkg-kconfig.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/pkg-kconfig.mk b/package/pkg-kconfig.mk index 684342bcef..8000de16c4 100644 --- a/package/pkg-kconfig.mk +++ b/package/pkg-kconfig.mk @@ -33,8 +33,7 @@ PKG_KCONFIG_COMMON_OPTS = \ # Macro to save the defconfig file # $(1): the name of the package in upper-case letters define kconfig-package-savedefconfig - $($(1)_MAKE_ENV) $($(1)_MAKE) -C $($(1)_DIR) \ - $(PKG_KCONFIG_COMMON_OPTS) $($(1)_KCONFIG_OPTS) savedefconfig + $($(1)_KCONFIG_MAKE) savedefconfig endef # The correct way to regenerate a .config file is to use 'make olddefconfig'. From b60d6dafb741c7b3ee7aac49a1442f9983452ae4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 19 Jul 2024 23:03:24 +0200 Subject: [PATCH 074/114] package/gcc: fix build with BR2_TIME_BITS_64=y On the architectures that supports libsanitizer (part of gcc), the build is currently failing with BR2_TIME_BITS_64=y. This is because some code in libsanitizer unsets _FILE_OFFSET_BITS, but building code with _FILE_OFFSET_BITS unset, but _TIME_BITS set isn't legal. To fix this, this commit backports two changes: - One change to also unset _TIME_BITS in sanitizer_platform_limits_posix.cpp. This change is upstream in LLVM, and already part of GCC 14.x, so we only bringing it to GCC 12.x and GCC 13.x. - A second change doing the same modification, but in sanitizer_procmaps_solaris.cpp, which as crazy as it might sound, also gets compiled on Linux platforms (but to basically an empty file). This change has been submitted upstream to both LLVM and gcc. Notes: - the special PowerPC SPE version of GCC cannot be affected, as only uClibc-ng is used for this architecture, and uClibc-ng doesn't use _TIME_BITS=64 (but now default to 64-bit time_t on 32-bit architectures, like musl does). - the special ARC version doesn't need patching because libsanitizer doesn't support the ARC architecture, so it doesn't get built Fixes: http://autobuild.buildroot.net/results/ff2dbfdabf0bb6a0d82ea8a80122ab97fd75bd3f/ https://gitlab.com/buildroot.org/buildroot/-/issues/16 Signed-off-by: Thomas Petazzoni (cherry picked from commit 81a4b6e7b8b5bb368bce940798bf8432fb420851) [Peter: drop 14.1.0 patch] Signed-off-by: Peter Korsgaard --- ...-along-with-_FILE_OFFSET_BITS-on-Lin.patch | 44 +++++++++++++++ ...o-undef-_TIME_BITS-in-sanitizer_proc.patch | 53 +++++++++++++++++++ ...-along-with-_FILE_OFFSET_BITS-on-Lin.patch | 44 +++++++++++++++ ...o-undef-_TIME_BITS-in-sanitizer_proc.patch | 53 +++++++++++++++++++ 4 files changed, 194 insertions(+) create mode 100644 package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch create mode 100644 package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch create mode 100644 package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch create mode 100644 package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch diff --git a/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch b/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch new file mode 100644 index 0000000000..386c9287f6 --- /dev/null +++ b/package/gcc/12.4.0/0005-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch @@ -0,0 +1,44 @@ +From e45f12ecf703eed45515d451cf014fba32e7410b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 3 Feb 2023 11:48:35 -0800 +Subject: [PATCH] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux + +On 32-bit glibc>=2.34 systems using 64bit time_t build fails because +_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64 + +Fixes + +``` +/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed + only with _FILE_OFFSET_BITS=64" +| # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" +| ^ +| 1 error generated. +``` + +Reviewed By: thesamesam, MaskRay + +Differential Revision: https://reviews.llvm.org/D140812 + +Upstream: https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d53b3d94aaf211ffb2159614f5aaaf03ceb861cc +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index bfdccd5df07..4cedcbfb4bf 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -18,6 +18,7 @@ + // depends on _FILE_OFFSET_BITS setting. + // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #endif + + // Must go after undef _FILE_OFFSET_BITS. +-- +2.45.2 + diff --git a/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch new file mode 100644 index 0000000000..80c3378d7b --- /dev/null +++ b/package/gcc/12.4.0/0006-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch @@ -0,0 +1,53 @@ +From 940a0c955bca98aba937c4bfe3fe4a4c17dddb85 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 18 Jul 2024 23:13:41 +0200 +Subject: [PATCH] libsanitizer: also undef _TIME_BITS in + sanitizer_procmaps_solaris.cpp + +Upstream commit +https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +of LLVM added a #undef _TIME_BITS in +libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to +fix the build on 32-bit Linux platforms that have enabled 64-bit +time_t using _TIME_BITS=64. + +Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but +sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before +including any header file. To fix this, the upstream fix was to also +undef _TIME_BITS. + +This commit simply does the same in sanitizer_procmaps_solaris.cpp, +which also gets compiled under Linux (despite what the file name +says). In practice on Linux hosts (where _TIME_BITS=64 matters), +sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much +the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So +the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here +before including sanitizer_platform.h, which will set the +SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. + +Fixes: + +armeb-buildroot-linux-gnueabi/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" + +Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html +Signed-off-by: Thomas Petazzoni +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index e16c4e938cb..ca88cf2c2df 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + #include "sanitizer_common.h" +-- +2.45.2 + diff --git a/package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch b/package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch new file mode 100644 index 0000000000..a3be0914b9 --- /dev/null +++ b/package/gcc/13.3.0/0004-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch @@ -0,0 +1,44 @@ +From 88b73eedcfa0fc58aee2555377e6f7d4de153282 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 3 Feb 2023 11:48:35 -0800 +Subject: [PATCH] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux + +On 32-bit glibc>=2.34 systems using 64bit time_t build fails because +_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64 + +Fixes + +``` +/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed + only with _FILE_OFFSET_BITS=64" +| # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" +| ^ +| 1 error generated. +``` + +Reviewed By: thesamesam, MaskRay + +Differential Revision: https://reviews.llvm.org/D140812 + +Upstream: https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d53b3d94aaf211ffb2159614f5aaaf03ceb861cc +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index bcbd143d19d..1b23898b374 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -18,6 +18,7 @@ + // depends on _FILE_OFFSET_BITS setting. + // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #endif + + // Must go after undef _FILE_OFFSET_BITS. +-- +2.45.2 + diff --git a/package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch new file mode 100644 index 0000000000..73b09ac389 --- /dev/null +++ b/package/gcc/13.3.0/0005-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch @@ -0,0 +1,53 @@ +From 7ad54084a2c07cca6d03dfe274893e903852d359 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 18 Jul 2024 23:13:41 +0200 +Subject: [PATCH] libsanitizer: also undef _TIME_BITS in + sanitizer_procmaps_solaris.cpp + +Upstream commit +https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +of LLVM added a #undef _TIME_BITS in +libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to +fix the build on 32-bit Linux platforms that have enabled 64-bit +time_t using _TIME_BITS=64. + +Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but +sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before +including any header file. To fix this, the upstream fix was to also +undef _TIME_BITS. + +This commit simply does the same in sanitizer_procmaps_solaris.cpp, +which also gets compiled under Linux (despite what the file name +says). In practice on Linux hosts (where _TIME_BITS=64 matters), +sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much +the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So +the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here +before including sanitizer_platform.h, which will set the +SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. + +Fixes: + +armeb-buildroot-linux-gnueabi/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" + +Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html +Signed-off-by: Thomas Petazzoni +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index eeb49e2afe3..1b23fd4d512 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -11,6 +11,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include "sanitizer_platform.h" + #if SANITIZER_SOLARIS + # include +-- +2.45.2 + From 6199d507c3490fccb9b0789ca69a79a96bf165d7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 21 Aug 2024 15:05:45 +0200 Subject: [PATCH 075/114] package/gcc: renumber 11.4.0 patches Patch 0009 should be numbered 0008. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...ning.patch => 0008-libiberty-Darwin-Fix-a-build-warning.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/gcc/11.4.0/{0009-libiberty-Darwin-Fix-a-build-warning.patch => 0008-libiberty-Darwin-Fix-a-build-warning.patch} (100%) diff --git a/package/gcc/11.4.0/0009-libiberty-Darwin-Fix-a-build-warning.patch b/package/gcc/11.4.0/0008-libiberty-Darwin-Fix-a-build-warning.patch similarity index 100% rename from package/gcc/11.4.0/0009-libiberty-Darwin-Fix-a-build-warning.patch rename to package/gcc/11.4.0/0008-libiberty-Darwin-Fix-a-build-warning.patch From 68a935ca294a1db0a793a78cf318128ca10c8fee Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 21 Aug 2024 15:05:46 +0200 Subject: [PATCH 076/114] package/gcc: add 64-bit time_t fixes to GCC 11.4.0 This commit brings the same patches as commit 81a4b6e7b8b5bb368bce940798bf8432fb420851 ("package/gcc: fix build with BR2_TIME_BITS_64=y"), but for GCC 11.4.0, which is still used in 2024.02.x. Fixes: http://autobuild.buildroot.org/results/641428197d37bc07649feb50eb7e2c65b3a0da0f/ Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- ...-along-with-_FILE_OFFSET_BITS-on-Lin.patch | 44 +++++++++++++++ ...o-undef-_TIME_BITS-in-sanitizer_proc.patch | 53 +++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 package/gcc/11.4.0/0009-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch create mode 100644 package/gcc/11.4.0/0010-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch diff --git a/package/gcc/11.4.0/0009-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch b/package/gcc/11.4.0/0009-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch new file mode 100644 index 0000000000..7f113a5c0a --- /dev/null +++ b/package/gcc/11.4.0/0009-Undef-_TIME_BITS-along-with-_FILE_OFFSET_BITS-on-Lin.patch @@ -0,0 +1,44 @@ +From 37b5a741ef2d40fc31569d71fbd953c3a8120b6b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 3 Feb 2023 11:48:35 -0800 +Subject: [PATCH] Undef _TIME_BITS along with _FILE_OFFSET_BITS on Linux + +On 32-bit glibc>=2.34 systems using 64bit time_t build fails because +_FILE_OFFSET_BITS is undefined here but _TIME_BITS is still set to 64 + +Fixes + +``` +/usr/include/features-time64.h:26:5: error: "_TIME_BITS=64 is allowed + only with _FILE_OFFSET_BITS=64" +| # error "_TIME_BITS=64 is allowed only with _FILE_OFFSET_BITS=64" +| ^ +| 1 error generated. +``` + +Reviewed By: thesamesam, MaskRay + +Differential Revision: https://reviews.llvm.org/D140812 + +Upstream: https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d53b3d94aaf211ffb2159614f5aaaf03ceb861cc +Signed-off-by: Thomas Petazzoni +--- + .../sanitizer_common/sanitizer_platform_limits_posix.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +index 5743516c046..81cf2923ebe 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -21,6 +21,7 @@ + // To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. + #ifdef _FILE_OFFSET_BITS + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #endif + + // Must go after undef _FILE_OFFSET_BITS. +-- +2.46.0 + diff --git a/package/gcc/11.4.0/0010-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch b/package/gcc/11.4.0/0010-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch new file mode 100644 index 0000000000..816f915152 --- /dev/null +++ b/package/gcc/11.4.0/0010-libsanitizer-also-undef-_TIME_BITS-in-sanitizer_proc.patch @@ -0,0 +1,53 @@ +From 51012d2f0d39293121a5c6e4e26314ebfd6cf958 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Thu, 18 Jul 2024 23:13:41 +0200 +Subject: [PATCH] libsanitizer: also undef _TIME_BITS in + sanitizer_procmaps_solaris.cpp + +Upstream commit +https://github.com/llvm/llvm-project/commit/26800a2c7e7996dc773b4e990dd5cca41c45e1a9 +of LLVM added a #undef _TIME_BITS in +libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp to +fix the build on 32-bit Linux platforms that have enabled 64-bit +time_t using _TIME_BITS=64. + +Indeed, _TIME_BITS=64 can only be used when _FILE_OFFSET_BITS=64, but +sanitizer_platform_limits_posix.cpp undefines _FILE_OFFSET_BITS before +including any header file. To fix this, the upstream fix was to also +undef _TIME_BITS. + +This commit simply does the same in sanitizer_procmaps_solaris.cpp, +which also gets compiled under Linux (despite what the file name +says). In practice on Linux hosts (where _TIME_BITS=64 matters), +sanitizer_procmaps_solaris.cpp will expand to nothing, as pretty much +the rest of the file is inside a #ifdef SANITIZER_SOLARIS...#endif. So +the #undef _FILE_OFFSET_BITS and #undef _TIME_BITS are only here +before including sanitizer_platform.h, which will set the +SANITIZER_LINUX/SANITIZER_SOLARIS define depending on the platform. + +Fixes: + +armeb-buildroot-linux-gnueabi/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" + +Upstream: https://gcc.gnu.org/pipermail/gcc-patches/2024-July/657811.html +Signed-off-by: Thomas Petazzoni +--- + libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +index 4063ec8deaa..503dedd1129 100644 +--- a/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp ++++ b/libsanitizer/sanitizer_common/sanitizer_procmaps_solaris.cpp +@@ -16,6 +16,7 @@ + + // Before Solaris 11.4, doesn't work in a largefile environment. + #undef _FILE_OFFSET_BITS ++#undef _TIME_BITS + #include + #include + +-- +2.46.0 + From 4bb569bccaeaf3adfc9d421075cd6cdfd2e5f4f7 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 31 Jul 2024 22:44:53 +0200 Subject: [PATCH 077/114] package/freerdp: security bump version to 2.11.7 See release announce: https://www.freerdp.com/2024/04/22/2_11_7-release Note: this release is flagged as a "security" bump from the upstream release note. While there is no allocated CVEs, commits in this release are backported fixes from oss-fuzz. See: https://github.com/FreeRDP/FreeRDP/compare/2.11.6...2.11.7 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit b382ede065e1260582d6d27ddb34b0450fce4e5e) Signed-off-by: Peter Korsgaard --- package/freerdp/freerdp.hash | 4 ++-- package/freerdp/freerdp.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/freerdp/freerdp.hash b/package/freerdp/freerdp.hash index 9ac9b25066..1007215cd6 100644 --- a/package/freerdp/freerdp.hash +++ b/package/freerdp/freerdp.hash @@ -1,5 +1,5 @@ -# From https://pub.freerdp.com/releases/freerdp-2.11.6.tar.gz.sha256 -sha256 ad5a0c7761b18af914041ed50902d6c9fd553e65eeba8a1bea41c4149980b84c freerdp-2.11.6.tar.gz +# From https://pub.freerdp.com/releases/freerdp-2.11.7.tar.gz.sha256 +sha256 5a2d54e1ca0f1facd1632bcc94c73b9f071a80c5fdbbb3f26e79f02aaa586ca3 freerdp-2.11.7.tar.gz # Locally calculated sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 8e359cbb4f..e8c8f320a9 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREERDP_VERSION = 2.11.6 +FREERDP_VERSION = 2.11.7 FREERDP_SITE = https://pub.freerdp.com/releases FREERDP_DEPENDENCIES = libglib2 openssl zlib FREERDP_LICENSE = Apache-2.0 From fa638cc8de60f6e443509c9f9bcd0fd2889ab685 Mon Sep 17 00:00:00 2001 From: Thomas Bonnefille Date: Thu, 1 Aug 2024 16:59:58 +0200 Subject: [PATCH 078/114] package/ffmpeg: add optional dependency on jack Add automatic JACK audio sound server support to ffmpeg if either JACK or JACK2 are enabled. Signed-off-by: Thomas Bonnefille Signed-off-by: Thomas Petazzoni (cherry picked from commit 15e411d800999a70cc04a8d506ead40ea3dba210) Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index ce285bcc60..89c99f4b64 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -86,6 +86,16 @@ else FFMPEG_CONF_OPTS += --disable-ffplay endif +ifeq ($(BR2_PACKAGE_JACK1),y) +FFMPEG_CONF_OPTS += --enable-libjack +FFMPEG_DEPENDENCIES += jack1 +else ifeq ($(BR2_PACKAGE_JACK2),y) +FFMPEG_CONF_OPTS += --enable-libjack +FFMPEG_DEPENDENCIES += jack2 +else +FFMPEG_CONF_OPTS += --disable-libjack +endif + ifeq ($(BR2_PACKAGE_LIBV4L),y) FFMPEG_DEPENDENCIES += libv4l FFMPEG_CONF_OPTS += --enable-libv4l2 From 49600cb5f0f110456d800dc5e1975d90aff798b3 Mon Sep 17 00:00:00 2001 From: Kilian Zinnecker Date: Thu, 1 Aug 2024 21:12:34 +0200 Subject: [PATCH 079/114] board/udoo/neo/readme.txt: provide more details This patch adds more information to the Udoo Neo's readme, e.g., UART pins and baudrate. Signed-off-by: Kilian Zinnecker Signed-off-by: Thomas Petazzoni (cherry picked from commit 008e37b3aeb304919a3eb4d1c47b2b4d49ec49db) Signed-off-by: Peter Korsgaard --- board/udoo/neo/readme.txt | 54 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/board/udoo/neo/readme.txt b/board/udoo/neo/readme.txt index 94ebcc12f2..e9f9fbac1c 100644 --- a/board/udoo/neo/readme.txt +++ b/board/udoo/neo/readme.txt @@ -1,12 +1,36 @@ MX6X Udoo Neo board - +=================== http://www.udoo.org/udoo-neo/ +Build: +====== + To build a minimal support for these boards: $ make mx6sx_udoo_neo_defconfig $ make +Files created in the output directory: +====================================== + +output/images +. +├── boot.scr +├── imx6sx-udoo-neo-basic.dtb +├── imx6sx-udoo-neo-extended.dtb +├── imx6sx-udoo-neo-full.dtb +├── rootfs.ext2 +├── rootfs.ext4 -> rootfs.ext2 +├── rootfs.tar +├── sdcard.img +├── SPL +├── u-boot.bin +├── u-boot.img +└── zImage + +Creating bootable SD card: +========================== + Buildroot prepares a bootable "sdcard.img" image in the output/images/ directory, ready to be dumped on an SD card: @@ -14,3 +38,31 @@ dd if=output/images/sdcard.img of=/dev/ For details about the medium image layout, see the definition in board/freescale/common/imx/genimage.cfg.template_no_boot_part_spl. + +Booting: +======== + +Serial console: +--------------- +The Udoo Neo features the serial console "UART1" on the pin header "P7". The +Uart pins are as follows (see board labels): + +pin 46: rx +pin 47: tx + +Baudrate for this board is 115200. + +Login: +------ +Enter 'root' as login user, and the prompt is ready. + +Documentation: +============== + +documentation link: +------------------- +https://www.udoo.org/docs-neo/Introduction/Introduction.html + +forum link: +----------- +https://www.udoo.org/forum/forums/udoo-neo.39/ From eb834ee93bb6dafb9b011a1a3aa27f3d7b916f39 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Fri, 2 Aug 2024 12:44:37 +0200 Subject: [PATCH 080/114] package/mdio-tools: enable CONFIG_NETDEVICES mdio-tools depends on CONFIG_MDIO_DEVICE in order for mdiobus driver to be built, but CONFIG_MDIO_DEVICE depends on CONFIG_NETDEVICES which we are not enabling so on platforms without it enabled in kernel config building mdio-tools will fail with: ERROR: modpost: "mdio_find_bus" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_c45_read" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_read" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_c45_write" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! ERROR: modpost: "__mdiobus_write" [output-1/build/mdio-tools-1.3.1/kernel/mdio-netlink.ko] undefined! So enable CONFIG_NETDEVICES as well to make sure CONFIG_MDIO_DEVICE can be enabled. Fixes: http://autobuild.buildroot.net/results/edf47df96cde6094c890c0b74034cced90335a39/ Signed-off-by: Robert Marko Signed-off-by: Thomas Petazzoni (cherry picked from commit b95fff0185803bac5c8cfb558d60234e59a1469b) Signed-off-by: Peter Korsgaard --- package/mdio-tools/mdio-tools.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mdio-tools/mdio-tools.mk b/package/mdio-tools/mdio-tools.mk index 16eba74734..b42ea41c79 100644 --- a/package/mdio-tools/mdio-tools.mk +++ b/package/mdio-tools/mdio-tools.mk @@ -14,6 +14,7 @@ MDIO_TOOLS_MODULE_SUBDIRS = kernel define MDIO_TOOLS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_NETDEVICES) $(call KCONFIG_ENABLE_OPT,CONFIG_MDIO_DEVICE) endef From 93fa10270225f3359d36dc625218f66f10d67ae4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 23 Jul 2024 15:20:58 +0200 Subject: [PATCH 081/114] package/pistache: needs NPTL pistache needs NPTL as it unconditionally uses pthread_setname_np since https://github.com/pistacheio/pistache/commit/b283c32963a7cb0500cf69555d320a6e9e252850 resulting in the following uclibc build failure since commit 82e61bed8208857d5d13c384c89086c4dd4e1e79: ../src/common/reactor.cc: In lambda function: ../src/common/reactor.cc:512:25: error: 'pthread_setname_np' was not declared in this scope; did you mean 'pthread_setcanceltype'? 512 | pthread_setname_np(pthread_self(), | ^~~~~~~~~~~~~~~~~~ | pthread_setcanceltype Fixes: 82e61bed8208857d5d13c384c89086c4dd4e1e79 - http://autobuild.buildroot.org/results/b2b22e4f9684aca0246650673fd8c33019712ddf - http://autobuild.buildroot.org/results/1597bfe2a57cd3aef54d331447dd81cae020d434 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit b6db4e2a79da7aadcbe2beda3e00381afb9e3f28) Signed-off-by: Peter Korsgaard --- package/pistache/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pistache/Config.in b/package/pistache/Config.in index 3acf1f53f0..2a845e7eb6 100644 --- a/package/pistache/Config.in +++ b/package/pistache/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_PISTACHE bool "pistache" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17, std::optional depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 select BR2_PACKAGE_RAPIDJSON @@ -13,9 +13,9 @@ config BR2_PACKAGE_PISTACHE https://github.com/oktal/pistache -comment "pistache needs a toolchain w/ C++, gcc >= 7, threads, wchar, not binutils bug 27597" +comment "pistache needs a toolchain w/ C++, gcc >= 7, NPTL, wchar, not binutils bug 27597" depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 From b9978410c1471a9424b33b44087131d1bf86d50c Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 27 Jun 2024 22:33:32 +0300 Subject: [PATCH 082/114] package/wpewebkit: disable libdrm usage when not available Pass USE_LIBDRM=OFF to the wpewebkit CMake configuration step when the libdrm package has not been selected. WPE WebKit can be built without libdrm support, and it will still work with backends that use other platform-specific methods to handle graphics buffers and/or presenting content onto an output. For example this is the case with wpebackend-rdk configured to use rpi-userland, which uses dispmanx to produce the output instead of DRM/KMS. Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 65f8174648a3df922892cfac1ad15279d1bffde3) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index ecb3b3e352..9daca79fc7 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -87,6 +87,13 @@ else WPEWEBKIT_CONF_OPTS += -DUSE_LIBBACKTRACE=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +WPEWEBKIT_CONF_OPTS += -DUSE_LIBDRM=ON +WPEWEBKIT_DEPENDENCIES += libdrm +else +WPEWEBKIT_CONF_OPTS += -DUSE_LIBDRM=OFF +endif + ifeq ($(BR2_PACKAGE_WOFF2),y) WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON WPEWEBKIT_DEPENDENCIES += woff2 From 6aeca07c728b46cb08571e349db25737553d79b9 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 9 Jul 2024 16:23:57 +0200 Subject: [PATCH 083/114] package/gpsd: condition python stuff to the proper kconfig option Currently, we have a Kconfig symbol to enable the python support in gpsd, but the condition at configure time is based on whether the python package is enabled. So, if a user does not enable python support in gpsd, they still get it. Switch to using the proper symbol. Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Reviewed-by: Jan Havran Signed-off-by: Thomas Petazzoni (cherry picked from commit 9696d277565159029e74efb9eae16b4a670bf945) Signed-off-by: Peter Korsgaard --- package/gpsd/gpsd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 1d4013d122..c57fad83c3 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -178,7 +178,7 @@ ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE) endif -ifeq ($(BR2_PACKAGE_PYTHON3),y) +ifeq ($(BR2_PACKAGE_GPSD_PYTHON),y) GPSD_SCONS_OPTS += \ python=yes \ python_libdir="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages" From 85f498fa8e40ad400e5df785826009ffcdc2922a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 9 Jul 2024 16:23:58 +0200 Subject: [PATCH 084/114] package/gpsd: fix comment about wchar requirement The comment does not follow the coding style, so update it appropriately. Signed-off-by: Yann E. MORIN Cc: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b88d2b51a4bd2d825d71730bde934dc9991fc6cf) Signed-off-by: Peter Korsgaard --- package/gpsd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 8c28c05efd..44615f4e43 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -84,7 +84,7 @@ config BR2_PACKAGE_GPSD_PYTHON Python libraries and tools for the gpsd service daemon including gpsfake test harness. -comment "GPSD python support not available with toolchain w/o wide characters support" +comment "python support needs a toolchain w/ wchar" depends on !BR2_USE_WCHAR comment "Protocols" From 92453b8029288859d8012e000933ba2ddc6a61db Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 3 Aug 2024 11:20:05 +0200 Subject: [PATCH 085/114] DEVELOPERS: remove Maeva Manuel Maeva told me personally she will no longer contribute to Buildroot for the time being. This commit removes all the associated DEVELOPERS entries. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 92d652df4869d073e383d9d44b5c43e338d83c29) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index d1c4c6ece0..2582f1415b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2054,11 +2054,6 @@ N: Ludwig Kormann F: board/in-circuit/ F: configs/icnova* -N: Maeva Manuel -F: board/freescale/imx8qmmek/ -F: configs/freescale_imx8qmmek_defconfig -F: package/freescale-imx/imx-seco/ - N: Mahyar Koshkouei F: package/ffmpeg/ F: package/mpv/ From 1b56d43b87a59127e43347d1f55adf2df4180822 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 20 Feb 2024 23:07:20 +0100 Subject: [PATCH 086/114] support/testing: add make runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 3e1e49069d5fc67b434de94637409c6ced915dea) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 + support/testing/tests/package/test_make.py | 82 +++++++++++++++++++ .../test_make/rootfs-overlay/root/Makefile | 23 ++++++ 3 files changed, 107 insertions(+) create mode 100644 support/testing/tests/package/test_make.py create mode 100644 support/testing/tests/package/test_make/rootfs-overlay/root/Makefile diff --git a/DEVELOPERS b/DEVELOPERS index 2582f1415b..9eb2da98a1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1834,6 +1834,8 @@ F: support/testing/tests/package/test_lzip.py F: support/testing/tests/package/test_lsof.py F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py +F: support/testing/tests/package/test_make.py +F: support/testing/tests/package/test_make/ F: support/testing/tests/package/test_mawk.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ diff --git a/support/testing/tests/package/test_make.py b/support/testing/tests/package/test_make.py new file mode 100644 index 0000000000..2ec62826be --- /dev/null +++ b/support/testing/tests/package/test_make.py @@ -0,0 +1,82 @@ +import os + +import infra.basetest + + +class TestMake(infra.basetest.BRTest): + rootfs_overlay = \ + infra.filepath("tests/package/test_make/rootfs-overlay") + config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ + f""" + BR2_PACKAGE_MAKE=y + BR2_ROOTFS_OVERLAY="{rootfs_overlay}" + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def gen_expected_str(self, count): + """Return the expected string generated by the test Makefile""" + return "".join(map(lambda x: str(x), range(1, count+1))) + + 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("make --version") + + # We touch the Makefile to set its modification time to the + # current system time. This is to avoid warnings from Make + # about having files with timestamps in the future. This is + # because the minimal system running in the emulator might not + # set the clock to the real time, and the Makefile has a + # correct timestamp from the build host (which is likely at + # the correct time). + self.assertRunOk("touch Makefile") + + # We test the "message" target and check we get the expected + # string. + out, ret = self.emulator.run("make message") + self.assertEqual(ret, 0) + self.assertEqual(out[0], "Hello Buildroot!") + + # We redo the same test, this time by passing a new message + # with a variable. + msg = "This is Another Message..." + out, ret = self.emulator.run(f"make message MESSAGE='{msg}'") + self.assertEqual(ret, 0) + self.assertEqual(out[0], msg) + + # We run a simple "make" invocation, using the defaults. + self.assertRunOk("make") + + # We check the generated output contains the expected string. + expected_str = self.gen_expected_str(10) + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_str) + + # Clean the previous invocation. + self.assertRunOk("make clean") + + # We check a output generated file is no longer present. + self.assertRunOk("test ! -e output.txt") + + # We run an invocation with a larger COUNT value. GNU Make + # version 4.4 introduced the --shuffle option, which shuffle + # rules. We use it with a constant seed, in order to have a + # stable reshuffling in all test runs. We also include in this + # execution a request for parallel jobs. + count = 50 + seed = 123456 + self.assertRunOk(f"make -j10 --shuffle={seed} COUNT={count}") + + # Despite the pseudo-randomization in the previous invocation, + # the expected output should be correctly ordered. + expected_str = self.gen_expected_str(count) + out, ret = self.emulator.run("cat output.txt") + self.assertEqual(ret, 0) + self.assertEqual(out[0], expected_str) diff --git a/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile b/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile new file mode 100644 index 0000000000..7ac86945a5 --- /dev/null +++ b/support/testing/tests/package/test_make/rootfs-overlay/root/Makefile @@ -0,0 +1,23 @@ +MESSAGE ?= "Hello Buildroot!" +COUNT ?= 10 + +LIST = $(shell seq $(COUNT)) +INPUTS = $(addsuffix .in.txt,$(LIST)) +OUTPUT = output.txt + +.PHONY: all +all: $(OUTPUT) + +.PHONY: clean +clean: + $(RM) $(OUTPUT) *.in.txt + +.PHONY: message +message: + @echo $(MESSAGE) + +%.in.txt: + echo $(subst .in.txt,,$@) > $@ + +$(OUTPUT): $(INPUTS) + (cat $? | tr -d '\n' ; echo) > $@ From 7254104a3d55bd88f8062712e9d1fe4059d5d62e Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 17 Feb 2024 19:45:20 +0100 Subject: [PATCH 087/114] support/testing: add mariadb runtime test Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 5356754d1e11174274553f2f7329edd7e8c7fd68) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + support/testing/tests/package/test_mariadb.py | 195 ++++++++++++++++++ 2 files changed, 196 insertions(+) create mode 100644 support/testing/tests/package/test_mariadb.py diff --git a/DEVELOPERS b/DEVELOPERS index 9eb2da98a1..1945e1fb37 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1836,6 +1836,7 @@ F: support/testing/tests/package/test_lz4.py F: support/testing/tests/package/test_lzop.py F: support/testing/tests/package/test_make.py F: support/testing/tests/package/test_make/ +F: support/testing/tests/package/test_mariadb.py F: support/testing/tests/package/test_mawk.py F: support/testing/tests/package/test_mdadm.py F: support/testing/tests/package/test_mdadm/ diff --git a/support/testing/tests/package/test_mariadb.py b/support/testing/tests/package/test_mariadb.py new file mode 100644 index 0000000000..523f075db1 --- /dev/null +++ b/support/testing/tests/package/test_mariadb.py @@ -0,0 +1,195 @@ +import os + +import infra.basetest + + +class TestMariaDB(infra.basetest.BRTest): + # We use a specific configuration for: + # - using Aarch64, to have more than 256MB memory, + # - to have an ext4 rootfs image exposed as a virtio storage + # (rather than cpio initrd). This will save some memory, as the + # rootfs image is big. + 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.78" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_PACKAGE_MYSQL=y + BR2_PACKAGE_MARIADB=y + BR2_PACKAGE_MARIADB_SERVER=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_4=y + BR2_TARGET_ROOTFS_EXT2_SIZE="512M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + # Configuration for the test + db_adminuser = "root" + db_admin = "mysql" + db_user = "br_user" + db_name = "br_database" + backup_file = "dump.sql" + + def run_user_db_query(self, user, database, query, opts=None): + cmd = f"mariadb --user={user} --database={database}" + cmd += f' --execute="{query}"' + if opts is not None: + cmd += " " + opts + self.assertRunOk(cmd) + + def run_admin_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_adminuser, self.db_admin, query, opts) + + def run_sql_query(self, query, opts=None): + self.run_user_db_query(self.db_user, self.db_name, query, opts) + + def cleanup_database(self): + # 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 prevent errors during the + # user/db creation. + + # Drop the test database, if it exists. + sql_query = f"DROP USER IF EXISTS {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + # Drop the test user, if it exists. + sql_query = f"DROP DATABASE IF EXISTS {self.db_name};" + self.run_admin_sql_query(sql_query) + + def create_tables(self): + sql_query = "CREATE TABLE fruits (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE colors (" + sql_query += "id integer PRIMARY KEY, name varchar(16) NOT NULL);" + self.run_sql_query(sql_query) + + sql_query = "CREATE TABLE fruit_colors (" + sql_query += "fruit_id integer REFERENCES fruits(id), " + sql_query += "color_id integer REFERENCES colors(id), " + sql_query += "UNIQUE (fruit_id, color_id));" + self.run_sql_query(sql_query) + + def insert_data(self): + fruits = ["Banana", "Blueberry", "Orange", "Raspberry"] + fruit_id = 1 + for fruit in fruits: + sql_query = "INSERT INTO fruits (id, name) " + sql_query += f"VALUES ({fruit_id}, '{fruit}');" + self.run_sql_query(sql_query) + fruit_id += 1 + + colors = ["Blue", "Orange", "Red", "Yellow"] + color_id = 1 + for color in colors: + sql_query = "INSERT INTO colors (id, name) " + sql_query += f"VALUES ({color_id}, '{color}');" + self.run_sql_query(sql_query) + color_id += 1 + + fruit_colors = [(1, 4), (2, 1), (3, 2), (4, 3)] + for fruit_color in fruit_colors: + fruit_id, color_id = fruit_color + sql_query = "INSERT INTO fruit_colors (fruit_id, color_id) " + sql_query += f"VALUES ({fruit_id}, {color_id});" + self.run_sql_query(sql_query) + + def query_database(self): + sql_query = "SELECT " + sql_query += "fruits.name AS fruit, colors.name AS color " + sql_query += "FROM fruits, colors, fruit_colors " + sql_query += "WHERE fruits.id = fruit_colors.fruit_id " + sql_query += "AND colors.id = fruit_colors.color_id " + sql_query += "ORDER BY fruit;" + self.run_sql_query(sql_query) + + 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-a57", + "-m", "2G", + "-smp", "2", + "-drive", f"file={drive},if=virtio,format=raw"]) + self.emulator.login() + + # Check the server binary can execute. + self.assertRunOk("mariadbd --version") + + # Check the client binary can execute. + self.assertRunOk("mariadb --version") + + # Check the server is ready. + self.assertRunOk("mariadb-admin ping") + + # Query the server version from the client. + sql_query = "SELECT version();" + self.run_admin_sql_query(sql_query, opts="-N -s") + + self.cleanup_database() + + # Create a new user. + sql_query = f"CREATE USER {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + # Create a new database. + sql_query = f"CREATE DATABASE {self.db_name}" + sql_query += " COMMENT = 'Test Database for Buildroot Test';" + self.run_admin_sql_query(sql_query) + + # Grant all permission on this new database to our test user. + sql_query = "GRANT ALL PRIVILEGES" + sql_query += f" ON {self.db_name}.*" + sql_query += f" TO {self.db_user}@localhost;" + self.run_admin_sql_query(sql_query) + + self.create_tables() + + self.insert_data() + + self.query_database() + + # Update a table. + sql_query = "UPDATE fruits SET name = 'Lemon' WHERE id = 1;" + self.run_sql_query(sql_query) + + # Backup the test database. + cmd = f"mariadb-dump --user={self.db_user}" + cmd += f" {self.db_name} > {self.backup_file}" + self.assertRunOk(cmd) + + # Drop all the tables. + sql_query = "DROP TABLE fruit_colors, fruits, colors;" + self.run_sql_query(sql_query) + + # Query the server status. + self.assertRunOk("mariadb-admin status") + + # Stop the server. + self.assertRunOk("/etc/init.d/S97mysqld stop") + + # Check the server is stopped. + _, exit_code = self.emulator.run("mariadb-admin ping") + self.assertNotEqual(exit_code, 0) + + # Restart the server. + self.assertRunOk("/etc/init.d/S97mysqld start") + + # Restore the backup. + cmd = f"mariadb --user={self.db_user} --database={self.db_name}" + cmd += f" < {self.backup_file}" + self.assertRunOk(cmd) + + # Query one last time our data, to check the backup + # restoration succeeded. + self.query_database() From 78a29492f5a2d344164f2619fe295041d5b153d5 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 10 Aug 2024 12:56:06 +0200 Subject: [PATCH 088/114] support/testing: package: mariadb: fix test configuration The mysql virtual package was removed in commit 8708f3a23a "package/mysql: drop virtual package". The mariadb runtime test was authored before this mysql virtual package removal, but was merged after it, in commit 5356754d1e "support/testing: add mariadb runtime test". Due to this, this test always failed with the error: Makefile.legacy:9: *** "You have legacy configuration in your .config! Please check your configuration.". Stop. This commit fixes the issue by removing the legacy BR2_PACKAGE_MYSQL=y configuration directive. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/7540345406 Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit 3da3361a1b9cafb274dac776693720fe20f6681b) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_mariadb.py | 1 - 1 file changed, 1 deletion(-) diff --git a/support/testing/tests/package/test_mariadb.py b/support/testing/tests/package/test_mariadb.py index 523f075db1..d40ffdba96 100644 --- a/support/testing/tests/package/test_mariadb.py +++ b/support/testing/tests/package/test_mariadb.py @@ -19,7 +19,6 @@ class TestMariaDB(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.78" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" - BR2_PACKAGE_MYSQL=y BR2_PACKAGE_MARIADB=y BR2_PACKAGE_MARIADB_SERVER=y BR2_TARGET_ROOTFS_EXT2=y From 09bff2c84903f769841d2dc1218aa0e6c62cf998 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:45:00 +0200 Subject: [PATCH 089/114] package/libxml2: security bump version to 2.12.9 Fixes CVE-2024-34459 (2.12.7) & CVE-2024-40896. Release notes: https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.7.news https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.8.news https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.9.news Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 45651cdb851bcd5af06bb94d824b078b03d4f187) 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 086bb41098..73fd0ecedf 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.6.sha256sum -sha256 889c593a881a3db5fdd96cc9318c87df34eb648edfc458272ad46fd607353fbb libxml2-2.12.6.tar.xz +# From https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.9.sha256sum +sha256 59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590 libxml2-2.12.9.tar.xz # License files, locally calculated sha256 7fb0a66f3989f9bd5c7e5438a3de02cd4a7a47dde0aea2f7ea2ba2ff454ee6a4 Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index e7ed6fb752..b69722b21d 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).6 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).9 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From 1a9e19cd7b7bbfed58e63c9a9409ebfcccf6318d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Aug 2024 12:46:33 +0200 Subject: [PATCH 090/114] {linux, linux-headers}: bump 6.{1, 6, 10}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 179bf242d564e18db278b39fdf67e43ec6806e28) [Peter: drop 6.10.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 4 ++-- package/linux-headers/Config.in.host | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 844fcb3a6b..a5be12bc5e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.6.43" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.6.44" 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 4f4d6a22e8..6ca30145db 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,6 +1,6 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 0ad83b1a1a780a1aad948d55aa55ee63c50c626f2d46910b9d2180028d100a5e linux-6.6.43.tar.xz -sha256 1ba5f93b411ead7587fe48b2eec6c656f6796d31f5e406d236913c77512497ec linux-6.1.102.tar.xz +sha256 93218296934915636fe6ba08e125948424cc270fd8948502c0ab91087a9fccd8 linux-6.6.44.tar.xz +sha256 5eb4706f898f50881552ff5146d892132d3ffc5298033bffe27087d3a44c4573 linux-6.1.103.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 ec6098faed64b8a47ba1772e812a6eb444385f7aa3c60d3e4739ab2fd3b29186 linux-5.15.164.tar.xz sha256 ca09d86a6b79706c33382d3f8606f476eb07918417a87fb1815f6a4aa81f2ba1 linux-5.10.223.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 62f10b1827..842df6e394 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -407,8 +407,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.281" if BR2_KERNEL_HEADERS_5_4 default "5.10.223" if BR2_KERNEL_HEADERS_5_10 default "5.15.164" if BR2_KERNEL_HEADERS_5_15 - default "6.1.102" if BR2_KERNEL_HEADERS_6_1 - default "6.6.43" if BR2_KERNEL_HEADERS_6_6 + default "6.1.103" if BR2_KERNEL_HEADERS_6_1 + default "6.6.44" 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 7b5bc0d1db8bb9864629fdba3d13e636645187c8 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sat, 3 Aug 2024 13:42:03 -0400 Subject: [PATCH 091/114] package/swaybg: bump to version 1.2.1 See also: https://github.com/swaywm/swaybg/releases/tag/v1.2.1 Signed-off-by: James Knight Signed-off-by: Thomas Petazzoni (cherry picked from commit 2143e8f8351c177d7fce87ccacba042afea94f93) Signed-off-by: Peter Korsgaard --- package/swaybg/swaybg.hash | 5 +++-- package/swaybg/swaybg.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/swaybg/swaybg.hash b/package/swaybg/swaybg.hash index 62bf048d61..e528349db9 100644 --- a/package/swaybg/swaybg.hash +++ b/package/swaybg/swaybg.hash @@ -1,3 +1,4 @@ -# Locally computed, tarball verified with GPG signature -sha256 c0205b34f1fad94553b6cb2c2b983cc33186018026058cad0b841a00bc3087e3 swaybg-1.2.0.tar.gz +# Locally calculated after checking pgp signature: +# https://github.com/swaywm/swaybg/releases/download/v1.2.1/swaybg-1.2.1.tar.gz.sig +sha256 6af1fdf0e57b1cc5345febed786b761fea0e170943a82639f94cfaed7df84f8f swaybg-1.2.1.tar.gz sha256 95224d118a325daf31828afcca98cd958d53f0a7cdd856b50b1be8ac44832faf LICENSE diff --git a/package/swaybg/swaybg.mk b/package/swaybg/swaybg.mk index 90a8cb5d80..87374e035e 100644 --- a/package/swaybg/swaybg.mk +++ b/package/swaybg/swaybg.mk @@ -4,7 +4,7 @@ # ################################################################################ -SWAYBG_VERSION = 1.2.0 +SWAYBG_VERSION = 1.2.1 SWAYBG_SITE = https://github.com/swaywm/swaybg/releases/download/v$(SWAYBG_VERSION) SWAYBG_LICENSE = MIT SWAYBG_LICENSE_FILES = LICENSE From cdadf61305b8564b77446a255abce9d9d62ce1ac Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Aug 2024 11:31:28 +0200 Subject: [PATCH 092/114] package/openldap: update to 2.5.18 See here for a Changelog: https://openldap.org/software/release/changes_lts.html Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 61ad5516485a1b4518c4997c9a146a5faa96e6d2) Signed-off-by: Peter Korsgaard --- package/openldap/openldap.hash | 4 ++-- package/openldap/openldap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash index 1383c6aef8..32bd83f349 100644 --- a/package/openldap/openldap.hash +++ b/package/openldap/openldap.hash @@ -1,5 +1,5 @@ # Verified by locally checking against the SHA3-512 hash available in -# https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.16.sha3-512 +# https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.5.18.sha3-512 # Locally computed -sha256 546ba591822e8bb0e467d40c4d4a30f89d937c3a507fe83a578f582f6a211327 openldap-2.5.16.tgz +sha256 2670ae43d8d99dd6b1ba182101d982350d613d09c098eb1607ea6b36e6b51d3e openldap-2.5.18.tgz sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 9cebff99dc..68cfb89c41 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.5.16 +OPENLDAP_VERSION = 2.5.18 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = https://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License From a5b0519fc772fa9b29690b8ea207aa01a3f8cf51 Mon Sep 17 00:00:00 2001 From: Edgar Bonet Date: Thu, 16 May 2024 12:06:50 +0200 Subject: [PATCH 093/114] package/nginx: fix compile error in configure script Building with GCC 14 fails at the configure step with: ./configure: error: libatomic_ops library was not found. The error is not caused by a missing library, but by an unrelated "incompatible pointer type" error in the test program: ... checking for atomic_ops library objs/autotest.c: In function 'main': objs/autotest.c:9:48: error: passing argument 1 of 'AO_compare_and_swap' from incompatible pointer type [-Wincompatible-pointer-types] This used to be a warning, but it is an error since GCC 14.[1] Fix this by patching the test program in order to use the correct pointer types. Fixes: http://autobuild.buildroot.net/results/a3d/a3d8c6fd631b31e272e4d8cc6c3318f2e4151882 [1] https://gcc.gnu.org/gcc-14/porting_to.html#incompatible-pointer-types Signed-off-by: Edgar Bonet Signed-off-by: Arnout Vandecappelle (cherry picked from commit 7d249dab514e6fc003cb92962890d2ce36b87931) Signed-off-by: Peter Korsgaard --- ...ix-compile-error-in-configure-script.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/nginx/0011-Fix-compile-error-in-configure-script.patch diff --git a/package/nginx/0011-Fix-compile-error-in-configure-script.patch b/package/nginx/0011-Fix-compile-error-in-configure-script.patch new file mode 100644 index 0000000000..672162759e --- /dev/null +++ b/package/nginx/0011-Fix-compile-error-in-configure-script.patch @@ -0,0 +1,33 @@ +From e1bcac837f6aeabc4ddece06ecbcf2bcca8dd651 Mon Sep 17 00:00:00 2001 +From: Edgar Bonet +Date: Thu, 16 May 2024 11:15:10 +0200 +Subject: [PATCH] Configure: fixed building libatomic test. + +Using "long *" instead of "AO_t *" leads either to -Wincompatible-pointer-types +or -Wpointer-sign warnings, depending on whether long and size_t are compatible +types (e.g., ILP32 versus LP64 data models). Notably, -Wpointer-sign warnings +are enabled by default in Clang only, and -Wincompatible-pointer-types is an +error starting from GCC 14. + +Signed-off-by: Edgar Bonet +Upstream: https://hg.nginx.org/nginx/rev/f58b6f636238 +--- + auto/lib/libatomic/conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf +index d1e484a..0f12b9c 100644 +--- a/auto/lib/libatomic/conf ++++ b/auto/lib/libatomic/conf +@@ -20,7 +20,7 @@ else + #include " + ngx_feature_path= + ngx_feature_libs="-latomic_ops" +- ngx_feature_test="long n = 0; ++ ngx_feature_test="AO_t n = 0; + if (!AO_compare_and_swap(&n, 0, 1)) + return 1; + if (AO_fetch_and_add(&n, 1) != 1) +-- +2.34.1 + From 76dda5f00af8d65ec6f4e1ae5d9896bf78bd36ac Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 5 Aug 2024 16:16:01 +0200 Subject: [PATCH 094/114] package/nginx: security update to 1.26.1 See here for a Changelog and CVE's: http://nginx.org/en/CHANGES-1.26 Patch 0006 is no longer required as the openssl library is found without this patch, which does not apply anymore. Patch 0009 is no longer required as it was fixed in another way upstream: https://hg.nginx.org/nginx/rev/fb989e24c60a Patch 0011 is upstream: https://hg.nginx.org/nginx/rev/f58b6f636238 Reorder the remaining patches and update .checkpackageignore accordingly. The LICENSE file is changed, the year changed from 2022 to 2024. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 761259c93400bc806611a242c7dc3df7ff67c231) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 8 +- ...-auto-lib-libgd-conf-use-pkg-config.patch} | 0 ...auto-lib-openssl-conf-use-pkg-config.patch | 251 ------------------ ...inux_config.h-only-include-dlfcn.h-.patch} | 0 ...of-endianness-for-cross-compilation.patch} | 0 ...to-os-linux-fix-build-with-libxcrypt.patch | 38 --- ...ix-compile-error-in-configure-script.patch | 33 --- package/nginx/nginx.hash | 4 +- package/nginx/nginx.mk | 2 +- 9 files changed, 6 insertions(+), 330 deletions(-) rename package/nginx/{0007-auto-lib-libgd-conf-use-pkg-config.patch => 0006-auto-lib-libgd-conf-use-pkg-config.patch} (100%) delete mode 100644 package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch rename package/nginx/{0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch => 0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch} (100%) rename package/nginx/{0010-Allow-forcing-of-endianness-for-cross-compilation.patch => 0008-Allow-forcing-of-endianness-for-cross-compilation.patch} (100%) delete mode 100644 package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch delete mode 100644 package/nginx/0011-Fix-compile-error-in-configure-script.patch diff --git a/.checkpackageignore b/.checkpackageignore index 15ef1ace68..0fd82e1eb4 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -875,11 +875,9 @@ package/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch Up package/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch Upstream package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch Upstream package/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch Upstream -package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch Upstream -package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch Upstream -package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch Upstream -package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch Upstream -package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch Upstream +package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch Upstream +package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch Upstream +package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch Upstream package/nginx/S50nginx Indent Variables package/nilfs-utils/0001-nilfs_cleanerd-link-dynamically.patch Upstream package/nmap/0001-libdnet-wrapper-configure.patch Upstream diff --git a/package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch b/package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch similarity index 100% rename from package/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch rename to package/nginx/0006-auto-lib-libgd-conf-use-pkg-config.patch diff --git a/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch b/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch deleted file mode 100644 index 4338729658..0000000000 --- a/package/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch +++ /dev/null @@ -1,251 +0,0 @@ -From 4ba4b1e0bd1b69e124eb34c95ae9e7c087370efa Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Fri, 6 May 2016 14:48:31 +0100 -Subject: [PATCH] auto/lib/openssl/conf: use pkg-config - -Change to using pkg-config to find the path to openssl and its -dependencies. - -Signed-off-by: Martin Bark ---- - auto/lib/openssl/conf | 187 +++++++++++++++++++++--------------------- - 1 file changed, 94 insertions(+), 93 deletions(-) - -diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf -index 4fb52df7..9f30490d 100644 ---- a/auto/lib/openssl/conf -+++ b/auto/lib/openssl/conf -@@ -1,4 +1,3 @@ -- - # Copyright (C) Igor Sysoev - # Copyright (C) Nginx, Inc. - -@@ -7,123 +6,125 @@ if [ $OPENSSL != NONE ]; then - - case "$CC" in - -- cl | bcc32) -- have=NGX_OPENSSL . auto/have -- have=NGX_SSL . auto/have -- -- CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" -- -- CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" -- CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" -- -- if [ -f $OPENSSL/ms/do_ms.bat ]; then -- # before OpenSSL 1.1.0 -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" -- else -- # OpenSSL 1.1.0+ -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib" -- CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib" -- fi -- -- # libeay32.lib requires gdi32.lib -- CORE_LIBS="$CORE_LIBS gdi32.lib" -- # OpenSSL 1.0.0 requires crypt32.lib -- CORE_LIBS="$CORE_LIBS crypt32.lib" -- ;; -- -- *) -- have=NGX_OPENSSL . auto/have -- have=NGX_SSL . auto/have -- -- CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" -- CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" -- CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" -- CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" -- CORE_LIBS="$CORE_LIBS $NGX_LIBDL" -- CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" -- -- if [ "$NGX_PLATFORM" = win32 ]; then -- CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" -- fi -- ;; -+ cl | bcc32) -+ have=NGX_OPENSSL . auto/have -+ have=NGX_SSL . auto/have -+ -+ CFLAGS="$CFLAGS -DNO_SYS_TYPES_H" -+ -+ CORE_INCS="$CORE_INCS $OPENSSL/openssl/include" -+ CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h" -+ -+ if [ -f $OPENSSL/ms/do_ms.bat ]; then -+ # before OpenSSL 1.1.0 -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib" -+ else -+ # OpenSSL 1.1.0+ -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libssl.lib" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libcrypto.lib" -+ fi -+ -+ # libeay32.lib requires gdi32.lib -+ CORE_LIBS="$CORE_LIBS gdi32.lib" -+ # OpenSSL 1.0.0 requires crypt32.lib -+ CORE_LIBS="$CORE_LIBS crypt32.lib" -+ ;; -+ -+ *) -+ have=NGX_OPENSSL . auto/have -+ have=NGX_SSL . auto/have -+ -+ CORE_INCS="$CORE_INCS $OPENSSL/.openssl/include" -+ CORE_DEPS="$CORE_DEPS $OPENSSL/.openssl/include/openssl/ssl.h" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libssl.a" -+ CORE_LIBS="$CORE_LIBS $OPENSSL/.openssl/lib/libcrypto.a" -+ CORE_LIBS="$CORE_LIBS $NGX_LIBDL" -+ CORE_LIBS="$CORE_LIBS $NGX_LIBPTHREAD" -+ -+ if [ "$NGX_PLATFORM" = win32 ]; then -+ CORE_LIBS="$CORE_LIBS -lgdi32 -lcrypt32 -lws2_32" -+ fi -+ ;; - esac - - else - - if [ "$NGX_PLATFORM" != win32 ]; then - -- OPENSSL=NO -+ OPENSSL=NO - -- ngx_feature="OpenSSL library" -- ngx_feature_name="NGX_OPENSSL" -- ngx_feature_run=no -- ngx_feature_incs="#include " -- ngx_feature_path= -- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL $NGX_LIBPTHREAD" -- ngx_feature_test="SSL_CTX_set_options(NULL, 0)" -- . auto/feature -+ ngx_feature="OpenSSL library" -+ ngx_feature_name="NGX_OPENSSL" -+ ngx_feature_run=no -+ ngx_feature_incs="#include " -+ ngx_feature_path= -+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl| -+ sed -re 's/(^|\s)-I\s*(\S+)/\1\2/g')" -+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)" -+ ngx_feature_test="SSL_CTX_set_options(NULL, 0)" -+ . auto/feature - -- if [ $ngx_found = no ]; then -+ if [ $ngx_found = no ]; then - -- # FreeBSD port -+ # FreeBSD port - -- ngx_feature="OpenSSL library in /usr/local/" -- ngx_feature_path="/usr/local/include" -+ ngx_feature="OpenSSL library in /usr/local/" -+ ngx_feature_path="/usr/local/include" - -- if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" -- else -- ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" -- fi -+ if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lssl -lcrypto" -+ else -+ ngx_feature_libs="-L/usr/local/lib -lssl -lcrypto" -+ fi - -- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" -+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" - -- . auto/feature -- fi -+ . auto/feature -+ fi - -- if [ $ngx_found = no ]; then -+ if [ $ngx_found = no ]; then - -- # NetBSD port -+ # NetBSD port - -- ngx_feature="OpenSSL library in /usr/pkg/" -- ngx_feature_path="/usr/pkg/include" -+ ngx_feature="OpenSSL library in /usr/pkg/" -+ ngx_feature_path="/usr/pkg/include" - -- if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" -- else -- ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" -- fi -+ if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-R/usr/pkg/lib -L/usr/pkg/lib -lssl -lcrypto" -+ else -+ ngx_feature_libs="-L/usr/pkg/lib -lssl -lcrypto" -+ fi - -- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" -+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" - -- . auto/feature -- fi -+ . auto/feature -+ fi - -- if [ $ngx_found = no ]; then -+ if [ $ngx_found = no ]; then - -- # MacPorts -+ # MacPorts - -- ngx_feature="OpenSSL library in /opt/local/" -- ngx_feature_path="/opt/local/include" -+ ngx_feature="OpenSSL library in /opt/local/" -+ ngx_feature_path="/opt/local/include" - -- if [ $NGX_RPATH = YES ]; then -- ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" -- else -- ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" -- fi -+ if [ $NGX_RPATH = YES ]; then -+ ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lssl -lcrypto" -+ else -+ ngx_feature_libs="-L/opt/local/lib -lssl -lcrypto" -+ fi - -- ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" -+ ngx_feature_libs="$ngx_feature_libs $NGX_LIBDL $NGX_LIBPTHREAD" - -- . auto/feature -- fi -+ . auto/feature -+ fi - -- if [ $ngx_found = yes ]; then -- have=NGX_SSL . auto/have -- CORE_INCS="$CORE_INCS $ngx_feature_path" -- CORE_LIBS="$CORE_LIBS $ngx_feature_libs" -- OPENSSL=YES -- fi -+ if [ $ngx_found = yes ]; then -+ have=NGX_SSL . auto/have -+ CORE_INCS="$CORE_INCS $ngx_feature_path" -+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs" -+ OPENSSL=YES -+ fi - fi - - if [ $OPENSSL != YES ]; then -@@ -136,7 +137,7 @@ into the system, or build the OpenSSL library statically from the source - with nginx by using --with-openssl= option. - - END -- exit 1 -+ exit 1 - fi - - fi --- -2.17.1 - diff --git a/package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch b/package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch similarity index 100% rename from package/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch rename to package/nginx/0007-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch diff --git a/package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch b/package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch similarity index 100% rename from package/nginx/0010-Allow-forcing-of-endianness-for-cross-compilation.patch rename to package/nginx/0008-Allow-forcing-of-endianness-for-cross-compilation.patch diff --git a/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch b/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch deleted file mode 100644 index 8b368d946f..0000000000 --- a/package/nginx/0009-auto-os-linux-fix-build-with-libxcrypt.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 79f1fe5251afc4e22a138b0c8f44fc9c94093b8b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 2 Apr 2021 09:18:26 +0200 -Subject: [PATCH] auto/os/linux: fix build with libxcrypt - -If crypt_r is found in libcrypt, add -lcrypt to CORE_LIBS to avoid the -following build failure with libxcrypt: - -objs/ngx_modules.o \ --lpcre -L/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lssl -lcrypto -L/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib -lxslt -lxml2 -lGeoIP \ --Wl,-E -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/9.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: objs/src/os/unix/ngx_user.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/nginx-1.18.0/src/os/unix/ngx_user.c:18: undefined reference to `crypt_r' - -Fixes: - - http://autobuild.buildroot.org/results/79a51b0d348e756517b5c9ce815a67f5c657e7e6 - -Signed-off-by: Fabrice Fontaine ---- - auto/os/linux | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/auto/os/linux b/auto/os/linux -index 5e280eca..04682812 100644 ---- a/auto/os/linux -+++ b/auto/os/linux -@@ -232,6 +232,9 @@ ngx_feature_test="struct crypt_data cd; - crypt_r(\"key\", \"salt\", &cd);" - . auto/feature - -+if [ $ngx_found = yes ]; then -+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs" -+fi - - ngx_include="sys/vfs.h"; . auto/include - --- -2.30.2 - diff --git a/package/nginx/0011-Fix-compile-error-in-configure-script.patch b/package/nginx/0011-Fix-compile-error-in-configure-script.patch deleted file mode 100644 index 672162759e..0000000000 --- a/package/nginx/0011-Fix-compile-error-in-configure-script.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e1bcac837f6aeabc4ddece06ecbcf2bcca8dd651 Mon Sep 17 00:00:00 2001 -From: Edgar Bonet -Date: Thu, 16 May 2024 11:15:10 +0200 -Subject: [PATCH] Configure: fixed building libatomic test. - -Using "long *" instead of "AO_t *" leads either to -Wincompatible-pointer-types -or -Wpointer-sign warnings, depending on whether long and size_t are compatible -types (e.g., ILP32 versus LP64 data models). Notably, -Wpointer-sign warnings -are enabled by default in Clang only, and -Wincompatible-pointer-types is an -error starting from GCC 14. - -Signed-off-by: Edgar Bonet -Upstream: https://hg.nginx.org/nginx/rev/f58b6f636238 ---- - auto/lib/libatomic/conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf -index d1e484a..0f12b9c 100644 ---- a/auto/lib/libatomic/conf -+++ b/auto/lib/libatomic/conf -@@ -20,7 +20,7 @@ else - #include " - ngx_feature_path= - ngx_feature_libs="-latomic_ops" -- ngx_feature_test="long n = 0; -+ ngx_feature_test="AO_t n = 0; - if (!AO_compare_and_swap(&n, 0, 1)) - return 1; - if (AO_fetch_and_add(&n, 1) != 1) --- -2.34.1 - diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 24bc588d85..0b45f96a45 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 77a2541637b92a621e3ee76776c8b7b40cf6d707e69ba53a940283e30ff2f55d nginx-1.24.0.tar.gz +sha256 f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b nginx-1.26.1.tar.gz # License files, locally calculated -sha256 ececed0b0e7243a4766cbc62b26df4bd3513b41de3a07425da1679c836d06320 LICENSE +sha256 f19c4caea60247490199c5a6d0134281e3fb20b3d7577e6873c628597f5381d9 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 7bd2173b48..e63acc7b16 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.24.0 +NGINX_VERSION = 1.26.1 NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE From 9586e77dc80bcb6bae4b4805a87f727e12d12738 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 5 Aug 2024 21:38:44 +0200 Subject: [PATCH 095/114] package/fluidsynth: bump to version 2.3.6 For change log since v2.3.5, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.6 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit f9f2ade9bb207d2481b12a325bba7cee5a3e9cbf) Signed-off-by: Peter Korsgaard --- package/fluidsynth/fluidsynth.hash | 2 +- package/fluidsynth/fluidsynth.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluidsynth/fluidsynth.hash b/package/fluidsynth/fluidsynth.hash index 91d8778cbf..0f54ad254e 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f89e8e983ecfb4a5b4f5d8c2b9157ed18d15ed2e36246fa782f18abaea550e0d fluidsynth-2.3.5.tar.gz +sha256 3340d73286b28fe6e5150fbe12648d4640e86c64c228878b572773bd08cac531 fluidsynth-2.3.6.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index ef05b6a569..3105162bda 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.5 +FLUIDSYNTH_VERSION = 2.3.6 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From 3952b976a3a84c0ceb34d4fefbc7e7b62f7c3f7d Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 6 Aug 2024 01:39:44 +0300 Subject: [PATCH 096/114] DEVELOPERS: assign Adrian Perez for sysprof Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni (cherry picked from commit 03505e34570d65ead565e13b0998b05a12ab95ac) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1945e1fb37..edd3c75cca 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -52,6 +52,7 @@ F: package/libepoxy/ F: package/libmanette/ F: package/libpsl/ F: package/libwpe/ +F: package/sysprof/ F: package/webkitgtk/ F: package/wlroots/ F: package/woff2/ @@ -3172,7 +3173,6 @@ N: Will Newton F: package/enchant/ F: package/erlang/ F: package/libmicrohttpd/ -F: package/sysprof/ F: package/time/ N: Will Wagner From a5482a73006e18b014469a0cbcba581f8abfff27 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Mon, 12 Feb 2024 01:21:26 +0100 Subject: [PATCH 097/114] Revert "docs/website/support.html: document irc channel permission changes" This didn't work out as planned, neither the restriction of muting unregistered users, nor the exception for matrix users worked as planned. The channel mode has been reverted to +R (meaning only registered users are allowed to join) and an exception for *that* has been introduced for matrix users via +e. The channel modes are documented in [1]. [1] https://www.oftc.net/ChannelModes/ This reverts commit d1e6d7845b0f3b450709b84a6e4fc4527f12b196. Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit bede54c774ef59640cc1b4d9fd1dabfc69e4ecdb) Signed-off-by: Peter Korsgaard --- docs/website/support.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/website/support.html b/docs/website/support.html index 28873c6d76..13d63b13a9 100644 --- a/docs/website/support.html +++ b/docs/website/support.html @@ -27,8 +27,8 @@ When asking for help on IRC, share relevant logs or pieces of code using a code sharing website.

-

Note that due to excessive spamming on IRC, you can only talk in the - channel if you are a registered user with +

Note that due to excessive spamming on IRC, the channel can only be + joined if you are a registered user with OFTC NickServ service. Follow the instructions to register as a user with a password, and then join the #buildroot channel.

From 3ff877be290823fbbaf302c1ac57627c9f03e599 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 4 Feb 2024 11:11:40 +0100 Subject: [PATCH 098/114] package/htop: fix BR2_SHARED_STATIC_LIBS build With BR2_SHARED_STATIC_LIBS=y, the generic infrastructure adds a --enable-static flags causing htop to be built as a static binary. Adding a --disable-static reverts this. This will fix the following build failure with hwloc raised since bump to version 3.3.0 in commit 09243186df3168022f0b23b8a9677c6313033769 and https://github.com/htop-dev/htop/commit/c8a61850dd31ab64eb8ad83929ce86d2adbeb96c: /home/autobuild/autobuild/instance-3/output-1/host/bin/mipsel-buildroot-linux-gnu-gcc -std=c99 -pedantic -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -I/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/include -I/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/include/libxml2 -Wall -Wcast-align -Wcast-qual -Wextra -Wfloat-equal -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wmissing-prototypes -Wpointer-arith -Wshadow -Wstrict-prototypes -Wundef -Wunused -Wwrite-strings -Wnull-dereference -D_XOPEN_SOURCE_EXTENDED -DSYSCONFDIR="\"/etc\"" -I"./linux" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -g0 -D_FORTIFY_SOURCE=2 -static -rdynamic -static -o htop htop.o Action.o Affinity.o AffinityPanel.o AvailableColumnsPanel.o AvailableMetersPanel.o BatteryMeter.o CategoriesPanel.o ClockMeter.o ColorsPanel.o ColumnsPanel.o CommandLine.o CommandScreen. o Compat.o CPUMeter.o CRT.o DateMeter.o DateTimeMeter.o DiskIOMeter.o DisplayOptionsPanel.o DynamicColumn.o DynamicMeter.o DynamicScreen.o EnvScreen.o FileDescriptorMeter.o FunctionBar.o Hashtable.o Header.o HeaderOptionsPanel.o HostnameMeter.o IncSet.o InfoScreen.o ListItem.o LoadAverageMeter.o Machine.o MainPanel.o MemoryMeter.o MemorySwapMeter.o Meter.o MetersPanel.o NetworkIOMeter.o Object.o OpenFilesScreen.o OptionItem.o Panel.o Process.o ProcessLocksScreen.o ProcessTable.o Row.o RichString.o Scheduling.o ScreenManager.o ScreensPanel.o ScreenTabsPanel.o Settings.o SignalsPanel.o SwapMeter.o SysArchMeter.o Table.o TasksMeter.o TraceScreen.o UptimeMeter.o UsersTable.o Vector.o XUtils.o generic/gettime.o generic/hostname.o generic/uname.o linux/CGroupUtils.o linux/HugePageMeter.o linux/IOPriorityPanel.o linux/LibSensors.o linux/LinuxMachine.o linux/LinuxProcess.o linux/LinuxProcessTable.o linux/Platform.o linux/PressureStallMeter.o linux/SELinuxMeter.o linux/SystemdMeter.o linux/Z ramMeter.o zfs/ZfsArcMeter.o zfs/ZfsCompressedArcMeter.o -lcap -llzma -L/home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib -lncurses -lm -L/home/autobuild/autobuild/instance-3/output-1/host/bin/../mipsel-buildroot-linux-gnu/sysroot/usr/lib -lhwloc /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Action.o: in function `Action_setUserOnly': Action.c:(.text+0x2490): warning: Using 'getpwnam' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: Settings.o: in function `Settings_new': Settings.c:(.text+0x2dd0): warning: Using 'getpwuid' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking /home/autobuild/autobuild/instance-3/output-1/host/lib/gcc/mipsel-buildroot-linux-gnu/12.3.0/../../../../mipsel-buildroot-linux-gnu/bin/ld: /home/autobuild/autobuild/instance-3/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/bin/../../usr/lib/libhwloc.a(topology-xml-libxml.o): in function `hwloc_libxml_free_buffer': topology-xml-libxml.c:(.text+0x2c): undefined reference to `xmlFree' Fixes: - http://autobuild.buildroot.org/results/04bd5633750ff5cef048ea78c9de043d3ffcfa32 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit 21f312a53e49a3338db870df778665e42cf72dbf) Signed-off-by: Peter Korsgaard --- package/htop/htop.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/htop/htop.mk b/package/htop/htop.mk index 6dbaae3796..4fa8e4fb5f 100644 --- a/package/htop/htop.mk +++ b/package/htop/htop.mk @@ -17,6 +17,16 @@ HTOP_LICENSE_FILES = COPYING # provided by autoconf relies on wchar_t. HTOP_CONF_ENV += ac_cv_prog_cc_c99=-std=gnu99 +# --enable-static has a non-standard semantic in htop, and causes the +# main binary to be linked statically, not just the production of +# static libraries. This causes issues with BR2_SHARED_STATIC_LIBS as +# htop is linked statically, but pkg-config returns results relevant +# for a shared library build. Since htop is only building an +# application, let's disable this bogus behavior. +ifeq ($(BR2_SHARED_STATIC_LIBS),y) +HTOP_CONF_OPTS += --disable-static +endif + ifeq ($(BR2_PACKAGE_HWLOC),y) HTOP_CONF_OPTS += --enable-hwloc HTOP_DEPENDENCIES += hwloc From 6ca8443f989049c0a6992bbf46dd0892fb236f74 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Tue, 6 Aug 2024 23:28:50 +0200 Subject: [PATCH 099/114] support/testing: package: gpsd: fix test by enabling python support Commit 9696d27756 "package/gpsd: condition python stuff to the proper kconfig option" changed the condition in which the gpsd python scripts are installed. After that change, the "gpsfake" command (which is a python script) is no longer found and the runtime test is failing. This commit fixes the issue by reflecting the change in the runtime test Buildroot configuration. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit b6f4d79df21b2affa1ccc5133c44647072d21058) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_gpsd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_gpsd.py b/support/testing/tests/package/test_gpsd.py index 7ca5973981..2c44e25cec 100644 --- a/support/testing/tests/package/test_gpsd.py +++ b/support/testing/tests/package/test_gpsd.py @@ -11,7 +11,7 @@ class TestGpsd(infra.basetest.BRTest): config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \ f""" BR2_PACKAGE_GPSD=y - BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_GPSD_PYTHON=y BR2_ROOTFS_OVERLAY="{rootfs_overlay}" BR2_TARGET_ROOTFS_CPIO=y # BR2_TARGET_ROOTFS_TAR is not set From 90cd6b3574b9425b0534e11a199331a0950b8856 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 7 Aug 2024 10:22:50 +0200 Subject: [PATCH 100/114] package/python-django: security bump to version 5.0.8 Django 5.0.7 fixes the following CVEs: * CVE-2024-38875: Potential denial-of-service vulnerability in django.utils.html.urlize() * CVE-2024-39329: Username enumeration through timing difference for users with unusable passwords * CVE-2024-39330: Potential directory-traversal via Storage.save() * CVE-2024-39614: Potential denial-of-service vulnerability in get_supported_language_variant() Django 5.0.8 fixes the following CVEs: * CVE-2024-41989: Memory exhaustion in django.utils.numberformat.floatformat() * CVE-2024-41990: Potential denial-of-service vulnerability in django.utils.html.urlize() * CVE-2024-41991: Potential denial-of-service vulnerability in django.utils.html.urlize() and AdminURLFieldWidget * CVE-2024-42005: Potential SQL injection in QuerySet.values() and values_list() Further release Notes: https://docs.djangoproject.com/en/5.0/releases/ Signed-off-by: Marcus Hoffmann Signed-off-by: Thomas Petazzoni (cherry picked from commit f777ce1fd6b9e0537593a70940dc23f4ca177054) Signed-off-by: Peter Korsgaard --- package/python-django/python-django.hash | 4 ++-- package/python-django/python-django.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-django/python-django.hash b/package/python-django/python-django.hash index d5684a083c..a5a8c7426d 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 1009c48d70060cadb40000cc15a8058a Django-5.0.3.tar.gz -sha256 5fb37580dcf4a262f9258c1f4373819aacca906431f505e4688e37f3a99195df Django-5.0.3.tar.gz +md5 fb167eef987a98421cad62036868a1ca Django-5.0.8.tar.gz +sha256 ebe859c9da6fead9c9ee6dbfa4943b04f41342f4cea2c4d8c978ef0d10694f2b Django-5.0.8.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 258ff9e0c1..2c5c20ee4d 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 5.0.3 +PYTHON_DJANGO_VERSION = 5.0.8 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/e1/b1/ac6a16aaf0049637b50afbcf06b8ec2fa5c6ce42d4ae6ba66bbaf4c3609a +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/79/1c/55733805bb735e26fee0430045efdb61df6fd704b6aebf2154875ef9e6a9 PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE PYTHON_DJANGO_CPE_ID_VENDOR = djangoproject From 1c5b296c5e3197aa5a7200616887e6a0c5fabab9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 18 Jun 2024 11:23:29 +0200 Subject: [PATCH 101/114] package/cryptsetup: bump version to 2.7.3 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 7c56e71b46007bc1d70e9c13267109abe4776f49) 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 531432aaaf..dfee537a4a 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 da5d1419e2a86e01aa32fd79582cd54d208857cb541bca2fd426a5ff1aaabbc3 cryptsetup-2.7.1.tar.xz +sha256 b772ae4f6df0cee7200b28cea960e4daaff2a203d2fd502beab3c1317b07a456 cryptsetup-2.7.3.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index b15f458576..d5046d9943 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).1 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From a3c471ded743a4f928355369d81037e726bfe7b2 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Wed, 7 Aug 2024 22:55:09 +0200 Subject: [PATCH 102/114] package/cryptsetup: bump version to 2.7.4 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit eea735bb6d89d99e8d536b839300e0432a3fcaab) 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 dfee537a4a..e0cb65642d 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 b772ae4f6df0cee7200b28cea960e4daaff2a203d2fd502beab3c1317b07a456 cryptsetup-2.7.3.tar.xz +sha256 dce29903a58f7b774fe61191e7e6de955de0f40d9e27b0028ffcf3438c0e9480 cryptsetup-2.7.4.tar.xz sha256 45670cce8b6a0ddd66c8016cd8ccef6cd71f35717cbacc7f1e895b3855207b33 COPYING sha256 8c33cc37871654ec7ed87e6fbb896c8cf33ef5ef05b1611a5aed857596ffafa5 COPYING.LGPL diff --git a/package/cryptsetup/cryptsetup.mk b/package/cryptsetup/cryptsetup.mk index d5046d9943..15cadb2840 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).3 +CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).4 CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) CRYPTSETUP_DEPENDENCIES = \ From 5aa45c4e00d9197cda147dbb4b92d100cffff038 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 8 Aug 2024 00:16:17 +0200 Subject: [PATCH 103/114] DEVELOPERS: drop Ariel D'Alessandro : host aspmx.l.google.com[2a00:1450:400c:c07::1a] said: 550-5.2.1 The email account that you tried to reach is inactive. For more 550-5.2.1 information, go to 550 5.2.1 https://support.google.com/mail/?p=DisabledUser ffacd0b85a97d-36bbd075381si7797549f8f.548 - gsmtp (in reply to RCPT TO command) Signed-off-by: Thomas Petazzoni (cherry picked from commit 53116d091562fb260460382fa295738323decf3d) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 6 ------ 1 file changed, 6 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index edd3c75cca..eaf1010747 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -251,12 +251,6 @@ F: configs/snps_archs38_axs103_defconfig F: configs/snps_archs38_haps_defconfig F: configs/snps_archs38_hsdk_defconfig -N: Ariel D'Alessandro -F: board/bsh/ -F: configs/imx8mn_bsh_smm_s2_pro_defconfig -F: package/axfsutils/ -F: package/mali-t76x/ - N: Arnaud Aujon F: package/espeak/ From 726588f81cb3a8687b3b350e5aae006fde90fa59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= Date: Thu, 8 Aug 2024 18:06:07 +0200 Subject: [PATCH 104/114] package/zfs: replace wip patch by upstream patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Luis Salvador Rufo Signed-off-by: Thomas Petazzoni (cherry picked from commit 08edb3c22a61b6de28e1472faceaebc3399b6537) Signed-off-by: Peter Korsgaard --- ...ll-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch | 70 ++++++++ ...s-ignore-if-SEEK_DATA-is-not-defined.patch | 162 ------------------ package/zfs/zfs.mk | 3 - 3 files changed, 70 insertions(+), 165 deletions(-) create mode 100644 package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch delete mode 100644 package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch diff --git a/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch b/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch new file mode 100644 index 0000000000..64972c4f57 --- /dev/null +++ b/package/zfs/0001-ZTS-small-fix-for-SEEK_DATA-SEEK_HOLE-tests.patch @@ -0,0 +1,70 @@ +From 2ccefd4aff98cf355c7d13b3f92bb4d390dfa522 Mon Sep 17 00:00:00 2001 +From: Tino Reichardt +Date: Sun, 4 Aug 2024 11:58:13 +0200 +Subject: [PATCH] ZTS: small fix for SEEK_DATA/SEEK_HOLE tests + +Some libc's like uClibc lag the proper definition of SEEK_DATA +and SEEK_HOLE. Since we have only two files in ZTS which use +these definitons, let's define them by hand: + +``` +#ifndef SEEK_DATA +#define SEEK_DATA 3 +#endif +#ifndef SEEK_HOLE +#define SEEK_HOLE 4 +#endif +``` + +There should be no failures, because: +- FreeBSD has support for SEEK_DATA/SEEK_HOLE since FreeBSD 8 +- Linux has it since Linux 3.1 +- the libc will submit the parameters unchanged to the kernel + +Signed-off-by: Tino Reichardt +Signed-off-by: José Luis Salvador Rufo +Upstream: https://github.com/openzfs/zfs/commit/bd949b10bed3d99e3b40249d9c8d74a0b4304774 +--- + tests/zfs-tests/cmd/mmap_seek.c | 10 ++++++++++ + tests/zfs-tests/tests/functional/cp_files/seekflood.c | 7 +++++++ + 2 files changed, 17 insertions(+) + +diff --git a/tests/zfs-tests/cmd/mmap_seek.c b/tests/zfs-tests/cmd/mmap_seek.c +index 7be92d109565..2d250554a13f 100644 +--- a/tests/zfs-tests/cmd/mmap_seek.c ++++ b/tests/zfs-tests/cmd/mmap_seek.c +@@ -35,6 +35,16 @@ + #include + #endif + ++/* some older uClibc's lack the defines, so we'll manually define them */ ++#ifdef __UCLIBC__ ++#ifndef SEEK_DATA ++#define SEEK_DATA 3 ++#endif ++#ifndef SEEK_HOLE ++#define SEEK_HOLE 4 ++#endif ++#endif ++ + static void + seek_data(int fd, off_t offset, off_t expected) + { +diff --git a/tests/zfs-tests/tests/functional/cp_files/seekflood.c b/tests/zfs-tests/tests/functional/cp_files/seekflood.c +index 02c2c8e6eca5..f832db85970d 100644 +--- a/tests/zfs-tests/tests/functional/cp_files/seekflood.c ++++ b/tests/zfs-tests/tests/functional/cp_files/seekflood.c +@@ -36,6 +36,13 @@ + #include + #include + ++/* some older uClibc's lack the defines, so we'll manually define them */ ++#ifdef __UCLIBC__ ++#ifndef SEEK_DATA ++#define SEEK_DATA 3 ++#endif ++#endif ++ + #define DATASIZE (4096) + char data[DATASIZE]; + diff --git a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch b/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch deleted file mode 100644 index f47c615d10..0000000000 --- a/package/zfs/0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 93e7f8889072047276da11fe6a525d3f0ea16205 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?= - -Date: Sat, 11 May 2024 22:40:12 +0200 -Subject: [PATCH] tests/cp_files: ignore if SEEK_DATA is not defined -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Not all C libraries support SEEK_DATA (e.g., uClibc). Skip the test case -cp_files if SEEK_DATA is not defined. - -Signed-off-by: José Luis Salvador Rufo -Upstream: https://github.com/openzfs/zfs/pull/16169 ---- - config/user-unistd.m4 | 24 ++++++++++++++++++++++++ - config/user.m4 | 1 + - config/zfs-build.m4 | 1 + - tests/test-runner/bin/zts-report.py.in | 1 + - tests/zfs-tests/Makefile.am | 2 ++ - tests/zfs-tests/cmd/Makefile.am | 6 +++++- - tests/zfs-tests/tests/Makefile.am | 14 +++++++++----- - 7 files changed, 43 insertions(+), 6 deletions(-) - create mode 100644 config/user-unistd.m4 - -diff --git a/config/user-unistd.m4 b/config/user-unistd.m4 -new file mode 100644 -index 000000000..302bc0bde ---- /dev/null -+++ b/config/user-unistd.m4 -@@ -0,0 +1,24 @@ -+dnl # -+dnl # Check for SEEK_DATA - only used for cp_files/seekflood test case. -+dnl # -+AC_DEFUN([ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA], [ -+ AC_MSG_CHECKING(whether host toolchain supports SEEK_DATA) -+ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -+ #ifndef _GNU_SOURCE -+ #define _GNU_SOURCE -+ #endif -+ #include -+ #if defined(SEEK_DATA) -+ int ok; -+ #else -+ error fail -+ #endif -+ ]])], [ -+ user_unistd_seek_data=yes -+ AC_MSG_RESULT([yes]) -+ ], [ -+ user_unistd_seek_data=no -+ AC_MSG_RESULT([no]) -+ ]) -+]) -diff --git a/config/user.m4 b/config/user.m4 -index 6ec27a5b2..2326a44be 100644 ---- a/config/user.m4 -+++ b/config/user.m4 -@@ -23,6 +23,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [ - ZFS_AC_CONFIG_USER_LIBAIO - ZFS_AC_CONFIG_USER_LIBATOMIC - ZFS_AC_CONFIG_USER_LIBFETCH -+ ZFS_AC_CONFIG_USER_UNISTD_SEEK_DATA - ZFS_AC_CONFIG_USER_AIO_H - ZFS_AC_CONFIG_USER_CLOCK_GETTIME - ZFS_AC_CONFIG_USER_PAM -diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 -index bb5a85d81..578692676 100644 ---- a/config/zfs-build.m4 -+++ b/config/zfs-build.m4 -@@ -294,6 +294,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [ - [test "x$qatsrc" != x ]) - AM_CONDITIONAL([WANT_DEVNAME2DEVID], [test "x$user_libudev" = xyes ]) - AM_CONDITIONAL([WANT_MMAP_LIBAIO], [test "x$user_libaio" = xyes ]) -+ AM_CONDITIONAL([WANT_UNISTD_SEEK_DATA], [test "x$user_unistd_seek_data" = xyes ]) - AM_CONDITIONAL([PAM_ZFS_ENABLED], [test "x$enable_pam" = xyes]) - ]) - -diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in -index ecc50f487..3a00345ed 100755 ---- a/tests/test-runner/bin/zts-report.py.in -+++ b/tests/test-runner/bin/zts-report.py.in -@@ -162,6 +162,7 @@ known = { - ['FAIL', rewind_reason], - 'cli_user/misc/zfs_share_001_neg': ['SKIP', na_reason], - 'cli_user/misc/zfs_unshare_001_neg': ['SKIP', na_reason], -+ 'cp_files/cp_stress': ['SKIP', 16169], - 'pool_checkpoint/checkpoint_discard_busy': ['SKIP', 12053], - 'privilege/setup': ['SKIP', na_reason], - 'refreserv/refreserv_004_pos': ['FAIL', known_reason], -diff --git a/tests/zfs-tests/Makefile.am b/tests/zfs-tests/Makefile.am -index 3dd1a6452..8ae790057 100644 ---- a/tests/zfs-tests/Makefile.am -+++ b/tests/zfs-tests/Makefile.am -@@ -13,8 +13,10 @@ scripts_zfs_tests_functional_hkdf_PROGRAMS = %D%/tests/functional/hkdf/hkdf_test - %C%_tests_functional_hkdf_hkdf_test_LDADD = \ - libzpool.la - -+if WANT_UNISTD_SEEK_DATA - scripts_zfs_tests_functional_cp_filesdir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/cp_files - scripts_zfs_tests_functional_cp_files_PROGRAMS = %D%/tests/functional/cp_files/seekflood -+endif - - if BUILD_LINUX - scripts_zfs_tests_functional_tmpfiledir = $(datadir)/$(PACKAGE)/zfs-tests/tests/functional/tmpfile -diff --git a/tests/zfs-tests/cmd/Makefile.am b/tests/zfs-tests/cmd/Makefile.am -index 23848a82f..69bba3039 100644 ---- a/tests/zfs-tests/cmd/Makefile.am -+++ b/tests/zfs-tests/cmd/Makefile.am -@@ -5,7 +5,6 @@ scripts_zfs_tests_bin_PROGRAMS = %D%/chg_usr_exec - scripts_zfs_tests_bin_PROGRAMS += %D%/clonefile - scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_cached - scripts_zfs_tests_bin_PROGRAMS += %D%/clone_mmap_write --scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files - scripts_zfs_tests_bin_PROGRAMS += %D%/ctime - scripts_zfs_tests_bin_PROGRAMS += %D%/dir_rd_update - scripts_zfs_tests_bin_PROGRAMS += %D%/dosmode_readonly_write -@@ -16,6 +15,11 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/truncate_test - scripts_zfs_tests_bin_PROGRAMS += %D%/zfs_diff-socket - - -+if WANT_UNISTD_SEEK_DATA -+scripts_zfs_tests_bin_PROGRAMS += %D%/cp_files -+endif -+ -+ - scripts_zfs_tests_bin_PROGRAMS += %D%/badsend - %C%_badsend_LDADD = \ - libzfs_core.la \ -diff --git a/tests/zfs-tests/tests/Makefile.am b/tests/zfs-tests/tests/Makefile.am -index cc66d762f..1e9f06a7e 100644 ---- a/tests/zfs-tests/tests/Makefile.am -+++ b/tests/zfs-tests/tests/Makefile.am -@@ -1394,11 +1394,6 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ - functional/compression/l2arc_encrypted.ksh \ - functional/compression/l2arc_encrypted_no_compressed_arc.ksh \ - functional/compression/setup.ksh \ -- functional/cp_files/cleanup.ksh \ -- functional/cp_files/cp_files_001_pos.ksh \ -- functional/cp_files/cp_files_002_pos.ksh \ -- functional/cp_files/cp_stress.ksh \ -- functional/cp_files/setup.ksh \ - functional/crtime/cleanup.ksh \ - functional/crtime/crtime_001_pos.ksh \ - functional/crtime/setup.ksh \ -@@ -2108,3 +2103,12 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ - functional/idmap_mount/idmap_mount_003.ksh \ - functional/idmap_mount/idmap_mount_004.ksh \ - functional/idmap_mount/idmap_mount_005.ksh -+ -+if WANT_UNISTD_SEEK_DATA -+nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \ -+ functional/cp_files/cleanup.ksh \ -+ functional/cp_files/cp_files_001_pos.ksh \ -+ functional/cp_files/cp_files_002_pos.ksh \ -+ functional/cp_files/cp_stress.ksh \ -+ functional/cp_files/setup.ksh -+endif --- -2.45.2 - diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index e0fa392670..e51ade55a4 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -12,9 +12,6 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs -# 0001-tests-cp_files-ignore-if-SEEK_DATA-is-not-defined.patch -ZFS_AUTORECONF = YES - ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl linux # sysvinit installs only a commented-out modules-load.d/ config file From 2266def7d0079d827c72f75eb9683a76b262c43a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Aug 2024 21:21:26 +0200 Subject: [PATCH 105/114] package/mjpg-streamer: fix undefined symbol error Fixes runtime error: dlopen: /usr/lib/mjpg-streamer/input_uvc.so: undefined symbol: resolutions_help Patch was suggested by Thomas: http://lists.busybox.net/pipermail/buildroot/2024-August/759732.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit fdbc8d97cb166ce721df96acda6d291f6f2c4aa9) Signed-off-by: Peter Korsgaard --- ...-all-symbols-of-mjpg_streamer-binary.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch diff --git a/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch b/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch new file mode 100644 index 0000000000..771ee83832 --- /dev/null +++ b/package/mjpg-streamer/0001-Export-all-symbols-of-mjpg_streamer-binary.patch @@ -0,0 +1,33 @@ +From fbde1593948ae95f287b2167d0bec5b27948cc01 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Tue, 6 Aug 2024 17:04:55 +0200 +Subject: [PATCH] Export all symbols of mjpg_streamer binary + +Fixes runtime error with stripped binary + + dlopen: /usr/lib/mjpg-streamer/input_uvc.so: undefined symbol: resolutions_help + +Source: http://lists.busybox.net/pipermail/buildroot/2024-August/759732.html + +Upstream: https://github.com/jacksonliam/mjpg-streamer/pull/401 + +Signed-off-by: Bernd Kuhls +--- + mjpg-streamer-experimental/CMakeLists.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/mjpg-streamer-experimental/CMakeLists.txt b/mjpg-streamer-experimental/CMakeLists.txt +index cf26620..3ff12cd 100644 +--- a/mjpg-streamer-experimental/CMakeLists.txt ++++ b/mjpg-streamer-experimental/CMakeLists.txt +@@ -92,6 +92,7 @@ set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + add_executable(mjpg_streamer mjpg_streamer.c + utils.c) + ++set_property(TARGET mjpg_streamer PROPERTY ENABLE_EXPORTS ON) + target_link_libraries(mjpg_streamer pthread dl) + install(TARGETS mjpg_streamer DESTINATION bin) + +-- +2.39.2 + From 207430d368afd5ff1169d5191ab161a56d052fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= Date: Sun, 11 Aug 2024 12:34:25 +0200 Subject: [PATCH 106/114] package/aer-inject: fix build error due to missing basename() prototype MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: http://autobuild.buildroot.net/results/e613fc777051be6325d7e3c088d5f723fab518fa/ Signed-off-by: J. Neuschäfer Signed-off-by: Thomas Petazzoni (cherry picked from commit 2a700617cc1aa14deb9f4e4f5c63e19c77901389) Signed-off-by: Peter Korsgaard --- package/aer-inject/0001-libgen-basename.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/aer-inject/0001-libgen-basename.patch diff --git a/package/aer-inject/0001-libgen-basename.patch b/package/aer-inject/0001-libgen-basename.patch new file mode 100644 index 0000000000..0762f5e305 --- /dev/null +++ b/package/aer-inject/0001-libgen-basename.patch @@ -0,0 +1,35 @@ +From 197f51d29a01f46750fa6928409301aa8f1163d7 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 25 Mar 2024 09:04:40 -0700 +Subject: aer-inject: Include libgen.h for explicit basename prototype + +The prototype for basename has been removed from string.h in the latest +versions of musl [1]. This absence of prototype is flagged as an error +by some compilers, such as clang-18. To resolve this, include libgen.h +explicitly, which provides the prototype for basename. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 +Signed-off-by: Khem Raj +[sathya: Updated the commit log] +Signed-off-by: Kuppuswamy Sathyanarayanan +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/knsathya/aer-inject.git/commit/?id=197f51d29a01f46750fa6928409301aa8f1163d7 +Signed-off-by: J. Neuschaefer +--- + aer-inject.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/aer-inject.c b/aer-inject.c +index 74e7f72..eed1211 100644 +--- a/aer-inject.c ++++ b/aer-inject.c +@@ -11,6 +11,7 @@ + */ + + #include ++#include + #include + #include + #include +-- +cgit 1.2.3-korg + From 046f174ddf150cced4c9d7bcb3d2b5fc38bdd227 Mon Sep 17 00:00:00 2001 From: Kadambini Nema Date: Wed, 14 Feb 2024 23:00:11 -0800 Subject: [PATCH 107/114] 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 (cherry picked from commit 9f94b3b35423a3d7b93e7fdd67e97dea6e33de60) 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 02ada0dcc6..a8634c4a7e 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 c00b16ce61..6d902c3b13 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 e36d6abb04b87021c7dac3839258c53a5be3cdb8 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 1 Apr 2024 19:16:22 +0200 Subject: [PATCH 108/114] package/iperf3: fix build with libatomic Commit 9f94b3b354 "package/iperf3: bump to version 3.16" updated the package but forgot to reflect a breaking change mentioned in the release note [1], "iperf3 now requires pthreads and C atomic variables to compile and run". When the toolchain has no atomic support, or the libatomic is not added in the linker flags, the compilation now fail with output: arm-buildroot-linux-gnueabi/bin/ld: ./.libs/libiperf.so: undefined reference to '__atomic_load_8' This issue can be seen when running the iperf3 runtime test, with command: support/testing/run-tests \ -d dl -o output_test \ tests.package.test_iperf3 This commit fixes the issue by adding a dependency on BR2_TOOLCHAIN_HAS_ATOMIC and by adding an upstream patch to detect if linking to libatomic is needed. Fixes: [2] [1] https://github.com/esnet/iperf/releases/tag/3.16 [2] https://gitlab.com/buildroot.org/buildroot/-/jobs/6466933622 Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit f10488a4117e2ee544a602a5625cc5e897f18b2d) Signed-off-by: Peter Korsgaard --- ...1-Check-and-link-libatomic-if-needed.patch | 42 +++++++++++++++++++ package/iperf3/Config.in | 2 + package/iperf3/iperf3.mk | 3 ++ 3 files changed, 47 insertions(+) create mode 100644 package/iperf3/0001-Check-and-link-libatomic-if-needed.patch diff --git a/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch b/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch new file mode 100644 index 0000000000..ddb50c4694 --- /dev/null +++ b/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch @@ -0,0 +1,42 @@ +From bbf710e77e4a0438a2d995fd69b472e5ff054c69 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Sun, 3 Dec 2023 12:14:05 +0100 +Subject: [PATCH] Check and link libatomic if needed + +Some architectures without native support for 64-bit atomics need +linking with libatomic. + +Signed-off-by: Julien Olivain +Upstream: https://github.com/esnet/iperf/commit/1511e9f85b548891ea53d4e378903344df1fd31e +--- + configure.ac | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2594b39..ad7eaf1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -92,7 +92,19 @@ CXX="$PTHREAD_CXX" + ]) + + # Atomics +-AC_CHECK_HEADERS([stdatomic.h]) ++AC_CHECK_HEADERS([stdatomic.h], ++ [AC_MSG_CHECKING([whether libatomic is required]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[atomic_uint_fast64_t i; i++;]])], ++ [AC_MSG_RESULT([no])], ++ [save_LIBS="$LIBS" ++ LIBS="$LIBS -latomic" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[atomic_uint_fast64_t i; i++;]])], ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_ERROR([failed to find working configuration with atomics])] ++ )] ++ )], ++ [] ++) + + # Check for poll.h (it's in POSIX so everyone should have it?) + AC_CHECK_HEADERS([poll.h]) +-- +2.44.0 + diff --git a/package/iperf3/Config.in b/package/iperf3/Config.in index 5b2204c5e0..0c6946f55d 100644 --- a/package/iperf3/Config.in +++ b/package/iperf3/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_IPERF3 bool "iperf3" + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on BR2_TOOLCHAIN_HAS_THREADS help iperf is a tool for active measurements of the maximum @@ -13,4 +14,5 @@ config BR2_PACKAGE_IPERF3 http://software.es.net/iperf/index.html comment "iperf3 needs a toolchain w/ threads" + depends on BR2_TOOLCHAIN_HAS_ATOMIC depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 6d902c3b13..3ab68bd13b 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -11,6 +11,9 @@ IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT IPERF3_LICENSE_FILES = LICENSE IPERF3_CPE_ID_VENDOR = es +# 0001-Check-and-link-libatomic-if-needed.patch +IPERF3_AUTORECONF = YES + IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" ifeq ($(BR2_PACKAGE_OPENSSL),y) From 81ee5b10d8696c0806bb0432fac2f60e8ab756a5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Aug 2024 19:38:34 +0200 Subject: [PATCH 109/114] package/iperf3: security bump to version 3.17.1 Removed patch which is included in this release, autoreconf is not needed anymore. Updated license hash due to copyright year bump: https://github.com/esnet/iperf/commit/7b947051d5192388dfa8a18989692e7af4226c62 Fixes CVE-2024-26306. Release notes: https://github.com/esnet/iperf/releases/tag/3.17.1 https://github.com/esnet/iperf/releases/tag/3.17 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 9d9a0db3d8b471ccf1721312450337ff53ed4a35) Signed-off-by: Peter Korsgaard --- ...1-Check-and-link-libatomic-if-needed.patch | 42 ------------------- package/iperf3/iperf3.hash | 6 +-- package/iperf3/iperf3.mk | 5 +-- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 package/iperf3/0001-Check-and-link-libatomic-if-needed.patch diff --git a/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch b/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch deleted file mode 100644 index ddb50c4694..0000000000 --- a/package/iperf3/0001-Check-and-link-libatomic-if-needed.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bbf710e77e4a0438a2d995fd69b472e5ff054c69 Mon Sep 17 00:00:00 2001 -From: Jan Palus -Date: Sun, 3 Dec 2023 12:14:05 +0100 -Subject: [PATCH] Check and link libatomic if needed - -Some architectures without native support for 64-bit atomics need -linking with libatomic. - -Signed-off-by: Julien Olivain -Upstream: https://github.com/esnet/iperf/commit/1511e9f85b548891ea53d4e378903344df1fd31e ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 2594b39..ad7eaf1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -92,7 +92,19 @@ CXX="$PTHREAD_CXX" - ]) - - # Atomics --AC_CHECK_HEADERS([stdatomic.h]) -+AC_CHECK_HEADERS([stdatomic.h], -+ [AC_MSG_CHECKING([whether libatomic is required]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[atomic_uint_fast64_t i; i++;]])], -+ [AC_MSG_RESULT([no])], -+ [save_LIBS="$LIBS" -+ LIBS="$LIBS -latomic" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[atomic_uint_fast64_t i; i++;]])], -+ [AC_MSG_RESULT([yes])], -+ [AC_MSG_ERROR([failed to find working configuration with atomics])] -+ )] -+ )], -+ [] -+) - - # Check for poll.h (it's in POSIX so everyone should have it?) - AC_CHECK_HEADERS([poll.h]) --- -2.44.0 - diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index a8634c4a7e..ee0149daed 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.16.tar.gz.sha256 -sha256 cc740c6bbea104398cc3e466befc515a25896ec85e44a662d5f4a767b9cf713e iperf-3.16.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.17.1.tar.gz.sha256 +sha256 84404ca8431b595e86c473d8f23d8bb102810001f15feaf610effd3b318788aa iperf-3.17.1.tar.gz # Locally computed -sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE +sha256 3dc3e2076dd9cdea2b66d8fe213997ff25fb6171594f055b59fe25321b438f6f LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 3ab68bd13b..1d2b57208a 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,16 +4,13 @@ # ################################################################################ -IPERF3_VERSION = 3.16 +IPERF3_VERSION = 3.17.1 IPERF3_SITE = https://downloads.es.net/pub/iperf IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT IPERF3_LICENSE_FILES = LICENSE IPERF3_CPE_ID_VENDOR = es -# 0001-Check-and-link-libatomic-if-needed.patch -IPERF3_AUTORECONF = YES - IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" ifeq ($(BR2_PACKAGE_OPENSSL),y) From 96c79a4349bc0c19f95b5d24d1408fc20293e70a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Aug 2024 19:46:45 +0200 Subject: [PATCH 110/114] package/gnutls: security bump version to 3.8.6 Version 3.8.4 fixes CVE-2024-28834 & CVE-2024-28835. Release notes: 3.8.4: https://lists.gnupg.org/pipermail/gnutls-help/2024-March/004845.html 3.8.5: https://lists.gnupg.org/pipermail/gnutls-help/2024-April/004846.html 3.8.6: https://lists.gnupg.org/pipermail/gnutls-help/2024-July/004848.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 904acfc41e1464848daf0240251e7701954c4918) Signed-off-by: Peter Korsgaard --- package/gnutls/gnutls.hash | 4 ++-- package/gnutls/gnutls.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gnutls/gnutls.hash b/package/gnutls/gnutls.hash index 47fb34ea7c..d9f830ec92 100644 --- a/package/gnutls/gnutls.hash +++ b/package/gnutls/gnutls.hash @@ -1,6 +1,6 @@ # Locally calculated after checking pgp signature -# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.3.tar.xz.sig -sha256 f74fc5954b27d4ec6dfbb11dea987888b5b124289a3703afcada0ee520f4173e gnutls-3.8.3.tar.xz +# https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.6.tar.xz.sig +sha256 2e1588aae53cb32d43937f1f4eca28febd9c0c7aa1734fc5dd61a7e81e0ebcdd gnutls-3.8.6.tar.xz # Locally calculated sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 doc/COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 doc/COPYING.LESSER diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 8a4f3345aa..7b754e215a 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -6,7 +6,7 @@ # When bumping, make sure *all* --without-libfoo-prefix options are in GNUTLS_CONF_OPTS GNUTLS_VERSION_MAJOR = 3.8 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).3 +GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).6 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) GNUTLS_LICENSE = LGPL-2.1+ (core library) From d78b6cf98a47fabde85ea10c7c04d276ab484d68 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 14 Aug 2024 15:25:06 +0200 Subject: [PATCH 111/114] package/hiawatha: update homepage URL The download and homepage URL for this project have been updated. The old site no longer works. Signed-off-by: Waldemar Brodkorb Signed-off-by: Thomas Petazzoni (cherry picked from commit 2a547e2c424ac08d8741dc557aee968f1b659735) Signed-off-by: Peter Korsgaard --- package/hiawatha/Config.in | 2 +- package/hiawatha/hiawatha.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/hiawatha/Config.in b/package/hiawatha/Config.in index 4b1a3ca86c..a5d8a7fbb1 100644 --- a/package/hiawatha/Config.in +++ b/package/hiawatha/Config.in @@ -26,7 +26,7 @@ config BR2_PACKAGE_HIAWATHA pipelining, keep alive connections, URL rewriting and many more. - http://www.hiawatha-webserver.org/ + https://hiawatha.leisink.net/ if BR2_PACKAGE_HIAWATHA diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk index 2ba8efb2fe..9268c368bc 100644 --- a/package/hiawatha/hiawatha.mk +++ b/package/hiawatha/hiawatha.mk @@ -5,7 +5,7 @@ ################################################################################ HIAWATHA_VERSION = 11.2 -HIAWATHA_SITE = https://www.hiawatha-webserver.org/files +HIAWATHA_SITE = https://hiawatha.leisink.net/files HIAWATHA_DEPENDENCIES = zlib HIAWATHA_LICENSE = GPL-2.0 HIAWATHA_LICENSE_FILES = LICENSE From ba22d70c074e0b2790279e461d510dcffebacb07 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 9 Sep 2024 16:12:18 +0200 Subject: [PATCH 112/114] package/am335x-pru-package: correct download hash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: http://autobuild.buildroot.net/results/94fd27ea48c4128033ad10cf0dc5dba3f5d97a02/ Commit 4aff9fae454495d071829cbe (package/am335x-pru-package: fix download issue) updated the filename and hash of the package, but something went wrong when adjusting the hash for 2024.02.x. Investigating the local tarball shows that the permissions in the tarball were were wrong: diffoscope old-dl/am335x-pru-package/am335x-pru-package-5f374*-br1.tar.gz \ dl/am335x-pru-package/am335x-pru-package-5f374*-br1.tar.gz | \ grep 96/.gitignore │ │ --rw-rw-rw- 0 0 0 199 2016-02-10 20:56:25.000000 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096/.gitignore │ │ +-rw-r--r-- 0 0 0 199 2016-02-10 20:56:25.000000 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096/.gitignore And indeed, the file does have mode 666 in the git repo: ls -lah old-dl/am335x-pru-package/git/.gitignore -rw-rw-rw- 1 peko peko 199 Aug 31 18:16 old-dl/am335x-pru-package/git/.gitignore It is unclear how this happened, maybe an issue with switching between master/2024.05.x/2024.02.x. Adjust the hash to match what is should have been instead. Signed-off-by: Peter Korsgaard --- package/am335x-pru-package/am335x-pru-package.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/am335x-pru-package/am335x-pru-package.hash b/package/am335x-pru-package/am335x-pru-package.hash index a6fc8109af..c7e7e32d4c 100644 --- a/package/am335x-pru-package/am335x-pru-package.hash +++ b/package/am335x-pru-package/am335x-pru-package.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 065807a896717a112a8630883ae87271a7586db7c72f21ec3572f76dd77ec34b am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096-br1.tar.gz +sha256 cb7d2998431a1d76e41121d0728d921baecb1501a25d30950102d017b0ced9d7 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096-br1.tar.gz sha256 f0fcdf9b2090896389eb4b784f23be96d5544c5ce5282d84f82ae9a8e8331beb pru_sw/utils/LICENCE.txt From d9b046e634f4b4390e2d36f7224b30851ee1e46c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 9 Sep 2024 16:33:59 +0200 Subject: [PATCH 113/114] Update for 2024.02.6 Signed-off-by: Peter Korsgaard --- CHANGES | 30 ++++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 64d89277f2..059c4ba4ee 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,33 @@ +2024.02.6, released September 9th, 2024 + + Important / security related fixes. + + Added a large number of additional runtime tests. + + Infrastructure: + - Be more robust against text files (for package hashes and + users) incorrectly missing a terminating newline. + + - Fix various issues with the pkg-kconfig infrastructure and + per-package-directories builds + (BR2_PER_PACKAGE_DIRECTORIES). + + Updated/fixed packages: aer-inject, am335x-pru-package, + apache, apr, apr-util, attr, boost, btrfs-progs, busybox, + cryptsetup, dropbear, elfutils, fetchmail, ffmpeg, fluidsynth, + freerdp, gcc, gdb, gnutls, gpsd, hiawatha, hostapd, htop, + intel-microcode, iperf3, ksmbd-tools, libcoap, libcurl, + libest, libgtk3, libpwquality, libressl, libupnp, libxml2, + libxslt, lrzsz, mdio-tools, micropython, mjpg-streamer, mpir, + ncftp, nginx, nodejs, open-iscsi, openldap, openvpn, pistache, + procps-ng, python-django, ruby, speex, swaybg, tinyssh, + uclibc, uclibc-ng-test, unbound, uuu, wpewebkit, zfs + + Issues resolved: + - Toolchain (host-gcc-final-14.1.0) build failure with + y2038/BR2_TIME_BITS_64 enabled + https://gitlab.com/buildroot.org/buildroot/-/issues/16 + 2024.02.5, released August 14th, 2024 Important / security related fixes. diff --git a/Makefile b/Makefile index 4d005cd06f..e3e2d4377d 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2024.02.5 +export BR2_VERSION := 2024.02.6 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1723635000 +BR2_VERSION_EPOCH = 1725892000 # Save running make version since it's clobbered by the make package RUNNING_MAKE_VERSION := $(MAKE_VERSION) diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile index ca7e161e1b..523943fa51 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2024.02.5' +RELEASE='2024.02.6' ### Change here for more memory/cores ### VM_MEMORY=2048 From d59d09ad3817bb4892dcbbd5794599982c2d3ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cerm=C3=A1k?= Date: Thu, 12 Sep 2024 13:45:47 +0200 Subject: [PATCH 114/114] package/procps-ng: fix build with BR2_PACKAGE_SYSTEMD enable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After update to v4.0.4, props-ng build fails on linker error if If BR2_PACKAGE_SYSTEMD is enabled: /build/output/host/lib/gcc/x86_64-buildroot-linux-gnu/12.4.0/../../../../x86_64-buildroot-linux-gnu/bin/ld: src/w.o: undefined reference to symbol 'sd_session_get_uid@@LIBSYSTEMD_209' /build/output/host/lib/gcc/x86_64-buildroot-linux-gnu/12.4.0/../../../../x86_64-buildroot-linux-gnu/bin/ld: /build/output/host/x86_64-buildroot-linux-gnu/sysroot/lib64/libsystemd.so.0: error adding symbols: DSO missing from command line collect2: error: ld returned 1 exit status Add lsystemd to configure arguments if systemd is enabled to fix this. Signed-off-by: Jan Čermák --- package/procps-ng/procps-ng.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index c5675e2ee6..6393bcdf91 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -12,11 +12,13 @@ PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB PROCPS_NG_CPE_ID_VALID = YES PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) -PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) +PROCPS_NG_CONF_OPTS = LIBS="$(PROCPS_NG_LIBS)" +PROCPS_NG_LIBS=$(TARGET_NLS_LIBS) ifeq ($(BR2_PACKAGE_SYSTEMD),y) PROCPS_NG_DEPENDENCIES += systemd PROCPS_NG_CONF_OPTS += --with-systemd +PROCPS_NG_LIBS += -lsystemd else PROCPS_NG_CONF_OPTS += --without-systemd endif