From 898f7adcb12fabdbaab58d4c3148f6d5fe9f20a9 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sun, 19 Mar 2023 13:16:59 +0100 Subject: [PATCH 0001/1167] package/rtl8189fs: bump to version 2023-03-13 on branch rtl8189fs rtl8189fs branch is specific for rtl8189fs controller and diverged from master so let's switch branch from master to rtl8189s to fix runtime failure. Signed-off-by: Giulio Benetti Tested-by: Indrek Kruusa Signed-off-by: Thomas Petazzoni (cherry picked from commit 5b1e431500d6e7d17cd23d70d55df2ba99813852) Signed-off-by: Peter Korsgaard --- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 4f117cfd14e..018e5b8a778 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 96347dbfedd95a217fb89b7b295fe417b711dbad3db896ef0c2fa733c6d150fd rtl8189fs-e58bd86c9d9408c648b1246a0dd76b16856ec172.tar.gz +sha256 20382dbb1ac33425e6b3198cc9be269b79cd1423ea656e0ccd16dedafa3e2a2a rtl8189fs-ed6741b52bc998875298117b55d18b0d557c37a6.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 15a5329a45b..2dd9e6097c5 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = e58bd86c9d9408c648b1246a0dd76b16856ec172 +RTL8189FS_VERSION = ed6741b52bc998875298117b55d18b0d557c37a6 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 From 76b6da9d4fefee95bcaf47d94ab77d99edffa561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CA=8E=C9=90H=20=C7=9D=CA=8C=C7=9D=CA=87S?= Date: Sun, 19 Mar 2023 15:22:12 +0100 Subject: [PATCH 0002/1167] package/ca-certificates: bump version to 20230311 The impetus for this change was that wget fails to load pages signed by Let's Encrypt due to missing root certs. This version has the updated and correct certs. 0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch Patch dropped because the fix is incorporated upstream. Signed-off-by: Steve Hay Signed-off-by: Thomas Petazzoni (cherry picked from commit 9f5c8bd4305ab7667f3a36911ba58cef358b5aa8) Signed-off-by: Peter Korsgaard --- ...2pem.py-make-cryptography-module-opt.patch | 27 ++++++++--------- ...2pem.py-Fix-compat-with-cryptography.patch | 29 ------------------- package/ca-certificates/ca-certificates.hash | 4 +-- package/ca-certificates/ca-certificates.mk | 4 +-- 4 files changed, 17 insertions(+), 47 deletions(-) delete mode 100644 package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch diff --git a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch index b76c1bfd7f5..ed90c217eca 100644 --- a/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch +++ b/package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch @@ -1,4 +1,4 @@ -From bf18b564122e8f976681a2398862fde1eafd84ba Mon Sep 17 00:00:00 2001 +From a4e468a2a0afa80df174831c2f422184820bb0fa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 6 Jan 2022 23:15:00 +0100 Subject: [PATCH] mozilla/certdata2pem.py: make cryptography module optional @@ -14,38 +14,39 @@ cryptography Python module is there, we perform the check, otherwise the check is skipped. Signed-off-by: Thomas Petazzoni +[Steve: refreshed to apply on ca-certificates version 20230311] +Signed-off-by: Steve Hay --- - mozilla/certdata2pem.py | 18 ++++++++++-------- - 1 file changed, 10 insertions(+), 8 deletions(-) + mozilla/certdata2pem.py | 17 ++++++++++------- + 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py -index ede23d4..a6261f8 100644 +index 4df86a2..3a6d7dc 100644 --- a/mozilla/certdata2pem.py +++ b/mozilla/certdata2pem.py -@@ -28,9 +28,6 @@ import sys +@@ -28,8 +28,6 @@ import sys import textwrap import io -from cryptography import x509 - -- + objects = [] - # Dirty file parser. -@@ -122,11 +119,16 @@ for obj in objects: +@@ -122,11 +120,16 @@ for obj in objects: if not obj['CKA_LABEL'] in trust or not trust[obj['CKA_LABEL']]: continue -- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -- if cert.not_valid_after < datetime.datetime.now(): +- cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) +- if cert.not_valid_after < datetime.datetime.utcnow(): - print('!'*74) - print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) - print('!'*74) + try: + from cryptography import x509 + -+ cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -+ if cert.not_valid_after < datetime.datetime.now(): ++ cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) ++ if cert.not_valid_after < datetime.datetime.utcnow(): + print('!'*74) + print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) + print('!'*74) @@ -55,5 +56,5 @@ index ede23d4..a6261f8 100644 bname = obj['CKA_LABEL'][1:-1].replace('/', '_')\ .replace(' ', '_')\ -- -2.33.1 +2.30.2 diff --git a/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch b/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch deleted file mode 100644 index 0537da92242..00000000000 --- a/package/ca-certificates/0002-mozilla-certdata2pem.py-Fix-compat-with-cryptography.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 5e493ca307a031e81528ceddb96f3da40bc062cf Mon Sep 17 00:00:00 2001 -From: Wataru Ashihara -Date: Wed, 2 Nov 2022 12:40:05 -0400 -Subject: [PATCH] mozilla/certdata2pem.py: Fix compat with cryptography > 3.0 - -In newer cryptography packages, load_der_x509_certificate is enforced to be 'bytes' rather than currently used 'bytearray'. This fixes that. - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008244 -Signed-off-by: Justin Wood ---- - mozilla/certdata2pem.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mozilla/certdata2pem.py b/mozilla/certdata2pem.py -index a6261f8..c0fa52c 100644 ---- a/mozilla/certdata2pem.py -+++ b/mozilla/certdata2pem.py -@@ -122,7 +122,7 @@ for obj in objects: - try: - from cryptography import x509 - -- cert = x509.load_der_x509_certificate(obj['CKA_VALUE']) -+ cert = x509.load_der_x509_certificate(bytes(obj['CKA_VALUE'])) - if cert.not_valid_after < datetime.datetime.now(): - print('!'*74) - print('Trusted but expired certificate found: %s' % obj['CKA_LABEL']) --- -2.38.1 - diff --git a/package/ca-certificates/ca-certificates.hash b/package/ca-certificates/ca-certificates.hash index a1675b999e7..8a5b48dd791 100644 --- a/package/ca-certificates/ca-certificates.hash +++ b/package/ca-certificates/ca-certificates.hash @@ -1,6 +1,4 @@ # hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : -sha1 bce5a8fac45456dbebf256f3a812c6cd0a853e3e ca-certificates_20211016.tar.xz -sha256 2ae9b6dc5f40c25d6d7fe55e07b54f12a8967d1955d3b7b2f42ee46266eeef88 ca-certificates_20211016.tar.xz - +sha256 83de934afa186e279d1ed08ea0d73f5cf43a6fbfb5f00874b6db3711c64576f3 ca-certificates_20230311.tar.xz # Locally computed sha256 e85e1bcad3a915dc7e6f41412bc5bdeba275cadd817896ea0451f2140a93967c debian/copyright diff --git a/package/ca-certificates/ca-certificates.mk b/package/ca-certificates/ca-certificates.mk index 0b6962ab7b8..202d0b92ac5 100644 --- a/package/ca-certificates/ca-certificates.mk +++ b/package/ca-certificates/ca-certificates.mk @@ -4,9 +4,9 @@ # ################################################################################ -CA_CERTIFICATES_VERSION = 20211016 +CA_CERTIFICATES_VERSION = 20230311 CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz -CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20211022T144903Z/pool/main/c/ca-certificates +CA_CERTIFICATES_SITE = https://snapshot.debian.org/archive/debian/20230317T205011Z/pool/main/c/ca-certificates CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python3 CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data) CA_CERTIFICATES_LICENSE_FILES = debian/copyright From 373b98b5a85466f60bf637eea4d2913522b97775 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Mar 2023 20:12:12 +0100 Subject: [PATCH 0003/1167] package/libmicrohttpd: security bump to version 0.9.76 Fix CVE-2023-27371: GNU libmicrohttpd before 0.9.76 allows remote DoS (Denial of Service) due to improper parsing of a multipart/form-data boundary in the postprocessor.c MHD_create_post_processor() method. This allows an attacker to remotely send a malicious HTTP POST packet that includes one or more '\0' bytes in a multipart/form-data boundary field, which - assuming a specific heap layout - will result in an out-of-bounds read and a crash in the find_boundary() function. https://lists.gnu.org/archive/html/libmicrohttpd/2023-02/msg00000.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 3b645ffda6529278212ab93eb038da28014502cd) Signed-off-by: Peter Korsgaard --- package/libmicrohttpd/libmicrohttpd.hash | 2 +- package/libmicrohttpd/libmicrohttpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libmicrohttpd/libmicrohttpd.hash b/package/libmicrohttpd/libmicrohttpd.hash index 7f95e78a6e9..ce30e2ba118 100644 --- a/package/libmicrohttpd/libmicrohttpd.hash +++ b/package/libmicrohttpd/libmicrohttpd.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9278907a6f571b391aab9644fd646a5108ed97311ec66f6359cebbedb0a4e3bb libmicrohttpd-0.9.75.tar.gz +sha256 f0b1547b5a42a6c0f724e8e1c1cb5ce9c4c35fb495e7d780b9930d35011ceb4c libmicrohttpd-0.9.76.tar.gz sha256 7399547209438c93f9b90297954698773d4846cea44cde5ca982c84c45952a3b COPYING diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index f75178bc0a2..4e7b72b65c3 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMICROHTTPD_VERSION = 0.9.75 +LIBMICROHTTPD_VERSION = 0.9.76 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_CPE_ID_VENDOR = gnu From 021eba76f03e823591f5a0ce680623522cd55529 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Mar 2023 20:25:26 +0100 Subject: [PATCH 0004/1167] package/wireshark: security bump to version 4.0.4 Fix CVE-2023-1161: ISO 15765 and ISO 10681 dissector crash in Wireshark 4.0.0 to 4.0.3 and 3.6.0 to 3.6.11 allows denial of service via packet injection or crafted capture file https://www.wireshark.org/security/wnpa-sec-2023-08.html https://www.wireshark.org/news/20230302.html Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 9d39b2aed23dc822cfa56e6cc54fe605e0fd99d2) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index 7128b560aed..d89caa5de81 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.3.txt -sha1 243b0057cfe6d447662e81b5646110aaf8b63c81 wireshark-4.0.3.tar.xz -sha256 6c51e15bcc0afb93734e686dbff354ffd159f570bd2904bcbbad6f3feb7e9511 wireshark-4.0.3.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.4.txt +sha1 ae3c28d6966c420ee3a8d058ea212a1b6adab50f wireshark-4.0.4.tar.xz +sha256 a4a09f6564f00639036ffe5064ac4dc2176adfa3e484c539c9c73f835436e74b wireshark-4.0.4.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 12c36575df1..f5a8e1f0706 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.3 +WIRESHARK_VERSION = 4.0.4 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 71655041dcf5e3b6b8d84babf9515cc876c663d0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 19 Mar 2023 20:53:27 +0100 Subject: [PATCH 0005/1167] package/vim: security bump to version 9.0.1414 Fix CVE-2023-1127, CVE-2023-1170, CVE-2023-1175, CVE-2023-1264 and CVE-2023-1355 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 31a0d92bf3362c3852e75191e6c8e6ac230e5dcc) Signed-off-by: Peter Korsgaard --- package/vim/vim.hash | 2 +- package/vim/vim.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/vim/vim.hash b/package/vim/vim.hash index 4000beedc18..26bc913b8a2 100644 --- a/package/vim/vim.hash +++ b/package/vim/vim.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 bcaf9b21ab00ab49de4f3bdfda1bcda82533ec16c412824226544a3fce6506ff vim-9.0.1260.tar.gz +sha256 c2bddf283a19c8714d7b21716e0a6a3214f9edb60b080f233cce4143fe228ff3 vim-9.0.1414.tar.gz sha256 0bcab3b635dd39208c42b496568d1e8171dad247cf3da5bab3d750c9d5883499 LICENSE sha256 d187aff219161f37138479257f82d687ea10b2cdd17d58b53a3ec9b79d6dc870 README.txt diff --git a/package/vim/vim.mk b/package/vim/vim.mk index e3648bfab91..bb6d4a8d277 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -4,7 +4,7 @@ # ################################################################################ -VIM_VERSION = 9.0.1260 +VIM_VERSION = 9.0.1414 VIM_SITE = $(call github,vim,vim,v$(VIM_VERSION)) VIM_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES) VIM_SUBDIR = src From 35485b3d104bdabbc56661cceb1507090daa1cba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 18 Mar 2023 13:32:17 +0100 Subject: [PATCH 0006/1167] package/snmppp: security bump to version 3.5.0 - Improved (security): Avoid timing attacks on authentication verification. - Drop patch (already in version) https://www.agentpp.com/download/changes_snmp++v3.txt Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit e011fa0415883b9d44df616cfaf6956e1a11da88) Signed-off-by: Peter Korsgaard --- .../0001-fix-build-with-libressl-3-5-0.patch | 39 ------------------- package/snmppp/snmppp.hash | 2 +- package/snmppp/snmppp.mk | 2 +- 3 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 package/snmppp/0001-fix-build-with-libressl-3-5-0.patch diff --git a/package/snmppp/0001-fix-build-with-libressl-3-5-0.patch b/package/snmppp/0001-fix-build-with-libressl-3-5-0.patch deleted file mode 100644 index f60f84f9a25..00000000000 --- a/package/snmppp/0001-fix-build-with-libressl-3-5-0.patch +++ /dev/null @@ -1,39 +0,0 @@ -fix build with libressl >= 3.5.0 - -Fix the following build failure with libressl >= 3.5.0: - -auth_priv.cpp: In member function 'virtual int Snmp_pp::AuthMD5::password_to_key(const unsigned char*, unsigned int, const unsigned char*, unsigned int, unsigned char*, unsigned int*)': -auth_priv.cpp:1132:20: error: aggregate 'Snmp_pp::MD5HashStateType md5_hash_state' has incomplete type and cannot be defined - MD5HashStateType md5_hash_state; - ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/b50b883c03e82564198a8b7e91bd14bf007772e0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: merged (emailed to katz.agentpp.com@magenta.de)] - -diff -Naurp snmp++-3.4.9.orig/src/auth_priv.cpp snmp++-3.4.9/src/auth_priv.cpp ---- snmp++-3.4.9.orig/src/auth_priv.cpp 2022-05-13 11:39:14.083038544 +0200 -+++ snmp++-3.4.9/src/auth_priv.cpp 2022-05-13 15:00:42.576102348 +0200 -@@ -79,8 +79,9 @@ static const char *loggerModuleName = "s - - /* -- START: Defines for OpenSSL -- */ - --#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) --// OpenSSL versions up to 1.0.x and LibreSSL -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) -+// OpenSSL versions up to 1.0.x and LibreSSL versions up to 3.4.x - typedef EVP_MD_CTX EVPHashStateType; - - int evpAllocAndInit(EVP_MD_CTX *ctx, const EVP_MD *md) -@@ -138,7 +139,7 @@ typedef EVP_MD_CTX* MD5HashSta - #define MD5_PROCESS(s, p, l) EVP_DigestUpdate(*(s), p, l) - #define MD5_DONE(s, k) evpDigestFinalAndFree(s, k) - --#endif // OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) -+#endif // OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) - - typedef DES_key_schedule DESCBCType; - #define DES_CBC_START_ENCRYPT(c, iv, k, kl, r, s) \ diff --git a/package/snmppp/snmppp.hash b/package/snmppp/snmppp.hash index 6dc3d39ced1..74c6a3e98f2 100644 --- a/package/snmppp/snmppp.hash +++ b/package/snmppp/snmppp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d7a77fd05ecd99b25c51cbab08dfeef22a5edf2677875695c213631af59d5bae snmp++-3.4.10.tar.gz +sha256 43a433bd5f6fd67add5a26add6521ca664c41aead438405658ed57483664b4bf snmp++-3.5.0.tar.gz sha256 61337e799c8274e596e5783b22607beea8073ee296c6b27fc5c7487296e56851 src/v3.cpp diff --git a/package/snmppp/snmppp.mk b/package/snmppp/snmppp.mk index 005a5a9f352..9f1916dd662 100644 --- a/package/snmppp/snmppp.mk +++ b/package/snmppp/snmppp.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNMPPP_VERSION = 3.4.10 +SNMPPP_VERSION = 3.5.0 SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz SNMPPP_SITE = http://www.agentpp.com/download SNMPPP_DEPENDENCIES = host-pkgconf From c7dee88ef04624931ae4d7919c0f6b1f1b61b8f5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Mar 2023 08:34:19 +0100 Subject: [PATCH 0007/1167] package/agentpp: security bump to version 4.6.0 - Fixed (security) [APP-70]: Memory leak in MibLeaf::set if same OID is set twice in the same PDU. - Fix the following build failure raised since bump of snmppp to version 3.5.0 in commit e011fa0415883b9d44df616cfaf6956e1a11da88: snmp_pp_ext.cpp: In member function 'int Agentpp::Snmpx::send(const Agentpp::Pdux&, Snmp_pp::SnmpTarget*)': snmp_pp_ext.cpp:1172:47: error: binding reference of type 'Snmp_pp::Pdu&' to 'const Snmp_pp::Pdu' discards qualifiers 1172 | status = snmpmsg.loadv3(Snmp::get_mpv3(), pdu, engine_id, security_name, | Fixes: - http://autobuild.buildroot.net/results/d7347b8b3953596b66da6ca6d85f084fb427934c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5f06ecf5e1516cac8911dbf9b05c66c0f7060379) Signed-off-by: Peter Korsgaard --- package/agentpp/agentpp.hash | 2 +- package/agentpp/agentpp.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/agentpp/agentpp.hash b/package/agentpp/agentpp.hash index 99aae702636..527414eed54 100644 --- a/package/agentpp/agentpp.hash +++ b/package/agentpp/agentpp.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5f2cfe98fd1d50683e02c65fccd9423351254df427e5825e4f321c488a9234eb agent++-4.5.4.tar.gz +sha256 e09dc2d40277d468c18f1539ad18f43e0c3a95b10fad8a02184e9ace8bac0d67 agent++-4.6.0.tar.gz sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt diff --git a/package/agentpp/agentpp.mk b/package/agentpp/agentpp.mk index d020228e44b..0ef549426e5 100644 --- a/package/agentpp/agentpp.mk +++ b/package/agentpp/agentpp.mk @@ -4,7 +4,7 @@ # ################################################################################ -AGENTPP_VERSION = 4.5.4 +AGENTPP_VERSION = 4.6.0 AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz AGENTPP_SITE = http://www.agentpp.com/download AGENTPP_LICENSE = Apache-2.0 From 1bf2cdc30c04432a135ca7e81992743799d36127 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Mar 2023 18:13:31 +0100 Subject: [PATCH 0008/1167] package/python-web2py: security bump to version 2.23.1 Fix CVE-2023-22432: Open redirect vulnerability exists in web2py versions prior to 2.23.1. When using the tool, a web2py user may be redirected to an arbitrary website by accessing a specially crafted URL. As a result, the user may become a victim of a phishing attack. https://github.com/web2py/web2py/compare/v2.23.0...v2.23.1 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 11f8c11dfb61f1efa92d80de2d5ee915d73ff656) Signed-off-by: Peter Korsgaard --- package/python-web2py/python-web2py.hash | 2 +- package/python-web2py/python-web2py.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python-web2py/python-web2py.hash b/package/python-web2py/python-web2py.hash index a8534977688..c0ce0cc3520 100644 --- a/package/python-web2py/python-web2py.hash +++ b/package/python-web2py/python-web2py.hash @@ -1,3 +1,3 @@ # sha256 locally computed -sha256 356f88b671e2bcdd9c89df526ee063ee9d6f4f57b60182ec2684adddcc426e99 python-web2py-2.23.0.tar.gz +sha256 f4066d76290b333bc1bb1cf4c23b612eebde712b7112e90a72e7609a14690d2c python-web2py-2.23.1.tar.gz sha256 2aae96826184a492bc799add49aed7b29036e7aba2d2294fb65053bd30fe55fe LICENSE diff --git a/package/python-web2py/python-web2py.mk b/package/python-web2py/python-web2py.mk index 4425b09d123..2a666cae174 100644 --- a/package/python-web2py/python-web2py.mk +++ b/package/python-web2py/python-web2py.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_WEB2PY_VERSION = 2.23.0 +PYTHON_WEB2PY_VERSION = 2.23.1 PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,v$(PYTHON_WEB2PY_VERSION)) PYTHON_WEB2PY_LICENSE = LGPL-3.0 PYTHON_WEB2PY_LICENSE_FILES = LICENSE From 2bc49f4cb25678c2d941807c2dbfe2384a31c2b5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Mar 2023 18:15:43 +0100 Subject: [PATCH 0009/1167] package/sudo: security bump to version 1.9.13p3 - Fix CVE-2023-27320: Sudo before 1.9.13p3 has a double free in the per-command chroot feature. - Update patch - Update hash of LICENSE.md (year and indentation updated: https://github.com/sudo-project/sudo/commit/dd934d6a218c05d2df61b5306e38c71edaa6ac59 https://github.com/sudo-project/sudo/commit/e5634ae99184d50afbdcb8a69dd4018b1a14871d) https://www.sudo.ws/security/advisories/double_free https://www.sudo.ws/releases/stable/#1.9.13p3 Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 556c32264c98f5696b523c3028d121adaed1e386) Signed-off-by: Peter Korsgaard --- ...onfigure.ac-fix-openssl-static-build.patch | 42 +++++++++---------- package/sudo/sudo.hash | 4 +- package/sudo/sudo.mk | 6 +-- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch index 32edd148a0c..dc91af61191 100644 --- a/package/sudo/0001-configure.ac-fix-openssl-static-build.patch +++ b/package/sudo/0001-configure.ac-fix-openssl-static-build.patch @@ -1,6 +1,6 @@ -From 5cfc7e277d0b262a1d12e867c47a36301fb7edb7 Mon Sep 17 00:00:00 2001 +From 1fed5adc166d5f2190a6b6ad048ec2d803316327 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine -Date: Wed, 22 Feb 2023 10:01:25 +0100 +Date: Wed, 22 Feb 2023 10:13:30 +0100 Subject: [PATCH] configure.ac: fix openssl static build Do not use AX_APPEND_FLAG as it will break static builds by removing @@ -24,26 +24,24 @@ Fixes: - http://autobuild.buildroot.org/results/8be59dd94e4916f9457cb435104e36e62a28373b Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/sudo-project/sudo/pull/244] +[Retrieved from: +https://github.com/sudo-project/sudo/commit/1fed5adc166d5f2190a6b6ad048ec2d803316327] --- - configure.ac | 4 +++- + m4/openssl.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index 8eccad7e4..523d8e56b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3082,7 +3082,9 @@ if test "${enable_openssl-no}" != no; then - SUDO_APPEND_LIBPATH([LIBTLS], [$f]) - ;; - *) -- AX_APPEND_FLAG([$f], [LIBTLS]) -+ # Do not use AX_APPEND_FLAG as it will break static builds by removing -+ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto -+ LIBTLS="$LIBTLS $f" - ;; - esac - done --- -2.39.0 - +diff --git a/m4/openssl.m4 b/m4/openssl.m4 +index a2e4941ae8..b4cbd821db 100644 +--- a/m4/openssl.m4 ++++ b/m4/openssl.m4 +@@ -44,7 +44,9 @@ AC_DEFUN([SUDO_CHECK_OPENSSL], [ + SUDO_APPEND_LIBPATH([LIBTLS], [$f]) + ;; + *) +- AX_APPEND_FLAG([$f], [LIBTLS]) ++ # Do not use AX_APPEND_FLAG as it will break static builds by removing ++ # duplicates such as -lz or -latomic which are needed by -lssl and -lcrypto ++ LIBTLS="$LIBTLS $f" + ;; + esac + done diff --git a/package/sudo/sudo.hash b/package/sudo/sudo.hash index c920b9fe744..720b21d849c 100644 --- a/package/sudo/sudo.hash +++ b/package/sudo/sudo.hash @@ -1,4 +1,4 @@ # From: https://www.sudo.ws/getting/download/ -sha256 b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539 sudo-1.9.12p2.tar.gz +sha256 92334a12bb93e0c056b09f53e255ccb7d6f67c6350e2813cd9593ceeca78560b sudo-1.9.13p3.tar.gz # Locally calculated -sha256 d2f93a3b17ed5586fddd07be33ad767146c1a81a22682baa68bb4360a31d020a LICENSE.md +sha256 ea33b3971e8e4d9657cd6794a952aaa71b22bd16745f1645455b6ead010e0a28 LICENSE.md diff --git a/package/sudo/sudo.mk b/package/sudo/sudo.mk index 3b5c8989175..e70e8bd31f0 100644 --- a/package/sudo/sudo.mk +++ b/package/sudo/sudo.mk @@ -4,8 +4,8 @@ # ################################################################################ -SUDO_VERSION_MAJOR = 1.9.12 -SUDO_VERSION_MINOR = p2 +SUDO_VERSION_MAJOR = 1.9.13 +SUDO_VERSION_MINOR = p3 SUDO_VERSION = $(SUDO_VERSION_MAJOR)$(SUDO_VERSION_MINOR) SUDO_SITE = https://www.sudo.ws/sudo/dist SUDO_LICENSE = ISC, BSD-3-Clause @@ -13,7 +13,7 @@ SUDO_LICENSE_FILES = LICENSE.md SUDO_CPE_ID_VERSION = $(SUDO_VERSION_MAJOR) SUDO_CPE_ID_UPDATE = $(SUDO_VERSION_MINOR) SUDO_SELINUX_MODULES = sudo -# We're patching configure.ac +# We're patching m4/openssl.m4 SUDO_AUTORECONF = YES # This is to avoid sudo's make install from chown()ing files which fails SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install From a23d06e96cd4eb6bd8feb03cf4cf0e1422072626 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 21 Mar 2023 20:05:01 +0100 Subject: [PATCH 0010/1167] package/openssh: security bump to version 9.3p1 From [1]: * sshd(8): fix a pre-authentication double-free memory fault introduced in OpenSSH 9.1. This is not believed to be exploitable, and it occurs in the unprivileged pre-auth process that is subject to chroot(2) and is further sandboxed on most major platforms. * ssh(8): in OpenSSH releases after 8.7, the PermitRemoteOpen option would ignore its first argument unless it was one of the special keywords "any" or "none", causing the permission list to fail open if only one permission was specified. bz3515 * ssh(1): if the CanonicalizeHostname and CanonicalizePermittedCNAMEs options were enabled, and the system/libc resolver did not check that names in DNS responses were valid, then use of these options could allow an attacker with control of DNS to include invalid characters (possibly including wildcards) in names added to known_hosts files when they were updated. These names would still have to match the CanonicalizePermittedCNAMEs allow-list, so practical exploitation appears unlikely. From [2]: * ssh-add(1): when adding smartcard keys to ssh-agent(1) with the per-hop destination constraints (ssh-add -h ...) added in OpenSSH 8.9, a logic error prevented the constraints from being communicated to the agent. This resulted in the keys being added without constraints. The common cases of non-smartcard keys and keys without destination constraints are unaffected. This problem was reported by Luci Stanescu. * ssh(1): Portable OpenSSH provides an implementation of the getrrsetbyname(3) function if the standard library does not provide it, for use by the VerifyHostKeyDNS feature. A specifically crafted DNS response could cause this function to perform an out-of-bounds read of adjacent stack data, but this condition does not appear to be exploitable beyond denial-of- service to the ssh(1) client. The getrrsetbyname(3) replacement is only included if the system's standard library lacks this function and portable OpenSSH was not compiled with the ldns library (--with-ldns). getrrsetbyname(3) is only invoked if using VerifyHostKeyDNS to fetch SSHFP records. This problem was found by the Coverity static analyzer. [1] https://www.openssh.com/txt/release-9.2 [2] https://www.openssh.com/txt/release-9.3 Signed-off-by: Peter Seiderer Signed-off-by: Peter Korsgaard (cherry picked from commit 68ca5f1e1f9f3f79e5a48928ad2dfac0cceee843) Signed-off-by: Peter Korsgaard --- package/openssh/openssh.hash | 4 ++-- package/openssh/openssh.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index eefb11ec15e..2be54431ec5 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.1 (base64 encoded) -sha256 19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288 openssh-9.1p1.tar.gz +# From https://www.openssh.com/txt/release-9.3 (base64 encoded) +sha256 e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8 openssh-9.3p1.tar.gz # Locally calculated sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index b70e327620a..26d6bd504d8 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENSSH_VERSION_MAJOR = 9.1 +OPENSSH_VERSION_MAJOR = 9.3 OPENSSH_VERSION_MINOR = p1 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) From de6e6008594eb5adfa9336a98f0fd2fad5d4132b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 10:00:30 +0200 Subject: [PATCH 0011/1167] package/protozero: fix double space in Config.in comment Signed-off-by: Peter Seiderer Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 0472287484e5914f7437cfd9f05524ab38b810fe) Signed-off-by: Peter Korsgaard --- package/protozero/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/protozero/Config.in b/package/protozero/Config.in index 19048dfe8da..e6347e6f7f3 100644 --- a/package/protozero/Config.in +++ b/package/protozero/Config.in @@ -16,5 +16,5 @@ config BR2_PACKAGE_PROTOZERO https://github.com/mapbox/protozero -comment "protozero needs a toolchain w/ C++, gcc >= 4.7" +comment "protozero needs a toolchain w/ C++, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 From 8406e06af3aaaaa2db8f71b815eb1e540796957b Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 10:00:31 +0200 Subject: [PATCH 0012/1167] package/lcdproc: fix double space in Config.in comment Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 2b2a679dfba428014900f1adaffee05d515f0e20) Signed-off-by: Peter Korsgaard --- package/lcdproc/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lcdproc/Config.in b/package/lcdproc/Config.in index 042abd69df9..e5ff432d407 100644 --- a/package/lcdproc/Config.in +++ b/package/lcdproc/Config.in @@ -1,4 +1,4 @@ -comment "lcdproc needs a toolchain w/ dynamic library" +comment "lcdproc needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS config BR2_PACKAGE_LCDPROC From 737d2217530992f9cf6d0d2e575d9105485b4a9f Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 10:00:32 +0200 Subject: [PATCH 0013/1167] package/libosmium: fix double space in Config.in comment Signed-off-by: Peter Seiderer Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit e81ca405164fbef1c43fc01aa2f95f67090d3bde) Signed-off-by: Peter Korsgaard --- package/libosmium/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libosmium/Config.in b/package/libosmium/Config.in index 3a4c64e9d22..825e2b7e338 100644 --- a/package/libosmium/Config.in +++ b/package/libosmium/Config.in @@ -13,6 +13,6 @@ config BR2_PACKAGE_LIBOSMIUM https://osmcode.org/libosmium/ -comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" +comment "libosmium needs a toolchain w/ C++, wchar, threads, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS From 786756e423865ebd7043bbaf0963a0b861f9d91f Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 10:00:33 +0200 Subject: [PATCH 0014/1167] package/osm2pgsql: fix double space in Config.in comment Signed-off-by: Peter Seiderer Reviewed-by: Maxim Kochetkov Signed-off-by: Thomas Petazzoni (cherry picked from commit 9611a3b323676637b9bc463268cfead66c8146fb) Signed-off-by: Peter Korsgaard --- package/osm2pgsql/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/osm2pgsql/Config.in b/package/osm2pgsql/Config.in index e903e92c49e..3e73572a800 100644 --- a/package/osm2pgsql/Config.in +++ b/package/osm2pgsql/Config.in @@ -22,7 +22,7 @@ config BR2_PACKAGE_OSM2PGSQL https://osm2pgsql.org -comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "osm2pgsql needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_HAS_THREADS From 9d215d42b9dad6bc73530942de1bd983fbadc7e0 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 10:00:34 +0200 Subject: [PATCH 0015/1167] package/zerofree: fix double space in Config.in comment Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit 05d3fdfd1314cce610f4fd2a55599b0595fcf2fc) Signed-off-by: Peter Korsgaard --- package/zerofree/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zerofree/Config.in b/package/zerofree/Config.in index 99466d6baec..e7007819d87 100644 --- a/package/zerofree/Config.in +++ b/package/zerofree/Config.in @@ -9,6 +9,6 @@ config BR2_PACKAGE_ZEROFREE https://frippery.org/uml/ -comment "zerofree needs a toolchain w/ dynamic library" +comment "zerofree needs a toolchain w/ dynamic library" depends on BR2_USE_MMU depends on BR2_STATIC_LIBS From 61acdc604784cabc32130f8a48edb2aa187b9c6e Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 27 Mar 2023 16:11:21 +0200 Subject: [PATCH 0016/1167] package/linux-tools: perf: ditch redundant -f 'rm' flag The value of the RM variable in make is 'rm -f' [0], thus the additional -f is redundant. [0] https://www.gnu.org/software/make/manual/make.html#index-RM Signed-off-by: Luca Ceresoli Signed-off-by: Yann E. MORIN (cherry picked from commit 37e63bb2c98052939de9b4e6cb30002016055c05) Signed-off-by: Peter Korsgaard --- package/linux-tools/linux-tool-perf.mk.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index dda63cccecb..5431c78152c 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -166,8 +166,8 @@ endef # target unless BR2_PACKAGE_LINUX_TOOLS_PERF_SCRIPTS is enabled ifeq ($(BR2_PACKAGE_LINUX_TOOLS_PERF_SCRIPTS),) define PERF_INSTALL_REMOVE_SCRIPTS - $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/ - $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/ + $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/scripts/ + $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/tests/ endef endif From 5380a3f3ae8dc6f48c9a0bf4a58729377f0bb8c2 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 27 Mar 2023 16:11:22 +0200 Subject: [PATCH 0017/1167] docs/manual: ditch redundant -f 'rm' flag The value of the RM variable in make is 'rm -f' [0], thus the additional -f is redundant. Avoid it on the docs to avoid developers taking it as a good example to follow. [0] https://www.gnu.org/software/make/manual/make.html#index-RM Signed-off-by: Luca Ceresoli Signed-off-by: Yann E. MORIN (cherry picked from commit 9a3d4e38183e7c7ade63588519796005f43efe78) Signed-off-by: Peter Korsgaard --- docs/manual/writing-rules.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index 758965d80a0..13b7fd5bea6 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -78,7 +78,7 @@ Do not align the +=+ signs. + --------------------- define LIBFOO_REMOVE_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/doc \ + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/doc \ $(TARGET_DIR)/usr/share/man/man3/libfoo* endef --------------------- @@ -118,7 +118,7 @@ YES: --------------------- ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) define LIBFOO_REMOVE_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/data + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef LIBFOO_POST_INSTALL_TARGET_HOOKS += LIBFOO_REMOVE_DATA endif @@ -128,7 +128,7 @@ NO: + --------------------- define LIBFOO_REMOVE_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/libfoo/data + $(RM) -r $(TARGET_DIR)/usr/share/libfoo/data endef ifneq ($(BR2_LIBFOO_INSTALL_DATA),y) From e660b4fe423c60b7822947e968f65b80b0b05191 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 26 Mar 2023 09:48:20 +0200 Subject: [PATCH 0018/1167] package/flann: needs C++11 support Fixes: - http://autobuild.buildroot.net/results/c92a3df1bc73e00e1e4493500bfb7277cf5064ee .../build/flann-1.9.2/src/cpp/flann/util/lsh_table.h:367:5: error: 'random_device' is not a member of 'std' std::random_device rd; ^ Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 16cd9494ba6496d7f5f873abd307952efea7da78) Signed-off-by: Peter Korsgaard --- package/flann/Config.in | 6 ++++-- package/flann/flann.mk | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/flann/Config.in b/package/flann/Config.in index 180d7eae8a0..8b32e9077c8 100644 --- a/package/flann/Config.in +++ b/package/flann/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_FLANN bool "flann" depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 select BR2_PACKAGE_LZ4 help FLANN is a library for performing fast approximate nearest @@ -22,5 +23,6 @@ config BR2_PACKAGE_FLANN_EXAMPLES endif -comment "flann needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +comment "flann needs a toolchain w/ C++, dynamic library, gcc >= 4.7" + depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/flann/flann.mk b/package/flann/flann.mk index d1a622e6853..dc75b977afa 100644 --- a/package/flann/flann.mk +++ b/package/flann/flann.mk @@ -18,7 +18,7 @@ FLANN_CONF_OPTS = \ -DUSE_OPENMP=$(if $(BR2_TOOLCHAIN_HAS_OPENMP),ON,OFF) \ -DCMAKE_DISABLE_FIND_PACKAGE_HDF5=TRUE -FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) +FLANN_CXXFLAGS = $(TARGET_CXXFLAGS) -std=c++11 ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_68485),y) FLANN_CXXFLAGS += -O0 From 3f359328bb423742599ed7cddb1a207a85cc30d4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 20 Mar 2023 18:17:33 +0100 Subject: [PATCH 0019/1167] package/snmppp: fix build without SNMPV3 Fix the following build failure without BR2_PACKAGE_SNMPPP_SNMPV3 raised since bump to version 3.5.0 in commit e011fa0415883b9d44df616cfaf6956e1a11da88: msgqueue.cpp: In member function 'int Snmp_pp::CSNMPMessage::ResendMessage()': msgqueue.cpp:263:34: error: 'version3' was not declared in this scope; did you mean 'version1'? 263 | if (m_target->get_version() == version3) { | ^~~~~~~~ | version1 Fixes: - http://autobuild.buildroot.org/results/8ef3e4407a51c53c15e530606227338761dd905b Signed-off-by: Fabrice Fontaine Reviewed-by: Luca Ceresoli Tested-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni (cherry picked from commit a45f2af7fae09e4daee9d017b02e8744b357cf48) Signed-off-by: Peter Korsgaard --- .../snmppp/0001-fix-build-without-v3.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/snmppp/0001-fix-build-without-v3.patch diff --git a/package/snmppp/0001-fix-build-without-v3.patch b/package/snmppp/0001-fix-build-without-v3.patch new file mode 100644 index 00000000000..4e81f7bfc15 --- /dev/null +++ b/package/snmppp/0001-fix-build-without-v3.patch @@ -0,0 +1,43 @@ +fix build without v3 + +Fix the following build failure without version3 raised since version +3.5.0: + +msgqueue.cpp: In member function 'int Snmp_pp::CSNMPMessage::ResendMessage()': +msgqueue.cpp:263:34: error: 'version3' was not declared in this scope; did you mean 'version1'? + 263 | if (m_target->get_version() == version3) { + | ^~~~~~~~ + | version1 + +Fixes: + - http://autobuild.buildroot.org/results/8ef3e4407a51c53c15e530606227338761dd905b + +Signed-off-by: Fabrice Fontaine +[Upstream status: sent to katz.agentpp.com@magenta.de] + +diff -Nura snmp++-3.5.0.orig/src/msgqueue.cpp snmp++-3.5.0/src/msgqueue.cpp +--- snmp++-3.5.0.orig/src/msgqueue.cpp 2023-03-20 10:49:30.629000853 +0100 ++++ snmp++-3.5.0/src/msgqueue.cpp 2023-03-20 10:51:36.880664304 +0100 +@@ -260,18 +260,20 @@ + m_target->set_retry(m_target->get_retry() - 1); + SetSendTime(); + int status; +- if (m_target->get_version() == version3) { + #ifdef _SNMPv3 ++ if (m_target->get_version() == version3) { + // delete entry in cache + if (m_snmp->get_mpv3()) + m_snmp->get_mpv3()->delete_from_cache(m_pdu.get_request_id()); +-#endif + status = m_snmp->snmp_engine(m_pdu, m_pdu.get_error_status(), m_pdu.get_error_index(), + *m_target, m_callBack, m_callData, m_socket, 0, this); + } + else { ++#endif + status = send_snmp_request(m_socket, m_rawPdu, m_rawPduLen, *m_address); ++#ifdef _SNMPv3 + } ++#endif + if (status != 0) + return SNMP_CLASS_TL_FAILED; + From 69d1d353d3b89d2a9fd2b6e5a108feba1a5ce09c Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 29 Mar 2023 11:17:22 -0700 Subject: [PATCH 0020/1167] package/runc: security bump to version v1.1.5 This is the fifth patch release in the 1.1.z series of runc, which fixes three CVEs found in runc. CVE-2023-25809 is a vulnerability involving rootless containers where (under specific configurations), the container would have write access to the /sys/fs/cgroup/user.slice/... cgroup hierarchy. No other hierarchies on the host were affected. This vulnerability was discovered by Akihiro Suda. GHSA-m8cg-xc2p-r3fc CVE-2023-27561 was a regression which effectively re-introduced CVE-2019-19921. This bug was present from v1.0.0-rc95 to v1.1.4. This regression was discovered by Beuc. GHSA-vpvm-3wq2-2wvm CVE-2023-28642 is a variant of CVE-2023-27561 and was fixed by the same patch. This variant of the above vulnerability was reported by Lei Wang. GHSA-g2j6-57v7-gm8c In addition, the following other fixes are included in this release: - Fix the inability to use /dev/null when inside a container - Fix changing the ownership of host's /dev/null caused by fd redirection - Fix rare runc exec/enter unshare error on older kernels, including CentOS < 7.7 - nsexec: Check for errors in write_log() https://github.com/opencontainers/runc/releases/tag/v1.1.5 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit 52976c54f76758aeab53f4b7777299cd5c8a3150) Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index 6c8fddd3978..eee2e34cbf7 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 4f02077432642eebd768fc857318ae7929290b3a3511eb1be338005e360cfa34 runc-1.1.4.tar.gz +sha256 76cbf30637cbb828794d72d32fb3fd6ff3139cd9743b8b44790fd110f43d96b2 runc-1.1.5.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index b60f1da2e71..9c6b5f9b37d 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.4 +RUNC_VERSION = 1.1.5 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE From 75a10d935f81dee4b7b3ec26718b1252014d2b3b Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 29 Mar 2023 15:06:21 +0200 Subject: [PATCH 0021/1167] package/docker-engine: security bump version to v23.0.2 Fixes the following security issue: - CVE-2023-26054: (Buildkit): Credentials inlined to Git URLs could end up in provenance attestation https://github.com/moby/buildkit/security/advisories/GHSA-gc89-7gcr-jxqc In addition, a number of issues have been fixed. For the full list, see: https://github.com/moby/moby/releases/tag/v23.0.2 Signed-off-by: Stefan Agner [Peter: Mark as security bump] Signed-off-by: Peter Korsgaard (cherry picked from commit cebd1389f4f22956516952eafb1183d1326907d3) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 99ab5e40035..4b7c026eefd 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c8e6c0ac5f0c772023e3430f80190e0f86644b6d94cac63118b03561385f7b56 docker-engine-23.0.1.tar.gz +sha256 4caca59c774445a5aad6114d89c97c88d9705f048704fecdd3f5712cb369dc39 docker-engine-23.0.2.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index c61aa491c20..a27625a38e3 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 23.0.1 +DOCKER_ENGINE_VERSION = 23.0.2 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 901031eecc206c082156e625a4ba20d4e330f471 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 29 Mar 2023 15:06:22 +0200 Subject: [PATCH 0022/1167] package/docker-cli: bump version to v23.0.2 This release contains some fixes and small improvements. For the full list see: https://github.com/moby/moby/releases/tag/v23.0.2 Signed-off-by: Stefan Agner Signed-off-by: Peter Korsgaard (cherry picked from commit 413a28940b46db5d84bc7430bc49df076cee01f9) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 9b231f03b17..a8ee6c7a342 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 37bc1c71a782fc10d35aa6708c1b3c90a71f3947c33665cb0de68df25dc14d94 docker-cli-23.0.1.tar.gz +sha256 bef4fc68b9f81ab2ae8bb2605e16a0965a3c4a82f0c0cf9d9f5d2cee8e95415d docker-cli-23.0.2.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 38d903150c3..5473edf1efb 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 23.0.1 +DOCKER_CLI_VERSION = 23.0.2 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From f7c17b3e026c832bb57272df2d88e8ed2a6384c7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 5 Apr 2023 07:46:15 +0200 Subject: [PATCH 0023/1167] package/uclibc: security update to 1.0.43 Security fix for CVE-2022-29503 Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard (cherry picked from commit f12bf2e6a78f1b5ff203fc234be68e224ec49b0e) Signed-off-by: Peter Korsgaard --- package/uclibc/uclibc.hash | 4 ++-- package/uclibc/uclibc.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/uclibc/uclibc.hash b/package/uclibc/uclibc.hash index 0122d08789e..cdca75b113a 100644 --- a/package/uclibc/uclibc.hash +++ b/package/uclibc/uclibc.hash @@ -1,4 +1,4 @@ -# From https://downloads.uclibc-ng.org/releases/1.0.42/uClibc-ng-1.0.42.tar.xz.sha256 -sha256 ec6dae44ce86558885e56bc3bef6bd4d082397114e6e1fc15795f71e804d7016 uClibc-ng-1.0.42.tar.xz +# From https://downloads.uclibc-ng.org/releases/1.0.43/uClibc-ng-1.0.43.tar.xz.sha256 +sha256 8c1f550f14728a9c06ff1fb3e85069f7f10f4d684b03e163f4d9d41727124047 uClibc-ng-1.0.43.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING.LIB diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 4c05d36ab34..80c9caf07f7 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UCLIBC_VERSION = 1.0.42 +UCLIBC_VERSION = 1.0.43 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) UCLIBC_LICENSE = LGPL-2.1+ From 2689e6974a9b3e07c8fd8fb002ad4a22ddf3eadf Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 5 Apr 2023 09:47:01 +0200 Subject: [PATCH 0024/1167] package/containerd: security bump to version 1.6.20 Various bugfixes and improvements. Noteable security fixes: - CVE-2023-25153: Fix OCI image importer memory exhaustion https://github.com/containerd/containerd/security/advisories/GHSA-259w-8hf6-59c2 - CVE-2023-25173: Fix supplementary groups not being set up properly https://github.com/containerd/containerd/security/advisories/GHSA-hmfx-3pcx-653p https://github.com/containerd/containerd/releases/tag/v1.6.20 Signed-off-by: Stefan Agner [Peter: add CVE references] Signed-off-by: Peter Korsgaard (cherry picked from commit 8bf66c5640c0fafd63dbacadeeb6ac3a9f4f26a9) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 16474089d17..65a87f25fab 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a containerd-1.6.16.tar.gz +sha256 819086ccdca44cfc5f108e226c7a9294d8fad3eb32031a621623da80dedbfb11 containerd-1.6.20.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 4a0d6ec38b4..bc1dd58611f 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.16 +CONTAINERD_VERSION = 1.6.20 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From dacc6751f5d16a95edb69d1e05e0bc5a06e8beeb Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 5 Apr 2023 09:47:02 +0200 Subject: [PATCH 0025/1167] package/docker-engine: security bump version to v23.0.3 Fixed a number of issues that can cause Swarm encrypted overlay networks to fail to uphold their guarantees, addressing CVE-2023-28841, CVE-2023-28840, and CVE-2023-28842. https://github.com/moby/moby/releases/tag/v23.0.3 Signed-off-by: Stefan Agner Signed-off-by: Peter Korsgaard (cherry picked from commit 238d49468751ad761b61e691a18aaf097c020c4a) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 4b7c026eefd..0dc974ce85f 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 4caca59c774445a5aad6114d89c97c88d9705f048704fecdd3f5712cb369dc39 docker-engine-23.0.2.tar.gz +sha256 2f74aef0eadf5bfe652b1822f1349fa0baf7412f83b856a9cfb9a8fbfd686880 docker-engine-23.0.3.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index a27625a38e3..c0f2c73b69b 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 23.0.2 +DOCKER_ENGINE_VERSION = 23.0.3 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From e0b0380de43e169c8ca667c25513442c59f8c4f8 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 5 Apr 2023 09:47:03 +0200 Subject: [PATCH 0026/1167] package/docker-cli: bump version to v23.0.3 This release contains some fixes and small improvements. For the full list see: https://github.com/moby/moby/releases/tag/v23.0.3 Signed-off-by: Stefan Agner Signed-off-by: Peter Korsgaard (cherry picked from commit 0d8d348826aa59b8fb922d3e970fb769aeb0cdb7) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index a8ee6c7a342..891ccf4b4e7 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bef4fc68b9f81ab2ae8bb2605e16a0965a3c4a82f0c0cf9d9f5d2cee8e95415d docker-cli-23.0.2.tar.gz +sha256 7d67500372b560110e8200815f7111962ccec7d0eb3b743f80e262c38e2f7b82 docker-cli-23.0.3.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 5473edf1efb..69c4f76ee69 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 23.0.2 +DOCKER_CLI_VERSION = 23.0.3 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From 8d44a0369d9c5380c827e0ef0d31af9ad209979e Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 4 Apr 2023 12:08:07 -0700 Subject: [PATCH 0027/1167] package/go: security bump to version 1.19.8 go1.19.8 (released 2023-04-04) includes security fixes to the go/parser, html/template, mime/multipart, net/http, and net/textproto packages, as well as bug fixes to the compiler, the linker, the runtime, and the time package. Fixes security vulnerabilities: go/parser: infinite loop in parsing (CVE-2023-24537) html/template: backticks not treated as string delimiters (CVE-2023-24538) net/http, net/textproto: denial of service from excessive memory allocation (CVE-2023-24534) net/http, net/textproto, mime/multipart: denial of service from excessive resource consumption (CVE-2023-24536) https://go.dev/doc/devel/release#go1.19.8 https://github.com/golang/go/issues?q=milestone%3AGo1.19.8+label%3ACherryPickApproved Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit b7eaa9af7ba87f2eac1ec9d2f7116b4ecf4f78be) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 89e2fd952f0..5488ed9710e 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 775bdf285ceaba940da8a2fe20122500efd7a0b65dbcee85247854a8d7402633 go1.19.7.src.tar.gz +sha256 1d7a67929dccafeaf8a29e55985bc2b789e0499cb1a17100039f084e3238da2f go1.19.8.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index a94603f2688..37554ddf864 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.7 +GO_VERSION = 1.19.8 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 8c84c53a15b738acc69c0518a1b21b4ff717fbfc Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 8 Apr 2023 20:45:59 +0200 Subject: [PATCH 0028/1167] package/matio: fix build failure due to gcc bug 99410 The matio package exhibits gcc bug 99410 when built for the Nios2 architecture with optimization enabled, which causes a build failure. As done for other packages in Buildroot work around this gcc bug by setting optimization to -O0 if BR2_TOOLCHAIN_HAS_GCC_BUG_99410=y. Fixes: http://autobuild.buildroot.net/results/971/9714160b80a0d1a01983d29af38a95049c07b4d3/ Signed-off-by: Giulio Benetti Signed-off-by: Arnout Vandecappelle (cherry picked from commit 97f8cc355b164ce023cd6a098051ce63c7a25f9a) Signed-off-by: Peter Korsgaard --- package/matio/matio.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/matio/matio.mk b/package/matio/matio.mk index 5e09f4e6cee..2ba9c8f5689 100644 --- a/package/matio/matio.mk +++ b/package/matio/matio.mk @@ -15,6 +15,14 @@ MATIO_INSTALL_STAGING = YES # va_copy() MATIO_CONF_ENV = ac_cv_va_copy=yes +MATIO_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_99410),y) +MATIO_CFLAGS += -O0 +endif + +MATIO_CONF_ENV += CFLAGS="$(MATIO_CFLAGS)" + # mat73 require hdf5 (not available), extented-sparse take 2KB MATIO_CONF_OPTS = --disable-mat73 --enable-extended-sparse From 644110a921da65c539fe1c9277f94afaa1e30d83 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 8 Apr 2023 15:47:13 +0200 Subject: [PATCH 0029/1167] configs/stm32f469_disco_sd_defconfig: explicitly set U-Boot version The version of U-Boot must be explicitly set because if you keep the default setting, the bootloader is continuously updated in buildroot with the risk of building a non-working image. Signed-off-by: Dario Binacchi Signed-off-by: Arnout Vandecappelle (cherry picked from commit 924b163b1e4e1f82ea758a7e69a73f9e6b888e62) Signed-off-by: Peter Korsgaard --- configs/stm32f469_disco_sd_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index ea1361efc02..dc00a47e1da 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -18,6 +18,9 @@ BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="stm32f469-discovery" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_DOSFSTOOLS=y From 5a8b764cd8aba8a060b3db1acf63c5ffaa9c0a69 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Sat, 8 Apr 2023 07:24:34 +0200 Subject: [PATCH 0030/1167] package/libite: bump version to v2.5.3 Fixes, from https://github.com/troglobit/libite/releases/tag/v2.5.3 - rsync() does not copy single files correctly - copyfile() does not handle empty source files correctly (error) - copyfile() does not properly create destination dir Signed-off-by: Joachim Wiberg Signed-off-by: Arnout Vandecappelle (cherry picked from commit be44dcf6957210b88fb2591817bd76eba14ee7b0) Signed-off-by: Peter Korsgaard --- package/libite/libite.hash | 2 +- package/libite/libite.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libite/libite.hash b/package/libite/libite.hash index 8b622d87a9a..7dac198ab87 100644 --- a/package/libite/libite.hash +++ b/package/libite/libite.hash @@ -1,5 +1,5 @@ # Upstream .sha256 from GitHub -sha256 baa9bf9931427ef5e9ddfc5b72139981047a8d0d3c03a534d9716de38cf18bb5 libite-2.5.2.tar.xz +sha256 ca086adc7ebf0c2ebf2ed7a6787f9567fb802db8583576228dd5dd5ddfb7bb97 libite-2.5.3.tar.xz # Locally calculated sha256 20db0601195f708d68ff7907907b3cd3b25808efa8332e064b11f00c839a5d2f LICENSE diff --git a/package/libite/libite.mk b/package/libite/libite.mk index 66a8253c629..1cef992e533 100644 --- a/package/libite/libite.mk +++ b/package/libite/libite.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBITE_VERSION = 2.5.2 +LIBITE_VERSION = 2.5.3 LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION) LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause From d9c4e693a13f1d349e4a6c66dd39fa1f59f63b74 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 20 Feb 2023 18:22:38 -0700 Subject: [PATCH 0031/1167] package/{rust, rust-bin}: bump to version 1.67.1 Link to Rust 1.67.1 announcement: https://blog.rust-lang.org/2023/02/09/Rust-1.67.1.html Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 792f1975175cb995600f7e3ac092fc3c741aa096) Signed-off-by: Peter Korsgaard --- package/rust-bin/rust-bin.hash | 252 +++++++++--------- package/rust-bin/rust-bin.mk | 2 +- ...-unsoundness-in-bootstrap-cache-code.patch | 43 --- package/rust/rust.hash | 6 +- package/rust/rust.mk | 2 +- 5 files changed, 131 insertions(+), 174 deletions(-) delete mode 100644 package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch diff --git a/package/rust-bin/rust-bin.hash b/package/rust-bin/rust-bin.hash index d00e6342e80..11cfae5e9b1 100644 --- a/package/rust-bin/rust-bin.hash +++ b/package/rust-bin/rust-bin.hash @@ -1,129 +1,129 @@ -# From https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 5a108891cab3fd0567bf8c2b44f18c045c067c607bbec3ea62b02ad40809b151 rust-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 2ba12fe020b17de3a6fe7633c59ab50ef44f9715caa858077aad3301408f583c rust-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 f7fd19d9b4740b2acaee2ac3bf502feb2f16d1d0c203c1d7d2d2652652a9f997 rust-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 23dc0289abd12ef396c2ac822a28245157f1be5b574b5a5f4059a9ba7b61184c rust-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 9998f93c29272d9ecabb69e908da23e728ec835520b430d0af12250d175b981d rust-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 c24de54f46022c9490fc403ccb1e7384a52181ecd28afea0a37f800793b229b4 rust-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 271b4181072251276e3c97c3f772b6d9ee39aa8d9f05ed28f34bf5910c9964ad rust-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 f3a8517334a174826cf92954d525d039c941265066f46948ad89b61791398dd3 rust-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 2b4c27e3a9475278838588fb64159f74a5a8e752f53249a299d2c5188f0bc2e1 rust-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 e6345aebeba55f39cb35fc06a3ac6c43c35f596309a6ed26023b1898346419bd rust-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz.asc -sha256 d78573b19cff475c5d3612570d79f53b220d6aaf3824c71bc94d74b5f778ef84 rust-std-1.67.0-aarch64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz.asc -sha256 6ba01d65aa949128a125d85d750f3facff59c5b1448ccaf66fbdb7bbb3696107 rust-std-1.67.0-aarch64-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz.asc -sha256 04fb84e9de6c815a7031930afca5d66e6993b639a7f304052df6da750d5bbbe8 rust-std-1.67.0-arm-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz.asc -sha256 896aad9bcf8990ef213230755311609a5a05c99f3d265f47bc6844638f60d202 rust-std-1.67.0-arm-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz.asc -sha256 8fd54bfb494089fd26c76b8d9f537bf031aa9018aa29ffe5d7258c82eaa51223 rust-std-1.67.0-arm-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz.asc -sha256 212def6f18494cd45c90a471f2b0aff67c4eaa03567c7ab03fe901c337d853d3 rust-std-1.67.0-arm-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz.asc -sha256 adcab5bb095b4b9af706d3b2cc62341bced76470a7c573354b52f9c8cffb4b46 rust-std-1.67.0-armv5te-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz.asc -sha256 97c7922f3250d70e8b7a7f7420caf299274e253e1f46c3160f2dea33e159d5fe rust-std-1.67.0-armv5te-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz.asc -sha256 8aec6e33b6c80365979519423a168729c4fff2ea57f66e5123e0602f2ef050a7 rust-std-1.67.0-armv7-unknown-linux-gnueabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz.asc -sha256 f98f2f4e76ef3056ba98be13ecfaacad07ab214f8ce940dfad56723056d42872 rust-std-1.67.0-armv7-unknown-linux-gnueabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz.asc -sha256 dc10cc70b1fd6f74d0c3a7d6cf25bc583edd5f61cd26dbcc6f6bfd22d3e4eb04 rust-std-1.67.0-armv7-unknown-linux-musleabihf.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz.asc -sha256 1677ef03dfbaa5715609fe7b51e3b036f722fe8934a9186e8f24e26b94588b41 rust-std-1.67.0-armv7-unknown-linux-musleabi.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz.asc -sha256 675f0e2e2930f784d03ad6de663fd4ed2b5737689944f0bc8b20653e611c3bb3 rust-std-1.67.0-i586-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i586-unknown-linux-musl.tar.xz.asc -sha256 da13b4d9cf2709b3de996d0923df05fb343f774ff89fcfb6a8548f562113c44a rust-std-1.67.0-i586-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz.asc -sha256 080ce3fa7f5b84d900be5842a52053345a40d6dd77b20bcac016eb2083a9a59d rust-std-1.67.0-i686-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-i686-unknown-linux-musl.tar.xz.asc -sha256 b5d5a777ca669d8d6aa8bad85efe5ff9d5559a3f6f9dfb9a8d95337dd0cf1b21 rust-std-1.67.0-i686-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz.asc -sha256 a2bf13ed3f38427ae65c9ee33a0f4c71fd70d8fae6d9af45045f5318834370e5 rust-std-1.67.0-mips-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips-unknown-linux-musl.tar.xz.asc -sha256 d7d223ec4ddb4816e9c537a395a6575ad853e48e0c41415c1a54235c3eb2aa72 rust-std-1.67.0-mips-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz.asc -sha256 3b02a3d60f952336e16d1d67a2276ae3197f3839c7b2a557f5ec8d2594325958 rust-std-1.67.0-mips64-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz.asc -sha256 2ca3557e288fc1a312021b5ee2c08d1c2acd052b72b60472b494e79b42d2e713 rust-std-1.67.0-mips64-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz.asc -sha256 585c73b1407938290aa5f72beea6d994c60323b6a48b26b618d2c2f9e53916b1 rust-std-1.67.0-mips64el-unknown-linux-gnuabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz.asc -sha256 23364fbf0dae146a0be76496ac3ac22fbae5603435020d930e28531395b8355d rust-std-1.67.0-mips64el-unknown-linux-muslabi64.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz.asc -sha256 2b877cdc8af0546358df77a0e22104d5e59a3fc622b6986a3fcbffc9c96a3c8b rust-std-1.67.0-mipsel-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz.asc -sha256 6e2e15c188dc67428467e894a62679d6f4115d5e5e10916d0273c16152ab060e rust-std-1.67.0-mipsel-unknown-linux-musl.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz.asc -sha256 44b700068e9e40a01418e537b5c0f4ee279995b55ee6d6266409f057ead1c6de rust-std-1.67.0-powerpc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz.asc -sha256 db3960e0eac9d7c2485fe418bf9052d2fdd16557499d320919f385f9f3db5448 rust-std-1.67.0-powerpc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz.asc -sha256 ec92fa64616c67785039bebabc213e6bae6ffc2744ef052b79c7960df60b257f rust-std-1.67.0-powerpc64le-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz.asc -sha256 630e4b8b95c0b501676f2477b6009ca122019e1e0d637222443e26a0c5931f3c rust-std-1.67.0-riscv64gc-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz.asc -sha256 f1988eb337c00dd30469f545b822b8fd3b0372e6aa88924b7906785ea1f69fba rust-std-1.67.0-s390x-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz.asc -sha256 d8cdbee292c86182b54ba152cd33ac3abe4c684186f29017bb4cf7e92ff3a2be rust-std-1.67.0-sparc64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz.asc -sha256 8f03b271bba56b0245833f2cb08044865068ce8721d6a736d3ef7056aa109daa rust-std-1.67.0-x86_64-unknown-linux-gnu.tar.xz -# From https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz.asc -sha256 33f320dc4ae075f720f541564868e494c17dea97ea853507225f89f8b0c57363 rust-std-1.67.0-x86_64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 b7b8e8b70cae457092661894efa5a4861ef4f0e20f2f617d05d6f17b1f780a68 rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 b686a2d0d1648e1b84def715dd65a85a3d2802b33ecf65808bdb2ed639aec7d3 rust-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 c9df968487707eb63207f63086daed4fe1484829fb6221bd9414de2700424995 rust-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 4f56194a354b1413fb973d25f1c895aaa8e85211d316755508d6848e3a4fe18b rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 852e5a714ea8d2737f2cd5b0d6a12ecfa712b75238c643ba8138b490fc39fc43 rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 0a5bc85383d5d9d077dccaad1fb213d9498b6137112aaaabced6eb079fe12c9e rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 574851ff8503df9cb0dd04e6a1cd0ce5d709b5ea8b9c1265b314b9e182c818da rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 50e98fefef58218bd2c09c826308d43abe11b05f528b08ecca3d2657d7996630 rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 6e8629ace0c1b9cc0c2bc6225e6716df852370e5c7e907815ff8e6241e427699 rust-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 7dbb718bdb09adad7e36b9a413e571863913682495527f7f2d6507ea2c068542 rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc +sha256 35027409400faaaa38ea2855b92dea6b553b2e656dff735da730f67ac02e57e6 rust-std-1.67.1-aarch64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc +sha256 dcd3926c151cdd33d4de2860f021c86a18556809c4d06cbddebc1b377638710a rust-std-1.67.1-aarch64-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc +sha256 da42d5b07984dac9a41719511eeb47cbb6c5e70b32a6eacba96c9f860ced0307 rust-std-1.67.1-arm-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc +sha256 3b95c9595db3e10077c4eca8f63d80414bf3a50c1f0f6b2ac33f1992ee0940db rust-std-1.67.1-arm-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz.asc +sha256 767761d99846174dfb7dfb579e2e2be63800478858a82f3f7050cc9555209a89 rust-std-1.67.1-arm-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz.asc +sha256 1e53306124de9f282452bd6085e86918e5e9f6f1940fc79809a1b284272e2d2b rust-std-1.67.1-arm-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz.asc +sha256 3e8bb4265c8c6d8984b69eeefe015131ea140148a58179b3abec5653d93bea7d rust-std-1.67.1-armv5te-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz.asc +sha256 cbfce327b623e341c1243f0d29ef2f60e5fb205d406c79eb8be1433652c3c9a5 rust-std-1.67.1-armv5te-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc +sha256 b6d00c4e338744ce1bf5b314f1056472acf1eb416f65057a8b3ca0a992fb04df rust-std-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz.asc +sha256 8a7e46b15adb0718b4e4ee33cd46529117411e8d73c29043778b05e7412c2b46 rust-std-1.67.1-armv7-unknown-linux-gnueabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz.asc +sha256 6102f98617dd37874f3d755d0a325b45d47c6e1715c39d5e9bc037992e4d3cd6 rust-std-1.67.1-armv7-unknown-linux-musleabihf.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz.asc +sha256 720958bc039c9ff00e7e399adf45f044484c5695a71bde0d07e0c895a819fe74 rust-std-1.67.1-armv7-unknown-linux-musleabi.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz.asc +sha256 22cbbf0b22d9b0894cfbd6e1dd6b95b71c7ad02cee4e477d375dcf81af8d1337 rust-std-1.67.1-i586-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i586-unknown-linux-musl.tar.xz.asc +sha256 49beb678732f34a0bfc22f94900c3d4a17ec05effdb7377864042df73b2a2819 rust-std-1.67.1-i586-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz.asc +sha256 aab2d7aa76793e78c9c8810e93ed8978f6422843b1277e9c60337b0f943a4409 rust-std-1.67.1-i686-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-i686-unknown-linux-musl.tar.xz.asc +sha256 a2c6e55a8a2987d0c306d2c164347a70ab7a6a18f6562039a772b33e25934972 rust-std-1.67.1-i686-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz.asc +sha256 048b3da190212b742f7a052618b57683dc96ee2b6c25fc7f5ae751143cb79bad rust-std-1.67.1-mips-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips-unknown-linux-musl.tar.xz.asc +sha256 b9ef413b764a92d42e07a2e588268ece09994d2cd1ab2a93858c27f85a250349 rust-std-1.67.1-mips-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc +sha256 ef7fe3160de629f0d38788f2c270f87b0631480e5b0d848595b460528de719e4 rust-std-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz.asc +sha256 15fdb3e8b39c8a122e9beee0c4c909ee8ec356e57aaaaae5f2b9e94f58d73c87 rust-std-1.67.1-mips64-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz.asc +sha256 6ccfd98fd920cc2f1199bcf9a842430c27f6fcd2cc46c18421e487309ff7811e rust-std-1.67.1-mips64el-unknown-linux-gnuabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz.asc +sha256 78477c45f5b848b156adaf0e0f6f2954ae73e2903321d1636c155020175eaaf5 rust-std-1.67.1-mips64el-unknown-linux-muslabi64.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc +sha256 94410897626546dde806a114299c3c32abb6b4b294af5daea5c4d136751fe063 rust-std-1.67.1-mipsel-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz.asc +sha256 b3f1a338e69428f1611f059c67b8afafa78ce5c7ed0799f8a90795390261d3a4 rust-std-1.67.1-mipsel-unknown-linux-musl.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc +sha256 26efe78c09ed36da34964c0d023cf9aa404766ab790a94d9becd373b8879cb5a rust-std-1.67.1-powerpc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc +sha256 135f5e6ab6d8f077a14521d387d3f31831abdb840ca4e6a15b6f0d0d5b7dbc81 rust-std-1.67.1-powerpc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc +sha256 364c47ed22e4268edf238d221c40007d7d8792a66ca325d3937596a9c911ea48 rust-std-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc +sha256 63a7e6a6c889a3d01bb3c66a3def3e41963511ea52e13906669da5b29b2fd9da rust-std-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc +sha256 04573298d9e815c1e8c47a2f9548ea55d4a2afc538eceaa6a704d44a5e1f7e3e rust-std-1.67.1-s390x-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz.asc +sha256 addf0b0beb1966787e599f32849f18c28d5cb65515272b7d9608d4a1dddee2e7 rust-std-1.67.1-sparc64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc +sha256 f4dc8468dfc1dbd86f865b10f06e0e4b4e76f5a3a1cc27317a520ab1660844e9 rust-std-1.67.1-x86_64-unknown-linux-gnu.tar.xz +# From https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc +sha256 89741cd2ac00c3a3f565bcccdf442cc1f9ec58ea419f1f0d09e911be0ff86c87 rust-std-1.67.1-x86_64-unknown-linux-musl.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust-bin/rust-bin.mk b/package/rust-bin/rust-bin.mk index d62ce39cfcc..bb66de5ec59 100644 --- a/package/rust-bin/rust-bin.mk +++ b/package/rust-bin/rust-bin.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_BIN_VERSION = 1.67.0 +RUST_BIN_VERSION = 1.67.1 RUST_BIN_SITE = https://static.rust-lang.org/dist RUST_BIN_LICENSE = Apache-2.0 or MIT RUST_BIN_LICENSE_FILES = LICENSE-APACHE LICENSE-MIT diff --git a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch b/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch deleted file mode 100644 index 3eae34642fd..00000000000 --- a/package/rust/0001-fix-unsoundness-in-bootstrap-cache-code.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6bf37780ed49846c78d6707355f1cf44790c4301 Mon Sep 17 00:00:00 2001 -From: Michael Goulet -Date: Mon, 12 Dec 2022 18:29:33 +0000 -Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8=20fix=20unsoundness=20in=20bootstr?= - =?UTF-8?q?ap=20cache=20code?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 3fe64ebbce21e79adb64099984e96dfb79bdd0f9) -Signed-off-by: Sebastian Weyer ---- - src/bootstrap/cache.rs | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs -index be5c9bb0788..05f25af68ea 100644 ---- a/src/bootstrap/cache.rs -+++ b/src/bootstrap/cache.rs -@@ -89,16 +89,16 @@ fn hash(&self, state: &mut H) { - - impl Deref for Interned { - type Target = T::Target; -- fn deref(&self) -> &'static Self::Target { -+ fn deref(&self) -> &Self::Target { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&Self::Target, &'static Self::Target>(l.get(*self)) } -+ unsafe { mem::transmute::<&Self::Target, &Self::Target>(l.get(*self)) } - } - } - - impl, U: ?Sized> AsRef for Interned { -- fn as_ref(&self) -> &'static U { -+ fn as_ref(&self) -> &U { - let l = T::intern_cache().lock().unwrap(); -- unsafe { mem::transmute::<&U, &'static U>(l.get(*self).as_ref()) } -+ unsafe { mem::transmute::<&U, &U>(l.get(*self).as_ref()) } - } - } - --- -2.25.1 - diff --git a/package/rust/rust.hash b/package/rust/rust.hash index 2a260ca64fe..1b4b08ceccd 100644 --- a/package/rust/rust.hash +++ b/package/rust/rust.hash @@ -1,6 +1,6 @@ -# From https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.sha256 -# Verified using https://static.rust-lang.org/dist/rustc-1.67.0-src.tar.xz.asc -sha256 9ef8cf88a1d35d319808daf2f193aadca9ed9bcae1d4d5db8946a448c9432c6d rustc-1.67.0-src.tar.xz +# From https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.sha256 +# Verified using https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc +sha256 77e0615011f887d9533d5374bf9c15c590c3caf32bbb035b392d1c2ae502a682 rustc-1.67.1-src.tar.xz # Locally generated sha256 62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a LICENSE-APACHE sha256 23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3 LICENSE-MIT diff --git a/package/rust/rust.mk b/package/rust/rust.mk index d14ad3a3e78..814a3c1dd43 100644 --- a/package/rust/rust.mk +++ b/package/rust/rust.mk @@ -6,7 +6,7 @@ # When updating this version, check whether support/download/cargo-post-process # still generates the same archives. -RUST_VERSION = 1.67.0 +RUST_VERSION = 1.67.1 RUST_SOURCE = rustc-$(RUST_VERSION)-src.tar.xz RUST_SITE = https://static.rust-lang.org/dist RUST_LICENSE = Apache-2.0 or MIT From b649f233eafc8c7e610f51ee817c605aaaf4cb20 Mon Sep 17 00:00:00 2001 From: Simon Rowe Date: Thu, 6 Apr 2023 10:54:12 +0000 Subject: [PATCH 0032/1167] package/mdadm: install udev rules mdadm contains various udev rules to manage RAID assembly and create symlinks, install them if udev (or equivalent) is enabled. Signed-off-by: Simon Rowe [Arnout: use MDADM_INSTALL_TARGET_OPTS for install-bin as well] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 0385719706433fa9aa560c775d46179b42c9080c) Signed-off-by: Peter Korsgaard --- package/mdadm/mdadm.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk index 0a2eb4e5bd3..c61937306af 100644 --- a/package/mdadm/mdadm.mk +++ b/package/mdadm/mdadm.mk @@ -21,12 +21,15 @@ MDADM_BUILD_OPTS = \ CPPFLAGS="$(TARGET_CPPFLAGS) -DBINDIR=\\\"/sbin\\\"" \ CHECK_RUN_DIR=0 +MDADM_INSTALL_TARGET_OPTS = install-bin + ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) MDADM_BUILD_OPTS += USE_PTHREADS= endif ifeq ($(BR2_PACKAGE_HAS_UDEV),y) MDADM_DEPENDENCIES += udev +MDADM_INSTALL_TARGET_OPTS += install-udev else MDADM_CXFLAGS += -DNO_LIBUDEV endif @@ -36,7 +39,7 @@ define MDADM_BUILD_CMDS endef define MDADM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install-bin + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) $(MDADM_INSTALL_TARGET_OPTS) endef $(eval $(generic-package)) From 8716d5065136efad14831cbcb258591ec9943057 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 5 Apr 2023 22:22:20 +0200 Subject: [PATCH 0033/1167] package/fluidsynth: bump to version 2.3.2 For change log since v2.3.1, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.2 Signed-off-by: Julien Olivain Signed-off-by: Arnout Vandecappelle (cherry picked from commit 15a649fd2dc0f950f0237802223ddb3ebd752da9) 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 3de41b16825..0f8f04d6768 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 d734e4cf488be763cf123e5976f3154f0094815093eecdf71e0e9ae148431883 fluidsynth-2.3.1.tar.gz +sha256 cd610810f30566e28fb98c36501f00446a06fa6bae3dc562c8cd3868fe1c0fc7 fluidsynth-2.3.2.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index ad1ed7df114..854ed000321 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.1 +FLUIDSYNTH_VERSION = 2.3.2 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From 6ce7cd546b0d9f5315c9840423b6c54f5cc0b9e9 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 24 Jul 2022 15:47:43 -0600 Subject: [PATCH 0034/1167] package/pkg-cargo: set RUSTFLAGS for host in HOST_PKG_CARGO_ENV Move RUSTFLAGS for host builds to HOST_PKG_CARGO_ENV so that they are set for host cargo builds which don't use the cargo infrastructure, e.g. python packages that include rust code. Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (cherry picked from commit d775b2ac05d473db490d2dc6babd2743b28cfbf5) Signed-off-by: Peter Korsgaard --- package/pkg-cargo.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 666c5ac9718..5600c8e97eb 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -57,7 +57,8 @@ ifeq ($(NORMALIZED_ARCH),arm) endif HOST_PKG_CARGO_ENV = \ - $(PKG_COMMON_CARGO_ENV) + $(PKG_COMMON_CARGO_ENV) \ + RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" ################################################################################ # inner-cargo-package -- defines how the configuration, compilation and @@ -130,7 +131,6 @@ else # ifeq ($(4),target) define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ - RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ @@ -171,7 +171,6 @@ ifndef $(2)_INSTALL_CMDS define $(2)_INSTALL_CMDS cd $$($$(PKG)_SRCDIR) && \ $$(HOST_MAKE_ENV) \ - RUSTFLAGS="$$(addprefix -C link-args=,$$(HOST_LDFLAGS))" \ $$(HOST_CONFIGURE_OPTS) \ $$(HOST_PKG_CARGO_ENV) \ $$($(2)_CARGO_ENV) \ From 2554f30194d79d2cddce8656487571b5a2a095bd Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 9 Apr 2023 22:55:09 +0200 Subject: [PATCH 0035/1167] package/efivar: don't install in $(HOST_DIR)/usr For years already, $(HOST_DIR)/usr is deprecated. Install directly in $(HOST_DIR). This will trigger a check-package error in the following commit. Signed-off-by: Arnout Vandecappelle (cherry picked from commit 47910ccc361934ab4b3fbcfe05530f38de07844f) Signed-off-by: Peter Korsgaard --- package/efivar/efivar.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/efivar/efivar.mk b/package/efivar/efivar.mk index 8b1d338bece..ee6d7302df4 100644 --- a/package/efivar/efivar.mk +++ b/package/efivar/efivar.mk @@ -39,7 +39,7 @@ define EFIVAR_BUILD_CMDS endef define HOST_EFIVAR_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/makeguids $(HOST_DIR)/usr/bin/makeguids + $(INSTALL) -D -m 0755 $(@D)/src/makeguids $(HOST_DIR)/bin/makeguids endef define EFIVAR_INSTALL_STAGING_CMDS From 7660792c1e79b03ea4c26dcf4b49a1fed0dfaa0b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 5 Apr 2023 10:18:41 +0200 Subject: [PATCH 0036/1167] configs/olimex_a20_olinuxino_lime*: bump Linux and U-Boot Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit 917718671193e2e7ea2d8463046ce2e53dd6ab73) Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime2_defconfig | 4 ++-- configs/olimex_a20_olinuxino_lime_defconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index 50a0986ab21..a8260a7ea36 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.22" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -44,7 +44,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime2" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 25ecf31146f..65a78f5352c 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -22,7 +22,7 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.9" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.22" BR2_LINUX_KERNEL_USE_DEFCONFIG=y BR2_LINUX_KERNEL_DEFCONFIG="sunxi" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olimex/a20_olinuxino/linux-disable-lima.fragment" @@ -44,7 +44,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYTHON3=y From 410c9f01ed9709e57f274d93cc0df2b579eaf721 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 5 Apr 2023 10:18:42 +0200 Subject: [PATCH 0037/1167] configs/olimex_a20_olinuxino_lime*: configure eth0 with DHCP Signed-off-by: Francois Perrad Signed-off-by: Yann E. MORIN (cherry picked from commit 370af35425e754808dd8691536bda5b0dbce7986) Signed-off-by: Peter Korsgaard --- configs/olimex_a20_olinuxino_lime2_defconfig | 1 + configs/olimex_a20_olinuxino_lime_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/olimex_a20_olinuxino_lime2_defconfig b/configs/olimex_a20_olinuxino_lime2_defconfig index a8260a7ea36..a38f3a1c5ee 100644 --- a/configs/olimex_a20_olinuxino_lime2_defconfig +++ b/configs/olimex_a20_olinuxino_lime2_defconfig @@ -15,6 +15,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" diff --git a/configs/olimex_a20_olinuxino_lime_defconfig b/configs/olimex_a20_olinuxino_lime_defconfig index 65a78f5352c..74b6a764cd3 100644 --- a/configs/olimex_a20_olinuxino_lime_defconfig +++ b/configs/olimex_a20_olinuxino_lime_defconfig @@ -15,6 +15,7 @@ BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" BR2_TARGET_GENERIC_GETTY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" +BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_OVERLAY="board/olimex/a20_olinuxino/rootfs_overlay" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" From aa658bec37677fa6b7259e186a80a75231ab5b92 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Sun, 2 Apr 2023 20:35:30 -0500 Subject: [PATCH 0038/1167] utils/check-package: drop six usage The shebang in check-package now defines python3. There is no longer a need to maintain support with python 2.x. See-also: 02b165dc71 (check-package: fix Python3 support) Signed-off-by: Vincent Fazio Tested-by: James Knight Signed-off-by: Yann E. MORIN (cherry picked from commit b7d4ae98faac020e2f620fda47c2777ad1deddfa) Signed-off-by: Peter Korsgaard --- utils/check-package | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/utils/check-package b/utils/check-package index 98a25bd0b2d..46f2897b512 100755 --- a/utils/check-package +++ b/utils/check-package @@ -6,7 +6,6 @@ import inspect import magic import os import re -import six import sys import checkpackagelib.base @@ -218,12 +217,9 @@ def check_file_using_lib(fname): if fail > 0: failed.add(name) nwarnings += warn - if six.PY3: - f = open(fname, "r", errors="surrogateescape") - else: - f = open(fname, "r") + lastline = "" - for lineno, text in enumerate(f.readlines()): + for lineno, text in enumerate(open(fname, "r", errors="surrogateescape").readlines()): nlines += 1 for name, cf in objects: if cf.disable.search(lastline): @@ -233,7 +229,7 @@ def check_file_using_lib(fname): failed.add(name) nwarnings += warn lastline = text - f.close() + for name, cf in objects: warn, fail = print_warnings(cf.after(), name in xfail) if fail > 0: From f29a5497f52eaa01d84d59951b0d70f90f0a272c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 10 Apr 2023 02:32:52 -0600 Subject: [PATCH 0039/1167] package/pkg-cargo: ensure host/target rustflags are properly split In Cargo, it is quite typical for "build scripts" to be written in Rust and therefore they need to be compiled as part of the overall build. In cross-compilation, that means a mixed host and target build. Unfortunately, by default Cargo makes no distinction between the RUSTFLAGS used for the host and the target. There is, however, an unstable feature to make this distinction [1][2]. We already have CARGO_TARGET_APPLIES_TO_HOST="false". This makes sure that any configuration that we make for the target doesn't automatically apply to the host as well. However, this only applies for per-target configuration, for example the setting of "cc" in the config.toml generated by package/rust/rust.mk. Flags that are passed with RUSTFLAGS still apply to both host and target. Therefore, we need to use the CARGO_TARGET__RUSTFLAGS environment variable instead of plain RUSTFLAGS. This, however, doesn't allow us to specify flags that apply only to the host. We could use CARGO_TARGET__RUSTFLAGS for that, but that doesn't work in case the host and target tuple are the same. For this, we need another unstable feature, enabled with CARGO_UNSTABLE_HOST_CONFIG="true". With this enabled, we can specify flags that apply only for the host build using CARGO_HOST_RUSTFLAGS. Currently, we don't have any such flags, but we really should: we should pass the proper link flags to point to $(HOST_DIR)/lib. Therefore, add CARGO_HOST_RUSTFLAGS doing exactly that. [1] https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#host-config [2] https://github.com/rust-lang/cargo/pull/10395 Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (cherry picked from commit b40a2cc3912a039d29231241daca477790e366cd) Signed-off-by: Peter Korsgaard --- package/pkg-cargo.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/pkg-cargo.mk b/package/pkg-cargo.mk index 5600c8e97eb..264bf5a1aeb 100644 --- a/package/pkg-cargo.mk +++ b/package/pkg-cargo.mk @@ -34,7 +34,10 @@ PKG_COMMON_CARGO_ENV = \ # using nighly features on stable releases, i.e features that are not # yet considered stable. # -# CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" "enables the nightly +# CARGO_UNSTABLE_HOST_CONFIG="true" enables the host specific +# configuration feature +# +# CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" enables the nightly # configuration option target-applies-to-host value to be set # # CARGO_TARGET_APPLIES_TO_HOST="false" is actually setting the value @@ -43,9 +46,11 @@ PKG_COMMON_CARGO_ENV = \ PKG_CARGO_ENV = \ $(PKG_COMMON_CARGO_ENV) \ __CARGO_TEST_CHANNEL_OVERRIDE_DO_NOT_USE_THIS="nightly" \ + CARGO_UNSTABLE_HOST_CONFIG="true" \ CARGO_UNSTABLE_TARGET_APPLIES_TO_HOST="true" \ CARGO_TARGET_APPLIES_TO_HOST="false" \ CARGO_BUILD_TARGET="$(RUSTC_TARGET_NAME)" \ + CARGO_HOST_RUSTFLAGS="$(addprefix -C link-args=,$(HOST_LDFLAGS))" \ CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_LINKER=$(notdir $(TARGET_CROSS))gcc # @@ -53,7 +58,8 @@ PKG_CARGO_ENV = \ # and should be removed when fixed upstream # ifeq ($(NORMALIZED_ARCH),arm) - PKG_CARGO_ENV += RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" + PKG_CARGO_ENV += \ + CARGO_TARGET_$(call UPPERCASE,$(RUSTC_TARGET_NAME))_RUSTFLAGS="-Clink-arg=-Wl,--allow-multiple-definition" endif HOST_PKG_CARGO_ENV = \ From 02b2c66ffcd48efa87c0503449d3ed18e32f3860 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 14 Apr 2023 23:35:02 +0200 Subject: [PATCH 0040/1167] package/nginx: change project and download URL to https Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 5b4eaa635f32ae6b2f1e1090372844c8c9001bde) Signed-off-by: Peter Korsgaard --- package/nginx/Config.in | 2 +- package/nginx/nginx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx/Config.in b/package/nginx/Config.in index 406a1c861a6..8e888baa1c6 100644 --- a/package/nginx/Config.in +++ b/package/nginx/Config.in @@ -6,7 +6,7 @@ menuconfig BR2_PACKAGE_NGINX nginx is an HTTP and reverse proxy server, as well as a mail proxy server. - http://nginx.org/ + https://nginx.org/ if BR2_PACKAGE_NGINX diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 10cc95d90ec..185bcd576f2 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -5,7 +5,7 @@ ################################################################################ NGINX_VERSION = 1.22.1 -NGINX_SITE = http://nginx.org/download +NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE NGINX_CPE_ID_VENDOR = f5 From 6b82c00c5d7f2a7c1b8d91b4e16efbd45ee27745 Mon Sep 17 00:00:00 2001 From: Stefan Ott Date: Thu, 13 Apr 2023 00:40:39 +0200 Subject: [PATCH 0041/1167] package/eudev: fix compile-time issue with very old kernel headers Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and compiling against such a kernel will fail. This patch introduces a version check and makes eudev fall back to v2cap.capabilities on these kernels. Signed-off-by: Stefan Ott Signed-off-by: Yann E. MORIN (cherry picked from commit 8f646eb2a124098bc7c34373a4921a19d436f26e) Signed-off-by: Peter Korsgaard --- ...mpile-time-issue-on-very-old-kernels.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch diff --git a/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch b/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch new file mode 100644 index 00000000000..46961cc9d10 --- /dev/null +++ b/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch @@ -0,0 +1,44 @@ +From 09b536e0b9d0964674936901ab9d2954f935c8b4 Mon Sep 17 00:00:00 2001 +From: Stefan Ott +Date: Wed, 5 Apr 2023 18:20:37 +0200 +Subject: [PATCH] Fix compile-time issue on very old kernels + +Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and +compiling against such a kernel will fail. + +This patch introduces a version check and makes eudev fall back to +v2cap.capabilities on these kernels. + +Upstream: https://github.com/eudev-project/eudev/commit/09b536e0b9d0964674936901ab9d2954f935c8b4 +Signed-off-by: Stefan Ott +--- + src/v4l_id/v4l_id.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c +index 6bf45effe..702d5b687 100644 +--- a/src/v4l_id/v4l_id.c ++++ b/src/v4l_id/v4l_id.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include "util.h" +@@ -71,9 +72,11 @@ int main(int argc, char *argv[]) { + printf("ID_V4L_VERSION=2\n"); + printf("ID_V4L_PRODUCT=%s\n", v2cap.card); + printf("ID_V4L_CAPABILITIES=:"); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) + if (v2cap.capabilities & V4L2_CAP_DEVICE_CAPS) + capabilities = v2cap.device_caps; + else ++#endif + capabilities = v2cap.capabilities; + if ((capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0 || + (capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE) > 0) +-- +2.40.0 + From f87fe6d4198a8595606646ebf15c0a9746403bb1 Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Mon, 10 Apr 2023 20:50:16 +0300 Subject: [PATCH 0042/1167] package/xr819-xradio: bump version With introduction of vmap'ed stacks to ARM in Linux v5.18, stack parameters can no longer be used for DMA. So pull the latest xradio changes that fix the driver and make it work with vmap'ed stacks in new kernels. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN (cherry picked from commit 53baedf9126cf14f8ef80d4170ad9e9f1667fd65) Signed-off-by: Peter Korsgaard --- package/xr819-xradio/xr819-xradio.hash | 2 +- package/xr819-xradio/xr819-xradio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/xr819-xradio/xr819-xradio.hash b/package/xr819-xradio/xr819-xradio.hash index 60185db7363..8676f065f82 100644 --- a/package/xr819-xradio/xr819-xradio.hash +++ b/package/xr819-xradio/xr819-xradio.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2b297fbcc9b5ed190bcfff9f6f808c170632ac3d69dbd92156a7f4f57142dec9 xr819-xradio-005f28cfe9e20b7f2dfd9d32d38ee97060dc707f.tar.gz +sha256 93388424f1f136db541ce056be017f2f0f6688278ac15a88bef34da8f12ffea6 xr819-xradio-119cad7d07aef6973dd44e4dae74d4c9defd06a2.tar.gz # Locally computed sha256 db296f2f7f35bca3a174efb0eb392b3b17bd94b341851429a3dff411b1c2fc73 LICENSE diff --git a/package/xr819-xradio/xr819-xradio.mk b/package/xr819-xradio/xr819-xradio.mk index e5daaa60511..66c08e79215 100644 --- a/package/xr819-xradio/xr819-xradio.mk +++ b/package/xr819-xradio/xr819-xradio.mk @@ -4,7 +4,7 @@ # ################################################################################ -XR819_XRADIO_VERSION = 005f28cfe9e20b7f2dfd9d32d38ee97060dc707f +XR819_XRADIO_VERSION = 119cad7d07aef6973dd44e4dae74d4c9defd06a2 XR819_XRADIO_SITE = $(call github,fifteenhex,xradio,$(XR819_XRADIO_VERSION)) XR819_XRADIO_LICENSE = GPL-2.0 XR819_XRADIO_LICENSE_FILES = LICENSE From d2b0ce01ba55cb32c01867aa93110cf5f72a07e1 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Mon, 3 Apr 2023 09:41:03 -0500 Subject: [PATCH 0043/1167] docs/manual: rewrite section for upstream documentation Previously, the documentation only requested links to upstream commits when backporting patches. Based on a mailing list discussion [0], patches should, when possible and when approriate, provide a link as evidence that the patch has been submitted upstream. The motivation is that hopefully the patch gets applied to upstream at some point reducing the long term maintenance burden within Buildroot. This also makes future patch review on subsequent package version bumps more streamlined. For patches that are unique to BR and do not apply to the upstream repository, patches should have a comment explaining why they do not apply upstream. [0] https://lists.buildroot.org/pipermail/buildroot/2023-March/666000.html Signed-off-by: Vincent Fazio Signed-off-by: Yann E. MORIN (cherry picked from commit 5b00b40a05437e1042b25c097b977d5a26bdee1d) Signed-off-by: Peter Korsgaard --- docs/manual/patch-policy.txt | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt index 063ef984d82..dc35132ecfd 100644 --- a/docs/manual/patch-policy.txt +++ b/docs/manual/patch-policy.txt @@ -144,24 +144,37 @@ AC_PROG_MAKE_SET +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) --------------- -=== Integrating patches found on the Web +=== Additional patch documentation -When integrating a patch of which you are not the author, you have to -add a few things in the header of the patch itself. +Ideally, all patches should document an upstream patch or patch submission, when +applicable, via the +Upstream+ trailer. -Depending on whether the patch has been obtained from the project -repository itself, or from somewhere on the web, add one of the -following tags: +When backporting an upstream patch that has been accepted into mainline, it is +preferred that the URL to the commit is referenced: --------------- -Backported from: +Upstream: --------------- -or +If a new issue is identified in Buildroot and upstream is generally affected by +the issue (it's not a Buildroot specific issue), users should submit the patch +upstream and provide a link to that submission when possible: --------------- -Fetch from: +Upstream: --------------- -It is also sensible to add a few words about any changes to the patch -that may have been necessary. +Patches that have been submitted but were denied upstream should note that and +include comments about why the patch is being used despite the upstream status. + +Note: in any of the above scenarios, it is also sensible to add a few words +about any changes to the patch that may have been necessary. + +If a patch does not apply upstream then this should be noted with a comment: + +--------------- +Upstream: N/A +--------------- + +Adding this documentation helps streamline the patch review process during +package version updates. \ No newline at end of file From cec14f3328bd7ea2d5c6762eb186d5161255084f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 4 Apr 2023 20:57:20 +0200 Subject: [PATCH 0044/1167] package/mali-driver: bump to version 2023-04-04 This versions fixed build failure on Linux 6.1 Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN (cherry picked from commit b713a230c54559637baea065b731748201e19c1a) Signed-off-by: Peter Korsgaard --- package/mali-driver/mali-driver.hash | 2 +- package/mali-driver/mali-driver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mali-driver/mali-driver.hash b/package/mali-driver/mali-driver.hash index 5d32c1af8a5..de3b6e69f05 100644 --- a/package/mali-driver/mali-driver.hash +++ b/package/mali-driver/mali-driver.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 761e3f000b4c546cbd35baf34f5a0d1090f048dd44ee543773674192fd95f6b3 mali-driver-87c13e6994b20b5068e3a5e4f4c1b64db666a4c8.tar.gz +sha256 763d3cf76eb03584df6a13986a2877dc0ae5f310fc3d91e8a498fc5f89271dcc mali-driver-c90627f78d58567a2acb7cbf77d565e03a131294.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/mali-driver/mali-driver.mk b/package/mali-driver/mali-driver.mk index bdc9fedeb4e..8e059fe8bda 100644 --- a/package/mali-driver/mali-driver.mk +++ b/package/mali-driver/mali-driver.mk @@ -4,7 +4,7 @@ # ################################################################################ -MALI_DRIVER_VERSION = 87c13e6994b20b5068e3a5e4f4c1b64db666a4c8 +MALI_DRIVER_VERSION = c90627f78d58567a2acb7cbf77d565e03a131294 MALI_DRIVER_SITE = $(call github,bootlin,mali-driver,$(MALI_DRIVER_VERSION)) MALI_DRIVER_DEPENDENCIES = linux MALI_DRIVER_LICENSE = GPL-2.0 From 8e4bf44aad24a56f68cafec59446f7c0565c5524 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Aug 2022 12:17:18 +0200 Subject: [PATCH 0045/1167] package/poppler: fix introspection build Fix the following build failure raised since commit 9d1d4818c39d97ad7a1cdf6e075b9acae6dfff71: [ 98%] Generating Poppler-0.18.typelib Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir error parsing file /home/giuliobenetti/autobuild/run/instance-1/output-1/build/poppler-21.12.0/glib/Poppler-0.18.gir: Failed to parse included gir GObject-2.0 If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help. Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs" Fixes: - http://autobuild.buildroot.org/results/d2f50aa56410c2fff8a0538c57038104906e747e Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: - drop patch adding INTROSPECTION_COMPILER_ARGS as it's now upstream as of 22.02.0, and we use 22.10.0 ] Signed-off-by: Yann E. MORIN (cherry picked from commit 4466c206212226da3d68374299989cada8d4542d) Signed-off-by: Peter Korsgaard --- package/poppler/poppler.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/poppler/poppler.mk b/package/poppler/poppler.mk index 02ccf742acd..5524bfc420f 100644 --- a/package/poppler/poppler.mk +++ b/package/poppler/poppler.mk @@ -47,7 +47,8 @@ POPPLER_DEPENDENCIES += gobject-introspection POPPLER_CONF_OPTS += \ -DENABLE_GOBJECT_INTROSPECTION=ON \ -DINTROSPECTION_SCANNER=$(STAGING_DIR)/usr/bin/g-ir-scanner \ - -DINTROSPECTION_COMPILER=$(STAGING_DIR)/usr/bin/g-ir-compiler + -DINTROSPECTION_COMPILER=$(STAGING_DIR)/usr/bin/g-ir-compiler \ + -DINTROSPECTION_COMPILER_ARGS="--includedir=$(STAGING_DIR)/usr/share/gir-1.0" else POPPLER_CONF_OPTS += -DENABLE_GOBJECT_INTROSPECTION=OFF endif From 7e86856d69666ae506bde293942ae335dd35fb4e Mon Sep 17 00:00:00 2001 From: Thierry GUIBERT Date: Sun, 4 Sep 2022 15:46:13 +0200 Subject: [PATCH 0046/1167] doc/manual: add documentation about docker registry on gitlab.com Add a paragraph and an example about using the Buildroot image registry hosted on gtilab.com, for people who want to build their own image based on the offical one. Signed-off-by: Thierry GUIBERT Signed-off-by: Yann E. MORIN (cherry picked from commit d9228faa4dbda084168e3c83273e651c05b6b08b) Signed-off-by: Peter Korsgaard --- docs/manual/adding-board-support.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index cd90a5871fa..b3a88024523 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -54,3 +54,19 @@ utils/docker-run script and inside it issue these commands: $ make +_defconfig+ $ make -------------------- + +By default, Buildroot developers use the official image hosted on the +https://gitlab.com/buildroot.org/buildroot/container_registry/2395076[gitlab.com +registry] and it should be convenient for most usage. If you still want +to build your own docker image, you can base it off the official image +as the +FROM+ directive of your own _Dockerfile_: + +---- +FROM registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM +RUN ... +COPY ... +---- + +The current version _YYYYMMDD.HHMM_ can be found in the +.gitlab-ci.yml+ +file at the top of the Buildroot source tree; all past versions are +listed in the aforementioned registry as well. From 5c7130f970a756df854373afce50b8a9b7aef1df Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 Apr 2023 14:28:41 +0200 Subject: [PATCH 0047/1167] doc/manual: fix formatting slightly Signed-off-by: Thierry GUIBERT [yann.morin.1998@free.fr: split off the previous patch by Thierry] Signed-off-by: Yann E. MORIN (cherry picked from commit 4468f828859de1f4be82655d63e96d59e760db7d) Signed-off-by: Peter Korsgaard --- docs/manual/adding-board-support.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/manual/adding-board-support.txt b/docs/manual/adding-board-support.txt index b3a88024523..ef6dbd3c2b9 100644 --- a/docs/manual/adding-board-support.txt +++ b/docs/manual/adding-board-support.txt @@ -49,9 +49,10 @@ Buildroot configuration. Refer to xref:customize[] for more details. Before submitting patches for new boards it is recommended to test it by building it using latest gitlab-CI docker container. To do this use -utils/docker-run script and inside it issue these commands: ++utils/docker-run+ script and inside it issue these commands: + -------------------- - $ make +_defconfig+ + $ make _defconfig $ make -------------------- From 6cee24af5316dd1104cc2a8198fdbddafeaa60d1 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 13 Sep 2022 16:53:03 +0930 Subject: [PATCH 0048/1167] package/coremark: Set cflags The coremark build needs to set PORT_CFLAGS explicitly in order to pick up the configured optmisation level, and other flags. Signed-off-by: Joel Stanley Acked-by: Chris Packham Signed-off-by: Yann E. MORIN (cherry picked from commit c9a13ae0838174d1c05f026cee3ff66482620626) Signed-off-by: Peter Korsgaard --- package/coremark/coremark.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/coremark/coremark.mk b/package/coremark/coremark.mk index 418fd5c8d39..9ea8693e718 100644 --- a/package/coremark/coremark.mk +++ b/package/coremark/coremark.mk @@ -11,6 +11,7 @@ COREMARK_LICENSE_FILES = LICENSE.md define COREMARK_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) \ + PORT_CFLAGS="$(TARGET_CFLAGS)" \ PORT_DIR=linux$(if $(BR2_ARCH_IS_64),64) EXE= link endef From 95741c08f1d635a68c5f555f97e2c751fde629b5 Mon Sep 17 00:00:00 2001 From: Arnout Vandecappelle Date: Sun, 18 Sep 2022 14:22:39 +0200 Subject: [PATCH 0049/1167] package/pkg-golang.mk: add osusergo and netgo tags in static builds CGO (the Go language C bindings) normally links dynamically with the C libraries. It seems that passing -extldflags=-static is not sufficient to make sure they link statically. As a result, a build using CGO will fail with runtime.gcdata: missing Go type information for global symbol .dynsym: size 72 There are two modules in the standard Go library that can use CGO: os/user and net. Both of these have pure Go versions, however, which can be selected with the osusergo and netgo tags. Since these two are standard library modules that get used in almost all Go programs, pass those flags in the common infrastructure. It's not entirely clear if this is always the case or only depending on the specific way CGO is used. In the former case, we could instead disable CGO globally if static libs are enabled. However, it turns out that this doesn't solve the problem completely anyway (delve still fails to link, with different errors). Also, it is possible that other cgo modules do still work. Therefore, just stick to adding the osusergo and netgo tags. Cf. Statically compiling Go programs [0] Fixes: - crucible: http://autobuild.buildroot.net/results/c2f/c2f29f55b461899e8e15c0494578304e6f74bf51/ - containerd: http://autobuild.buildroot.net/results/699/69910fc6b9f474a7eb0ca7ffa27ac5512cc1bb37/ - delve: http://autobuild.buildroot.net/results/552/55225d5da17e85271943f7adce6f07d014d9717d/ - probably others... [0] https://www.arp242.net/static-go.html Signed-off-by: Arnout Vandecappelle Signed-off-by: Yann E. MORIN (cherry picked from commit c6bb759e2cb14ebaf2603e69652c44d337a39c72) Signed-off-by: Peter Korsgaard --- package/pkg-golang.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index da9c9a21ac9..7ba82284f3e 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -102,6 +102,7 @@ ifeq ($(4),target) ifeq ($(BR2_STATIC_LIBS),y) $(2)_LDFLAGS += -extldflags '-static' +$(2)_TAGS += osusergo netgo endif # Build package for target From 69d9cdfcc723849c7c7b81378af430dea3bf483e Mon Sep 17 00:00:00 2001 From: Mario Haustein Date: Mon, 26 Sep 2022 18:08:49 +0200 Subject: [PATCH 0050/1167] package/dcron: fix /etc/cron.d/system cron jobs Jobs with the syntax @hourly, @daily, ... were not executed since the version bump from `v4.5` to commit `1ba33c3325df48de46263276a43ed76cf9d81518`. This patch fixes the bug downstream. Signed-off-by: Mario Haustein Signed-off-by: Yann E. MORIN (cherry picked from commit 1557312f18a5e2a84387055aada9b1e6d59c5ad4) Signed-off-by: Peter Korsgaard --- package/dcron/0002-system-crontab.patch | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/dcron/0002-system-crontab.patch diff --git a/package/dcron/0002-system-crontab.patch b/package/dcron/0002-system-crontab.patch new file mode 100644 index 00000000000..ac293687275 --- /dev/null +++ b/package/dcron/0002-system-crontab.patch @@ -0,0 +1,28 @@ +From 1fd99b71b063b1573beaf9f6b801ec5be2fbe24f Mon Sep 17 00:00:00 2001 +From: Mario Haustein +Date: Fri, 2 Sep 2022 23:20:14 +0200 +Subject: [PATCH] Make @hourly, @daily, ... work again + +closes #15 + +Signed-off-by: Mario Haustein +Upstream: https://github.com/dubiousjim/dcron/pull/35 +--- + database.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/database.c b/database.c +index 37cf17a..6ec720e 100644 +--- a/database.c ++++ b/database.c +@@ -455,6 +455,8 @@ SynchronizeFile(const char *dpath, const char *fileName, const char *userName) + line.cl_Days[j] = 1; + for (j=0; j<12; ++j) + line.cl_Mons[j] = 1; ++ for (j=0; j<7; ++j) ++ line.cl_Dow[j] = ALL_DOW; + } + + while (*ptr == ' ' || *ptr == '\t') +-- +2.35.1 From af738be309376fec8f888c8f4f831a7855ebea03 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 27 Sep 2022 15:11:33 -0700 Subject: [PATCH 0051/1167] package/linux-tools: Exclude checking PE binaries from perf test Since upstream Linux commit ed21d6d7c48e6e96c2d617e304a7ebfbd17b1807 ("perf tests: Add test for PE binary format support") present in >= v5.10 there is an unconditional installation of PE binaries. Some toolchains have a readelf tool that correctly interpret the PE files, and reports ELF-alike fields. This causes check-bin-arch to reject those files. Make sure that these binaries are excluded from being checked to allow the installation of the perf tests. Fixes: 6fcdaa4c5096 ("package/linux-tools: Allow installation of perf scripts") Signed-off-by: Florian Fainelli Signed-off-by: Yann E. MORIN (cherry picked from commit a7ad7816262dd1b0db6c51a08f3013e2c473c0b3) Signed-off-by: Peter Korsgaard --- package/linux-tools/linux-tool-perf.mk.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index 5431c78152c..122c7cbbc42 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -169,6 +169,10 @@ define PERF_INSTALL_REMOVE_SCRIPTS $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/scripts/ $(RM) -r $(TARGET_DIR)/usr/libexec/perf-core/tests/ endef + +LINUX_TOOLS_BIN_ARCH_EXCLUDE += \ + /usr/libexec/perf-core/tests/pe-file.exe \ + /usr/libexec/perf-core/tests/pe-file.exe.debug endif define PERF_INSTALL_TARGET_CMDS From ab0507cd5abf6b68ab73a793e95306008957ef41 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Tue, 11 Apr 2023 22:39:30 +0200 Subject: [PATCH 0052/1167] package/openocd: bump to 0.12.0 As reported by [1], version 0.12.0 fixes these errors: Error executing event examine-end on target stm32f7x.cpu: buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl:37: Error: wrong # args: should be "expr expression" in procedure 'mmw' called at file "buildroot/output/host/bin/../share/openocd/scripts/target/stm32f7x.cfg", line 103 at file "buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl", line 37 Info : starting gdb server for stm32f7x.cpu on 3333 Info : Listening on port 3333 for gdb connections Info : Unable to match requested speed 2000 kHz, using 1800 kHz Info : Unable to match requested speed 2000 kHz, using 1800 kHz Error executing event examine-end on target stm32f7x.cpu: buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl:37: Error: wrong # args: should be "expr expression" in procedure 'ocd_process_reset' in procedure 'ocd_process_reset_inner' called at file "embedded:startup.tcl", line 288 in procedure 'mmw' called at file "buildroot/output/host/bin/../share/openocd/scripts/target/stm32f7x.cfg", line 103 at file "buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl", line 37 target halted due to debug-request, current mode: Thread xPSR: 0x01000000 pc: 0x080003fc msp: 0x20050000 Error executing event reset-init on target stm32f7x.cpu: buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl:37: Error: wrong # args: should be "expr expression" in procedure 'ocd_process_reset' in procedure 'ocd_process_reset_inner' called at file "embedded:startup.tcl", line 288 in procedure 'mmw' called at file "buildroot/output/host/bin/../share/openocd/scripts/board/stm32f769i-disco.cfg", line 71 at file "buildroot/output/host/bin/../share/openocd/scripts/mem_helper.tcl", line 37 Remove upstream patches. The new version moves the GPL-2.0 license from COPYING to the subfolder "preferred", adding the header required by spdxcheck.py. A minimalist COPYING is added in the top directory, as required by automake, pointing to the files in LICENSES. [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1014849 Signed-off-by: Dario Binacchi [yann.morin.1998@free.fr: - one license or license file per line - reorder licenses to match file order ] Signed-off-by: Yann E. MORIN (cherry picked from commit 53bad8f502687c5430cd7a4dc852314a3d75be2c) Signed-off-by: Peter Korsgaard --- ...ac-fix-autoreconf-with-autoconf-2.70.patch | 32 ------- ...GV-with-libusb-v1.0.24-33-g32a2206-1.patch | 89 ------------------- package/openocd/openocd.hash | 18 +++- package/openocd/openocd.mk | 33 ++++++- 4 files changed, 44 insertions(+), 128 deletions(-) delete mode 100644 package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch delete mode 100644 package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch diff --git a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch b/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch deleted file mode 100644 index ecb716b6fa0..00000000000 --- a/package/openocd/0002-configure.ac-fix-autoreconf-with-autoconf-2.70.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 3106d16bbc45de52bc0a8b638a84aa9d7c9abc46 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 6 Oct 2021 17:43:16 +0200 -Subject: [PATCH] configure.ac: fix autoreconf with autoconf >= 2.70 - -Fix the following build failure raised with openocd and autoconf >= 2.70 -due to -http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=aba75f6d4a9c875a9d5d90a07c6b3678db66a4bf: - ->>> openocd 0.11.0 Autoreconfiguring -autoreconf: error: configure.ac: AC_INIT not found; not an autoconf script? - -Fixes: - - http://autobuild.buildroot.org/results/5fb7aa28703aff61ba850eac11bd35c8804528ae - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/msteveb/jimtcl/pull/209] ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/jimtcl/configure.ac b/jimtcl/configure.ac -index b70b5d8..8c45114 100644 ---- a/jimtcl/configure.ac -+++ b/jimtcl/configure.ac -@@ -1 +1,3 @@ - # Dummy configure.ac to make automake happy -+AC_INIT([jimtcl], [0.80]) -+AC_OUTPUT --- -2.33.0 - diff --git a/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch b/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch deleted file mode 100644 index 776816892b3..00000000000 --- a/package/openocd/0003-stlink-fix-SIGSEGV-with-libusb-v1.0.24-33-g32a2206-1.patch +++ /dev/null @@ -1,89 +0,0 @@ -From cff0e417da58adef1ceef9a63a99412c2cc87ff3 Mon Sep 17 00:00:00 2001 -From: Antonio Borneo -Date: Wed, 23 Jun 2021 16:52:16 +0200 -Subject: [PATCH] stlink: fix SIGSEGV with libusb v1.0.24-33-g32a2206 (11618) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The stlink driver incorrectly uses a NULL pointer for libusb's -struct libusb_context. -The correct value to be used is local in libusb_helper.c. - -Move in the helper file, in a wrapper function, the only call that -requires the above value, and let stlink driver to use this -wrapper. - -This issue has not triggered any visible problem until a code -refactoring [1] in libusb has made OpenOCD crashing on Windows and -on MacOS. - -Change-Id: Id1818c8af7cf0d4d17dfa1d22aad079da01ef740 -Signed-off-by: Antonio Borneo -Fixes: https://sourceforge.net/p/openocd/tickets/308/ -Fixes: https://github.com/libusb/libusb/issues/928/ -Fixes: 42d8fa899c6a ("stlink_usb: Submit multiple USB URBs at once to improve performance") -Link: [1] https://github.com/libusb/libusb/commit/32a22069428c -Reported-by: Andrzej Sierżęga -Co-developed-by: Andrzej Sierżęga -Co-developed-by: Xiaofan Chen -Reviewed-on: http://openocd.zylin.com/6331 -Tested-by: jenkins -Reviewed-by: Marc Schink -Reviewed-by: Xiaofan -Reviewed-by: Andrzej Sierżęga -Reviewed-by: Oleksij Rempel -Reviewed-by: Andreas Fritiofson -Signed-off-by: Yannick Brosseau ---- - src/jtag/drivers/libusb_helper.c | 5 +++++ - src/jtag/drivers/libusb_helper.h | 1 + - src/jtag/drivers/stlink_usb.c | 7 +------ - 3 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/src/jtag/drivers/libusb_helper.c b/src/jtag/drivers/libusb_helper.c -index f0122d534..18fe4bad4 100644 ---- a/src/jtag/drivers/libusb_helper.c -+++ b/src/jtag/drivers/libusb_helper.c -@@ -363,3 +363,8 @@ int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid) - - return ERROR_FAIL; - } -+ -+int jtag_libusb_handle_events_completed(int *completed) -+{ -+ return libusb_handle_events_completed(jtag_libusb_context, completed); -+} -diff --git a/src/jtag/drivers/libusb_helper.h b/src/jtag/drivers/libusb_helper.h -index fa7d06e28..3e77865d6 100644 ---- a/src/jtag/drivers/libusb_helper.h -+++ b/src/jtag/drivers/libusb_helper.h -@@ -60,5 +60,6 @@ int jtag_libusb_choose_interface(struct libusb_device_handle *devh, - unsigned int *usb_write_ep, - int bclass, int subclass, int protocol, int trans_type); - int jtag_libusb_get_pid(struct libusb_device *dev, uint16_t *pid); -+int jtag_libusb_handle_events_completed(int *completed); - - #endif /* OPENOCD_JTAG_DRIVERS_LIBUSB_HELPER_H */ -diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c -index c68bbb3ca..7b1932b9f 100644 ---- a/src/jtag/drivers/stlink_usb.c -+++ b/src/jtag/drivers/stlink_usb.c -@@ -497,13 +497,8 @@ static void sync_transfer_wait_for_completion(struct libusb_transfer *transfer) - { - int r, *completed = transfer->user_data; - -- /* Assuming a single libusb context exists. There no existing interface into this -- * module to pass a libusb context. -- */ -- struct libusb_context *ctx = NULL; -- - while (!*completed) { -- r = libusb_handle_events_completed(ctx, completed); -+ r = jtag_libusb_handle_events_completed(completed); - if (r < 0) { - if (r == LIBUSB_ERROR_INTERRUPTED) - continue; --- -2.35.1 - diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash index 91eb56d930e..938711d86c0 100644 --- a/package/openocd/openocd.hash +++ b/package/openocd/openocd.hash @@ -1,3 +1,15 @@ -# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/ -sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2 -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +# From http://sourceforge.net/projects/openocd/files/openocd/0.12.0/ +sha256 af254788be98861f2bd9103fe6e60a774ec96a8c374744eef9197f6043075afa openocd-0.12.0.tar.bz2 +sha256 1b8f7e37ee5afbbf95c2a4d62b12b25232e29538692663b434318503a9a88419 COPYING +sha256 034da732b4f3079b8783fff756613c1cff89dec5ac80c5cdd90532b7539922a1 LICENSES/exceptions/eCos-exception-2.0 +sha256 0a37155eb8bc0cb94477a0cae4f030e39da9317374e8a9f597e9229fd09aff78 LICENSES/license-rules.txt +sha256 f3ba76203a7b6993db31f987559cc4c621ae1ff78119ced2a669756c2c5fd3b1 LICENSES/preferred/BSD-1-Clause +sha256 6313108c23efffa36948f8b2cff1560a5935373b527b0e1a837cc77e6ed1bacd LICENSES/preferred/BSD-2-Clause +sha256 1483f15e9fddc73b5df0acab1c42d21ecd0bf6ade8a79179fb90c09f13d03dcd LICENSES/preferred/BSD-2-Clause-Views +sha256 7a83b1aeb460458db9a4bd521d7f237c45b1650f6e60ea5ffc71e49472454de3 LICENSES/preferred/BSD-3-Clause +sha256 5cf024f6e3611d5c6fb98748d1a0ad99b8cf9ffe46f2d60fa10c299cd29e0a75 LICENSES/preferred/BSD-Source-Code +sha256 f35396f4095619f986736ca5e2976b313d381463a35c921c9ae677cc7eb83e28 LICENSES/preferred/GFDL-1.2 +sha256 76515be2d7334a1a038f775238c9a4c2b37e19514248e5eea0434cdfee526f9d LICENSES/preferred/gfdl-1.2.texi.readme +sha256 7d35bc44da7bb763022e3c2c32cfc0125dd222060bc50992420599d8e65f6c0a LICENSES/preferred/GPL-2.0 +sha256 323c587d0ccf10e376f8bf9a7f31fb4ca6078105194b42e0b1e0ee2bc9bde71f LICENSES/preferred/MIT +sha256 9a41b56594cd89743ca72f188318c9871661847074dd16497ae0c695fe3ab9c9 LICENSES/stand-alone/GPL-3.0 diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 37a06ca848b..9973498cf56 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -4,12 +4,37 @@ # ################################################################################ -OPENOCD_VERSION = 0.11.0 +OPENOCD_VERSION = 0.12.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION) -OPENOCD_LICENSE = GPL-2.0+ -OPENOCD_LICENSE_FILES = COPYING -# 0002-configure-enable-build-on-uclinux.patch patches configure.ac +OPENOCD_LICENSE = \ + eCos-exception-2.0, \ + BSD-1-clause, \ + BSD-2-clause, \ + BSD-2-Clause-Views, \ + BSD-3-clause, \ + BSD-Source-Code, \ + GFDL-1.2-no-invariants-or-later (docs), \ + GPL-2.0+ (code), \ + GPL-3.0+ (stand-alone code), \ + MIT + +OPENOCD_LICENSE_FILES = \ + COPYING \ + LICENSES/license-rules.txt \ + LICENSES/exceptions/eCos-exception-2.0 \ + LICENSES/preferred/BSD-1-Clause \ + LICENSES/preferred/BSD-2-Clause \ + LICENSES/preferred/BSD-2-Clause-Views \ + LICENSES/preferred/BSD-3-Clause \ + LICENSES/preferred/BSD-Source-Code \ + LICENSES/preferred/GFDL-1.2 \ + LICENSES/preferred/gfdl-1.2.texi.readme \ + LICENSES/preferred/GPL-2.0 \ + LICENSES/preferred/MIT \ + LICENSES/stand-alone/GPL-3.0 + +# 0001-configure-enable-build-on-uclinux.patch patches configure.ac OPENOCD_AUTORECONF = YES OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" From 32dc4feacc29b9dc377746168d174b7ecd2cfa70 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 22 Apr 2023 15:36:07 +0200 Subject: [PATCH 0053/1167] package/openocd: add the eCos exception to the GPL-2.0+ license As noted by Yann E. MORIN in [1] only the src/flash/nand/ecc.c file refers to the eCos license. The SPDX identifier for that file is: SPDX-License-Identifier: GPL-2.0-or-later WITH eCos-exception-2.0 The file is part of the openocd executable via libopenocd.la, which being a static library it is not installed. Based on this, becomes more natural to associate the eCos exception with the GPL 2.0+ license, rather than considering it separately as a license. [1] https://patchwork.ozlabs.org/project/buildroot/patch/20230411203930.2455301-1-dario.binacchi@amarulasolutions.com/ Suggested-by: Yann E. MORIN Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit 548e30d140066d5464eef1c3be57284a1a3dcf5e) Signed-off-by: Peter Korsgaard --- package/openocd/openocd.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk index 9973498cf56..78c6e10c58e 100644 --- a/package/openocd/openocd.mk +++ b/package/openocd/openocd.mk @@ -8,14 +8,13 @@ OPENOCD_VERSION = 0.12.0 OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION) OPENOCD_LICENSE = \ - eCos-exception-2.0, \ BSD-1-clause, \ BSD-2-clause, \ BSD-2-Clause-Views, \ BSD-3-clause, \ BSD-Source-Code, \ GFDL-1.2-no-invariants-or-later (docs), \ - GPL-2.0+ (code), \ + GPL-2.0+ with eCos-exception-2.0 (code), \ GPL-3.0+ (stand-alone code), \ MIT From 9543cb3285232174e3ef77adb052b180dc6770f2 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Fri, 28 Apr 2023 19:26:33 +0700 Subject: [PATCH 0054/1167] package/git: security bump to version 2.39.3 Fix three CVEs (CVE-2023-25652, CVE-2023-25815, and CVE-2023-29007). For details on these, see release announcement at [1]. While at it, also drop two Buildroot patches as these have been applied on upstream release branch. [1]: https://lore.kernel.org/git/xmqqa5yv3n93.fsf@gitster.g/ Signed-off-by: Bagas Sanjaya Signed-off-by: Peter Korsgaard --- ...avoid-redefining-system-function-nam.patch | 109 ------------------ ...undefine-system-names-before-redecla.patch | 55 --------- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 4 files changed, 2 insertions(+), 166 deletions(-) delete mode 100644 package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch delete mode 100644 package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch diff --git a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch b/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch deleted file mode 100644 index 24100e1f6e4..00000000000 --- a/package/git/0001-git-compat-util-avoid-redefining-system-function-nam.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 86aeac96d04ae5381085c0f93acb12d3bfd06969 Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Wed, 30 Nov 2022 16:15:14 -0500 -Subject: [PATCH] git-compat-util: avoid redefining system function names -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Our git-compat-util header defines a few noop wrappers for system -functions if they are not available. This was originally done with a -macro, but in 15b52a44e0 (compat-util: type-check parameters of no-op -replacement functions, 2020-08-06) we switched to inline functions, -because it gives us basic type-checking. - -This can cause compilation failures when the system _does_ declare those -functions but we choose not to use them, since the compiler will -complain about the redeclaration. This was seen in the real world when -compiling against certain builds of uclibc, which may leave -_POSIX_THREAD_SAFE_FUNCTIONS unset, but still declare flockfile() and -funlockfile(). - -It can also be seen on any platform that has setitimer() if you choose -to compile without it (which plausibly could happen if the system -implementation is buggy). E.g., on Linux: - - $ make NO_SETITIMER=IWouldPreferNotTo git.o - CC git.o - In file included from builtin.h:4, - from git.c:1: - git-compat-util.h:344:19: error: conflicting types for ‘setitimer’; have ‘int(int, const struct itimerval *, struct itimerval *)’ - 344 | static inline int setitimer(int which UNUSED, - | ^~~~~~~~~ - In file included from git-compat-util.h:234: - /usr/include/x86_64-linux-gnu/sys/time.h:155:12: note: previous declaration of ‘setitimer’ with type ‘int(__itimer_which_t, const struct itimerval * restrict, struct itimerval * restrict)’ - 155 | extern int setitimer (__itimer_which_t __which, - | ^~~~~~~~~ - make: *** [Makefile:2714: git.o] Error 1 - -Here I think the compiler is complaining about the lack of "restrict" -annotations in our version, but even if we matched it completely (and -there is no way to match all platforms anyway), it would still complain -about a static declaration following a non-static one. Using macros -doesn't have this problem, because the C preprocessor rewrites the name -in our code before we hit this level of compilation. - -One way to fix this would just be to revert most of 15b52a44e0. What we -really cared about there was catching build problems with -precompose_argv(), which most platforms _don't_ build, and which is our -custom function. So we could just switch the system wrappers back to -macros; most people build the real versions anyway, and they don't -change. So the extra type-checking isn't likely to catch bugs. - -But with a little work, we can have our cake and eat it, too. If we -define the type-checking wrappers with a unique name, and then redirect -the system names to them with macros, we still get our type checking, -but without redeclaring the system function names. - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano -[Bagas: cherry-picked from e0c08a4f738b3dea7a4e8fe3511c323cf1f41942 on next branch] -Signed-off-by: Bagas Sanjaya ---- - git-compat-util.h | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/git-compat-util.h b/git-compat-util.h -index af05077560..f6882b9b50 100644 ---- a/git-compat-util.h -+++ b/git-compat-util.h -@@ -341,11 +341,12 @@ struct itimerval { - #endif - - #ifdef NO_SETITIMER --static inline int setitimer(int which UNUSED, -- const struct itimerval *value UNUSED, -- struct itimerval *newvalue UNUSED) { -+static inline int git_setitimer(int which, -+ const struct itimerval *value, -+ struct itimerval *newvalue) { - return 0; /* pretend success */ - } -+#define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) - #endif - - #ifndef NO_LIBGEN_H -@@ -1479,14 +1480,16 @@ int open_nofollow(const char *path, int flags); - #endif - - #ifndef _POSIX_THREAD_SAFE_FUNCTIONS --static inline void flockfile(FILE *fh UNUSED) -+static inline void git_flockfile(FILE *fh) - { - ; /* nothing */ - } --static inline void funlockfile(FILE *fh UNUSED) -+static inline void git_funlockfile(FILE *fh) - { - ; /* nothing */ - } -+#define flockfile(fh) git_flockfile(fh) -+#define funlockfile(fh) git_funlockfile(fh) - #define getc_unlocked(fh) getc(fh) - #endif - - -base-commit: cbf04937d5b9fcf0a76c28f69e6294e9e3ecd7e6 --- -An old man doll... just what I always wanted! - Clara - diff --git a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch b/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch deleted file mode 100644 index f6207300ee8..00000000000 --- a/package/git/0002-git-compat-util-undefine-system-names-before-redecla.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d4a11fd215195cd1ca6a43058ef250b688ade1f4 Mon Sep 17 00:00:00 2001 -From: Jeff King -Date: Fri, 2 Dec 2022 06:05:38 -0500 -Subject: [PATCH] git-compat-util: undefine system names before redeclaring - them - -When we define a macro to point a system function (e.g., flockfile) to -our custom wrapper, we should make sure that the system did not already -define it as a macro. This is rarely a problem, but can cause -compilation failures if both of these are true: - - - we decide to define our own wrapper even though the system provides - the function; we know this happens at least with uclibc, which may - declare flockfile, etc, without _POSIX_THREAD_SAFE_FUNCTIONS - - - the system version is declared as a macro; we know this happens at - least with uclibc's version of getc_unlocked() - -So just handling getc_unlocked() would be sufficient to deal with the -real-world case we've seen. But since it's easy to do, we may as well be -defensive about the other macro wrappers added in the previous patch. - -Signed-off-by: Jeff King -Signed-off-by: Junio C Hamano -[Bagas: cherry-picked from e1a95b78d8a26762ea04332de8b7c3878da51522 on next branch] -Signed-off-by: Bagas Sanjaya ---- - git-compat-util.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/git-compat-util.h b/git-compat-util.h -index f6882b9b50..dadb9e55cb 100644 ---- a/git-compat-util.h -+++ b/git-compat-util.h -@@ -346,6 +346,7 @@ static inline int git_setitimer(int which, - struct itimerval *newvalue) { - return 0; /* pretend success */ - } -+#undef setitimer - #define setitimer(which,value,ovalue) git_setitimer(which,value,ovalue) - #endif - -@@ -1488,6 +1489,9 @@ static inline void git_funlockfile(FILE *fh) - { - ; /* nothing */ - } -+#undef flockfile -+#undef funlockfile -+#undef getc_unlocked - #define flockfile(fh) git_flockfile(fh) - #define funlockfile(fh) git_funlockfile(fh) - #define getc_unlocked(fh) getc(fh) --- -An old man doll... just what I always wanted! - Clara - diff --git a/package/git/git.hash b/package/git/git.hash index b7840cd1eb6..d63fb096866 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,5 +1,5 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 475f75f1373b2cd4e438706185175966d5c11f68c4db1e48c26257c43ddcf2d6 git-2.39.2.tar.xz +sha256 7aa19f7cd54df2edb9b66dd74c1acf9672ebfe1d018e0d88789450d31fdab7eb git-2.39.3.tar.xz # Locally calculated sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 206d06ffe7f..b0c70fa9e1b 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.39.2 +GIT_VERSION = 2.39.3 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+ From b825bbd1007e58837d1b50666ad651e03bb3cae9 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 22 Apr 2023 02:34:58 -0700 Subject: [PATCH 0055/1167] DEVELOPERS: update email address This patch updates my email address in the DEVELOPERS file. Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit e538824692822cab06c44e6b70e9ae3b92d4c920) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 9ef47a60c87..bab2ededed2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -538,7 +538,7 @@ F: package/syslog-ng/ N: Christian Kellermann F: package/python-pylibftdi/ -N: Christian Stewart +N: Christian Stewart F: package/balena-engine/ F: package/batman-adv/ F: package/catatonit/ From 7959fe04b5ea75b488eaf7cb06d43f81d2e8494b Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Mon, 13 Mar 2023 09:13:23 +0300 Subject: [PATCH 0056/1167] package/postgresql: ignore CVE-2017-8806 CVE-2017-8806 is related to postgresql-common package, as present in Debian and its derivatives; Buildroot does not have that package. It is false positive for postgresql, so ignore it. To be noted, is that a similar CVE [0] applied to postgresql itself, as stated in [1], but that was fixed a while ago [2], and we need not ignore it. [0] https://nvd.nist.gov/vuln/detail/CVE-2017-12172 [1] https://ubuntu.com/security/CVE-2017-8806 [2] https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=dfc015dcf46c1996bd7ed5866e9e045d258604b3 Signed-off-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN (cherry picked from commit 6104b62d95e87e5cb4f4815b78841541de4301e8) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index a2aed9a2eb7..e46622c0e7a 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -19,6 +19,10 @@ POSTGRESQL_CONF_ENV = \ POSTGRESQL_CONF_OPTS = --disable-rpath POSTGRESQL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) +# CVE-2017-8806 is related to postgresql-common package +# It is false positive for postgresql +POSTGRESQL_IGNORE_CVES += CVE-2017-8806 + # https://www.postgresql.org/docs/11/static/install-procedure.html: # "If you want to invoke the build from another makefile rather than # manually, you must unset MAKELEVEL or set it to zero" From 904966909dbdeb835d22b41166eebfcbaa5b46cf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 15 Apr 2023 21:43:41 +0200 Subject: [PATCH 0057/1167] utils/docker-run: allow running without a tty Currently, utils/docker-run spawns a container with a tty, so that he user can interact properly in the container. However, that requires a tty when calling docker-run, which is not always guaranteed, e.g. if called from a git hook. Since the script is a bash script already, we can use an array to store options passed to docker, and only add the -t option when there is actually a tty available. Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski (cherry picked from commit 3d8212c4b29d00caf20a3036ced885a3260678ec) Signed-off-by: Peter Korsgaard --- utils/docker-run | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/utils/docker-run b/utils/docker-run index 164e11c0e6f..135a1451b62 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -6,8 +6,15 @@ MAIN_DIR=$(readlink -f "${DIR}/..") IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') -exec docker run -it --rm \ - --user "$(id -u):$(id -g)" \ - --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \ - --workdir "${MAIN_DIR}" \ - "${IMAGE}" "${@}" +declare -a docker_opts=( + -i + --rm + --user "$(id -u):$(id -g)" + --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" + --workdir "${MAIN_DIR}" +) +if tty -s; then + docker_opts+=( -t ) +fi + +exec docker run "${docker_opts[@]}" "${IMAGE}" "${@}" From f1b72dd33d8c20657fac557c2d3179e58ec26d92 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 23 Apr 2023 21:47:51 +0200 Subject: [PATCH 0058/1167] utils/check-package: fix grammar The past participle for "to fix" is "fix". The "did you forget" got eluded into "forget", so again a past participle. Signed-off-by: Yann E. MORIN (cherry picked from commit a3e796b74e98171518cdf72920875264eb685988) Signed-off-by: Peter Korsgaard --- support/testing/tests/utils/test_check_package.py | 4 ++-- utils/check-package | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index d2c15568458..77f8208043b 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -228,9 +228,9 @@ def test_run(self): self.WITH_UTILS_IN_PATH, subdir_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:0: Indent was expected to fail, did you fixed the file and forgot to update .checkpackageignore_outdated?" + self.assertIn("{}:0: Indent was expected to fail, did you fix the file and forgot to update .checkpackageignore_outdated?" .format(subdir_file), w) - self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fixed the file and forgot to update " + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fix the file and forgot to update " ".checkpackageignore_outdated?" .format(subdir_file), w) diff --git a/utils/check-package b/utils/check-package index 46f2897b512..5974781104b 100755 --- a/utils/check-package +++ b/utils/check-package @@ -246,7 +246,7 @@ def check_file_using_lib(fname): for should_fail in xfail: if should_fail not in failed: - print("{}:0: {} was expected to fail, did you fixed the file and forgot to update {}?" + print("{}:0: {} was expected to fail, did you fix the file and forget to update {}?" .format(fname, should_fail, flags.ignore_filename)) nwarnings += 1 From 5c2a942eb06ffed94f56c5cd6f11dd92c67bdcc7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 23 Apr 2023 21:53:02 +0200 Subject: [PATCH 0059/1167] support/testing: complete the grammar fix Commit a3e796b74e98 (utils/check-package: fix grammar) only partially fixed the test-case (git commit --amend missed the test-case...) Signed-off-by: Yann E. MORIN (cherry picked from commit 4f38b5dcbd09ae8eb73ff64741c1df0be3b1c0f7) Signed-off-by: Peter Korsgaard --- support/testing/tests/utils/test_check_package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/testing/tests/utils/test_check_package.py b/support/testing/tests/utils/test_check_package.py index 77f8208043b..146c4521512 100644 --- a/support/testing/tests/utils/test_check_package.py +++ b/support/testing/tests/utils/test_check_package.py @@ -228,9 +228,9 @@ def test_run(self): self.WITH_UTILS_IN_PATH, subdir_path) self.assert_file_was_processed(m) self.assert_warnings_generated_for_file(m) - self.assertIn("{}:0: Indent was expected to fail, did you fix the file and forgot to update .checkpackageignore_outdated?" + self.assertIn("{}:0: Indent was expected to fail, did you fix the file and forget to update .checkpackageignore_outdated?" .format(subdir_file), w) - self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fix the file and forgot to update " + self.assertIn("{}:0: NewlineAtEof was expected to fail, did you fix the file and forget to update " ".checkpackageignore_outdated?" .format(subdir_file), w) From e5e171093f195227012e76821933d5052ae04e2c Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 22 Mar 2023 17:25:38 +0100 Subject: [PATCH 0060/1167] package/readline: add upstream patch to fix crash with invalid locale specification Add upstream patch to fix crash with invalid locale specification (see [1] for details). Fixes: - https://bugs.busybox.net/show_bug.cgi?id=15456 [1] https://lists.gnu.org/archive/html/bug-readline/2022-10/msg00002.html Signed-off-by: Peter Seiderer Tested-by: Stefan Agner Signed-off-by: Yann E. MORIN (cherry picked from commit 2dff6e93ca2a675cebe5cfb6d864ff5da78a4ef4) Signed-off-by: Peter Korsgaard --- ...ch-1-fix-crash-when-readline-is-star.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch diff --git a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch new file mode 100644 index 00000000000..b0f784b8ba3 --- /dev/null +++ b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch @@ -0,0 +1,41 @@ +From b8d91eab12603fa88e095248855f5f772d182d05 Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Wed, 5 Oct 2022 10:41:16 -0400 +Subject: [PATCH] Readline-8.2 patch 1: fix crash when readline is started with + an invalid locale specification + +[Upstream: https://git.savannah.gnu.org/cgit/readline.git/patch/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b + Stripped unrelated ._.gitignore change] +Signed-off-by: Peter Seiderer +--- + nls.c | 4 ++++ + patchlevel | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/nls.c b/nls.c +index 5c6a13b..8c027d6 100644 +--- a/nls.c ++++ b/nls.c +@@ -141,6 +141,10 @@ _rl_init_locale (void) + if (lspec == 0) + lspec = ""; + ret = setlocale (LC_CTYPE, lspec); /* ok, since it does not change locale */ ++ if (ret == 0 || *ret == 0) ++ ret = setlocale (LC_CTYPE, (char *)NULL); ++ if (ret == 0 || *ret == 0) ++ ret = RL_DEFAULT_LOCALE; + #else + ret = (lspec == 0 || *lspec == 0) ? RL_DEFAULT_LOCALE : lspec; + #endif +diff --git a/patchlevel b/patchlevel +index d8c9df7..fdf4740 100644 +--- a/patchlevel ++++ b/patchlevel +@@ -1,3 +1,3 @@ + # Do not edit -- exists only for use by patch + +-0 ++1 +-- +2.39.2 + From 5c3c5a6bbdf7f71f2632f2aeb02e6da79e5641f1 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Apr 2023 21:01:08 +0200 Subject: [PATCH 0061/1167] package/readline: fix "Upstream:" tag The test chckes that the "Upstream:" tag be on the first column, without any leading character (no space, no bracket of any kind). Signed-off-by: Yann E. MORIN (cherry picked from commit d89fdaea2b795ea0e06c3b7ed092d50950559fa8) Signed-off-by: Peter Korsgaard --- ...Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch index b0f784b8ba3..c2c2d812600 100644 --- a/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch +++ b/package/readline/0002-Readline-8.2-patch-1-fix-crash-when-readline-is-star.patch @@ -4,8 +4,8 @@ Date: Wed, 5 Oct 2022 10:41:16 -0400 Subject: [PATCH] Readline-8.2 patch 1: fix crash when readline is started with an invalid locale specification -[Upstream: https://git.savannah.gnu.org/cgit/readline.git/patch/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b - Stripped unrelated ._.gitignore change] +Upstream: https://git.savannah.gnu.org/cgit/readline.git/patch/?id=7274faabe97ce53d6b464272d7e6ab6c1392837b +[peter: stripped unrelated ._.gitignore change] Signed-off-by: Peter Seiderer --- nls.c | 4 ++++ From 6fab42da906eeeec84fe760369e4ad61c23dd1e0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 20:07:46 +0200 Subject: [PATCH 0062/1167] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.1.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit d79fce3edd69f0a92495042ca8ed2f777006f2f6) 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 5cbef197abb..690ee9c3392 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.14" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.26" 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 f45b244e6bc..43c9314a23f 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 a27076011efec7ad11e9ed0644f512c34cab4c5ed5ba42cfe71c83fabebe810d linux-6.1.14.tar.xz +sha256 dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110 linux-6.1.26.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 348d974c143fdef8517ec703fdaa24bade12a49047848be92cb9e3253b19ef98 linux-5.15.96.tar.xz -sha256 a2b51876befb8cc35724ed62820845f2b387d471a6cf46e8eedd0b6cb595825f linux-5.10.170.tar.xz -sha256 5a1e5754b4f2a4fe73b119d810ecda2ce07ecfb6f6cbbd16547c9ecd30b97627 linux-5.4.233.tar.xz +sha256 066c4bbcbe3c480068a2e302f52b1708f340ecaaf633ec43d7f791bbeac5771a linux-5.15.109.tar.xz +sha256 1bbd445c154b053eea46acc883be548a98179988a9ed3a0b81bddfbf30a37e29 linux-5.10.179.tar.xz +sha256 142f9aed1c9f2e409dd72c5c490ad824dddf31f955ed2097d5989c4b5074fc28 linux-5.4.242.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 4e1c1555c306874e0477d1af282d04a4efb285121456ab3f79519c92e406b701 linux-4.14.307.tar.xz -sha256 64a265a193c9e3e14d1397278e2348386ef6d6043af76d693c0fbbafed345ca8 linux-4.19.274.tar.xz +sha256 43a514997d3a9052b765a9e1c8fbf7f5a810771937f8754a529ed09e0e02e20b linux-4.19.282.tar.xz +sha256 876c01f0d12ad0147b5c9ee2de919bedc7ffb7c2714dbfb7ccf44426f6f49153 linux-4.14.314.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 ae40520c51f..e102369395f 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.307" if BR2_KERNEL_HEADERS_4_14 - default "4.19.274" if BR2_KERNEL_HEADERS_4_19 - default "5.4.233" if BR2_KERNEL_HEADERS_5_4 - default "5.10.170" if BR2_KERNEL_HEADERS_5_10 - default "5.15.96" if BR2_KERNEL_HEADERS_5_15 - default "6.1.14" if BR2_KERNEL_HEADERS_6_1 + default "4.14.314" if BR2_KERNEL_HEADERS_4_14 + default "4.19.282" if BR2_KERNEL_HEADERS_4_19 + default "5.4.242" if BR2_KERNEL_HEADERS_5_4 + default "5.10.179" if BR2_KERNEL_HEADERS_5_10 + default "5.15.109" if BR2_KERNEL_HEADERS_5_15 + default "6.1.26" if BR2_KERNEL_HEADERS_6_1 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 a5145ca1f88e3c92215ee188c096ed5f31853122 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 14:57:15 +0200 Subject: [PATCH 0063/1167] package/php: bump version to 8.2.5 Changelog: https://www.php.net/ChangeLog-8.php#8.2.4 https://www.php.net/ChangeLog-8.php#8.2.5 Release notes: https://news-web.php.net/php.announce/351 https://news-web.php.net/php.announce/352 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 1fb66e2852cb004ed31b54d28b5e12181d6d2df5) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 41aa3261562..6b1549958f8 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 b9b566686e351125d67568a33291650eb8dfa26614d205d70d82e6e92613d457 php-8.2.3.tar.xz +sha256 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 php-8.2.5.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 49f02d7f204..7cebc178fe2 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.3 +PHP_VERSION = 8.2.5 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 8117ff67d0550ca34dc6a43d97510d11f0609add Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 15:11:15 +0200 Subject: [PATCH 0064/1167] package/apache: security bump version to 2.4.57 Release notes: https://lists.apache.org/thread/lp9t6w2t0qsbbo14lylk2yvfj8hgfoh9 Changelog: https://downloads.apache.org/httpd/CHANGES_2.4.57 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 839c0c7d7ce5d197dce1bb281a401e843fcb1a3a) 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 36144917fba..1f0020f65a2 100644 --- a/package/apache/apache.hash +++ b/package/apache/apache.hash @@ -1,5 +1,5 @@ -# From https://downloads.apache.org/httpd/httpd-2.4.56.tar.bz2.{sha256,sha512} -sha256 d8d45f1398ba84edd05bb33ca7593ac2989b17cb9c7a0cafe5442d41afdb2d7c httpd-2.4.56.tar.bz2 -sha512 5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12 httpd-2.4.56.tar.bz2 +# From https://archive.apache.org/dist/httpd/httpd-2.4.57.tar.bz2.{sha256,sha512} +sha256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a httpd-2.4.57.tar.bz2 +sha512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155 httpd-2.4.57.tar.bz2 # Locally computed sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE diff --git a/package/apache/apache.mk b/package/apache/apache.mk index 80205a63620..320a6ad20ed 100644 --- a/package/apache/apache.mk +++ b/package/apache/apache.mk @@ -4,7 +4,7 @@ # ################################################################################ -APACHE_VERSION = 2.4.56 +APACHE_VERSION = 2.4.57 APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 APACHE_SITE = https://downloads.apache.org/httpd APACHE_LICENSE = Apache-2.0 From 65a935c50c23c908467e815050647860583a0dff Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 15:13:31 +0200 Subject: [PATCH 0065/1167] package/x11r7/xserver_xorg-server: security bump version to 21.1.8 Release notes: https://lists.x.org/archives/xorg-announce/2023-March/003377.html Fixes CVE-2023-1393: https://lists.x.org/archives/xorg-announce/2023-March/003374.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 83f6a498718dbb00684e3f954d96695557c3885f) Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.hash | 6 +++--- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index e2a2a251c33..092a640f04e 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-February/003321.html -sha256 d9c60b2dd0ec52326ca6ab20db0e490b1ff4f566f59ca742d6532e92795877bb xorg-server-21.1.7.tar.xz -sha512 e2a093381e28da9b2aa700c6609349fa851f4ca8df23c776f30e4e2733e7a6c1b257576b93f4c4e87fb09df901385bf52528982f6e7a6ad469597aeae8640bb5 xorg-server-21.1.7.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-March/003377.html +sha256 38aadb735650c8024ee25211c190bf8aad844c5f59632761ab1ef4c4d5aeb152 xorg-server-21.1.8.tar.xz +sha512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937 xorg-server-21.1.8.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 33b35b79797..593bbd42768 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.7 +XSERVER_XORG_SERVER_VERSION = 21.1.8 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From ba339be0f7a485b102ea30f37838d7d6fcad3dab Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 15:36:17 +0200 Subject: [PATCH 0066/1167] package/libxml2: security bump to version 2.10.4 - [CVE-2023-29469] Hashing of empty dict strings isn't deterministic - [CVE-2023-28484] Fix null deref in xmlSchemaFixupComplexType - schemas: Fix null-pointer-deref in xmlSchemaCheckCOSSTDerivedOK https://gitlab.gnome.org/GNOME/libxml2/-/tags/v2.10.4 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 162053090f891036106a5c70f423eb7fbdb8ca4a) 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 6957e2ed872..37030bdfaa7 100644 --- a/package/libxml2/libxml2.hash +++ b/package/libxml2/libxml2.hash @@ -1,4 +1,4 @@ -# From https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.3.sha256sum -sha256 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c libxml2-2.10.3.tar.xz +# From https://download.gnome.org/sources/libxml2/2.10/libxml2-2.10.4.sha256sum +sha256 ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45 libxml2-2.10.4.tar.xz # License files, locally calculated sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd Copyright diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 7a01dc4259c..cf26a36cc4b 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBXML2_VERSION_MAJOR = 2.10 -LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).3 +LIBXML2_VERSION = $(LIBXML2_VERSION_MAJOR).4 LIBXML2_SOURCE = libxml2-$(LIBXML2_VERSION).tar.xz LIBXML2_SITE = \ https://download.gnome.org/sources/libxml2/$(LIBXML2_VERSION_MAJOR) From 13cf1ba623a3e709754aeeb4299e39be50ff22f3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 12:55:11 +0200 Subject: [PATCH 0067/1167] package/intel-microcode: security bump version to 20230214 Release notes: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/blob/main/releasenote.md CVE-2022-21216 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00700.html CVE-2022-33196 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00738.html CVE-2022-38090 https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00767.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit f32673ff8defabd50ec6f59fdb77152161d6afc3) 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 56f02372772..acec71000fb 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8d14a914815f56c27b1f41be0fd699d1afcfdbc05432056427e455100798975e intel-microcode-20221108.tar.gz +sha256 3a3cfe2c7642339af9f4c2ad69f5f367dfa4cd1f7f9fd4124dedefb7803591d4 intel-microcode-20230214.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 787537da785..6e7d66f4820 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20221108 +INTEL_MICROCODE_VERSION = 20230214 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 1c15acd6bce3c528b3918f255dd75a07c4de9a2f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 14:24:20 +0200 Subject: [PATCH 0068/1167] package/ffmpeg: bump version to 4.4.4 Changelog: https://git.videolan.org/?p=ffmpeg.git;a=blob;f=Changelog;hb=refs/heads/release/4.4 Rebased all patches, switched _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 72edd5633ef65a7b26844770345e57918b278573) Signed-off-by: Peter Korsgaard --- .../0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch | 4 ++-- package/ffmpeg/0003-libavutil-Fix-mips-build.patch | 4 ++-- .../0004-configure-add-extralibs-to-extralibs_xxx.patch | 2 +- package/ffmpeg/Config.in | 2 +- package/ffmpeg/ffmpeg.hash | 2 +- package/ffmpeg/ffmpeg.mk | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch index 951ce4186d6..9c1baaa651d 100644 --- a/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch +++ b/package/ffmpeg/0001-swscale-x86-yuv2rgb-Fix-build-without-SSSE3.patch @@ -22,7 +22,7 @@ diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index c12e88cbb5..4791e5b93a 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c -@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) +@@ -71,6 +71,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) #if HAVE_X86ASM int cpu_flags = av_get_cpu_flags(); @@ -30,7 +30,7 @@ index c12e88cbb5..4791e5b93a 100644 if (EXTERNAL_SSSE3(cpu_flags)) { switch (c->dstFormat) { case AV_PIX_FMT_RGB32: -@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) +@@ -99,6 +100,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) return yuv420_rgb15_ssse3; } } diff --git a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch index 8b81e66981b..8dd689f5d0d 100644 --- a/package/ffmpeg/0003-libavutil-Fix-mips-build.patch +++ b/package/ffmpeg/0003-libavutil-Fix-mips-build.patch @@ -20,7 +20,7 @@ diff --git a/configure b/configure index 6bfd98b384..773a7d516c 100755 --- a/configure +++ b/configure -@@ -2161,6 +2161,7 @@ HEADERS_LIST=" +@@ -2135,6 +2135,7 @@ HEADERS_LIST=" opencv2_core_core_c_h OpenGL_gl3_h poll_h @@ -28,7 +28,7 @@ index 6bfd98b384..773a7d516c 100755 sys_param_h sys_resource_h sys_select_h -@@ -6218,6 +6219,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa +@@ -6182,6 +6183,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa check_headers windows.h check_headers X11/extensions/XvMClib.h check_headers asm/types.h diff --git a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch index dbc19c1cecb..3247ab08fe4 100644 --- a/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch +++ b/package/ffmpeg/0004-configure-add-extralibs-to-extralibs_xxx.patch @@ -17,7 +17,7 @@ diff --git a/configure b/configure index 0bb3a7cf2b..3bda99e415 100755 --- a/configure +++ b/configure -@@ -7602,15 +7602,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}") +@@ -7715,15 +7715,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}") source_path=${source_path} LIBPREF=${LIBPREF} LIBSUF=${LIBSUF} diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in index 2efef7dd86e..52029c2adeb 100644 --- a/package/ffmpeg/Config.in +++ b/package/ffmpeg/Config.in @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_FFMPEG FFmpeg is a complete, cross-platform solution to record, convert and stream audio and video. - http://www.ffmpeg.org + https://www.ffmpeg.org if BR2_PACKAGE_FFMPEG diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index c9d7ea7c41d..b18218cb48f 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,5 +1,5 @@ # Locally calculated -sha256 6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e ffmpeg-4.4.3.tar.xz +sha256 e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309 ffmpeg-4.4.4.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2 sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1 sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 136e3e24caf..59e13b503e8 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,9 +4,9 @@ # ################################################################################ -FFMPEG_VERSION = 4.4.3 +FFMPEG_VERSION = 4.4.4 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz -FFMPEG_SITE = http://ffmpeg.org/releases +FFMPEG_SITE = https://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES FFMPEG_LICENSE = LGPL-2.1+, libjpeg license From 754dc7b1b4a454b104f04eb6c29272ea3c69ea1f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 29 Apr 2023 01:06:17 +0200 Subject: [PATCH 0069/1167] Config.in.legacy: add missing binutils 2.36.x entry Commit [1] removed binutils 2.36.1 but forgot to add the legacy entry. [1] d08639e6b9e5b687c21c35041bb60a941fc7edb4 Signed-off-by: Romain Naour Cc: Waldemar Brodkorb Signed-off-by: Peter Korsgaard (cherry picked from commit 272bfb4cabe70e4251650f9fa27124c189eb835e) Signed-off-by: Peter Korsgaard --- Config.in.legacy | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Config.in.legacy b/Config.in.legacy index a31543d5fa1..64419a26153 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -325,6 +325,12 @@ config BR2_PACKAGE_USBREDIR_SERVER comment "Legacy options removed in 2022.11" +config BR2_BINUTILS_VERSION_2_36_X + bool "binutils 2.36.x has been removed" + select BR2_LEGACY + help + binutils 2.36 has been removed, use a newer version. + config BR2_PACKAGE_RABBITMQ_SERVER bool "rabbitmq-server removed" select BR2_LEGACY From 242cc8c7de068550ff6e0f128bff656c8d854ff9 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 29 Apr 2023 22:01:33 +0200 Subject: [PATCH 0070/1167] package/lua: bump to version 5.4.5 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 60d8e5257608098bd1d66c44282b04d02c733f75) Signed-off-by: Peter Korsgaard --- package/lua/5.4.4/lua.hash | 6 ------ package/lua/{5.4.4 => 5.4.5}/0001-root-path.patch | 2 +- package/lua/{5.4.4 => 5.4.5}/0002-shared-libs-for-lua.patch | 2 +- package/lua/{5.4.4 => 5.4.5}/0011-linenoise.patch | 2 +- package/lua/5.4.5/lua.hash | 5 +++++ package/lua/lua.mk | 2 +- 6 files changed, 9 insertions(+), 10 deletions(-) delete mode 100644 package/lua/5.4.4/lua.hash rename package/lua/{5.4.4 => 5.4.5}/0001-root-path.patch (95%) rename package/lua/{5.4.4 => 5.4.5}/0002-shared-libs-for-lua.patch (96%) rename package/lua/{5.4.4 => 5.4.5}/0011-linenoise.patch (97%) create mode 100644 package/lua/5.4.5/lua.hash diff --git a/package/lua/5.4.4/lua.hash b/package/lua/5.4.4/lua.hash deleted file mode 100644 index b55b17f2586..00000000000 --- a/package/lua/5.4.4/lua.hash +++ /dev/null @@ -1,6 +0,0 @@ -# Hashes from: https://www.lua.org/ftp/ -md5 bd8ce7069ff99a400efd14cf339a727b lua-5.4.4.tar.gz -sha1 03c27684b9d5d9783fb79a7c836ba1cdc5f309cd lua-5.4.4.tar.gz - -# Locally computed -sha256 2556ac7198243f9f83130b9c81016e1904f7b30351481f1c28e02475dbd237fb doc/readme.html diff --git a/package/lua/5.4.4/0001-root-path.patch b/package/lua/5.4.5/0001-root-path.patch similarity index 95% rename from package/lua/5.4.4/0001-root-path.patch rename to package/lua/5.4.5/0001-root-path.patch index c4f6e312eb0..5e3037b7865 100644 --- a/package/lua/5.4.4/0001-root-path.patch +++ b/package/lua/5.4.5/0001-root-path.patch @@ -6,7 +6,7 @@ Index: b/src/luaconf.h =================================================================== --- a/src/luaconf.h +++ b/src/luaconf.h -@@ -217,7 +217,7 @@ +@@ -223,7 +223,7 @@ #else /* }{ */ diff --git a/package/lua/5.4.4/0002-shared-libs-for-lua.patch b/package/lua/5.4.5/0002-shared-libs-for-lua.patch similarity index 96% rename from package/lua/5.4.4/0002-shared-libs-for-lua.patch rename to package/lua/5.4.5/0002-shared-libs-for-lua.patch index 4ff20442982..388aa9966a8 100644 --- a/package/lua/5.4.4/0002-shared-libs-for-lua.patch +++ b/package/lua/5.4.5/0002-shared-libs-for-lua.patch @@ -31,7 +31,7 @@ Index: b/src/Makefile --- a/src/Makefile +++ b/src/Makefile @@ -33,6 +33,7 @@ - PLATS= guess aix bsd c89 freebsd generic linux linux-readline macosx mingw posix solaris + PLATS= guess aix bsd c89 freebsd generic ios linux linux-readline macosx mingw posix solaris LUA_A= liblua.a +LUA_SO= liblua.so diff --git a/package/lua/5.4.4/0011-linenoise.patch b/package/lua/5.4.5/0011-linenoise.patch similarity index 97% rename from package/lua/5.4.4/0011-linenoise.patch rename to package/lua/5.4.5/0011-linenoise.patch index 68316e108f5..5054ae19e24 100644 --- a/package/lua/5.4.4/0011-linenoise.patch +++ b/package/lua/5.4.5/0011-linenoise.patch @@ -8,7 +8,7 @@ Index: b/src/lua.c =================================================================== --- a/src/lua.c +++ b/src/lua.c -@@ -428,6 +428,14 @@ +@@ -438,6 +438,14 @@ #define lua_saveline(L,line) ((void)L, add_history(line)) #define lua_freeline(L,b) ((void)L, free(b)) diff --git a/package/lua/5.4.5/lua.hash b/package/lua/5.4.5/lua.hash new file mode 100644 index 00000000000..5526cd51255 --- /dev/null +++ b/package/lua/5.4.5/lua.hash @@ -0,0 +1,5 @@ +# Hashes from: https://www.lua.org/ftp/ +sha256 59df426a3d50ea535a460a452315c4c0d4e1121ba72ff0bdde58c2ef31d6f444 lua-5.4.5.tar.gz + +# Locally computed +sha256 0d4ee721cf740f9cd878ef82ef75f4f2724dcf0403e56cd0b5643ad88f9de337 doc/readme.html diff --git a/package/lua/lua.mk b/package/lua/lua.mk index 16086e7bf4c..ecb86c11ed3 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.4 +LUA_VERSION = 5.4.5 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else From 802dba0f97e3231d0d3d0eee53ec172f380ca68a Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 24 Apr 2023 15:49:15 +0300 Subject: [PATCH 0071/1167] package/wpewebkit: security bump to version 2.38.6 Bugfix release with many security fixes, including (but not limited to) patches for CVE-2023-25358, CVE-2022-0108, CVE-2022-32885, CVE-2023-27932, CVE-2023-27954, and CVE-2023-28205. Release notes: https://wpewebkit.org/release/wpewebkit-2.38.6.html Accompanying security advisory: https://wpewebkit.org/security/WSA-2023-0003.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit b9c6684fa37f20d48645868a1e15bb831ca1ba85) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 0fa1018721b..d5f628e1ee1 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.5.tar.xz.sums -md5 73f7abd0c1cc808032869f72602166e3 wpewebkit-2.38.5.tar.xz -sha1 3f10a04758eeb349f63f841aff765dae25bcde1b wpewebkit-2.38.5.tar.xz -sha256 ff00fd3d0a4c6d551850a78a7dfe4883b6b7ebd93c5549e1121b2f43d3ac1661 wpewebkit-2.38.5.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.38.6.tar.xz.sums +md5 eb44d3132208218f3752170cae3220b8 wpewebkit-2.38.6.tar.xz +sha1 5c541a10e216d8d9ca48572b3dc0f82bfb2236c5 wpewebkit-2.38.6.tar.xz +sha256 dcb6591456393c5366ad9abc62a808137d4fea039cbc7ef4c8d64ead506d035b wpewebkit-2.38.6.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 48e5c2f8cdb..7b8ac67d924 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.5 +WPEWEBKIT_VERSION = 2.38.6 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From c1fab37709e5f8fedd783365bfd758c92623b531 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 24 Apr 2023 15:50:33 +0300 Subject: [PATCH 0072/1167] package/webkitgtk: security bump to version 2.38.6 Bugfix release with many security fixes, including (but not limited to) patches for CVE-2023-25358, CVE-2022-0108, CVE-2022-32885, CVE-2023-27932, CVE-2023-27954, and CVE-2023-28205. Release notes: https://webkitgtk.org/2023/04/20/webkitgtk2.38.6-released.html Accompanying security advisory: https://webkitgtk.org/security/WSA-2023-0003.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit d6b871e137f758466b0c24d1551144e8a4ef8822) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 8 ++++---- package/webkitgtk/webkitgtk.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index c771297b5a1..3bc521e4450 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,7 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.5.tar.xz.sums -md5 de05d314a3ecb5fb3835e4d84f8f466d webkitgtk-2.38.5.tar.xz -sha1 1774390c628bb3a524d4ed76f11de4a878078db6 webkitgtk-2.38.5.tar.xz -sha256 40c20c43022274df5893f22b1054fa894c3eea057389bb08aee08c5b0bb0c1a7 webkitgtk-2.38.5.tar.xz +# From https://webkitgtk.org/releases/webkitgtk-2.38.6.tar.xz.sums +md5 a50290fdc80842b1ae8be1e1147b5679 webkitgtk-2.38.6.tar.xz +sha1 4dfb3d96f621fc633ff347e083e429893551fb26 webkitgtk-2.38.6.tar.xz +sha256 1c614c9589389db1a79ea9ba4293bbe8ac3ab0a2234cac700935fae0724ad48b webkitgtk-2.38.6.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index 3263f7fea04..dd17b46e676 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.5 +WEBKITGTK_VERSION = 2.38.6 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES From 81a2daef27abe434b59fd21aa77b8a83d2506490 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Tue, 25 Apr 2023 09:33:41 +0200 Subject: [PATCH 0073/1167] package/sdl2: bump version to 2.26.5 Signed-off-by: Michael Fischer Signed-off-by: Peter Korsgaard (cherry picked from commit 4ed0608c8882a33f031d90b1278118be7d9d76d2) Signed-off-by: Peter Korsgaard --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index e26dcee3016..0c7bdf7fa10 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.3.tar.gz.sig -sha256 c661205a553b7d252425f4b751ff13209e5e020b876bbfa1598494af61790057 SDL2-2.26.3.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.26.5.tar.gz.sig +sha256 ad8fea3da1be64c83c45b1d363a6b4ba8fd60f5bde3b23ec73855709ec5eabf7 SDL2-2.26.5.tar.gz # Locally calculated sha256 9928507f684c1965d07f2b6ef4b4723d5efc2f6b4ab731f743a413c51c319927 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index c01f12d12cf..5f2e1e0ed18 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.26.3 +SDL2_VERSION = 2.26.5 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From f5dac8fc40fb62588df76657e0080975ec2b3819 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Mon, 17 Apr 2023 21:20:47 +0200 Subject: [PATCH 0074/1167] package/tcpdump: security bump to version 4.99.4 Fixes CVE-2023-1801 Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard (cherry picked from commit 19a35e72363e42b68d7a7a988d3baf747e7b8874) Signed-off-by: Peter Korsgaard --- package/tcpdump/tcpdump.hash | 2 +- package/tcpdump/tcpdump.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tcpdump/tcpdump.hash b/package/tcpdump/tcpdump.hash index e548e326269..1a22889851c 100644 --- a/package/tcpdump/tcpdump.hash +++ b/package/tcpdump/tcpdump.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature at # https://www.tcpdump.org/release/tcpdump-4.99.3.tar.gz.sig # using key 1F166A5742ABB9E0249A8D30E089DEF1D9C15D0D -sha256 ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3 tcpdump-4.99.3.tar.gz +sha256 0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea tcpdump-4.99.4.tar.gz sha256 8a54594d257e14a5260ac770f1633516cb51e3fc28c40136ce2697014eda7afd LICENSE diff --git a/package/tcpdump/tcpdump.mk b/package/tcpdump/tcpdump.mk index 7a679ce4bfd..91643e7beaa 100644 --- a/package/tcpdump/tcpdump.mk +++ b/package/tcpdump/tcpdump.mk @@ -4,7 +4,7 @@ # ################################################################################ -TCPDUMP_VERSION = 4.99.3 +TCPDUMP_VERSION = 4.99.4 TCPDUMP_SITE = https://www.tcpdump.org/release TCPDUMP_LICENSE = BSD-3-Clause TCPDUMP_LICENSE_FILES = LICENSE From a708a811c168ce74ae12f9544bb28b1983cc30b7 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:33 -0600 Subject: [PATCH 0075/1167] package/gstreamer1: bump to version 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit 42b9277479b3c0aeea927e919b5f55cb4041ed6a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gstreamer1/gstreamer1.hash | 4 ++-- package/gstreamer1/gstreamer1/gstreamer1.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gstreamer1/gstreamer1.hash b/package/gstreamer1/gstreamer1/gstreamer1.hash index db0ed5bede2..f74832ce6a3 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.hash +++ b/package/gstreamer1/gstreamer1/gstreamer1.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.0.tar.xz.sha256sum -sha256 78d21b5469ac93edafc6d8ceb63bc82f6cbbee94d2f866cca6b9252157ee0a09 gstreamer-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.22.2.tar.xz.sha256sum +sha256 b2afe73603921c608ba48969dbb7d743776744bfe5d8059ece241137b7f88e21 gstreamer-1.22.2.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1/gstreamer1.mk index 09d1a10ce75..8584735129e 100644 --- a/package/gstreamer1/gstreamer1/gstreamer1.mk +++ b/package/gstreamer1/gstreamer1/gstreamer1.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_VERSION = 1.22.0 +GSTREAMER1_VERSION = 1.22.2 GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer GSTREAMER1_INSTALL_STAGING = YES From a5c1c1d8848f62445ee4830a23f555dd0a3a707c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:34 -0600 Subject: [PATCH 0076/1167] package/gst1-plugins-base: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit 7812b591252652d35903cfc36b767a6339dbf343) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash | 4 ++-- package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash index bac4f8398ac..173f359afcd 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.0.tar.xz.sha256sum -sha256 f53672294f3985d56355c8b1df8f6b49c8c8721106563e19f53be3507ff2229d gst-plugins-base-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.22.2.tar.xz.sha256sum +sha256 eb65120c4ee79b7a153c3c1972d5c0158c2151877cc51ec7725bba5749679d49 gst-plugins-base-1.22.2.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 7d509331fe4..153187f743d 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BASE_VERSION = 1.22.0 +GST1_PLUGINS_BASE_VERSION = 1.22.2 GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base GST1_PLUGINS_BASE_INSTALL_STAGING = YES From 2d95bb06f0c80ea063ad3ac4192b2a0a31c05863 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:35 -0600 Subject: [PATCH 0077/1167] package/gst1-plugins-good: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit 9b279b66991bcdcfca3d1fed6cd1865c244a558a) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash | 4 ++-- package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash index 3e219faad86..604e74b57d9 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.0.tar.xz.sha256sum -sha256 582e617271e7f314d1a2211e3e3856ae2e4303c8c0d6114e9c4a5ea5719294b0 gst-plugins-good-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.2.tar.xz.sha256sum +sha256 7c8cc59425f2b232f60ca7d13e56edd615da4f711e73dd01a7cffa46e6bc0cdd gst-plugins-good-1.22.2.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk index 93c2328bdac..bbcd3aecabd 100644 --- a/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ b/package/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_GOOD_VERSION = 1.22.0 +GST1_PLUGINS_GOOD_VERSION = 1.22.2 GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING From fc2aef38ee0a024e2e18859fffddf6944ffef233 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:36 -0600 Subject: [PATCH 0078/1167] package/gst1-plugins-bad: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit aab52c395e12119c233f60fea1e6e9a6a64eec9e) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash | 4 ++-- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash index 90b3a18982b..2bbb8af9047 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.0.tar.xz.sha256sum -sha256 3c9d9300f5f4fb3e3d36009379d1fb6d9ecd79c1a135df742b8a68417dd663a1 gst-plugins-bad-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.22.2.tar.xz.sha256sum +sha256 3d8faf1ce3402c8535ce3a8c4e1a6c960e4b5655dbda6b55943db9ac79022d0f gst-plugins-bad-1.22.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index edac8189859..1713f0b4b84 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_BAD_VERSION = 1.22.0 +GST1_PLUGINS_BAD_VERSION = 1.22.2 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES From 5306eebf3b170a46f792cc82f6eef3b6de8c5ebf Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:37 -0600 Subject: [PATCH 0079/1167] package/gst1-plugins-ugly: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit 1155c854dcc942dbe9e943760d58fd0240105770) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash | 4 ++-- package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash index 21579216df0..ed781df686f 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.0.tar.xz.sha256sum -sha256 a644dc981afa2d8d3a913f763ab9523c0620ee4e65a7ec73c7721c29da3c5a0c gst-plugins-ugly-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.22.2.tar.xz.sha256sum +sha256 8f30f44db0bd063709bf6fbe55138e3a98af0abcb61c360f35582bbe10e80691 gst-plugins-ugly-1.22.2.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING diff --git a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk index 9f16fa3da8f..f1566b058e6 100644 --- a/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ b/package/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PLUGINS_UGLY_VERSION = 1.22.0 +GST1_PLUGINS_UGLY_VERSION = 1.22.2 GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING From 0ece37e28ddabb49223438698bcdbe55397be200 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:38 -0600 Subject: [PATCH 0080/1167] package/gst1-devtools: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit e375104371314ea90ee01771a1a2511eeb301c47) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-devtools/gst1-devtools.hash | 4 ++-- package/gstreamer1/gst1-devtools/gst1-devtools.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.hash b/package/gstreamer1/gst1-devtools/gst1-devtools.hash index 46480445abb..4abdd6ece4b 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.hash +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.0.tar.xz.sha256sum -sha256 4d21fee5c15f2877c0b1f6c2da0cdba67ce7caab2c199ab27e91a1394d5ba195 gst-devtools-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-1.22.2.tar.xz.sha256sum +sha256 eb62726d3e27a8782369a24fd6364a8885ed2462b3bbdab091dffc8139ee06d8 gst-devtools-1.22.2.tar.xz sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 validate/COPYING diff --git a/package/gstreamer1/gst1-devtools/gst1-devtools.mk b/package/gstreamer1/gst1-devtools/gst1-devtools.mk index 8fd3321d9e8..7801f9b62c7 100644 --- a/package/gstreamer1/gst1-devtools/gst1-devtools.mk +++ b/package/gstreamer1/gst1-devtools/gst1-devtools.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_DEVTOOLS_VERSION = 1.22.0 +GST1_DEVTOOLS_VERSION = 1.22.2 GST1_DEVTOOLS_SOURCE = gst-devtools-$(GST1_DEVTOOLS_VERSION).tar.xz GST1_DEVTOOLS_SITE = https://gstreamer.freedesktop.org/src/gst-devtools GST1_DEVTOOLS_LICENSE = LGPL-2.1+ From 7f2352031953ef234f068f1aad6bd19c50721872 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:39 -0600 Subject: [PATCH 0081/1167] package/gst1-libav: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit d34c0b3df4b8ccec9cc95502254a6e48f4797bec) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-libav/gst1-libav.hash | 4 ++-- package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-libav/gst1-libav.hash b/package/gstreamer1/gst1-libav/gst1-libav.hash index c2c58ab2fe9..c3e84a17d21 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.hash +++ b/package/gstreamer1/gst1-libav/gst1-libav.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.0.tar.xz.sha256sum -sha256 0e48407b4905227a260213dbda84cba3812f0530fc7a75b43829102ef82810f1 gst-libav-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.22.2.tar.xz.sha256sum +sha256 fcaaf9878fe8f3bc82317ef13a1558824cb68df1f8968c6797f556c5e33bcffd gst-libav-1.22.2.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING diff --git a/package/gstreamer1/gst1-libav/gst1-libav.mk b/package/gstreamer1/gst1-libav/gst1-libav.mk index d4b3873af11..0306db42c0a 100644 --- a/package/gstreamer1/gst1-libav/gst1-libav.mk +++ b/package/gstreamer1/gst1-libav/gst1-libav.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_LIBAV_VERSION = 1.22.0 +GST1_LIBAV_VERSION = 1.22.2 GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav GST1_LIBAV_LICENSE = LGPL-2.1+ From 2a6404684e37994d694dd09e3533c81b36fafbb4 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:40 -0600 Subject: [PATCH 0082/1167] package/gst1-vaapi: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit 2231878df246a81b885e3c49108fde53d7e2bf99) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-vaapi/gst1-vaapi.hash | 4 ++-- package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash index 6dec625c935..2fdec4e83fa 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.0.tar.xz.sha256sum -sha256 593ccad19f88e5fa29f40f98356c007806bd535828707b1406944d16a90bdff5 gstreamer-vaapi-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-1.22.2.tar.xz.sha256sum +sha256 d2e642f9745f97d9f73a7f5085e7659a9a31fe209b774e6e45dae041b435df06 gstreamer-vaapi-1.22.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 9533cdf2b60..cae239094a3 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_VAAPI_VERSION = 1.22.0 +GST1_VAAPI_VERSION = 1.22.2 GST1_VAAPI_SITE = https://gstreamer.freedesktop.org/src/gstreamer-vaapi GST1_VAAPI_SOURCE = gstreamer-vaapi-$(GST1_VAAPI_VERSION).tar.xz GST1_VAAPI_LICENSE = LGPL-2.1+ From 7f0dac02345547724f1d1a84bd9d220add826ffc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:41 -0600 Subject: [PATCH 0083/1167] package/gst1-rtsp-server: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit e796e5a70be0a78c1a4cf70582f006f05bf33712) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash | 4 ++-- package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash index f37e7bb292b..c98d10d79c0 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash @@ -1,4 +1,4 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.0.tar.xz.sha256sum -sha256 aea24eeb59ee5fadfac355de2f7cecb51966c3e147e5ad7cfb4c314f1a4086ed gst-rtsp-server-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.22.2.tar.xz.sha256sum +sha256 2be4aecfb88710100ea7115ed0216403e8094344ebf146094271b8d4d73828bf gst-rtsp-server-1.22.2.tar.xz sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING sha256 ad2eec519ebd4b5df86ea84dff24ae3bfa2edea846a703b58902dd221ae375db COPYING.LIB diff --git a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk index 6b4bd49fded..6f5fc4f7aad 100644 --- a/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ b/package/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_RTSP_SERVER_VERSION = 1.22.0 +GST1_RTSP_SERVER_VERSION = 1.22.2 GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server GST1_RTSP_SERVER_LICENSE = LGPL-2.1+ From cb7d10bcbe6f5d7723ef8611c5eff613b5c34d7c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:42 -0600 Subject: [PATCH 0084/1167] package/gstreamer1-editing-services: bump version to 1.22.2 Drop patch which is now upstream. Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit e4fb09f95f8dbac5c21026392ae0bcc91f17585f) Signed-off-by: Peter Korsgaard --- ...treamer-validate-1.0-dependency-name.patch | 35 ------------------- .../gstreamer1-editing-services.hash | 4 +-- .../gstreamer1-editing-services.mk | 2 +- 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch diff --git a/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch b/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch deleted file mode 100644 index 6c190d37273..00000000000 --- a/package/gstreamer1/gstreamer1-editing-services/0001-Fix-gstreamer-validate-1.0-dependency-name.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c3edd999195445319ea619b6d719d7743f5b560d Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Tue, 31 Jan 2023 21:38:09 -0700 -Subject: [PATCH] Fix gstreamer-validate-1.0 dependency name - -The gst-devtools project generates gstreamer-validate-1.0.pc, this -must match the dependency in gst-editing-services for detection -to work properly. - -Fixes: -Run-time dependency gst-validate-1.0 found: NO (tried pkgconfig and cmake) - -Signed-off-by: James Hilliard -[Upstream status: -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3859] ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index bdc47f5d8b..b949f55317 100644 ---- a/meson.build -+++ b/meson.build -@@ -110,7 +110,7 @@ if host_machine.system() != 'windows' - endif - gstcontroller_dep = dependency('gstreamer-controller-1.0', version : gst_req, - fallback : ['gstreamer', 'gst_controller_dep']) --gstvalidate_dep = dependency('gst-validate-1.0', version : gst_req, required : get_option('validate'), -+gstvalidate_dep = dependency('gstreamer-validate-1.0', version : gst_req, required : get_option('validate'), - fallback : ['gst-devtools', 'validate_dep']) - - gio_dep = dependency('gio-2.0', version: glib_req) --- -2.34.1 - diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash index bd5dcfdbafb..0cdb18ea5d1 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.hash @@ -1,5 +1,5 @@ -# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.0.tar.xz.sha256sum -sha256 2a23856379af03586b66c193910fa8bb963024580bc2337c7405578dc077aa79 gst-editing-services-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gstreamer-editing-services/gst-editing-services-1.22.2.tar.xz.sha256sum +sha256 453b1464fc3857de269a7cb0ebd966afe02171d97bef672a0b8a0a6d43e0cebf gst-editing-services-1.22.2.tar.xz # Hashes for license files: sha256 f445dc78b88496f7e20c7a2a461b95baba5865c8919b8289ac24ac0a80c6ce7a COPYING diff --git a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk index 0ae9205c3b4..9fdc877db04 100644 --- a/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk +++ b/package/gstreamer1/gstreamer1-editing-services/gstreamer1-editing-services.mk @@ -4,7 +4,7 @@ # ################################################################################ -GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.0 +GSTREAMER1_EDITING_SERVICES_VERSION = 1.22.2 GSTREAMER1_EDITING_SERVICES_SOURCE = gst-editing-services-$(GSTREAMER1_EDITING_SERVICES_VERSION).tar.xz GSTREAMER1_EDITING_SERVICES_SITE = https://gstreamer.freedesktop.org/src/gstreamer-editing-services GSTREAMER1_EDITING_SERVICES_LICENSE = LGPL-2.0+ From 1781226e5c7c2dd0c2aa0febbb2a432f28a059ea Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:43 -0600 Subject: [PATCH 0085/1167] package/gst-omx: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit e29fff83887063240485e14c1e690a2eb458cf1f) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst-omx/gst-omx.hash | 4 ++-- package/gstreamer1/gst-omx/gst-omx.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst-omx/gst-omx.hash b/package/gstreamer1/gst-omx/gst-omx.hash index 51ea74a0cb6..d4a95c631a7 100644 --- a/package/gstreamer1/gst-omx/gst-omx.hash +++ b/package/gstreamer1/gst-omx/gst-omx.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.0.tar.xz.sha256sum -sha256 dbc951a99af532380e599aa8acd9e1385fdb299b46b5868cd2be4230ad888341 gst-omx-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.22.2.tar.xz.sha256sum +sha256 1b0c57f2cc4ddeec5e7f0c436e502f06665c4e93c73261855b94e04fc94337b2 gst-omx-1.22.2.tar.xz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/gstreamer1/gst-omx/gst-omx.mk b/package/gstreamer1/gst-omx/gst-omx.mk index 6f7168279b3..87f162f7150 100644 --- a/package/gstreamer1/gst-omx/gst-omx.mk +++ b/package/gstreamer1/gst-omx/gst-omx.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST_OMX_VERSION = 1.22.0 +GST_OMX_VERSION = 1.22.2 GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx From a07e9f253d9f5a771b236a735d711379404f4ade Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Wed, 19 Apr 2023 02:31:44 -0600 Subject: [PATCH 0086/1167] package/gst1-python: bump version to 1.22.2 Signed-off-by: James Hilliard Signed-off-by: Peter Korsgaard (cherry picked from commit 8fb9e8ca6bea3f99e167911ae1e79da314614ae3) Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-python/gst1-python.hash | 4 ++-- package/gstreamer1/gst1-python/gst1-python.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gstreamer1/gst1-python/gst1-python.hash b/package/gstreamer1/gst1-python/gst1-python.hash index 128a739c2ca..006d4985efb 100644 --- a/package/gstreamer1/gst1-python/gst1-python.hash +++ b/package/gstreamer1/gst1-python/gst1-python.hash @@ -1,3 +1,3 @@ -# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.0.tar.xz.sha256sum -sha256 6c63ad364ca4617eb2cbb3975ab26c66760eb3c7a6adf5be69f99c11e21ef3a5 gst-python-1.22.0.tar.xz +# From https://gstreamer.freedesktop.org/src/gst-python/gst-python-1.22.2.tar.xz.sha256sum +sha256 bef2b3d82ce4be46b775b1bb56305c1003ee01b535a53a82f9fe8924972153ad gst-python-1.22.2.tar.xz sha256 ea3ad127610e5ded2210b3a86a46314f2b3b28e438eccffdae19a4d6fbcdb0c2 COPYING diff --git a/package/gstreamer1/gst1-python/gst1-python.mk b/package/gstreamer1/gst1-python/gst1-python.mk index 2fc268b0aca..527d1017868 100644 --- a/package/gstreamer1/gst1-python/gst1-python.mk +++ b/package/gstreamer1/gst1-python/gst1-python.mk @@ -4,7 +4,7 @@ # ################################################################################ -GST1_PYTHON_VERSION = 1.22.0 +GST1_PYTHON_VERSION = 1.22.2 GST1_PYTHON_SOURCE = gst-python-$(GST1_PYTHON_VERSION).tar.xz GST1_PYTHON_SITE = https://gstreamer.freedesktop.org/src/gst-python GST1_PYTHON_INSTALL_STAGING = YES From b25cfba01e5bd3d46a725c3f8955963a428951d6 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 27 Mar 2023 23:07:20 +0200 Subject: [PATCH 0087/1167] package/rtl8723ds: fix typo CLAGS renaming with CFLAGS Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard (cherry picked from commit 7c30ba90ce581b3cb8ac9b0ba304fddab20d4ba6) Signed-off-by: Peter Korsgaard --- package/rtl8723ds/rtl8723ds.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8723ds/rtl8723ds.mk b/package/rtl8723ds/rtl8723ds.mk index 1bb164fa86d..f62ce2bf6c7 100644 --- a/package/rtl8723ds/rtl8723ds.mk +++ b/package/rtl8723ds/rtl8723ds.mk @@ -9,7 +9,7 @@ RTL8723DS_SITE = $(call github,lwfinger,rtl8723ds,$(RTL8723DS_VERSION)) RTL8723DS_LICENSE = GPL-2.0 RTL8723DS_LICENSE_FILES = COPYING -RTL8723DS_USER_EXTRA_CLAGS = \ +RTL8723DS_USER_EXTRA_CFLAGS = \ -DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ -DCONFIG_IOCTL_CFG80211 \ -DRTW_USE_CFG80211_STA_EVENT \ @@ -20,7 +20,7 @@ RTL8723DS_MODULE_MAKE_OPTS = \ CONFIG_RTL8723DS=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) \ - USER_EXTRA_CFLAGS="$(RTL8723DS_USER_EXTRA_CLAGS)" + USER_EXTRA_CFLAGS="$(RTL8723DS_USER_EXTRA_CFLAGS)" define RTL8723DS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_NET) From cfaf4ec64f4c2d239418659ef072a571f38d88c3 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 27 Mar 2023 20:27:21 +0200 Subject: [PATCH 0088/1167] package/rtl8189fs: bump to version 2023-03-27 on rtl8189fs branch Fixes: http://autobuild.buildroot.net/results/a1c/a1c4c386e60a082d30cae686b9e1d27d01046266/ Signed-off-by: Giulio Benetti Signed-off-by: Peter Korsgaard (cherry picked from commit 0bd9dabec58eb0d1208333eea7412a6703524fee) Signed-off-by: Peter Korsgaard --- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 018e5b8a778..95a031b6f29 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 20382dbb1ac33425e6b3198cc9be269b79cd1423ea656e0ccd16dedafa3e2a2a rtl8189fs-ed6741b52bc998875298117b55d18b0d557c37a6.tar.gz +sha256 5d8aad48b8d124a313e5b8182c5dba2b94ecdbac2a9f1861a50c081b9034a543 rtl8189fs-c223a25b1000d64432eca4201a8f012414dfc7ce.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index 2dd9e6097c5..dd35a166e53 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = ed6741b52bc998875298117b55d18b0d557c37a6 +RTL8189FS_VERSION = c223a25b1000d64432eca4201a8f012414dfc7ce RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 From 93b506f33793209c9bf0757e5a7ca6e3fa06a28c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 2 Apr 2023 11:05:00 +0200 Subject: [PATCH 0089/1167] package/zeek: disable with libressl Disable building with libressl to avoid the following build failure raised since the addition of the package in commit ea36681572255ec906167308c07adc42ed2ac9f9: In file included from /home/thomas/autobuild/instance-2/output-1/build/zeek-4.1.1/src/analyzer/protocol/mime/MIME.cc:7: /home/thomas/autobuild/instance-2/output-1/build/zeek-4.1.1/src/zeek/digest.h: In function 'void* EVP_MD_CTX_md_data(const EVP_MD_CTX*)': /home/thomas/autobuild/instance-2/output-1/build/zeek-4.1.1/src/zeek/digest.h:22:12: error: invalid use of incomplete type 'const EVP_MD_CTX' {aka 'const struct env_md_ctx_st'} 22 | return ctx->md_data; | ^~ Fixes: - http://autobuild.buildroot.org/results/2db2988d495f9d06d058fb532a2dcfa9ef6e207c Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard (cherry picked from commit 5b63325e86a034b63075f01a2ddbb7c5b1f67dc1) Signed-off-by: Peter Korsgaard --- package/zeek/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/zeek/Config.in b/package/zeek/Config.in index 114ec4235de..730388ded75 100644 --- a/package/zeek/Config.in +++ b/package/zeek/Config.in @@ -10,6 +10,7 @@ config BR2_PACKAGE_ZEEK select BR2_PACKAGE_LIBPCAP select BR2_PACKAGE_MUSL_FTS if !BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_OPENSSL + select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL select BR2_PACKAGE_ZLIB help The Zeek Network Security Monitor From fbdad6a5ff6605b0877f2a2f580518c9918f818f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 1 May 2023 19:12:33 +0200 Subject: [PATCH 0090/1167] package/samba4: security bump version to 4.15.13 Release notes: https://www.samba.org/samba/history/samba-4.15.13.html Fixes CVE-2022-37966, CVE-2022-37967, CVE-2022-38023 & CVE-2022-45141. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 734cc8e951e899a88867feb83b0bf087a7d6b542) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 81cbab45527..18ec63e07a5 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.12.tar.asc -sha256 5889493d69dc7723be6c3154387fbed38c1cddf93a16da8670d99b7cca33b15e samba-4.15.12.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.15.13.tar.asc +sha256 c412e3536a5265d04e52983e643bae9e047bcc3eac08683a945b1057ecdf4968 samba-4.15.13.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 31f692e03d7..b979aaf09f6 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.12 +SAMBA4_VERSION = 4.15.13 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 02dd429870d48192c83ca0bd4a2c610749377fec Mon Sep 17 00:00:00 2001 From: James Knight Date: Sat, 29 Apr 2023 15:05:50 -0400 Subject: [PATCH 0091/1167] package/systemd: update help links When browsing the help references for various systemd features, it was observed that the `systemd-rfkill` link was dead (originally pointing to `systemd-rfkill@.service.html`; now `systemd-rfkill.service.html`). This commit corrects this link, as well as updates all other links to https (since freedesktop.org now force redirects to https). Signed-off-by: James Knight Signed-off-by: Peter Korsgaard (cherry picked from commit 8520da532b5ce366c10eb22dbbe65bf2f85ff072) Signed-off-by: Peter Korsgaard --- package/systemd/Config.in | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 9f4d933779e..bea717a4560 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -100,7 +100,7 @@ menuconfig BR2_PACKAGE_SYSTEMD the apropriate ones (e.g. e2fsck, from the e2fsprogs package) according to the system configuration. - http://freedesktop.org/wiki/Software/systemd + https://freedesktop.org/wiki/Software/systemd/ if BR2_PACKAGE_SYSTEMD @@ -185,7 +185,7 @@ config BR2_PACKAGE_SYSTEMD_BACKLIGHT systemd-backlight is a service that restores the display backlight brightness at early boot and saves it at shutdown. - http://www.freedesktop.org/software/systemd/man/systemd-backlight@.service.html + https://www.freedesktop.org/software/systemd/man/systemd-backlight@.service.html config BR2_PACKAGE_SYSTEMD_BINFMT bool "enable binfmt tool" @@ -202,7 +202,7 @@ config BR2_PACKAGE_SYSTEMD_COREDUMP kernel when a user space program receives a fatal signal and dumps core. - http://www.freedesktop.org/software/systemd/man/systemd-coredump.html + https://www.freedesktop.org/software/systemd/man/systemd-coredump.html config BR2_PACKAGE_SYSTEMD_PSTORE bool "enable pstore support" @@ -220,7 +220,7 @@ config BR2_PACKAGE_SYSTEMD_FIRSTBOOT systemd-firstboot initializes the most basic system settings interactively on the first boot. - http://www.freedesktop.org/software/systemd/man/systemd-firstboot.html + https://www.freedesktop.org/software/systemd/man/systemd-firstboot.html config BR2_PACKAGE_SYSTEMD_HIBERNATE bool "enable hibernation support" @@ -229,7 +229,7 @@ config BR2_PACKAGE_SYSTEMD_HIBERNATE When this features is enabled, additional tools and services are built to support suspending and resuming the system. - http://www.freedesktop.org/software/systemd/man/systemd-sleep.html + https://www.freedesktop.org/software/systemd/man/systemd-sleep.html config BR2_PACKAGE_SYSTEMD_HOMED bool "enable home daemon" @@ -261,7 +261,7 @@ config BR2_PACKAGE_SYSTEMD_HOSTNAMED systemd-hostnamed is a system service that may be used as a mechanism to change the system's hostname. - http://www.freedesktop.org/software/systemd/man/systemd-hostnamed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-hostnamed.service.html config BR2_PACKAGE_SYSTEMD_HWDB bool "enable hwdb installation" @@ -286,7 +286,7 @@ config BR2_PACKAGE_SYSTEMD_IMPORTD machine and container images for systemd-machined and machinectl. - http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands + https://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands config BR2_PACKAGE_SYSTEMD_CATALOGDB bool "enable journal catalog database installation" @@ -309,14 +309,14 @@ config BR2_PACKAGE_SYSTEMD_LOCALED mechanism to change the system locale settings, as well as the console key mapping and default X11 key mapping. - http://www.freedesktop.org/software/systemd/man/systemd-localed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-localed.service.html config BR2_PACKAGE_SYSTEMD_LOGIND bool "enable login daemon" help systemd-logind is a system service that manages user logins. - http://www.freedesktop.org/software/systemd/man/systemd-logind.service.html + https://www.freedesktop.org/software/systemd/man/systemd-logind.service.html config BR2_PACKAGE_SYSTEMD_MACHINED bool "enable machine daemon" @@ -325,7 +325,7 @@ config BR2_PACKAGE_SYSTEMD_MACHINED virtual machines and containers, and processes belonging to them. - http://www.freedesktop.org/software/systemd/man/systemd-machined.service.html + https://www.freedesktop.org/software/systemd/man/systemd-machined.service.html config BR2_PACKAGE_SYSTEMD_MYHOSTNAME bool "enable myhostname NSS plugin" @@ -336,7 +336,7 @@ config BR2_PACKAGE_SYSTEMD_MYHOSTNAME primarily providing hostname resolution for the locally configured system hostname as returned by gethostname(2). - http://www.freedesktop.org/software/systemd/man/nss-myhostname.html + https://www.freedesktop.org/software/systemd/man/nss-myhostname.html config BR2_PACKAGE_SYSTEMD_NETWORKD bool "enable network manager" @@ -349,7 +349,7 @@ config BR2_PACKAGE_SYSTEMD_NETWORKD This simple network configuration solution is an alternative to dhcpcd or ISC dhcp. - http://www.freedesktop.org/software/systemd/man/systemd-networkd.html + https://www.freedesktop.org/software/systemd/man/systemd-networkd.html config BR2_PACKAGE_SYSTEMD_OOMD bool "enable out-of-memory killer" @@ -373,7 +373,7 @@ config BR2_PACKAGE_SYSTEMD_POLKIT useful for allowing unprivileged processes to speak to systemd's many privileged processes. - http://wiki.freedesktop.org/www/Software/polkit/ + https://wiki.freedesktop.org/www/Software/polkit/ comment "polkit support needs a toolchain with threads, wchar, gcc >= 7" depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ @@ -408,7 +408,7 @@ config BR2_PACKAGE_SYSTEMD_QUOTACHECK file systems are mounted. It is pulled in only if at least one file system has quotas enabled. - http://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html + https://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html config BR2_PACKAGE_SYSTEMD_RANDOMSEED bool "enable random-seed support" @@ -418,7 +418,7 @@ config BR2_PACKAGE_SYSTEMD_RANDOMSEED shutdown. Saving/restoring the random seed across boots increases the amount of available entropy early at boot. - http://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html + https://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html config BR2_PACKAGE_SYSTEMD_REPART bool "enable repart support" @@ -440,7 +440,7 @@ config BR2_PACKAGE_SYSTEMD_RESOLVED caching and validating DNS/DNSSEC stub resolver, as well as an LLMNR resolver and responder. - http://www.freedesktop.org/software/systemd/man/systemd-resolved.html + https://www.freedesktop.org/software/systemd/man/systemd-resolved.html config BR2_PACKAGE_SYSTEMD_RFKILL bool "enable rfkill tools" @@ -448,7 +448,7 @@ config BR2_PACKAGE_SYSTEMD_RFKILL systemd-rfkill is a service that restores the RF kill switch state at early boot and saves it at shutdown. - http://www.freedesktop.org/software/systemd/man/systemd-rfkill@.service.html + https://www.freedesktop.org/software/systemd/man/systemd-rfkill.service.html config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT bool "enable SMACK support" @@ -503,7 +503,7 @@ config BR2_PACKAGE_SYSTEMD_SYSUSERS systemd-sysusers creates system users and groups, based on the file format and location specified in sysusers.d(5). - http://www.freedesktop.org/software/systemd/man/systemd-sysusers.html + https://www.freedesktop.org/software/systemd/man/systemd-sysusers.html config BR2_PACKAGE_SYSTEMD_TIMEDATED bool "enable timedate daemon" @@ -513,7 +513,7 @@ config BR2_PACKAGE_SYSTEMD_TIMEDATED mechanism to change the system clock and timezone, as well as to enable/disable NTP time synchronization. - http://www.freedesktop.org/software/systemd/man/systemd-timedated.service.html + https://www.freedesktop.org/software/systemd/man/systemd-timedated.service.html config BR2_PACKAGE_SYSTEMD_TIMESYNCD bool "enable timesync daemon" @@ -526,7 +526,7 @@ config BR2_PACKAGE_SYSTEMD_TIMESYNCD This simple NTP solution is an alternative to sntp/ntpd from the ntp package. - http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html + https://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html config BR2_PACKAGE_SYSTEMD_USERDB bool "enable userdb daemon" @@ -567,6 +567,6 @@ config BR2_PACKAGE_SYSTEMD_VCONSOLE systemd-vconsole-setup is an early boot service that configures the virtual console font and console keymap. - http://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html + https://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html endif From 93d44d957143b0a0776962e6a2a633c81cb65d3a Mon Sep 17 00:00:00 2001 From: James Knight Date: Tue, 25 Apr 2023 00:33:52 -0400 Subject: [PATCH 0092/1167] package/libcurl: drop override of LD_LIBRARY_PATH A previous commit [1] (libcurl 7.19.2) configured `LD_LIBRARY_PATH` to prevent cross-compiling errors when target == host; however, such an override is no longer needed [2][3] (libcurl 7.37, 7.74) and causes build errors in some environments. Dropping the override. Fixes: - https://bugs.busybox.net/show_bug.cgi?id=15181 [1]: a51ce3194923430fc229fc2ad98b12795b5a1876 [2]: https://github.com/curl/curl/commit/e48a821ed580cd2897b3e1b0bc88ca9245ac234c [3]: https://github.com/curl/curl/commit/6f3369bbcf9d0ebdaa5d141f8ca446448c24494c Signed-off-by: James Knight Signed-off-by: Yann E. MORIN (cherry picked from commit 6b6814f149cccfb4ae7f34fbfd317560b6cd98ca) Signed-off-by: Peter Korsgaard --- package/libcurl/libcurl.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 1a1594a45e2..dd715c1bb67 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -56,11 +56,6 @@ endif ifeq ($(BR2_PACKAGE_LIBCURL_OPENSSL),y) LIBCURL_DEPENDENCIES += openssl -# configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up -# native stuff during the rest of configure when target == host. -# Fix it by setting LD_LIBRARY_PATH to something sensible so those libs -# are found first. -LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)/lib:/usr/lib LIBCURL_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr \ --with-ca-path=/etc/ssl/certs else From aa6e00367fecbcc8fda9eeee3c9a288c9cb133e0 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 8 Mar 2023 09:50:55 +0100 Subject: [PATCH 0093/1167] package/libgtk3: bump to version 3.24.37 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni (cherry picked from commit c4a2c66f6c9b479cedfde8774ac0ac386345334d) 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 9fed2c9df2e..22c37bf6056 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.36.sha256sum -sha256 27a6ef157743350c807ffea59baa1d70226dbede82a5e953ffd58ea6059fe691 gtk+-3.24.36.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.37.sha256sum +sha256 6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57 gtk+-3.24.37.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 283c129cef9..18a8a9fa428 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).36 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).37 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From 3232298f1ebc8402b36256a15e37458ec85bff82 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Fri, 28 Apr 2023 21:02:00 +0200 Subject: [PATCH 0094/1167] package/libgtk3: fix cups backend When explicitly specifying printing backends libgtk3 requires file to be one of them on linux. Fixes: - output/build/libgtk3-3.24.37/modules/printbackends/meson.build:39:4: ERROR: Problem encountered: 'file' print backed needs to be enabled Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN (cherry picked from commit 9a0857d734c5fca74915b1cd85b92555fe15fb93) Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index 18a8a9fa428..b41049b0eea 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -68,7 +68,7 @@ LIBGTK3_DEPENDENCIES += xlib_libXdamage endif ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK3_CONF_OPTS += -Dprint_backends=cups +LIBGTK3_CONF_OPTS += -Dprint_backends=file,cups LIBGTK3_DEPENDENCIES += cups else LIBGTK3_CONF_OPTS += -Dprint_backends=auto From 0189f41ecc41818feb932818771249c2684ea34d Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 2 May 2023 16:23:08 -0700 Subject: [PATCH 0095/1167] package/go: security bump to version 1.19.9 go1.19.9 (released 2023-05-02) includes three security fixes to the html/template package, as well as bug fixes to the compiler, the runtime, and the crypto/subtle, crypto/tls, net/http, and syscall packages. CVE-2023-24539: html/template: improper sanitization of CSS values CVE-2023-24540: html/template: improper handling of JavaScript whitespace CVE-2023-29400: html/template: improper handling of empty HTML attributes https://go.dev/doc/devel/release#go1.19.9 https://github.com/golang/go/issues?q=milestone%3AGo1.19.9+label%3ACherryPickApproved Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit 509a5d66c4672ce2e8418c3fe1aa5834ab4acb53) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 5488ed9710e..ffe42bf3959 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 1d7a67929dccafeaf8a29e55985bc2b789e0499cb1a17100039f084e3238da2f go1.19.8.src.tar.gz +sha256 131190a4697a70c5b1d232df5d3f55a3f9ec0e78e40516196ffb3f09ae6a5744 go1.19.9.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 37554ddf864..89c3577982c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.8 +GO_VERSION = 1.19.9 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 9446c4a7b6836fa275917de6d72678bb12079cfb Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Thu, 4 May 2023 10:33:32 +0200 Subject: [PATCH 0096/1167] package/dnsmasq: fix CVE-2023-28450 Adds the upstream patch that fixes the CVE. No new release so far. Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard (cherry picked from commit 3816471496036661b2032d5424d0496231b04ca7) Signed-off-by: Peter Korsgaard --- ...default-maximum-dns-udp-package-size.patch | 64 +++++++++++++++++++ package/dnsmasq/dnsmasq.mk | 3 + 2 files changed, 67 insertions(+) create mode 100644 package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch diff --git a/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch new file mode 100644 index 00000000000..4dd17ec069b --- /dev/null +++ b/package/dnsmasq/0001-set-default-maximum-dns-udp-package-size.patch @@ -0,0 +1,64 @@ +From eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 Mon Sep 17 00:00:00 2001 +From: Simon Kelley +Date: Tue, 7 Mar 2023 22:07:46 +0000 +Subject: [PATCH] Set the default maximum DNS UDP packet size to 1232. +Upstream: https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=eb92fb32b746f2104b0f370b5b295bb8dd4bd5e5 + +http://www.dnsflagday.net/2020/ refers. + +Thanks to Xiang Li for the prompt. + +[dalang@gmx.at: backport from upstream] +Signed-off-by: Daniel Lang +--- + CHANGELOG | 9 ++++++++ + man/dnsmasq.8 | 3 ++- + src/config.h | 2 +- + 3 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 3af20cf..52d8678 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,12 @@ version 2.90 ++version 2.90 ++ Set the default maximum DNS UDP packet sice to 1232. This ++ has been the recommended value since 2020 because it's the ++ largest value that avoid fragmentation, and fragmentation ++ is just not reliable on the modern internet, especially ++ for IPv6. It's still possible to override this with ++ --edns-packet-max for special circumstances. ++ ++ + version 2.89 + Fix bug introduced in 2.88 (commit fe91134b) which can result + in corruption of the DNS cache internal data structures and +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index 41e2e04..5acb935 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -183,7 +183,8 @@ to zero completely disables DNS function, leaving only DHCP and/or TFTP. + .TP + .B \-P, --edns-packet-max= + Specify the largest EDNS.0 UDP packet which is supported by the DNS +-forwarder. Defaults to 4096, which is the RFC5625-recommended size. ++forwarder. Defaults to 1232, which is the recommended size following the ++DNS flag day in 2020. Only increase if you know what you are doing. + .TP + .B \-Q, --query-port= + Send outbound DNS queries from, and listen for their replies on, the +diff --git a/src/config.h b/src/config.h +index 1e7b30f..37b374e 100644 +--- a/src/config.h ++++ b/src/config.h +@@ -19,7 +19,7 @@ + #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ + #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ + #define TCP_BACKLOG 32 /* kernel backlog limit for TCP connections */ +-#define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ ++#define EDNS_PKTSZ 1232 /* default max EDNS.0 UDP packet from from /dnsflagday.net/2020 */ + #define SAFE_PKTSZ 1232 /* "go anywhere" UDP packet size, see https://dnsflagday.net/2020/ */ + #define KEYBLOCK_LEN 40 /* choose to minimise fragmentation when storing DNSSEC keys */ + #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ +-- +2.20.1 diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk index 58c53904334..9c05857f224 100644 --- a/package/dnsmasq/dnsmasq.mk +++ b/package/dnsmasq/dnsmasq.mk @@ -17,6 +17,9 @@ DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 DNSMASQ_CPE_ID_VENDOR = thekelleys DNSMASQ_SELINUX_MODULES = dnsmasq +# 0001-set-default-maximum-dns-udp-package-size.patch +DNSMASQ_IGNORE_CVES += CVE-2023-28450 + DNSMASQ_I18N = $(if $(BR2_SYSTEM_ENABLE_NLS),-i18n) ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y) From 8025cfad1055ad23a5935b7a69580ebc2b003e1e Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 9 May 2023 22:38:47 +0200 Subject: [PATCH 0097/1167] Update for 2023.02.1 Signed-off-by: Peter Korsgaard --- CHANGES | 36 ++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index a03a4876b8a..55dcc830de9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,39 @@ +2023.02.1, released May 9th, 2023 + + Important / security related fixes. + + Infrastucture: + - go: Ensure go versions of os/user and net are used for + static builds so CGO is not used + + - rust / cargo: Correctly split up rust flags for host and + target builds + + Defconfigs: Olimex a20 olinuxino lime*: Bring up network at + boot, stmf469 disco sd: Lock U-Boot version + + Updated/fixed packages: agentpp, apache, bluez5_utils, + ca-certificates, containerd, coremark, dcron, dnsmasq, + docker-cli, docker-engine, efivar, eudev, ffmpeg, flann, + fluidsynth, git, go, gst-omx, gst1-devtools, gst1-libav, + gst1-plugins-bad, gst1-plugins-base, gst1-plugins-good, + gst1-plugins-ugly, gst1-python, gst1-rtsp-server, gst1-vaapi, + gstreamer1, gstreamer1-editing-services, intel-microcode, + kexec, libcurl, libite, libgtk3, libmicrohttpd, libxml2, + linux-tools, lua, mali-driver, matio, mdadm, nginx, openocd, + openssh, php, poppler, postgresql, python-web2py, qt6base, + readline, rtl8189fs, rtl8723ds, rtl8812au-aircrack-ng, runc, + rust, rust-bin, s390-tools, samba4, sdl2, snmppp, sudo, + systemd, tcpdump, uclibc, vim, webkitgtk, wireshark, + wpewebkit, xr819-radio, xserver_xorg-server, zeek + + Issues resolved (http://bugs.uclibc.org): + + #14356: cronstamp jobs are not performed with bumped version of... + #15306: glibc build fails in Docker container + #15376: Libiconv config + #15461: QtVirtualKeyboard segfaults + 2023.02, released March 12th, 2023 Fixes all over the tree. diff --git a/Makefile b/Makefile index 634780b4212..000f1dcec01 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02 +export BR2_VERSION := 2023.02.1 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1678652000 +BR2_VERSION_EPOCH = 1683664000 # 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 a1de1707495..d1b75ed405d 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.02' +RELEASE='2023.02.1' ### Change here for more memory/cores ### VM_MEMORY=2048 From 1b2cc4afbf9b4ba63877f81113f3b4ba92944add Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 4 May 2023 18:40:52 +0200 Subject: [PATCH 0098/1167] {linux, linux-headers}: bump 5.15.x / 6.{1, 2, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 773a6fb1b21caa01b209a81abe531d23e53e7b58) [Peter: drop 6.2.x / 6.3.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 690ee9c3392..9e34c6981e2 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.26" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.27" 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 43c9314a23f..c4052f79337 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110 linux-6.1.26.tar.xz +sha256 c2b74b96dd3d0cc9f300914ef7c4eef76d5fac9de6047961f49e69447ce9f905 linux-6.1.27.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 066c4bbcbe3c480068a2e302f52b1708f340ecaaf633ec43d7f791bbeac5771a linux-5.15.109.tar.xz +sha256 9829fcc77b9978dce97a26980dec445caf2410024696625dbb2314ead4830b5b linux-5.15.110.tar.xz sha256 1bbd445c154b053eea46acc883be548a98179988a9ed3a0b81bddfbf30a37e29 linux-5.10.179.tar.xz sha256 142f9aed1c9f2e409dd72c5c490ad824dddf31f955ed2097d5989c4b5074fc28 linux-5.4.242.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index e102369395f..d9e74c6e735 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -388,8 +388,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.282" if BR2_KERNEL_HEADERS_4_19 default "5.4.242" if BR2_KERNEL_HEADERS_5_4 default "5.10.179" if BR2_KERNEL_HEADERS_5_10 - default "5.15.109" if BR2_KERNEL_HEADERS_5_15 - default "6.1.26" if BR2_KERNEL_HEADERS_6_1 + default "5.15.110" if BR2_KERNEL_HEADERS_5_15 + default "6.1.27" if BR2_KERNEL_HEADERS_6_1 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 18ea458338358731d3e4b9fb833e70ee1a363003 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 4 May 2023 22:21:36 +0200 Subject: [PATCH 0099/1167] package/edid-decode: fix typo in Config.in for comment selection Fix typo ('!!' vs. '!') Config.in for dependencies comment selection (introduced by commit 'package/edid-decode: bump version to 1889504', see [1]). [1] https://git.buildroot.net/buildroot/commit/?id=d498088fe7e1e664d4ee8d9bc54262d40227d6e5 Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 0ee49d6272b7046c0d961da0b3950e0f78b89a0b) Signed-off-by: Peter Korsgaard --- package/edid-decode/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/edid-decode/Config.in b/package/edid-decode/Config.in index ddf1942c68a..5ebecd73304 100644 --- a/package/edid-decode/Config.in +++ b/package/edid-decode/Config.in @@ -8,5 +8,5 @@ config BR2_PACKAGE_EDID_DECODE https://git.linuxtv.org/edid-decode.git/ comment "edid-decode needs a toolchain w/ C++, gcc >= 4.7" - depends on !!BR2_INSTALL_LIBSTDCPP || \ + depends on !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 From 7ce01f03f24477d8cb5a1d2ff3f7f1876608e06a Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 4 May 2023 22:45:22 +0200 Subject: [PATCH 0100/1167] package/edid-decode: change download from git URL to https - change download from git URL to https (and SITE_METHOD git) Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 9507e5a4b495716aa8e91211691f62223b883276) Signed-off-by: Peter Korsgaard --- package/edid-decode/edid-decode.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index 7e463c02b1f..f2fcde6e342 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -5,7 +5,8 @@ ################################################################################ EDID_DECODE_VERSION = 188950472c19492547e298b27f9da0d72cf826df -EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git +EDID_DECODE_SITE = https://git.linuxtv.org/edid-decode.git +EDID_DECODE_SITE_METHOD = git EDID_DECODE_LICENSE = MIT EDID_DECODE_LICENSE_FILES = LICENSE From bd4d2ece38579906352bd75b813a73b1c20ace35 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 29 Mar 2023 21:13:22 +0200 Subject: [PATCH 0101/1167] DEVELOPERS: add Julien Olivain for package/openblas The package has been orphan since commit ee58353 (2018-12-22). Signed-off-by: Julien Olivain Signed-off-by: Yann E. MORIN (cherry picked from commit 90ffab4011fa42492e12335a93ce749d60d8190c) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 + 1 file changed, 1 insertion(+) diff --git a/DEVELOPERS b/DEVELOPERS index bab2ededed2..5421f76bd91 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1707,6 +1707,7 @@ F: package/kexec/ F: package/libjxl/ F: package/octave/ F: package/ola/ +F: package/openblas/ F: package/openmpi/ F: package/perftest/ F: package/ptm2human/ From 88aee033d14f729ea0f00f2327e399e249fc5be9 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sun, 14 May 2023 16:45:12 +0200 Subject: [PATCH 0102/1167] package/lua: bump to version 5.4.6 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 603df32a0cd416caa2d2688008cb87f14ad68ef3) Signed-off-by: Peter Korsgaard --- package/lua/5.4.5/lua.hash | 5 ----- package/lua/{5.4.5 => 5.4.6}/0001-root-path.patch | 0 package/lua/{5.4.5 => 5.4.6}/0002-shared-libs-for-lua.patch | 0 package/lua/{5.4.5 => 5.4.6}/0011-linenoise.patch | 0 package/lua/5.4.6/lua.hash | 5 +++++ package/lua/lua.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 package/lua/5.4.5/lua.hash rename package/lua/{5.4.5 => 5.4.6}/0001-root-path.patch (100%) rename package/lua/{5.4.5 => 5.4.6}/0002-shared-libs-for-lua.patch (100%) rename package/lua/{5.4.5 => 5.4.6}/0011-linenoise.patch (100%) create mode 100644 package/lua/5.4.6/lua.hash diff --git a/package/lua/5.4.5/lua.hash b/package/lua/5.4.5/lua.hash deleted file mode 100644 index 5526cd51255..00000000000 --- a/package/lua/5.4.5/lua.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hashes from: https://www.lua.org/ftp/ -sha256 59df426a3d50ea535a460a452315c4c0d4e1121ba72ff0bdde58c2ef31d6f444 lua-5.4.5.tar.gz - -# Locally computed -sha256 0d4ee721cf740f9cd878ef82ef75f4f2724dcf0403e56cd0b5643ad88f9de337 doc/readme.html diff --git a/package/lua/5.4.5/0001-root-path.patch b/package/lua/5.4.6/0001-root-path.patch similarity index 100% rename from package/lua/5.4.5/0001-root-path.patch rename to package/lua/5.4.6/0001-root-path.patch diff --git a/package/lua/5.4.5/0002-shared-libs-for-lua.patch b/package/lua/5.4.6/0002-shared-libs-for-lua.patch similarity index 100% rename from package/lua/5.4.5/0002-shared-libs-for-lua.patch rename to package/lua/5.4.6/0002-shared-libs-for-lua.patch diff --git a/package/lua/5.4.5/0011-linenoise.patch b/package/lua/5.4.6/0011-linenoise.patch similarity index 100% rename from package/lua/5.4.5/0011-linenoise.patch rename to package/lua/5.4.6/0011-linenoise.patch diff --git a/package/lua/5.4.6/lua.hash b/package/lua/5.4.6/lua.hash new file mode 100644 index 00000000000..0b03fd563c6 --- /dev/null +++ b/package/lua/5.4.6/lua.hash @@ -0,0 +1,5 @@ +# Hashes from: https://www.lua.org/ftp/ +sha256 7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88 lua-5.4.6.tar.gz + +# Locally computed +sha256 8f1bff27c5b0585ab679dbe4e37e75a1014af0f79732f42a79f86728321a0c6d doc/readme.html diff --git a/package/lua/lua.mk b/package/lua/lua.mk index ecb86c11ed3..93d4803812a 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -5,7 +5,7 @@ ################################################################################ ifeq ($(BR2_PACKAGE_LUA_5_4),y) -LUA_VERSION = 5.4.5 +LUA_VERSION = 5.4.6 else ifeq ($(BR2_PACKAGE_LUA_5_3),y) LUA_VERSION = 5.3.6 else From 0f229a4231ba4009fca0092fa0a77d84ea20c4b5 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 29 Apr 2023 01:06:18 +0200 Subject: [PATCH 0103/1167] support/config-fragments/autobuild/br-arm-internal-glibc: update to bleeding edge components The br-arm-internal-glibc.config used to be generally used as a configuration to test the bleeding edge versions of components. However, it has been lagging behind somewhat and produce invalid configuration since binutils 2.36 removal in d08639e6b9e5... so let's bring it up-to-date: - Binutils 2.39.x - GCC 12.x Since Buildroot 2022.02, the autobuilders doesn't use the csv file anymore but the test-pkg script still use it. Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit 4944ff2878733f4f6f837ee0d417423420c663ce) Signed-off-by: Peter Korsgaard --- .../config-fragments/autobuild/br-arm-internal-glibc.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/support/config-fragments/autobuild/br-arm-internal-glibc.config b/support/config-fragments/autobuild/br-arm-internal-glibc.config index fb930cbef7c..cd148f32e63 100644 --- a/support/config-fragments/autobuild/br-arm-internal-glibc.config +++ b/support/config-fragments/autobuild/br-arm-internal-glibc.config @@ -1,6 +1,6 @@ BR2_arm=y BR2_cortex_a8=y BR2_TOOLCHAIN_BUILDROOT_GLIBC=y -BR2_BINUTILS_VERSION_2_36_X=y -BR2_GCC_VERSION_11_X=y +BR2_BINUTILS_VERSION_2_39_X=y +BR2_GCC_VERSION_12_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y From 8f0fa2899b4962ff3fe2f481d3f4f175da650737 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Thu, 18 May 2023 12:22:22 +0200 Subject: [PATCH 0104/1167] package/llvm: fix host compile with gcc-13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add upstream patch to fix host compile error on openSUSE Tumbleweed (gcc-13.0.1). Fixes: .../build/host-llvm-11.1.0/include/llvm/Support/Signals.h:117:8: error: variable or field ‘CleanupOnSignal’ declared void 117 | void CleanupOnSignal(uintptr_t Context); | ^~~~~~~~~~~~~~~ .../build/host-llvm-11.1.0/include/llvm/Support/Signals.h:117:24: error: ‘uintptr_t’ was not declared in this scope 117 | void CleanupOnSignal(uintptr_t Context); | ^~~~~~~~~ .../build/host-llvm-11.1.0/include/llvm/Support/Signals.h:18:1: note: ‘uintptr_t’ is defined in header ‘’; did you forget to ‘#include ’? 17 | #include +++ |+#include 18 | Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit f0795bd104248c5d5af71769e4b657dc9fd3ade8) Signed-off-by: Peter Korsgaard --- ...-missing-cstdint-header-to-Signals.h.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch diff --git a/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch b/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch new file mode 100644 index 00000000000..c798f585d68 --- /dev/null +++ b/package/llvm/0002-Add-missing-cstdint-header-to-Signals.h.patch @@ -0,0 +1,34 @@ +From c6c71ab47d658ab8f84e6a6066d476fd9632bbca Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Mon, 23 May 2022 08:03:23 +0100 +Subject: [PATCH] Add missing header to Signals.h + +Without the change llvm build fails on this week's gcc-13 snapshot as: + + [ 0%] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o + In file included from llvm/lib/Support/Signals.cpp:14: + llvm/include/llvm/Support/Signals.h:119:8: error: variable or field 'CleanupOnSignal' declared void + 119 | void CleanupOnSignal(uintptr_t Context); + | ^~~~~~~~~~~~~~~ + +Upstream: https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch +Signed-off-by: Peter Seiderer +--- + include/llvm/Support/Signals.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/llvm/Support/Signals.h b/include/llvm/Support/Signals.h +index e0a18e72..148216b8 100644 +--- a/include/llvm/Support/Signals.h ++++ b/include/llvm/Support/Signals.h +@@ -14,6 +14,7 @@ + #ifndef LLVM_SUPPORT_SIGNALS_H + #define LLVM_SUPPORT_SIGNALS_H + ++#include + #include + + namespace llvm { +-- +2.40.1 + From 0a92e971968191a7e209015721a5f44c38f5acaf Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 22 Mar 2023 17:24:45 +0100 Subject: [PATCH 0105/1167] package/libcurl: security bump version to 8.0.1 For details see [1] and [2]. [1] https://curl.se/changes.html#8_0_0 [1] https://curl.se/changes.html#8_0_1 Fixes the following security issues: CVE-2023-27533: https://curl.se/docs/CVE-2023-27533.html CVE-2023-27534: https://curl.se/docs/CVE-2023-27534.html CVE-2023-27535: https://curl.se/docs/CVE-2023-27535.html CVE-2023-27536: https://curl.se/docs/CVE-2023-27536.html CVE-2023-27537: https://curl.se/docs/CVE-2023-27537.html CVE-2023-27538: https://curl.se/docs/CVE-2023-27538.html Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 1e735c48372a40c0c838baf4946022545ed531f1) [Peter: Mark as security bump] 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 32b3d0b5e2b..8a29e7b977c 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-7.88.1.tar.xz.asc +# https://curl.se/download/curl-8.0.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f curl-7.88.1.tar.xz +sha256 0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0 curl-8.0.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index dd715c1bb67..a5313e686fe 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 7.88.1 +LIBCURL_VERSION = 8.0.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 971cabfd917627b5d7a3c11e5342126b0e351cf6 Mon Sep 17 00:00:00 2001 From: Bagas Sanjaya Date: Wed, 24 May 2023 10:16:01 +0700 Subject: [PATCH 0106/1167] toolchain-external-custom: Describe BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX "Toolchain prefix" option apparently doesn't have any help describing it, which causes confusion when using external toolchain. Leaving this option at default prefix name ("$(ARCH)-linux") when external toolchain components are called with different prefix (e.g. "$(ARCH)-unknown-linux-gnu") may cause build failure unless the prefix symlink is already in place (e.g. when using Buildroot-generated toolchain as external toolchain). Describe the option to clarify. Signed-off-by: Bagas Sanjaya Reviewed-by: Thomas Petazzoni Signed-off-by: Yann E. MORIN (cherry picked from commit e418a2c06a1bdc7a5fc65ce58400ed0a9c9e28bb) Signed-off-by: Peter Korsgaard --- .../toolchain-external-custom/Config.in.options | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options index 1c39334ddd6..e9a9c1c2a17 100644 --- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options @@ -24,6 +24,21 @@ config BR2_TOOLCHAIN_EXTERNAL_REL_BIN_PATH config BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX string "Toolchain prefix" default "$(ARCH)-linux" + help + Component name prefix used by your external toolchain. + + Typically, this is the target tuple, e.g. something that + looks like: $(ARCH)-unknown-linux-gnu. + + If unsure, look at the "bin" directory of your toolchain and + note the part of component name before the last dash, i.e. if + you call the toolchain's gcc as $(ARCH)-unknown-linux-gnu-gcc, + the prefix is $(ARCH)-unknown-linux-gnu. + + Note that Buildroot toolchains have shorter aliases that look + like $(ARCH)-linux, as symlinks to the full-tuple components, + so you can leave this option at default value if you use them + as external toolchain. choice bool "External toolchain gcc version" From e453fbe0e688d328a05bb0787560a6b4258fa5e7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 24 May 2023 22:56:28 +0200 Subject: [PATCH 0107/1167] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 2, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit c27bf8881d94b3973b5bf00f414321a6ee7db819) [Peter: drop 6.2.x / 6.3.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 9e34c6981e2..6337e098b4d 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.27" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.30" 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 c4052f79337..19066fcbdb0 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 c2b74b96dd3d0cc9f300914ef7c4eef76d5fac9de6047961f49e69447ce9f905 linux-6.1.27.tar.xz +sha256 1bf254c4ca9ebccb25328296584fb5e87ad635ae0c1cc1deb0b5bb37a4608813 linux-6.1.30.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 9829fcc77b9978dce97a26980dec445caf2410024696625dbb2314ead4830b5b linux-5.15.110.tar.xz -sha256 1bbd445c154b053eea46acc883be548a98179988a9ed3a0b81bddfbf30a37e29 linux-5.10.179.tar.xz -sha256 142f9aed1c9f2e409dd72c5c490ad824dddf31f955ed2097d5989c4b5074fc28 linux-5.4.242.tar.xz +sha256 4a4e98d21149d781867a6d44855f708b02f03cfe233d8026a0af9c9841b3b9ca linux-5.15.113.tar.xz +sha256 da839a4bf1f6c964b9bde593bd58928f106f53690ff677e226bc50cf368b0c29 linux-5.10.180.tar.xz +sha256 c3cf664feeeee47e0f0c45c53705568f73692c37a3ff7f11c1b15e59610feb04 linux-5.4.243.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 43a514997d3a9052b765a9e1c8fbf7f5a810771937f8754a529ed09e0e02e20b linux-4.19.282.tar.xz -sha256 876c01f0d12ad0147b5c9ee2de919bedc7ffb7c2714dbfb7ccf44426f6f49153 linux-4.14.314.tar.xz +sha256 047316d20c6c97ad41c40477c7e1ab0bea434243e17bfc72155801b123cc51f4 linux-4.19.283.tar.xz +sha256 a346c5c34c06caeb28063b6379a28ec1f4111fa438ecd933a55f696fe362c99d linux-4.14.315.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 d9e74c6e735..98e60d74f8b 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.314" if BR2_KERNEL_HEADERS_4_14 - default "4.19.282" if BR2_KERNEL_HEADERS_4_19 - default "5.4.242" if BR2_KERNEL_HEADERS_5_4 - default "5.10.179" if BR2_KERNEL_HEADERS_5_10 - default "5.15.110" if BR2_KERNEL_HEADERS_5_15 - default "6.1.27" if BR2_KERNEL_HEADERS_6_1 + default "4.14.315" if BR2_KERNEL_HEADERS_4_14 + default "4.19.283" if BR2_KERNEL_HEADERS_4_19 + default "5.4.243" if BR2_KERNEL_HEADERS_5_4 + default "5.10.180" if BR2_KERNEL_HEADERS_5_10 + default "5.15.113" if BR2_KERNEL_HEADERS_5_15 + default "6.1.30" if BR2_KERNEL_HEADERS_6_1 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 e69bd1179cae7e2008ca7bd63570e42ea1a35fd7 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 26 May 2023 23:49:35 +0200 Subject: [PATCH 0108/1167] package/python-django: add missing python-zlib runtime dependency Tree django core files are using "import zlib" and requires BR2_PACKAGE_PYTHON3_ZLIB to be enabled. django/core/cache/backends/filebased.py:import zlib django/core/files/images.py:import zlib django/core/signing.py:import zlib Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819300 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit aecf8a96e1768a20f2f12258a6c755e5aa316ff9) Signed-off-by: Peter Korsgaard --- package/python-django/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-django/Config.in b/package/python-django/Config.in index 5830cadc93d..c236a6dc0b4 100644 --- a/package/python-django/Config.in +++ b/package/python-django/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_DJANGO bool "python-django" select BR2_PACKAGE_PYTHON3_UNICODEDATA select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_PYTHON_ASGIREF # runtime select BR2_PACKAGE_PYTHON_SQLPARSE # runtime help From f1237f0429160e5c49a8869a72966aebd8d45968 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 27 May 2023 00:23:12 +0200 Subject: [PATCH 0109/1167] package/python-can: add missing setuptools runtime dependency The commit [1] removed setuptools from runtime dependencies "Drop spurious setuptools runtime dependency.". Since then the test TestPythonPy3Can fail with the following error: ModuleNotFoundError: No module named 'pkg_resources' Add back setuptools to provide "pkg_resources". Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819285 [1] 09c966af735ca53b447f52965d123c21e43ae522 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 8ac1458e8162ab9d3ac3c5354c874a00bdf36d57) Signed-off-by: Peter Korsgaard --- package/python-can/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-can/Config.in b/package/python-can/Config.in index 5d21e29d88f..68a9ffca71b 100644 --- a/package/python-can/Config.in +++ b/package/python-can/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_CAN bool "python-can" + select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_AENUM # runtime select BR2_PACKAGE_PYTHON_MSGPACK # runtime From dbbcd3be5da0fe86a167ee8e86e7992aa1e92a7a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Thu, 25 May 2023 23:07:22 +0200 Subject: [PATCH 0110/1167] package/crudini: fix python 3.10+ warning due to pipes import The TestCrudiniPy3 test fail due to a python 3.10 warning due to pipes import in crudini. Indeed, pipes is deprecated since python 3.10 and slated for removal in python 3.13. Backport an upstream patch fixing the warning. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819049 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit d3a93df9e84a65bfdbf5748692f4d9241363c025) Signed-off-by: Peter Korsgaard --- .../0001-prefer-shlex-over-pipes.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/crudini/0001-prefer-shlex-over-pipes.patch diff --git a/package/crudini/0001-prefer-shlex-over-pipes.patch b/package/crudini/0001-prefer-shlex-over-pipes.patch new file mode 100644 index 00000000000..16296f619fa --- /dev/null +++ b/package/crudini/0001-prefer-shlex-over-pipes.patch @@ -0,0 +1,41 @@ +From d81b703f3e8e29c1547386135c7e9ca539c1f054 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?P=C3=A1draig=20Brady?= +Date: Tue, 2 Aug 2022 14:40:37 +0100 +Subject: [PATCH] prefer shlex over pipes + +pipes is deprecated since python 3.10 +and slated for removal in python 3.13 + +[Romain backport to 0.9.3] +Upstream: https://github.com/pixelb/crudini/commit/e1650941054822faad4cda788bff6fe364eb4ca3 +Signed-off-by: Romain Naour +--- + crudini | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/crudini b/crudini +index 669596b..a136241 100755 +--- a/crudini ++++ b/crudini +@@ -17,15 +17,17 @@ import getopt + import hashlib + import iniparse + import os +-import pipes ++import re + import shutil + import string + import tempfile + + if sys.version_info[0] >= 3: ++ import shlex as pipes + from io import StringIO + import configparser + else: ++ import pipes + from cStringIO import StringIO + import ConfigParser as configparser + +-- +2.34.3 + From 888eaf619ea2587b3e05c4e103b9b8926ea461cf Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 30 May 2023 09:31:42 +0200 Subject: [PATCH 0111/1167] package/libressl: bump to version 3.6.3 Bugfix release, fixing a number of issues. For details, see the announcement: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.6.3-relnotes.txt Signed-off-by: Peter Korsgaard --- package/libressl/libressl.hash | 2 +- package/libressl/libressl.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libressl/libressl.hash b/package/libressl/libressl.hash index 907b9cdd068..e2d4decb7c1 100644 --- a/package/libressl/libressl.hash +++ b/package/libressl/libressl.hash @@ -1,4 +1,4 @@ # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256 -sha256 4be80fff073746cf50b4a8e5babe2795acae98c6b132a9e02519b445dfbfd033 libressl-3.6.2.tar.gz +sha256 87b1bbe36e9eec8d0ae5f04c83d36b2c5b0e581784c7eb0817025ed29eadea37 libressl-3.6.3.tar.gz # Locally computed sha256 5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1 COPYING diff --git a/package/libressl/libressl.mk b/package/libressl/libressl.mk index b5fae7e26e0..58c8398e79f 100644 --- a/package/libressl/libressl.mk +++ b/package/libressl/libressl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRESSL_VERSION = 3.6.2 +LIBRESSL_VERSION = 3.6.3 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code) LIBRESSL_LICENSE_FILES = COPYING From 42448495973b06225253b52e0cbc3cfb9188f39b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 14:42:08 +0200 Subject: [PATCH 0112/1167] package/zfs: fix python3 support check Backport an upstream commit fixing the python3 support check "The 22.0 release of the python `packaging` package removed the `LegacyVersion` trait, causing ZFS to no longer compile. This commit replaces the sections of `ax_python_dev.m4` that rely on `LegacyVersion` with updated implementations from the upstream `autoconf-archive`." Add a comment above ZFS_AUTORECONF. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819411 https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819410 https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819409 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 2816038d8b468725f318d680a73044ef91925870) Signed-off-by: Peter Korsgaard --- ...LegacyVersion-broke-ax_python_dev.m4.patch | 134 ++++++++++++++++++ package/zfs/zfs.mk | 1 + 2 files changed, 135 insertions(+) create mode 100644 package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch diff --git a/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch b/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch new file mode 100644 index 00000000000..c7c4dc7d10c --- /dev/null +++ b/package/zfs/0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch @@ -0,0 +1,134 @@ +From ad2c8e13e42bc2f396cce117d17a227dadedd476 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 5 Jan 2023 11:04:24 -0800 +Subject: [PATCH] removal of LegacyVersion broke ax_python_dev.m4 + +The 22.0 release of the python `packaging` package removed the +`LegacyVersion` trait, causing ZFS to no longer compile. + +This commit replaces the sections of `ax_python_dev.m4` that rely on +`LegacyVersion` with updated implementations from the upstream +`autoconf-archive`. + +Reviewed-by: Brian Behlendorf +Signed-off-by: Matthew Ahrens +Closes #14297 +Upstream: https://github.com/openzfs/zfs/commit/b72efb751147ab57afd1588a15910f547cb22600 +[Romain: backport to 2.1.7] +Signed-off-by: Romain Naour +--- + config/ax_python_devel.m4 | 71 +++++++++++++++++++-------------------- + 1 file changed, 35 insertions(+), 36 deletions(-) + +diff --git a/config/ax_python_devel.m4 b/config/ax_python_devel.m4 +index 7adcf01a0..9eef45065 100644 +--- a/config/ax_python_devel.m4 ++++ b/config/ax_python_devel.m4 +@@ -97,23 +97,13 @@ AC_DEFUN([AX_PYTHON_DEVEL],[ + # Check for a version of Python >= 2.1.0 + # + AC_MSG_CHECKING([for a version of Python >= '2.1.0']) +- ac_supports_python_ver=`cat<= '2.1.0')"` + if test "$ac_supports_python_ver" != "True"; then + if test -z "$PYTHON_NOVERSIONCHECK"; then + AC_MSG_RESULT([no]) +- m4_ifvaln([$2],[$2],[ +- AC_MSG_FAILURE([ ++ AC_MSG_FAILURE([ + This version of the AC@&t@_PYTHON_DEVEL macro + doesn't work properly with versions of Python before + 2.1.0. You may need to re-run configure, setting the +@@ -122,7 +112,6 @@ PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. + Moreover, to disable this check, set PYTHON_NOVERSIONCHECK + to something else than an empty string. + ]) +- ]) + else + AC_MSG_RESULT([skip at user request]) + fi +@@ -131,37 +120,47 @@ to something else than an empty string. + fi + + # +- # if the macro parameter ``version'' is set, honour it ++ # If the macro parameter ``version'' is set, honour it. ++ # A Python shim class, VPy, is used to implement correct version comparisons via ++ # string expressions, since e.g. a naive textual ">= 2.7.3" won't work for ++ # Python 2.7.10 (the ".1" being evaluated as less than ".3"). + # + if test -n "$1"; then + AC_MSG_CHECKING([for a version of Python $1]) +- # Why the strip ()? Because if we don't, version.parse +- # will, for example, report 3.10.0 >= '3.11.0' +- ac_supports_python_ver=`cat< ax_python_devel_vpy.py ++class VPy: ++ def vtup(self, s): ++ return tuple(map(int, s.strip().replace("rc", ".").split("."))) ++ def __init__(self): ++ import sys ++ self.vpy = tuple(sys.version_info) ++ def __eq__(self, s): ++ return self.vpy == self.vtup(s) ++ def __ne__(self, s): ++ return self.vpy != self.vtup(s) ++ def __lt__(self, s): ++ return self.vpy < self.vtup(s) ++ def __gt__(self, s): ++ return self.vpy > self.vtup(s) ++ def __le__(self, s): ++ return self.vpy <= self.vtup(s) ++ def __ge__(self, s): ++ return self.vpy >= self.vtup(s) ++EOF ++ ac_supports_python_ver=`$PYTHON -c "import ax_python_devel_vpy; \ ++ ver = ax_python_devel_vpy.VPy(); \ ++ print (ver $1)"` ++ rm -rf ax_python_devel_vpy*.py* __pycache__/ax_python_devel_vpy*.py* + if test "$ac_supports_python_ver" = "True"; then +- AC_MSG_RESULT([yes]) ++ AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) +- m4_ifvaln([$2],[$2],[ +- AC_MSG_ERROR([this package requires Python $1. ++ AC_MSG_ERROR([this package requires Python $1. + If you have it installed, but it isn't the default Python + interpreter in your system path, please pass the PYTHON_VERSION + variable to configure. See ``configure --help'' for reference. + ]) +- PYTHON_VERSION="" +- ]) ++ PYTHON_VERSION="" + fi + fi + +-- +2.34.3 + diff --git a/package/zfs/zfs.mk b/package/zfs/zfs.mk index 84e9099ba90..97e9442cf87 100644 --- a/package/zfs/zfs.mk +++ b/package/zfs/zfs.mk @@ -12,6 +12,7 @@ ZFS_LICENSE_FILES = LICENSE COPYRIGHT ZFS_CPE_ID_VENDOR = openzfs ZFS_CPE_ID_PRODUCT = openzfs +# 0001-removal-of-LegacyVersion-broke-ax_python_dev.m4.patch ZFS_AUTORECONF = YES ZFS_DEPENDENCIES = libaio openssl udev util-linux zlib libcurl From 5250b33c7b0cbcefcc43a67c204767f5f46e0d49 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 12:12:40 +0200 Subject: [PATCH 0113/1167] package/perl-clone: new package perl-clone is a new mandatory dependency of perl-http-message v6.44 that is already available in Buildroot since commit [1]. [1] 79e8aad721099eb05e60b449432136691275022f Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 0ac6713cee7e683b08234df14fff652cfbfef91b) Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/perl-clone/Config.in | 10 ++++++++++ package/perl-clone/perl-clone.hash | 6 ++++++ package/perl-clone/perl-clone.mk | 14 ++++++++++++++ 4 files changed, 31 insertions(+) create mode 100644 package/perl-clone/Config.in create mode 100644 package/perl-clone/perl-clone.hash create mode 100644 package/perl-clone/perl-clone.mk diff --git a/package/Config.in b/package/Config.in index c7bb52d2788..4da083d35f2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -796,6 +796,7 @@ menu "Perl libraries/modules" source "package/perl-class-method-modifiers/Config.in" source "package/perl-class-std/Config.in" source "package/perl-class-std-fast/Config.in" + source "package/perl-clone/Config.in" source "package/perl-convert-asn1/Config.in" source "package/perl-cookie-baker/Config.in" source "package/perl-crypt-blowfish/Config.in" diff --git a/package/perl-clone/Config.in b/package/perl-clone/Config.in new file mode 100644 index 00000000000..78f13dfe6b0 --- /dev/null +++ b/package/perl-clone/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PERL_CLONE + bool "perl-clone" + depends on !BR2_STATIC_LIBS + help + recursively copy Perl datatypes. + + https://metacpan.org/release/Clone + +comment "perl-clone needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-clone/perl-clone.hash b/package/perl-clone/perl-clone.hash new file mode 100644 index 00000000000..7b69b97d065 --- /dev/null +++ b/package/perl-clone/perl-clone.hash @@ -0,0 +1,6 @@ +# retrieved by scancpan from https://cpan.metacpan.org/ +md5 cafa8984a2c2e005e54b27dd1e3f0afe Clone-0.46.tar.gz +sha256 aadeed5e4c8bd6bbdf68c0dd0066cb513e16ab9e5b4382dc4a0aafd55890697b Clone-0.46.tar.gz + +# computed by scancpan +sha256 40aa7eb133e97b075024380640528760a54aefc344781741ed02539a375db5ac README.md diff --git a/package/perl-clone/perl-clone.mk b/package/perl-clone/perl-clone.mk new file mode 100644 index 00000000000..9e04329eabd --- /dev/null +++ b/package/perl-clone/perl-clone.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# perl-clone +# +################################################################################ + +PERL_CLONE_VERSION = 0.46 +PERL_CLONE_SOURCE = Clone-$(PERL_CLONE_VERSION).tar.gz +PERL_CLONE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GARU +PERL_CLONE_LICENSE = Artistic or GPL-1.0+ +PERL_CLONE_LICENSE_FILES = README.md +PERL_CLONE_DISTNAME = Clone + +$(eval $(perl-package)) From 73e21bb8a20a0c646e57d8eace7f8ce4515c57e0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 12:12:41 +0200 Subject: [PATCH 0114/1167] package/perl-http-message: add missing perl-clone dependency perl-clone was added to perl-http-message v6.44 as mandatory dependency by commit [1]. While updating to v6.44 [2] in Buildroot the new dependency was forgotten. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819252 https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819256 [1] https://github.com/libwww-perl/HTTP-Message/commit/6b89d6b2cce67b540ade87fc6fdf88cdede20b46 [2] 79e8aad721099eb05e60b449432136691275022f Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 742258fec06df18782e4bd75b00ca530120312cb) Signed-off-by: Peter Korsgaard --- package/perl-http-message/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/perl-http-message/Config.in b/package/perl-http-message/Config.in index 82538cfce81..3c6849487ad 100644 --- a/package/perl-http-message/Config.in +++ b/package/perl-http-message/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE bool "perl-http-message" + select BR2_PACKAGE_PERL_CLONE # runtime select BR2_PACKAGE_PERL_ENCODE_LOCALE # runtime select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_IO_HTML # runtime From c6452ab1673bb8a965a9cac65928bd95b35267ef Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 17:18:12 +0200 Subject: [PATCH 0115/1167] package/znc: fix build with swig 4.1.x Buildroot commit 260924e239627cbe1379cfc752939245d53a06e0 "package/swig: bump to version 4.1.1" broke the build of znc. Fixes: http://autobuild.buildroot.net/results/14c/14c44e94b6b588aa033f24202aa8437882cf8792/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 222d747effc286ac71d643077ab96cf7e2182c6d) Signed-off-by: Peter Korsgaard --- ...rt-SWIG-4.1.0-drop-support-for-4.0.1.patch | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch diff --git a/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch b/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch new file mode 100644 index 00000000000..cb0988e6314 --- /dev/null +++ b/package/znc/0004-Add-support-SWIG-4.1.0-drop-support-for-4.0.1.patch @@ -0,0 +1,53 @@ +From fecdd9895894b3afe903021b0843a422eb4d3308 Mon Sep 17 00:00:00 2001 +From: Alexey Sokolov +Date: Sat, 5 Nov 2022 12:54:40 +0000 +Subject: [PATCH] Add support SWIG 4.1.0, drop support for < 4.0.1 + +https://bugs.gentoo.org/878587 + +Upstream: https://github.com/znc/znc/commit/fecdd9895894b3afe903021b0843a422eb4d3308 + +Signed-off-by: Bernd Kuhls +--- + CMakeLists.txt | 2 +- + modules/modperl/CMakeLists.txt | 1 - + modules/modpython/CMakeLists.txt | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9d43578e0e..efab0ee1ee 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,7 +173,7 @@ if(WANT_PYTHON AND NOT EXISTS + endif() + endif() + if(search_swig) +- find_package(SWIG 3.0.0) ++ find_package(SWIG 4.0.1) + if(NOT SWIG_FOUND) + message(FATAL_ERROR + "Can't find SWIG, therefore Perl and Python aren't supported. " +diff --git a/modules/modperl/CMakeLists.txt b/modules/modperl/CMakeLists.txt +index e18fe47644..a87f74e478 100644 +--- a/modules/modperl/CMakeLists.txt ++++ b/modules/modperl/CMakeLists.txt +@@ -53,7 +53,6 @@ if(SWIG_FOUND) + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." + "-I${CMAKE_CURRENT_SOURCE_DIR}/include" +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modperl_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modperl.i" +diff --git a/modules/modpython/CMakeLists.txt b/modules/modpython/CMakeLists.txt +index edbeb41ed5..36a2e649f0 100644 +--- a/modules/modpython/CMakeLists.txt ++++ b/modules/modpython/CMakeLists.txt +@@ -50,7 +50,6 @@ if(SWIG_FOUND) + "-I${PROJECT_BINARY_DIR}/include" + "-I${PROJECT_SOURCE_DIR}/include" + "-I${CMAKE_CURRENT_SOURCE_DIR}/.." +- -DZNC_EXPORT_LIB_EXPORT + -outdir "${CMAKE_CURRENT_BINARY_DIR}" + -o "${CMAKE_CURRENT_BINARY_DIR}/modpython_biglib.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/modpython.i" From 23ac9f2a6e121eae576b9adbb565aafb1a1d3966 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 25 Mar 2023 19:19:58 +0100 Subject: [PATCH 0116/1167] package/libcurl: disable NTLM support definitely - do not only disable NTLM delegation to winbinds ntlm_auth but disable NTLM support overall (and drop enforced libopenssl DES dependency introduced by 'package/libcurl: make sure openssl supports DES' (commit f25c820a4f93ad0ca7eaf5e504667bd4099b878c) - change man page hint to https URL - rearrange configure options to one option per line Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit 7b1a980465452af44636b06197abe1835da9ed9f) Signed-off-by: Peter Korsgaard --- package/libcurl/Config.in | 1 - package/libcurl/libcurl.mk | 21 ++++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index 218309ed56f..adab1ca3e6d 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -57,7 +57,6 @@ choice config BR2_PACKAGE_LIBCURL_OPENSSL bool "OpenSSL" depends on BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL config BR2_PACKAGE_LIBCURL_BEARSSL bool "BearSSL" diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index a5313e686fe..0f7ae640f64 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -16,15 +16,22 @@ LIBCURL_CPE_ID_VENDOR = haxx LIBCURL_CPE_ID_PRODUCT = libcurl LIBCURL_INSTALL_STAGING = YES -# We disable NTLM support because it uses fork(), which doesn't work -# on non-MMU platforms. Moreover, this authentication method is -# probably almost never used. See -# http://curl.se/docs/manpage.html#--ntlm. +# We disable NTLM delegation to winbinds ntlm_auth ('--disable-ntlm-wb') +# support because it uses fork(), which doesn't work on non-MMU platforms. +# Moreover, this authentication method is probably almost never used (see +# https://curl.se/docs/manpage.html#--ntlm), so disable NTLM support overall. +# # Likewise, there is no compiler on the target, so libcurl-option (to # generate C code) isn't very useful -LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \ - --with-random=/dev/urandom --disable-curldebug \ - --disable-libcurl-option --disable-ldap --disable-ldaps +LIBCURL_CONF_OPTS = \ + --disable-manual \ + --disable-ntlm \ + --disable-ntlm-wb \ + --with-random=/dev/urandom \ + --disable-curldebug \ + --disable-libcurl-option \ + --disable-ldap \ + --disable-ldaps ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) LIBCURL_CONF_OPTS += --enable-threaded-resolver From 2317c7775b5237559e907fee28dc4b3bc253e8ee Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Tue, 21 Mar 2023 07:01:20 +0100 Subject: [PATCH 0117/1167] package/atkmm: bump to version 2.36.2 Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN (cherry picked from commit 6d7e5e2b63d138ac902e21644256d9fcbae686ef) Signed-off-by: Peter Korsgaard --- package/atkmm/atkmm.hash | 4 ++-- package/atkmm/atkmm.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/atkmm/atkmm.hash b/package/atkmm/atkmm.hash index 9e2bb2830ca..08cf86b3df9 100644 --- a/package/atkmm/atkmm.hash +++ b/package/atkmm/atkmm.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.1.sha256sum -sha256 e11324bfed1b6e330a02db25cecc145dca03fb0dff47f0710c85e317687da458 atkmm-2.36.1.tar.xz +# From https://download.gnome.org/sources/atkmm/2.36/atkmm-2.36.2.sha256sum +sha256 6f62dd99f746985e573605937577ccfc944368f606a71ca46342d70e1cdae079 atkmm-2.36.2.tar.xz # locally computed sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/atkmm/atkmm.mk b/package/atkmm/atkmm.mk index 7ceb87b0470..8afd0586437 100644 --- a/package/atkmm/atkmm.mk +++ b/package/atkmm/atkmm.mk @@ -5,7 +5,7 @@ ################################################################################ ATKMM_VERSION_MAJOR = 2.36 -ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).1 +ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).2 ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz ATKMM_SITE = https://download.gnome.org/sources/atkmm/$(ATKMM_VERSION_MAJOR) ATKMM_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) From e1845fdd25304f36b8e1b3350fa5dcfd344c105e Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 29 Mar 2023 15:02:35 +0200 Subject: [PATCH 0118/1167] package/gptfdisk: fix another runtime failure with popt 1.19 Fix the following runtime failure raised since bump of popt to version 1.19 in commit 895bfba93f6e5535f2132aeea144d2cd87ebc71b: Segmentation fault (core dumped) Fix the issue by backporting a fix found in upstream git repository [0]. [0] https://sourceforge.net/p/gptfdisk/code/ci/f5de3401b974ce103ffd93af8f9d43505a04aaf9/ Signed-off-by: Stefan Agner Signed-off-by: Yann E. MORIN (cherry picked from commit f2a676dcfff886104e83170c274a2e97e9d32aba) Signed-off-by: Peter Korsgaard --- ...ence-when-duplicating-string-argumen.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch diff --git a/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch new file mode 100644 index 00000000000..1642343d064 --- /dev/null +++ b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch @@ -0,0 +1,43 @@ +From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001 +Message-Id: +From: Damian Kurek +Date: Thu, 7 Jul 2022 03:39:16 +0000 +Subject: [PATCH] Fix NULL dereference when duplicating string argument + +poptGetArg can return NULL if there are no additional arguments, which +makes strdup dereference NULL on strlen + +Signed-off-by: Stefan Agner +--- + gptcl.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/gptcl.cc b/gptcl.cc +index 0d578eb..ab95239 100644 +--- a/gptcl.cc ++++ b/gptcl.cc +@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + } // while + + // Assume first non-option argument is the device filename.... +- device = strdup((char*) poptGetArg(poptCon)); +- poptResetContext(poptCon); ++ device = (char*) poptGetArg(poptCon); + + if (device != NULL) { ++ device = strdup(device); ++ poptResetContext(poptCon); + JustLooking(); // reset as necessary + BeQuiet(); // Tell called functions to be less verbose & interactive + if (LoadPartitions((string) device)) { +@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) { + cerr << "Error encountered; not saving changes.\n"; + retval = 4; + } // if ++ free(device); + } // if (device != NULL) + poptFreeContext(poptCon); + return retval; +-- +2.40.0 + From 412e5f7c99c524a7c18234ac04a22a4b3a537307 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 6 May 2023 17:09:53 +0200 Subject: [PATCH 0119/1167] package/gptfdisk: add upstrream tag info on new patch Signed-off-by: Yann E. MORIN (cherry picked from commit b4a82b0111ed67eacd91a2b9658e9b059444ab4a) Signed-off-by: Peter Korsgaard --- ...03-Fix-NULL-dereference-when-duplicating-string-argumen.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch index 1642343d064..250c0715823 100644 --- a/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch +++ b/package/gptfdisk/0003-Fix-NULL-dereference-when-duplicating-string-argumen.patch @@ -8,6 +8,7 @@ poptGetArg can return NULL if there are no additional arguments, which makes strdup dereference NULL on strlen Signed-off-by: Stefan Agner +Upstream: https://sourceforge.net/p/gptfdisk/code/ci/f5de3401b974ce103ffd93af8f9d43505a04aaf9 --- gptcl.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) From fcc906241d326d9c5e5bf39e86c1762f50bb6c12 Mon Sep 17 00:00:00 2001 From: Aaron Sierra Date: Wed, 29 Mar 2023 10:51:54 -0500 Subject: [PATCH 0120/1167] package/python-requests: bump to version 2.28.2 Get explicit compatibility with charset-normalizer 3.x Signed-off-by: Aaron Sierra Acked-by: Yann E. MORIN Tested-by: Yann E. MORIN Signed-off-by: Yann E. MORIN (cherry picked from commit f9c196598d58cecef769194df3c54466cf62459d) Signed-off-by: Peter Korsgaard --- package/python-requests/python-requests.hash | 4 ++-- package/python-requests/python-requests.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index 1383e680d52..b6f696000b5 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 796ea875cdae283529c03b9203d9c454 requests-2.28.1.tar.gz -sha256 7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983 requests-2.28.1.tar.gz +md5 09b752e0b0a672d805ae54455c128d42 requests-2.28.2.tar.gz +sha256 98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf requests-2.28.2.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 7a21cca52c3..8f9f4b2db4b 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.28.1 +PYTHON_REQUESTS_VERSION = 2.28.2 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/a5/61/a867851fd5ab77277495a8709ddda0861b28163c4613b011bc00228cc724 +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/9d/ee/391076f5937f0a8cdf5e53b701ffc91753e87b07d66bae4a09aa671897bf PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE From 387d2d12f33939d9eb86f7abe849110b63dfc703 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Fri, 5 May 2023 21:27:43 +0200 Subject: [PATCH 0121/1167] package/ncurses: security bump to 6.4.20230429 Update to 6.4 and use latest snapshot to fix CVE-2023-29491. COPYING has been changed in snapshot 20230107 to update the year [0]. Update CVE version to major.minor.snapshot, as NVD uses the snapshot date as patch version [1]. [0]: https://github.com/ThomasDickey/ncurses-snapshots/commit/eedb756850fdddcd2767d488ed5ea323d40b37ec [1]: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe:2.3:a:gnu:ncurses Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN (cherry picked from commit aee4f42ba07c603bbc7cf16b18f9706029ab5d74) Signed-off-by: Peter Korsgaard --- package/ncurses/ncurses.hash | 4 ++-- package/ncurses/ncurses.mk | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/package/ncurses/ncurses.hash b/package/ncurses/ncurses.hash index c96bf77bce5..a5f83c8725d 100644 --- a/package/ncurses/ncurses.hash +++ b/package/ncurses/ncurses.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 4057d800ee96623ae70d06b05b2dadb481a80c030e4968aa5d9bcea4439441da ncurses-6.3-20221224.tar.gz +sha256 004603a9b3ec51599ef0a0089482004ee3d33b0240d87ce17b6f77525b51fb4e ncurses-6.4-20230429.tar.gz # Locally computed -sha256 63de87399e9fc8860236082b6b0520e068e9eb1fad0ebd30202aa30bb6f690ac COPYING +sha256 0413b2f4ea863194c174673032f0fca84f1ea1ed4eed6476baea68c075a631ce COPYING diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk index 73e3c3feb85..4753da299c3 100644 --- a/package/ncurses/ncurses.mk +++ b/package/ncurses/ncurses.mk @@ -5,8 +5,8 @@ ################################################################################ # When there is no snapshost yet for a new version, set it to the empty string -NCURSES_VERSION_MAJOR = 6.3 -NCURSES_SNAPSHOT_DATE = 20221224 +NCURSES_VERSION_MAJOR = 6.4 +NCURSES_SNAPSHOT_DATE = 20230429 NCURSES_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),-$(NCURSES_SNAPSHOT_DATE)) NCURSES_VERSION_GIT = $(subst .,_,$(subst -,_,$(NCURSES_VERSION))) NCURSES_SITE = $(call github,ThomasDickey,ncurses-snapshots,v$(NCURSES_VERSION_GIT)) @@ -15,12 +15,9 @@ NCURSES_DEPENDENCIES = host-ncurses NCURSES_LICENSE = MIT with advertising clause NCURSES_LICENSE_FILES = COPYING NCURSES_CPE_ID_VENDOR = gnu -NCURSES_CPE_ID_VERSION = $(NCURSES_VERSION_MAJOR) +NCURSES_CPE_ID_VERSION = $(NCURSES_VERSION_MAJOR)$(if $(NCURSES_SNAPSHOT_DATE),.$(NCURSES_SNAPSHOT_DATE)) NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)6-config -# Fixed since snapshot 20220416 -NCURSES_IGNORE_CVES += CVE-2022-29458 - NCURSES_CONF_OPTS = \ --without-cxx \ --without-cxx-binding \ From 83e422c4ae870cb69adeef99a783ba214228860c Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Wed, 3 May 2023 20:58:32 +0200 Subject: [PATCH 0122/1167] package/gnupg2: bump version to 2.4.1 For details see [1]. [1] https://lists.gnupg.org/pipermail/gnupg-announce/2023q2/000478.html Signed-off-by: Peter Seiderer Signed-off-by: Yann E. MORIN (cherry picked from commit a27cb09d9aaa4f6f1056c520f8d0c48912451734) Signed-off-by: Peter Korsgaard --- package/gnupg2/gnupg2.hash | 8 ++++---- package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index c642862fe2f..baee8241045 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2022q4/000477.html -sha1 63dde155a8df0d5e1987efa5fc17438beca83ac1 gnupg-2.4.0.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2023q2/000478.html +sha1 d7d021101361a5e1166a6c0cc1731276e7134547 gnupg-2.4.1.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.0.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.1.tar.bz2.sig # using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 1d79158dd01d992431dd2e3facb89fdac97127f89784ea2cb610c600fb0c1483 gnupg-2.4.0.tar.bz2 +sha256 76b71e5aeb443bfd910ce9cbc8281b617c8341687afb67bae455877972b59de8 gnupg-2.4.1.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 73de185ba7c..f7c7ae847c1 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.0 +GNUPG2_VERSION = 2.4.1 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From 00b48471055dc51c34204af2e2130491838dc28b Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 May 2023 16:52:34 -0700 Subject: [PATCH 0123/1167] package/docker-engine: bump version to 23.0.5 https://github.com/moby/moby/releases/tag/v23.0.5 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit 341dfc305bd59c2172849fa6d481878330209941) Signed-off-by: Peter Korsgaard --- package/docker-engine/docker-engine.hash | 2 +- package/docker-engine/docker-engine.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-engine/docker-engine.hash b/package/docker-engine/docker-engine.hash index 0dc974ce85f..092ec989cf5 100644 --- a/package/docker-engine/docker-engine.hash +++ b/package/docker-engine/docker-engine.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2f74aef0eadf5bfe652b1822f1349fa0baf7412f83b856a9cfb9a8fbfd686880 docker-engine-23.0.3.tar.gz +sha256 f502eba135828ae52cefb12f1c74092c8865e39cb94f5daed0f3f6717a8d50a3 docker-engine-23.0.5.tar.gz sha256 7c87873291f289713ac5df48b1f2010eb6963752bbd6b530416ab99fc37914a8 LICENSE diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index c0f2c73b69b..f904793aa2f 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_ENGINE_VERSION = 23.0.3 +DOCKER_ENGINE_VERSION = 23.0.5 DOCKER_ENGINE_SITE = $(call github,moby,moby,v$(DOCKER_ENGINE_VERSION)) DOCKER_ENGINE_LICENSE = Apache-2.0 From 3653187497c19a8535b5dac045f64e20fae639cf Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 May 2023 16:52:35 -0700 Subject: [PATCH 0124/1167] package/docker-cli: bump version to 23.0.5 https://github.com/moby/moby/releases/tag/v23.0.5 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit f32e9809c0ac86bf13eb3d79f3c41cf197cfd50f) Signed-off-by: Peter Korsgaard --- package/docker-cli/docker-cli.hash | 2 +- package/docker-cli/docker-cli.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/docker-cli/docker-cli.hash b/package/docker-cli/docker-cli.hash index 891ccf4b4e7..e9e9a18cb1c 100644 --- a/package/docker-cli/docker-cli.hash +++ b/package/docker-cli/docker-cli.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7d67500372b560110e8200815f7111962ccec7d0eb3b743f80e262c38e2f7b82 docker-cli-23.0.3.tar.gz +sha256 2d6599783d447ac56d4caa482e9d8f09ad9e6f91ba2be6707bc107be04f89ddd docker-cli-23.0.5.tar.gz sha256 2d81ea060825006fc8f3fe28aa5dc0ffeb80faf325b612c955229157b8c10dc0 LICENSE diff --git a/package/docker-cli/docker-cli.mk b/package/docker-cli/docker-cli.mk index 69c4f76ee69..522971ac987 100644 --- a/package/docker-cli/docker-cli.mk +++ b/package/docker-cli/docker-cli.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_CLI_VERSION = 23.0.3 +DOCKER_CLI_VERSION = 23.0.5 DOCKER_CLI_SITE = $(call github,docker,cli,v$(DOCKER_CLI_VERSION)) DOCKER_CLI_LICENSE = Apache-2.0 From 21ae60c35f067ddaac03c70e2fa3fe279d695190 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 May 2023 17:04:03 -0700 Subject: [PATCH 0125/1167] package/runc: bump version to 1.1.7 This is the last planned release of the 1.1.x series. https://github.com/opencontainers/runc/releases/tag/v1.1.7 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit c24012ad86d753f376e01fbaf1ea72cb5975365f) Signed-off-by: Peter Korsgaard --- package/runc/runc.hash | 2 +- package/runc/runc.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/runc/runc.hash b/package/runc/runc.hash index eee2e34cbf7..1a68b74ccb6 100644 --- a/package/runc/runc.hash +++ b/package/runc/runc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 76cbf30637cbb828794d72d32fb3fd6ff3139cd9743b8b44790fd110f43d96b2 runc-1.1.5.tar.gz +sha256 f1885d6dfa188f8112328ac2355e5d67346174a2e2e795ec514a972bcbfcc2fa runc-1.1.7.tar.gz sha256 552a739c3b25792263f731542238b92f6f8d07e9a488eae27e6c4690038a8243 LICENSE diff --git a/package/runc/runc.mk b/package/runc/runc.mk index 9c6b5f9b37d..805ff23964f 100644 --- a/package/runc/runc.mk +++ b/package/runc/runc.mk @@ -4,7 +4,7 @@ # ################################################################################ -RUNC_VERSION = 1.1.5 +RUNC_VERSION = 1.1.7 RUNC_SITE = $(call github,opencontainers,runc,v$(RUNC_VERSION)) RUNC_LICENSE = Apache-2.0, LGPL-2.1 (libseccomp) RUNC_LICENSE_FILES = LICENSE From 1d55413b5a41a29df382308a7fa2a60daadadd2f Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 3 May 2023 17:24:04 -0700 Subject: [PATCH 0126/1167] package/delve: bump to version 1.20.2 https://github.com/go-delve/delve/releases/tag/v1.20.2 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit f3bb3797af6247398850c56247d1dd724cfe5539) Signed-off-by: Peter Korsgaard --- package/delve/delve.hash | 2 +- package/delve/delve.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/delve/delve.hash b/package/delve/delve.hash index bf730b9047e..105249f7f9e 100644 --- a/package/delve/delve.hash +++ b/package/delve/delve.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 39d2e3ae965abf5e71f3d8efbef368b1ee1d7154ea6604ec71d508350d419d03 delve-1.20.0.tar.gz +sha256 58ad7a7fb42ae2ddd33e7d52dad688b249ca8a358eb73b9e48f91eda79e862a8 delve-1.20.2.tar.gz sha256 778864b990007e8cef6633f8c372dd05bac1fada6cf67b008afb1483f83b38f5 LICENSE diff --git a/package/delve/delve.mk b/package/delve/delve.mk index b43d0f03c83..f261d240b22 100644 --- a/package/delve/delve.mk +++ b/package/delve/delve.mk @@ -4,7 +4,7 @@ # ################################################################################ -DELVE_VERSION = 1.20.0 +DELVE_VERSION = 1.20.2 DELVE_SITE = $(call github,go-delve,delve,v$(DELVE_VERSION)) DELVE_LICENSE = MIT DELVE_LICENSE_FILES = LICENSE From b713be49dba221591656977b152ea532a8740a2e Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 4 May 2023 00:33:10 -0700 Subject: [PATCH 0127/1167] package/moby-buildkit: security bump version to 0.11.6 Bugfixes and a security fix in v0.11.4: - CVE-2023-26054: Credentials inlined to Git URLs could end up in provenance attestation https://github.com/moby/buildkit/security/advisories/GHSA-gc89-7gcr-jxqc https://github.com/moby/buildkit/releases/tag/v0.11.6 Signed-off-by: Christian Stewart Signed-off-by: Yann E. MORIN (cherry picked from commit 2b18a93cd5cdb56dd2a0e85ea9d04e16f1513fa4) [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- package/moby-buildkit/moby-buildkit.hash | 2 +- package/moby-buildkit/moby-buildkit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/moby-buildkit/moby-buildkit.hash b/package/moby-buildkit/moby-buildkit.hash index ef927636d99..f7922d7e8f1 100644 --- a/package/moby-buildkit/moby-buildkit.hash +++ b/package/moby-buildkit/moby-buildkit.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b1746575f37715a8a2f2df5bab77ea081ba8436854e241792702109fc9e3653d moby-buildkit-0.11.2.tar.gz +sha256 1efa1c54b299c463c1b039d3df8ba1c68e70fe4de608fd14653fcebf9f27837b moby-buildkit-0.11.6.tar.gz sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/moby-buildkit/moby-buildkit.mk b/package/moby-buildkit/moby-buildkit.mk index a25f676710e..91560c1ed1d 100644 --- a/package/moby-buildkit/moby-buildkit.mk +++ b/package/moby-buildkit/moby-buildkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOBY_BUILDKIT_VERSION = 0.11.2 +MOBY_BUILDKIT_VERSION = 0.11.6 MOBY_BUILDKIT_SITE = $(call github,moby,buildkit,v$(MOBY_BUILDKIT_VERSION)) MOBY_BUILDKIT_LICENSE = Apache-2.0 MOBY_BUILDKIT_LICENSE_FILES = LICENSE From 791ad4cc89d489ed6d9b70834a4cc679398c853d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 5 Jan 2023 20:18:12 +0100 Subject: [PATCH 0128/1167] package/freeswitch: ffmpeg's libavresample is an optional dependency See upstream commit from 2019: https://github.com/signalwire/freeswitch/commit/e9c58084db249845af88011a1e3c5d7b9ec05a76#diff-2cd3a5516ad0fc3cba6d14d0ea3e72da43a2c2fc3c21eb7ade6c49d52136bbd2R43 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 7e6e2bde8bc1ae0069c534b95f66b8fbb3117c2e) Signed-off-by: Peter Korsgaard --- package/freeswitch/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/freeswitch/Config.in b/package/freeswitch/Config.in index bad101486cf..1ab624c33cd 100644 --- a/package/freeswitch/Config.in +++ b/package/freeswitch/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_FREESWITCH depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # apr, included in freeswitch source depends on BR2_USE_WCHAR # uses wchar_t - select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_JPEG From d1bd45fdcd2e04af4715d67418dfbb372b0e9e0f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:38:56 +0200 Subject: [PATCH 0129/1167] package/x11r7/xdriver_xf86-video-geode: bump version to 2.11.21 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003393.html Fixes: http://autobuild.buildroot.net/results/d1d/d1dae8c7ba9dc82fbbcc5914ea3b378e48304617/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 1a81a2f28c5e59dadcddefe2c38613ebad5e51c6) Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash | 4 +++- .../xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash index 7a66c28b52b..7dcb99fe2a8 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash @@ -1,3 +1,5 @@ +# From https://lists.x.org/archives/xorg-announce/2023-May/003393.html +sha256 8256ac3f14117324d00b7bfa8053645ca92562fe837c542489a502adbb5f9f1e xf86-video-geode-2.11.21.tar.xz +sha512 e12f74268ab7d16b57644a9465b4be1ca28d250625a31b8810e19a1f94a17e47e0a258455155fd8f336fa59fd78160cdf3763aa94b85c6ccc2c42edf3b65bc61 xf86-video-geode-2.11.21.tar.xz # Locally calculated -sha256 f497d0bfb09f36c72e3467e2d701f57f6b03ab8992c5d570e66582f714f84d64 xf86-video-geode-2.11.20.tar.bz2 sha256 3994ef7cee54f0935a4b57b1c34efd904da567931dd9e1a2d9390d22c8332ea2 COPYING diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk index dbeae1aa659..8f84e4863ff 100644 --- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk +++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.20 -XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.21 +XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.xz +XDRIVER_XF86_VIDEO_GEODE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT XDRIVER_XF86_VIDEO_GEODE_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xorgproto From 8f059f406b823237e32004ed1fd01e3906d030f5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:38:57 +0200 Subject: [PATCH 0130/1167] package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.5 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003392.html Updated license hash due to update in copyrighht years with upstream commit: https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/commit/5f63ab04338fd811c610ae7617757ede52471316 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit b30206b708e02adb1b287a2d450f48c4bd12f754) Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-input-mouse.hash | 8 ++++---- .../xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash index adba659aea6..d654c362a94 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-November/003247.html -sha256 7f6f8551fc238abdddcf9f38906564c1f8c7dacb0ad947cfc110487aefbd8d4c xf86-input-mouse-1.9.4.tar.xz -sha512 7dfde3b1e0c1291c4d78ee920942771808b007f743bfc6eed20de12579383745858673dd874a4b5cf4ab8d9d15f6f7ca2db81ee831547a488d64848a7fe5e16c xf86-input-mouse-1.9.4.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-May/003392.html +sha256 4fde8ae9b44352e2a208584c36528ee3ed13cf5fe4417208a9785daccefd9968 xf86-input-mouse-1.9.5.tar.xz +sha512 ed9bd9cb9a05dac0ff1bfb4e4704cb2e94117afb400aa9e0b7ccdbb102bc6db1b0d3af7cb6f99d0892f8fc306f1643286291c0fa7114af8e65864412bd6c1afa xf86-input-mouse-1.9.5.tar.xz # Locally computed -sha256 472ff645ead9bf3ffb48d42c596376ffc595897e0c0993a071a7ada0da1f4f10 COPYING +sha256 5b066654bdb61a1ef41f38cceda752897bbddb6e60e20f5889cab436a9b7b813 COPYING diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk index 4a9eb3089ff..25e25ab93de 100644 --- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.4 +XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.5 XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.xz XDRIVER_XF86_INPUT_MOUSE_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT From 23db85f782e59e18e622937a4da03e61956243cb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:38:58 +0200 Subject: [PATCH 0131/1167] package/x11r7/xapp_xcalc: bump version to 1.1.2 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003391.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit e07901f5e74c0d97a98a69dae4aad5014bb6983b) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xcalc/xapp_xcalc.hash | 6 +++--- package/x11r7/xapp_xcalc/xapp_xcalc.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.hash b/package/x11r7/xapp_xcalc/xapp_xcalc.hash index 0580253dd69..12633a41a92 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.hash +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003138.html -sha256 8cb08212c5322e8043f39b28699e13a43f000976c90b3c7fadd4fae2766326b4 xcalc-1.1.1.tar.xz -sha512 a261e9798d62727f40b9aff07e68e63ba40aa7f4f9b1811d8efd8c3e73cd5912d6178c55ca3c059968191051bd20b889b06b5e92b3df70c7b5d09bd013b9ebdb xcalc-1.1.1.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-May/003391.html +sha256 8578dfa1457e94289f6d6ed6146714307d8a73a1b54d2f42af1321b625fc1cd4 xcalc-1.1.2.tar.xz +sha512 51da677dc88bcd7299ed8d678cb26b048fdb82a1983e1496a06253ee2dceefca4ac87d1a74432b4a76dcc11921a61339bb3d292607be46228164140b430bbad2 xcalc-1.1.2.tar.xz # Locally computed sha256 8dd69dbec37866a41d3040c5c478aca46e0b50c30319f178064d5e2ed9d3f912 COPYING diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk index 849746ece3f..ffb724e39cf 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XCALC_VERSION = 1.1.1 +XAPP_XCALC_VERSION = 1.1.2 XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.xz XAPP_XCALC_SITE = https://xorg.freedesktop.org/releases/individual/app XAPP_XCALC_LICENSE = MIT From 0d622f347954e696033da0a318849e6ac7e0de12 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:38:59 +0200 Subject: [PATCH 0132/1167] package/x11r7/xlib_libXi: bump version to 1.8.1 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003390.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit e45fb0242496ed4d5bb43108c8bac0ba01af2fff) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXi/xlib_libXi.hash | 6 +++--- package/x11r7/xlib_libXi/xlib_libXi.mk | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xlib_libXi/xlib_libXi.hash b/package/x11r7/xlib_libXi/xlib_libXi.hash index a86ef13225f..545d4881f6a 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.hash +++ b/package/x11r7/xlib_libXi/xlib_libXi.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-September/003109.html -sha256 2ed181446a61c7337576467870bc5336fc9e222a281122d96c4d39a3298bba00 libXi-1.8.tar.bz2 -sha512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba libXi-1.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-May/003390.html +sha256 89bfc0e814f288f784202e6e5f9b362b788ccecdeb078670145eacd8749656a7 libXi-1.8.1.tar.xz +sha512 a30b1a07e6d710f5196e7477415d68074736f89d954e8f2d5ccc9b5f349e7d1d440c90fb512508176b5db5ecad55608cfb540872936b731963fd83343db3a0b9 libXi-1.8.1.tar.xz # Locally computed sha256 9392174bc86e291369fd2f61f3ed325962735a5f5c585ce8d7ebd365e2a5639f COPYING diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk index b4802cf018c..6ae5ec8be83 100644 --- a/package/x11r7/xlib_libXi/xlib_libXi.mk +++ b/package/x11r7/xlib_libXi/xlib_libXi.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXI_VERSION = 1.8 -XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 -XLIB_LIBXI_SITE = https://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXI_VERSION = 1.8.1 +XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.xz +XLIB_LIBXI_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXI_LICENSE = MIT XLIB_LIBXI_LICENSE_FILES = COPYING XLIB_LIBXI_CPE_ID_VENDOR = x.org From 633932349d7697e9a627d4742a410fd165169ee3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:00 +0200 Subject: [PATCH 0133/1167] package/x11r7/xapp_xinput: bump version to 1.6.4 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003389.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 33916e184b1e6efa9221c66707132d9b997eb98b) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xinput/xapp_xinput.hash | 8 +++----- package/x11r7/xapp_xinput/xapp_xinput.mk | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xapp_xinput/xapp_xinput.hash b/package/x11r7/xapp_xinput/xapp_xinput.hash index 0961879637e..d3a6a66902a 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.hash +++ b/package/x11r7/xapp_xinput/xapp_xinput.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003013.html -md5 ac6b7432726008b2f50eba82b0e2dbe4 xinput-1.6.3.tar.bz2 -sha1 92ea7dfb3d8465921b0dca85da7d5b01cedae6c8 xinput-1.6.3.tar.bz2 -sha256 35a281dd3b9b22ea85e39869bb7670ba78955d5fec17c6ef7165d61e5aeb66ed xinput-1.6.3.tar.bz2 -sha512 cb2fef866ac5a71dbca3e23b4ecadaca38e65dc1b30f8bb024bad92486554fafc472706619a1af04c746a4f53ce6aea827d694b9f4f0c7d0d46bb1da81984076 xinput-1.6.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003389.html +sha256 ad04d00d656884d133110eeddc34e9c69e626ebebbbab04dc95791c2907057c8 xinput-1.6.4.tar.xz +sha512 6734860852715e5cb9d26259a173e42413fc037546ed7fa4173ffa802c2619ee0322bed228a28cd1911be759d860070867d9b89b115f37323cca1c9ef75354b9 xinput-1.6.4.tar.xz # Locally computed sha256 bbd35c7a8e8c5cb073935e84b29b0c53f7131a4ef1ce737dc2be5616941e07e1 COPYING diff --git a/package/x11r7/xapp_xinput/xapp_xinput.mk b/package/x11r7/xapp_xinput/xapp_xinput.mk index 0d6c0deffe4..614b62fe773 100644 --- a/package/x11r7/xapp_xinput/xapp_xinput.mk +++ b/package/x11r7/xapp_xinput/xapp_xinput.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XINPUT_VERSION = 1.6.3 -XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2 +XAPP_XINPUT_VERSION = 1.6.4 +XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.xz XAPP_XINPUT_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XINPUT_LICENSE = MIT XAPP_XINPUT_LICENSE_FILES = COPYING From 9c81ab45921df33cc5e7a3b5e60cde081b25a97b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:01 +0200 Subject: [PATCH 0134/1167] package/x11r7/xapp_xdpyinfo: bump version to 1.3.4 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003388.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 770c9baa3ebc56ef0633948ecc0ccceb12b7825c) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash | 6 +++--- package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash index 07a3eb936cf..b0afdc15acd 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003157.html -sha256 356d5fd62f3e98ee36d6becf1b32d4ab6112d618339fb4b592ccffbd9e0fc206 xdpyinfo-1.3.3.tar.xz -sha512 47fe0821bc64145876853712ebd7c0af80111c243813615b892429021cc9a53abd38c4684551ae300cb5a4eacdd3d26e2c93e789ed91a948b20e2c37cd2d2442 xdpyinfo-1.3.3.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-April/003388.html +sha256 a8ada581dbd7266440d7c3794fa89edf6b99b8857fc2e8c31042684f3af4822b xdpyinfo-1.3.4.tar.xz +sha512 9ef9f5c10e15a40895e8f008896b960fdd438277657c7159d16f05db79cd2374cfaca4af2f4e59335824bfd2f74a045ef89dd99ea4130ed436ea59fbbb1cbe12 xdpyinfo-1.3.4.tar.xz # Locally computed sha256 49733ead65fdfa1da0d176f9b965cc08dae74d73d66c9606488d52f6fc036abf COPYING diff --git a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk index c5e2a857e3f..a198fc44c36 100644 --- a/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk +++ b/package/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk @@ -4,9 +4,9 @@ # ################################################################################ -XAPP_XDPYINFO_VERSION = 1.3.3 +XAPP_XDPYINFO_VERSION = 1.3.4 XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.xz -XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app +XAPP_XDPYINFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XDPYINFO_LICENSE = MIT XAPP_XDPYINFO_LICENSE_FILES = COPYING XAPP_XDPYINFO_CONF_OPTS = --without-xf86misc # not in BR From 4ad7b1f310bf708c9e406913e4fe7f3d37b34244 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:03 +0200 Subject: [PATCH 0135/1167] package/x11r7/xlib_libXpm: bump version to 3.5.16 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003385.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit a8c003ae295f056699a325ba1bf9ec0c4d8e37e9) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXpm/xlib_libXpm.hash | 6 +++--- package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.hash b/package/x11r7/xlib_libXpm/xlib_libXpm.hash index 733c404543f..a041f0d440d 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.hash +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2023-January/003313.html -sha256 60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1 libXpm-3.5.15.tar.xz -sha512 955d716fcea2c9d868ab941c56f017b39bfa0f47fd2904e9b04c6a9be17f23f8b8c906da9c90a89a789f1f399d419641705ff5b6f9921820e34d4807c7a1992f libXpm-3.5.15.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-April/003385.html +sha256 e6bc5da7a69dbd9bcc67e87c93d4904fe2f5177a0711c56e71fa2f6eff649f51 libXpm-3.5.16.tar.xz +sha512 ee564311f8c1c9c08ed1035d55c287ecf7c20c6fee09ad448acfab59f38fd1ef381d4a24b4af2b581f3033730eebc7c690918e52ba706de689d1ef11085edac2 libXpm-3.5.16.tar.xz # Locally calculated sha256 a80d706759624a04aa90fd62bc644a360fc3d72e08dcbfb129f167c11ca285de COPYING sha256 cbe4ced0abc8a32bea471204ae01038c202758ce4e772d3d329a341ffa761e71 COPYRIGHT diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk index 970ec934077..51f62833701 100644 --- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk +++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXPM_VERSION = 3.5.15 +XLIB_LIBXPM_VERSION = 3.5.16 XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.xz XLIB_LIBXPM_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXPM_LICENSE = MIT From aa4c242b56e017ce48a0db18adc9a6b0aac863af Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:04 +0200 Subject: [PATCH 0136/1167] package/x11r7/xlib_libXft: bump version to 2.3.8 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003384.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 634a119e9c04c68408800f78e05f9d29d5750627) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXft/xlib_libXft.hash | 6 +++--- package/x11r7/xlib_libXft/xlib_libXft.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libXft/xlib_libXft.hash b/package/x11r7/xlib_libXft/xlib_libXft.hash index 5074365aeda..749aa0ad620 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.hash +++ b/package/x11r7/xlib_libXft/xlib_libXft.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg/2022-November/061175.html -sha256 79f0b37c45007381c371a790c2754644ad955166dbf2a48e3625032e9bdd4f71 libXft-2.3.7.tar.xz -sha512 9df29d3c7b88a21952df1015604511e5d79856d721b2a61eb2c5a062a9abccf16318132432a7c86c0ef816bf174ae86842fa67dabbaa0b163dfa56d99022de19 libXft-2.3.7.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-April/003384.html +sha256 5e8c3c4bc2d4c0a40aef6b4b38ed2fb74301640da29f6528154b5009b1c6dd49 libXft-2.3.8.tar.xz +sha512 fc385d73e1acb701942c154ffb5a283d17891f21d3ac598c4a3fb375a7d6082734593062368c15cad67c1a94177dd15deed878ec5ea852188393b52e92c372c8 libXft-2.3.8.tar.xz # Locally computed sha256 7cda22286b1379b9b73df695f72cbad36595e65b039a5fbc5c89b69ecc44438c COPYING diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk index 845b612669f..154c220aa11 100644 --- a/package/x11r7/xlib_libXft/xlib_libXft.mk +++ b/package/x11r7/xlib_libXft/xlib_libXft.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXFT_VERSION = 2.3.7 +XLIB_LIBXFT_VERSION = 2.3.8 XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.xz XLIB_LIBXFT_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFT_LICENSE = MIT From 1e6a4f1fd632a3c9d6d81e5e4322140829009aee Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:06 +0200 Subject: [PATCH 0137/1167] package/x11r7/xlib_libXfixes: bump version to 6.0.1 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003382.html Update license hash due to copyright update with upstream commit: https://gitlab.freedesktop.org/xorg/lib/libxfixes/-/commit/1f908b1f27723a9a8f532ab4cc58429c2f174224 -> drop "all rights reserved" -> no licensing change Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 6bd350f9bdd4f4358b037d6d873ee915f4dc5ac1) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXfixes/xlib_libXfixes.hash | 9 ++++----- package/x11r7/xlib_libXfixes/xlib_libXfixes.mk | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash index 5dfe4960525..03de9062453 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-May/003086.html -sha256 a7c1a24da53e0b46cac5aea79094b4b2257321c621b258729bc3139149245b4c libXfixes-6.0.0.tar.bz2 -sha512 1985ef156f382e9a7e1cc7e044e0f626de1e4c82557a511cbcf6431994c0ac25b1f8b3a0293bd3089331593db8ce01d3a71ddec68f19b5fe6029d5082fb6885d libXfixes-6.0.0.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2023-April/003382.html +sha256 b695f93cd2499421ab02d22744458e650ccc88c1d4c8130d60200213abc02d58 libXfixes-6.0.1.tar.xz +sha512 b46deffb30cd73ec8a127390d99f2ba2f3ab78f334fdba227f1f461441644a0c169b0d13ffa47576fa458780e7a6db664ff8b93e9195fb217262efd8128f1ffe libXfixes-6.0.1.tar.xz # Locally calculated -sha256 d64e671ffeb483d4543f98c842788ab34c77427e27d83d6b082065a4438d4885 COPYING +sha256 a07d8a5a6972638a745a03983207a1052881c24eea29021fdca7794bea8d7774 COPYING diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk index c0229b57d2e..3f535fc1d49 100644 --- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk +++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXFIXES_VERSION = 6.0.0 -XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2 -XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXFIXES_VERSION = 6.0.1 +XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.xz +XLIB_LIBXFIXES_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXFIXES_LICENSE = MIT XLIB_LIBXFIXES_LICENSE_FILES = COPYING XLIB_LIBXFIXES_CPE_ID_VENDOR = x From c9f2fca27619f76ded3b51931912e56c1698a125 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:08 +0200 Subject: [PATCH 0138/1167] package/x11r7/xdriver_xf86-video-neomagic: bump version to 1.3.1 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003380.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit cb4b592f6654ba15f21b4cead97661e18df2beec) Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-neomagic.hash | 8 +++----- .../xdriver_xf86-video-neomagic.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash index acc65348f79..b5a139fdacd 100644 --- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash +++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-December/002934.html -md5 349d5254d09eb46f2a1f151cd423b89a xf86-video-neomagic-1.3.0.tar.bz2 -sha1 6bccfa15ea05d5264120cd96ccf13687642e8f6d xf86-video-neomagic-1.3.0.tar.bz2 -sha256 93833950fae7757088eb6abb125e15e8c245e5e25681c19c3ad4213ec7319064 xf86-video-neomagic-1.3.0.tar.bz2 -sha512 25d019a2556e52aeb4e25942f444437a921e76d527c10ddd420f16aa7d85bf2b8a51612c382a2a7e3e407bb1e8d610d063101184eea0889c3e1a69bfb3b37735 xf86-video-neomagic-1.3.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003380.html +sha256 b61fac7ec32971e92e34cfd51f88fef169e272a210455e0e1a0faa0d30fc7494 xf86-video-neomagic-1.3.1.tar.xz +sha512 b2425c4e9b8e6e816cbb6fa436da12bd242acf55c3c615352fc80ea072b1822abdb40838c2adcc3c450e429ec6e3b5112d194e739cf5d8ac22d430e273d5378b xf86-video-neomagic-1.3.1.tar.xz # Locally computed sha256 95063ce9aa09850025dd317549ce688519079a8d3cf66ceb3d882cb2bafcced9 COPYING diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk index 8dd2777ff9c..8c7beeed6e9 100644 --- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk +++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.3.0 -XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.3.1 +XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.xz +XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE = MIT XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xorgproto From 2a23ae346c7563c8e9486903a13ff28d6bf0334f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:09 +0200 Subject: [PATCH 0139/1167] package/x11r7/xapp_xwininfo: bump version to 1.1.6 Release notes: https://lists.x.org/archives/xorg-announce/2023-April/003379.html Updated license hash due to upstream commit: https://gitlab.freedesktop.org/xorg/app/xwininfo/-/commit/9a5623e2ffc6995b2c6edf379f191d76d7b4444a -> drop "all rights reserved", update years -> no change in licensing Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit de8a3a53e52dc1ac6e04e623739aa67d412e965e) Signed-off-by: Peter Korsgaard --- package/x11r7/xapp_xwininfo/xapp_xwininfo.hash | 10 ++++------ package/x11r7/xapp_xwininfo/xapp_xwininfo.mk | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash b/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash index fbc7f7be000..bbf2e37328a 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-July/003012.html -md5 26d46f7ef0588d3392da3ad5802be420 xwininfo-1.1.5.tar.bz2 -sha1 9f67b1eb07c5824d437bf577cf6198962af1aeb7 xwininfo-1.1.5.tar.bz2 -sha256 7a405441dfc476666c744f5fcd1bc8a75abf8b5b1d85db7b88b370982365080e xwininfo-1.1.5.tar.bz2 -sha512 a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6 xwininfo-1.1.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-April/003379.html +sha256 3518897c17448df9ba99ad6d9bb1ca0f17bc0ed7c0fd61281b34ceed29a9253f xwininfo-1.1.6.tar.xz +sha512 c6df4ed3dcf97772450612f2786ecab8313a43bb78e0b8020cc9ec228b3f466f55090313ad02c8159a73a6892d117322ad85e28d9d76e38bb84c9750712c20bc xwininfo-1.1.6.tar.xz # Locally computed -sha256 443d675237c023a47e4886506b72796afbb2633394812027f91d6e8fa433b2af COPYING +sha256 1be1f0763a5efd08e48089c52728a822bf769b690a2fd82fbab456cfffee822f COPYING diff --git a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk index 9652487aae5..196b73c83d2 100644 --- a/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk +++ b/package/x11r7/xapp_xwininfo/xapp_xwininfo.mk @@ -4,8 +4,8 @@ # ################################################################################ -XAPP_XWININFO_VERSION = 1.1.5 -XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2 +XAPP_XWININFO_VERSION = 1.1.6 +XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.xz XAPP_XWININFO_SITE = https://xorg.freedesktop.org/archive/individual/app XAPP_XWININFO_LICENSE = MIT XAPP_XWININFO_LICENSE_FILES = COPYING From 9f9fac6fb485a20a15ae5e8f1d620da2742e4c05 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:11 +0200 Subject: [PATCH 0140/1167] package/x11r7/xlib_libXaw: bump version to 1.0.15 Release notes: https://lists.x.org/archives/xorg-announce/2023-March/003372.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 0864f874287c06cdbc54c6150f52c003b5741226) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libXaw/xlib_libXaw.hash | 7 +++---- package/x11r7/xlib_libXaw/xlib_libXaw.mk | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.hash b/package/x11r7/xlib_libXaw/xlib_libXaw.hash index f289e661530..ce2ec4a3e15 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.hash +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.hash @@ -1,6 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2021-March/003077.html -sha256 76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e libXaw-1.0.14.tar.bz2 -sha512 29d1c151369523ae6cb418e636b0b7b39ccccc35462a0b394dbeb46d5b6d780badd2eb872a55d9fbba1ee1af034e76c0463f40f8d8a7be2c336d08b3b1bf81d4 libXaw-1.0.14.tar.bz2 - +# From https://lists.x.org/archives/xorg-announce/2023-March/003372.html +sha256 ab35f70fde9fb02cc71b342f654846a74328b74cb3a0703c02d20eddb212754a libXaw-1.0.15.tar.xz +sha512 8edbf280b7b24b9040c291545053c1251d6af7e7f56da43a6065a1848245863eb52bdfc28c2f18dbb6597a4064394a44f4df5d8596a1a467549ccc9ce50a7821 libXaw-1.0.15.tar.xz # Locally calculated sha256 9f5adb26952f93b3e4650285b94ec6c61a27aab5a21088bfb6694001be1b360d COPYING diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk index 6b615a8de5e..f81a7b4a889 100644 --- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk +++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk @@ -4,9 +4,9 @@ # ################################################################################ -XLIB_LIBXAW_VERSION = 1.0.14 -XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2 -XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXAW_VERSION = 1.0.15 +XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.xz +XLIB_LIBXAW_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBXAW_LICENSE = MIT XLIB_LIBXAW_LICENSE_FILES = COPYING XLIB_LIBXAW_INSTALL_STAGING = YES From e8f4288e61cf56dbeac2b5afaea4c2c80f5519dd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:12 +0200 Subject: [PATCH 0141/1167] package/x11r7/xfont_encodings: bump version to 1.0.7 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003355.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 75d404bb2902cf891f76e8b21a913355d117e514) Signed-off-by: Peter Korsgaard --- package/x11r7/xfont_encodings/xfont_encodings.hash | 6 +++--- package/x11r7/xfont_encodings/xfont_encodings.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xfont_encodings/xfont_encodings.hash b/package/x11r7/xfont_encodings/xfont_encodings.hash index 6da1080576e..80d4a48c406 100644 --- a/package/x11r7/xfont_encodings/xfont_encodings.hash +++ b/package/x11r7/xfont_encodings/xfont_encodings.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-July/003189.html -sha256 77e301de661f35a622b18f60b555a7e7d8c4d5f43ed41410e830d5ac9084fc26 encodings-1.0.6.tar.xz -sha512 2d52486996939401121bc858ba23031f70eef857760db8da4c84f083e981868e4bc7a8c2ab6d59274a0cf95f592a0dbfad47bce6c9299bb45d115b48abc39134 encodings-1.0.6.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-February/003355.html +sha256 3a39a9f43b16521cdbd9f810090952af4f109b44fa7a865cd555f8febcea70a4 encodings-1.0.7.tar.xz +sha512 dc72982b14e5d89fe1eff1ab11f308796c89255a06337d8cd6bf65757f11dd0a5478b41d844793213db8fe9638389734f148abe9df9fb05027ea563dacde6ba8 encodings-1.0.7.tar.xz # Locally computed sha256 13b4a0f9431f0fdd6ee36ed386e0b7d1eb429c5cb88df73353896078cbb5a137 COPYING diff --git a/package/x11r7/xfont_encodings/xfont_encodings.mk b/package/x11r7/xfont_encodings/xfont_encodings.mk index d499b421fb0..7825f4117e1 100644 --- a/package/x11r7/xfont_encodings/xfont_encodings.mk +++ b/package/x11r7/xfont_encodings/xfont_encodings.mk @@ -4,9 +4,9 @@ # ################################################################################ -XFONT_ENCODINGS_VERSION = 1.0.6 +XFONT_ENCODINGS_VERSION = 1.0.7 XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.xz -XFONT_ENCODINGS_SITE = https://xorg.freedesktop.org/releases/individual/font +XFONT_ENCODINGS_SITE = https://xorg.freedesktop.org/archive/individual/font XFONT_ENCODINGS_LICENSE = Public Domain XFONT_ENCODINGS_LICENSE_FILES = COPYING From 221b7b045ee6b7a294f3bb35a29cc3ab4736451f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:13 +0200 Subject: [PATCH 0142/1167] package/x11r7/xdata_xbitmaps: bump version to 1.1.3 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003333.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 1a5d479d6887a241fc6092f1828617e4cb72d93e) Signed-off-by: Peter Korsgaard --- package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash | 8 +++----- package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash index 7ebc88a0bee..c9a3956686e 100644 --- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash +++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002881.html -md5 cedeef095918aca86da79a2934e03daf xbitmaps-1.1.2.tar.bz2 -sha1 1cb0e485a66280e9a64b48426140b8a0de9cf169 xbitmaps-1.1.2.tar.bz2 -sha256 b9f0c71563125937776c8f1f25174ae9685314cbd130fb4c2efce811981e07ee xbitmaps-1.1.2.tar.bz2 -sha512 eed5e2fce9fc6c532984e6ed1262e440591e311ca6c61a7fe7a5c877df84bfc2d7aff388fb9c894fc098785b8e5352f0bd7c918252247a040cf123874847450d xbitmaps-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003333.html +sha256 ad6cad54887832a17d86c2ccfc5e52a1dfab090f8307b152c78b0e1529cd0f7a xbitmaps-1.1.3.tar.xz +sha512 b9a7340385fcce2dcd0204f14a462685b14b72ff58f3ec53cd76695bef2b02af902bdac809622dcb27fd4075d5ba13587b5d059530aff502cd5288d161352814 xbitmaps-1.1.3.tar.xz # Locally computed sha256 e121ec6605558ee021674d33b1ab9306e16b9ea7d30453df42286556247be17a COPYING diff --git a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk index e9545abaec6..c8b64458291 100644 --- a/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk +++ b/package/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDATA_XBITMAPS_VERSION = 1.1.2 -XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2 -XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data +XDATA_XBITMAPS_VERSION = 1.1.3 +XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.xz +XDATA_XBITMAPS_SITE = https://xorg.freedesktop.org/archive/individual/data XDATA_XBITMAPS_LICENSE = MIT XDATA_XBITMAPS_LICENSE_FILES = COPYING From cf6733b7943347fde134cc2e3d6836d481e813a4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:14 +0200 Subject: [PATCH 0143/1167] package/x11r7/xdata_xcursor-themes: bump version to 1.0.7 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003332.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 58035c687aa9128408e6519857a8b6a8c64ae6e8) Signed-off-by: Peter Korsgaard --- .../x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash | 8 +++----- .../x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash index 2b88f567a07..1bb3831c91e 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-February/002945.html -md5 aea14eabf40528ec4db18f1cfcf5c458 xcursor-themes-1.0.6.tar.bz2 -sha1 b56fd5bf5b1ada0532a85c27db0d296e392168c5 xcursor-themes-1.0.6.tar.bz2 -sha256 ee1ec574741293abcf66ac14ce7e74add7ac6be7deb8b38179ef010d22354999 xcursor-themes-1.0.6.tar.bz2 -sha512 2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3 xcursor-themes-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003332.html +sha256 95bae8f48823d894a05bf42dfbf453674ab7dbdeb11e2bc079e8525ad47378c8 xcursor-themes-1.0.7.tar.xz +sha512 910925dd17c576028ae0d9dfe5683888648b941806b53cd9ff74ed18ff2de537664b07ab4c647a55290aeba37f6051f322b29e8ecd54f348e32abe2ccea1c902 xcursor-themes-1.0.7.tar.xz # Locally computed sha256 e437aed89c3440a9fe7e19968a3f2eeb97041ef6c9616837a3fd42d0874fc0e6 COPYING diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index c3c5f388e90..e5bf1e502f4 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDATA_XCURSOR_THEMES_VERSION = 1.0.6 -XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2 -XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data +XDATA_XCURSOR_THEMES_VERSION = 1.0.7 +XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.xz +XDATA_XCURSOR_THEMES_SITE = https://xorg.freedesktop.org/archive/individual/data XDATA_XCURSOR_THEMES_LICENSE = MIT XDATA_XCURSOR_THEMES_LICENSE_FILES = COPYING From 44b1e44ef9b62c637975d8446c24c8cc6653f912 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 6 May 2023 19:39:17 +0200 Subject: [PATCH 0144/1167] package/x11r7/xdriver_xf86-video-ark: bump version to 0.7.6 Release notes: https://lists.x.org/archives/xorg-announce/2023-February/003328.html Removed patch which was applied upstream. Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: regenerate .checkpackageignore] Signed-off-by: Yann E. MORIN (cherry picked from commit cd1b1bcc0ec31b3af8d901cb7e05bd2794e3130f) Signed-off-by: Peter Korsgaard --- .../0001-mibstore.patch | 40 ------------------- .../xdriver_xf86-video-ark.hash | 5 ++- .../xdriver_xf86-video-ark.mk | 6 +-- 3 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch diff --git a/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch b/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch deleted file mode 100644 index fa3e68596aa..00000000000 --- a/package/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3a3eb72baec46f48e6cf15a834271c3d3386deac Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon -Date: Tue, 17 Sep 2013 19:55:37 +0000 -Subject: Remove usage of mibstore.h (removed from server) - -The module had a compile error for this missing header file. - -Changes similar to vmware commit -23d87c92b7211cc5249eefe4ab3a2c7f370e279e - -Reviewed-by: Alex Deucher -Signed-off-by: Gaetan Nadon ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-ark/commit/?id=3a3eb72baec46f48e6cf15a834271c3d3386deac - -Signed-off-by: Bernd Kuhls - -diff --git a/src/ark_driver.c b/src/ark_driver.c -index b7c287c..65cfe84 100644 ---- a/src/ark_driver.c -+++ b/src/ark_driver.c -@@ -39,7 +39,6 @@ - #include "compiler.h" - #include "mipointer.h" - #include "micmap.h" --#include "mibstore.h" - #include "fb.h" - #include "ark.h" - -@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL) - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - if (!pARK->NoAccel) { --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash index 2e2e9536763..68131fdb38a 100644 --- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash +++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash @@ -1,4 +1,5 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002007.html -sha256 c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e xf86-video-ark-0.7.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003328.html +sha256 5acc9e78122ff6f4390787b2d0d44df81379bd613b6245983cc4bf3f325d085d xf86-video-ark-0.7.6.tar.xz +sha512 a52623e07eef6fa12d77b1afc55bb74b21662b850515b3a32bbf5988dcea2e787b4eddf4e020279aa4e4ddba436505ca9298548406913031e0ed5edaac835491 xf86-video-ark-0.7.6.tar.xz # Locally calculated sha256 8ba9850fb0ecd9033bb1d25c1be85625cb53ca56ce76b71f78f4a034f7310bda COPYING diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk index 3f2a63609e1..6301a97300f 100644 --- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk +++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.5 -XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.6 +XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.xz +XDRIVER_XF86_VIDEO_ARK_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_ARK_LICENSE = MIT XDRIVER_XF86_VIDEO_ARK_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xorgproto From ded4f049f674f996c5f65911a87a024010b3cd16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= Date: Sat, 29 Apr 2023 14:47:31 +0200 Subject: [PATCH 0145/1167] package/micropython: pass $TARGET_LDFLAGS to build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LDFLAGS need to be passed to the micropython build system via the LDFLAGS_EXTRA variable, which was so far missing. This patch adds it. Signed-off-by: Jonathan Neuschäfer Acked-by: Chris Packham Signed-off-by: Yann E. MORIN (cherry picked from commit f89b988d33c9bd65ab33023fafab80b69d767656) Signed-off-by: Peter Korsgaard --- package/micropython/micropython.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk index 51b45e5e99d..5f687c73b9b 100644 --- a/package/micropython/micropython.mk +++ b/package/micropython/micropython.mk @@ -36,6 +36,7 @@ MICROPYTHON_MAKE_OPTS += \ MICROPY_PY_USSL=0 \ CROSS_COMPILE=$(TARGET_CROSS) \ CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ + LDFLAGS_EXTRA="$(TARGET_LDFLAGS)" \ CWARN= define MICROPYTHON_BUILD_CMDS From 9e9280fea5ec5c0d7878a6f12ff185013db50a45 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 22 Apr 2023 15:41:00 +0200 Subject: [PATCH 0146/1167] configs/stm32f4xx_defconfig: remove BR2_PACKAGE_IFUPDOWN_SCRIPTS Kernel is built without network support. It is useless to compile the package and then remove it from rootfs. Signed-off-by: Dario Binacchi Signed-off-by: Yann E. MORIN (cherry picked from commit 58e7ac21b185fab04af40a2f26d8f5c789de26eb) Signed-off-by: Peter Korsgaard --- board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh | 4 ---- configs/stm32f429_disco_xip_defconfig | 1 + configs/stm32f469_disco_sd_defconfig | 1 + configs/stm32f469_disco_xip_defconfig | 1 + 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh b/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh index e324afe59a9..2ac9c653c32 100755 --- a/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh +++ b/board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh @@ -2,7 +2,3 @@ # Kernel is built without devpts support sed -i '/^devpts/d' ${TARGET_DIR}/etc/fstab - -# Kernel is built without network support -rm -f ${TARGET_DIR}/etc/init.d/S40network -rm -rf ${TARGET_DIR}/etc/network/ diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index 872e4b6a306..9edbbab387e 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f429-disco" BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_AFBOOT_STM32=y diff --git a/configs/stm32f469_disco_sd_defconfig b/configs/stm32f469_disco_sd_defconfig index dc00a47e1da..24791178f46 100644 --- a/configs/stm32f469_disco_sd_defconfig +++ b/configs/stm32f469_disco_sd_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="zImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" # BR2_TARGET_ROOTFS_TAR is not set diff --git a/configs/stm32f469_disco_xip_defconfig b/configs/stm32f469_disco_xip_defconfig index fc3b3f92139..ae2780556ad 100644 --- a/configs/stm32f469_disco_xip_defconfig +++ b/configs/stm32f469_disco_xip_defconfig @@ -14,6 +14,7 @@ BR2_LINUX_KERNEL_IMAGE_TARGET_NAME="xipImage" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="stm32f469-disco" BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-minimal.config" +# BR2_PACKAGE_IFUPDOWN_SCRIPTS is not set BR2_TARGET_ROOTFS_INITRAMFS=y # BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_AFBOOT_STM32=y From ff7de79f729ec54629db7c7e46ed620884995cb1 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 1 May 2023 18:26:19 +0200 Subject: [PATCH 0147/1167] configs/stm32f429_disco_xip_defconfig: fix runtime error due to low ram space and bump to linux version 6.1.27 After booting Linux the userspace is unusable since every command issued, that is a symlink to busybox, fails because of no free ram. So let's disable IIO in linux.config to give some more ram to userspace. Signed-off-by: Giulio Benetti Signed-off-by: Yann E. MORIN (cherry picked from commit 65ff3e10ed14fe2e42eeacf6037981730b63177d) Signed-off-by: Peter Korsgaard --- board/stmicroelectronics/stm32f429-disco/linux.config | 4 ---- configs/stm32f429_disco_xip_defconfig | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/board/stmicroelectronics/stm32f429-disco/linux.config b/board/stmicroelectronics/stm32f429-disco/linux.config index 7b5c60f1806..02d9c2d1e09 100644 --- a/board/stmicroelectronics/stm32f429-disco/linux.config +++ b/board/stmicroelectronics/stm32f429-disco/linux.config @@ -95,10 +95,6 @@ CONFIG_STM32_MDMA=y CONFIG_SYNC_FILE=y # CONFIG_VIRTIO_MENU is not set # CONFIG_VHOST_MENU is not set -CONFIG_IIO=y -CONFIG_IIO_BUFFER=y -CONFIG_IIO_TRIGGERED_BUFFER=y -CONFIG_IIO_STM32_TIMER_TRIGGER=y # CONFIG_FILE_LOCKING is not set # CONFIG_DNOTIFY is not set # CONFIG_INOTIFY_USER is not set diff --git a/configs/stm32f429_disco_xip_defconfig b/configs/stm32f429_disco_xip_defconfig index 9edbbab387e..5640d9dc4d3 100644 --- a/configs/stm32f429_disco_xip_defconfig +++ b/configs/stm32f429_disco_xip_defconfig @@ -6,7 +6,7 @@ BR2_ENABLE_LTO=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/stmicroelectronics/common/stm32f4xx/stm32-post-build.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.10" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.27" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/stmicroelectronics/stm32f429-disco/linux.config" BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM=y From 2cf01c59ed6a2e8500017936f3d6ecdb7940c399 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 3 May 2023 00:04:51 +0200 Subject: [PATCH 0148/1167] package/busybox: disable sha1/sha256 hwaccel with x86 Buxybox's init segfault when built with x86 musl toolchain due to recent changes about sha1 and sha156 hwaccel support in Busybox 1.36.0. From Alpinelinux [1]: "main/busybox: disable sha hwaccel the flag check for this seems incorrect- it triggers sha_ni use when the instructions aren't available, but avx512vl/bw is - Elly on irc causes failures in github actions, which have avx512 but no sha_no" The flag check was supposed to be fixed upstream by commit [2]. But init still crash with the latest 1_36_stable (with backported patch) and master branch... The same workaround has been applied to openembedded-core [3], which states that they also have the issue with glibc. Disable hardware sha acceleration on x86 (not x86_64), to avoid the issue. Checked that qemu_x86_64_defconfig with musl for x86_64 for core2 boot as expected with sha hwaccel enabled. Fixes: https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/4202276721 [1] https://git.alpinelinux.org/aports/commit/main/busybox?id=ae2cfdf6f6da3dc46ee09d8ceafa26921f6e058e [2] https://git.busybox.net/busybox/commit/?id=bd76b75f72f717150b909e8c64edfda725cabe11 [3] https://github.com/openembedded/openembedded-core/commit/22f639d61127f4b82a79008c5305e44e090a3680 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit a57c02a4ea48bdb3ffc8cdba2569d240275b1bc3) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 1633ca525d1..fd4f3c17c5a 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -276,6 +276,15 @@ define BUSYBOX_INSTALL_INDIVIDUAL_BINARIES endef endif +# Disable SHA1 and SHA256 HWACCEL to avoid segfault in init +# with some x86 toolchains (mostly musl?). +ifeq ($(BR2_i386),y) +define BUSYBOX_MUSL_DISABLE_SHA_HWACCEL + $(call KCONFIG_DISABLE_OPT,CONFIG_SHA1_HWACCEL) + $(call KCONFIG_DISABLE_OPT,CONFIG_SHA256_HWACCEL) +endef +endif + # Only install our logging scripts if no other package does it. ifeq ($(BR2_PACKAGE_SYSKLOGD)$(BR2_PACKAGE_RSYSLOG)$(BR2_PACKAGE_SYSLOG_NG),) define BUSYBOX_INSTALL_LOGGING_SCRIPT @@ -364,6 +373,7 @@ endef BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_ADD_TO_SHELLS define BUSYBOX_KCONFIG_FIXUP_CMDS + $(BUSYBOX_MUSL_DISABLE_SHA_HWACCEL) $(BUSYBOX_SET_MMU) $(BUSYBOX_PREFER_STATIC) $(BUSYBOX_SET_MDEV) From 7ad09fbb876ed3b800a7020ac4887c4a5f117f13 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 2 May 2023 23:11:58 +0200 Subject: [PATCH 0149/1167] package/gdb: disable gdb for or1k builds with musl libc The or1k musl port is incomplete, elf_gregset_t definition is missing (user.h is empty) [1]. It fail to build gdbserver and the full gdb. [1] https://git.musl-libc.org/cgit/musl/tree/arch/or1k/bits/user.h?h=v1.2.3 Fixes: https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/4202276569 Signed-off-by: Romain Naour Cc: Stafford Horne [yann.morin.1998@free.fr: simplify condition, add comment] Signed-off-by: Yann E. MORIN (cherry picked from commit 3fed683035658ee354885f46f1ac1096c2d94e4b) Signed-off-by: Peter Korsgaard --- package/gdb/Config.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/gdb/Config.in b/package/gdb/Config.in index 80b1185b5e1..d1813fd7b96 100644 --- a/package/gdb/Config.in +++ b/package/gdb/Config.in @@ -4,6 +4,10 @@ config BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT) depends on !BR2_microblaze +comment "gdb needs a glibc or uclibc toolchain" + depends on BR2_or1k + depends on BR2_TOOLCHAIN_USES_MUSL + comment "gdb/gdbserver needs a toolchain w/ threads, threads debug" depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -17,6 +21,9 @@ config BR2_PACKAGE_GDB depends on BR2_PACKAGE_GDB_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 depends on BR2_INSTALL_LIBSTDCPP + # The or1k musl port is incomplete, elf_gregset_t definition is missing: + # https://git.musl-libc.org/cgit/musl/tree/arch/or1k/bits/user.h?h=v1.2.3 + depends on !BR2_or1k || !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_ZLIB # When the external toolchain gdbserver is copied to the # target, we don't allow building a separate gdbserver. The From 13e4f1942cb2aca57edf5b2b7514d491690e8eeb Mon Sep 17 00:00:00 2001 From: Sergey Matyukevich Date: Tue, 18 Apr 2023 22:19:23 +0300 Subject: [PATCH 0150/1167] package/cmake: (ctest) add support for riscv architecture Package binaries can be successfully built for and then executed on RISC-V platforms including RV32 and RV64 variants. Tested in QEMU. Signed-off-by: Sergey Matyukevich Signed-off-by: Yann E. MORIN (cherry picked from commit f7d0ed4a78f4aa3741f94c4bbb69efbe74c920a9) Signed-off-by: Peter Korsgaard --- package/cmake/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 3c47fdcb497..4ef5612b577 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_CMAKE_ARCH_SUPPORTS BR2_mipsel || BR2_mips64el || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \ BR2_i386 || BR2_x86_64 || BR2_xtensa || \ - BR2_s390x + BR2_s390x || BR2_riscv config BR2_PACKAGE_CMAKE bool From 96bc3c58cd0132ff5bae5b7f30b3dc9495e6f04d Mon Sep 17 00:00:00 2001 From: Maxim Kochetkov Date: Wed, 3 May 2023 07:39:06 +0300 Subject: [PATCH 0151/1167] package/libgeos: bump version to 3.11.2 Changelog: https://github.com/libgeos/geos/releases/tag/3.11.2 Signed-off-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN (cherry picked from commit ee348693531d581ad57a0c605dbebd8fba673ca3) Signed-off-by: Peter Korsgaard --- package/libgeos/libgeos.hash | 2 +- package/libgeos/libgeos.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgeos/libgeos.hash b/package/libgeos/libgeos.hash index cd0a4e03309..54f53d19deb 100644 --- a/package/libgeos/libgeos.hash +++ b/package/libgeos/libgeos.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6d0eb3cfa9f92d947731cc75f1750356b3bdfc07ea020553daf6af1c768e0be2 geos-3.11.1.tar.bz2 +sha256 b1f077669481c5a3e62affc49e96eb06f281987a5d36fdab225217e5b825e4cc geos-3.11.2.tar.bz2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libgeos/libgeos.mk b/package/libgeos/libgeos.mk index c6d470dc971..5a7932bad2b 100644 --- a/package/libgeos/libgeos.mk +++ b/package/libgeos/libgeos.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGEOS_VERSION = 3.11.1 +LIBGEOS_VERSION = 3.11.2 LIBGEOS_SITE = http://download.osgeo.org/geos LIBGEOS_SOURCE = geos-$(LIBGEOS_VERSION).tar.bz2 LIBGEOS_LICENSE = LGPL-2.1 From 2246f8f10ba104f7c3ccd24fa3402815664a0f78 Mon Sep 17 00:00:00 2001 From: James Knight Date: Thu, 4 May 2023 23:43:17 -0400 Subject: [PATCH 0152/1167] package/pkg-utils.mk: make kconfig set/disable operations quiet In a previous commit [1], the use of `KCONFIG_ENABLE_OPT` was tweaked in a way which no longer generates a default output unless the quiet flag is unset (`Q=`). The use of `KCONFIG_SET_OPT` and `KCONFIG_DISABLE_OPT` does not apply a quiet operation. In order to make all these kernel configuration defines operate in a consistent way, adjusting both `KCONFIG_SET_OPT` and `KCONFIG_DISABLE_OPT` to be default-quiet as well. [1]: 66d2ff25bad813659ed4541b3f4c6c2a09455bd7 Signed-off-by: James Knight Signed-off-by: Yann E. MORIN (cherry picked from commit c110bb17ade18f446dd663c984dc3ef48b20fc64) Signed-off-by: Peter Korsgaard --- package/pkg-utils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 0945e6ed318..530638566c0 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -34,9 +34,9 @@ define KCONFIG_ENABLE_OPT fi endef # KCONFIG_SET_OPT (option, value [, file]) -KCONFIG_SET_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=$(2), $(3)) +KCONFIG_SET_OPT = $(Q)$(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(1)=$(2), $(3)) # KCONFIG_DISABLE_OPT (option [, file]) -KCONFIG_DISABLE_OPT = $(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $(1) is not set, $(2)) +KCONFIG_DISABLE_OPT = $(Q)$(call KCONFIG_MUNGE_DOT_CONFIG, $(1), $(SHARP_SIGN) $(1) is not set, $(2)) # Helper functions to determine the name of a package and its # directory from its makefile directory, using the $(MAKEFILE_LIST) From 5288721e8d059bc46ee9a87dfcdc710f47a2bc71 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sun, 7 May 2023 17:34:29 -0400 Subject: [PATCH 0153/1167] package/rpm: drop remnants of custom CFLAGS Drops the use of `RPM_CFLAGS`, which their use has been obsolete when this package bumped to v4.17 [1]. [1]: 429e247b869027f6ecd4efa0f31bccd2765e3875 Signed-off-by: James Knight Signed-off-by: Yann E. MORIN (cherry picked from commit b7de8417e1b8f36da2b002a7adb9a633cdcc0ac4) Signed-off-by: Peter Korsgaard --- package/rpm/rpm.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index fc57a14fd65..08bcb85ae41 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -104,7 +104,6 @@ endif # ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`). RPM_CONF_ENV = \ ac_cv_prog_cc_c99='-std=gnu99' \ - CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)" \ LIBS=$(TARGET_NLS_LIBS) $(eval $(autotools-package)) From 999e55cea232603157c2ee39fa36bc39a50283e4 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sun, 7 May 2023 17:34:30 -0400 Subject: [PATCH 0154/1167] package/rpm: add more disabling options Adding a series of feature-disable configurations of options introduced over the recent versions, but where never added. Signed-off-by: James Knight Signed-off-by: Yann E. MORIN (cherry picked from commit 2a068781f1280f7f36d95678b3b359b1457f8dc9) Signed-off-by: Peter Korsgaard --- package/rpm/rpm.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 08bcb85ae41..38e4ea2160c 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -29,7 +29,10 @@ RPM_SELINUX_MODULES = rpm RPM_CONF_OPTS = \ --disable-python \ --disable-rpath \ - --with-gnu-ld + --with-gnu-ld \ + --without-fapolicyd \ + --without-fsverity \ + --without-imaevm ifeq ($(BR2_PACKAGE_ACL),y) RPM_DEPENDENCIES += acl From 33127e67f1d5ac0e704ddb5406fc9f0de83bdae4 Mon Sep 17 00:00:00 2001 From: James Knight Date: Sun, 7 May 2023 17:34:31 -0400 Subject: [PATCH 0155/1167] package/rpm: bump to version 4.18.1 The most recent release of RPM is v4.18.1 [1]. Adding an upstream patch to prevent build failures for certain toolchains (0001-fix-var-declare-in-label-error.patch). Fix should be available next release. [1]: https://rpm.org/wiki/Releases/4.18.1 Signed-off-by: James Knight Signed-off-by: Yann E. MORIN (cherry picked from commit 233be1c216a8f7f923245791c6d9a897e10e5c63) Signed-off-by: Peter Korsgaard --- .../0001-fix-var-declare-in-label-error.patch | 40 +++++++++++++++++++ package/rpm/rpm.hash | 4 +- package/rpm/rpm.mk | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 package/rpm/0001-fix-var-declare-in-label-error.patch diff --git a/package/rpm/0001-fix-var-declare-in-label-error.patch b/package/rpm/0001-fix-var-declare-in-label-error.patch new file mode 100644 index 00000000000..648040c6630 --- /dev/null +++ b/package/rpm/0001-fix-var-declare-in-label-error.patch @@ -0,0 +1,40 @@ +From b960c0b43a080287a7c13533eeb2d9f288db1414 Mon Sep 17 00:00:00 2001 +From: Florian Festi +Date: Thu, 16 Mar 2023 19:05:04 +0100 +Subject: [PATCH] Fix compiler error on clang + +Turns out variable declarations are not allowed after a label, even in +C99. And while some compilers don't seem to care others do. + +Moving the declaration of mayopen to the start of the function to avoid +this problem. + +Resolves: #2435 + +Upstream: b960c0b43a080287a7c13533eeb2d9f288db1414 +Signed-off-by: James Knight +--- + lib/fsm.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/fsm.c b/lib/fsm.c +index 5671ac642d..183293edb0 100644 +--- a/lib/fsm.c ++++ b/lib/fsm.c +@@ -879,6 +879,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0; + int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0; + int firstlinkfile = -1; ++ int mayopen = 0; + char *tid = NULL; + struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata)); + struct filedata_s *firstlink = NULL; +@@ -1016,7 +1017,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, + + setmeta: + /* Special files require path-based ops */ +- int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); ++ mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode); + if (!rc && fd == -1 && mayopen) { + int flags = O_RDONLY; + /* Only follow safe symlinks, and never on temporary files */ diff --git a/package/rpm/rpm.hash b/package/rpm/rpm.hash index dfe50303f7d..fd03f062bc7 100644 --- a/package/rpm/rpm.hash +++ b/package/rpm/rpm.hash @@ -1,5 +1,5 @@ -# From https://rpm.org/wiki/Releases/4.18.0.html -sha256 2a17152d7187ab30edf2c2fb586463bdf6388de7b5837480955659e5e9054554 rpm-4.18.0.tar.bz2 +# From https://rpm.org/wiki/Releases/4.18.1.html +sha256 37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56 rpm-4.18.1.tar.bz2 # Hash for license file sha256 171d94d9f1641316bff7f157a903237dc69cdb5fca405fed8c832c76ed8370f9 COPYING diff --git a/package/rpm/rpm.mk b/package/rpm/rpm.mk index 38e4ea2160c..2b289fcc9f8 100644 --- a/package/rpm/rpm.mk +++ b/package/rpm/rpm.mk @@ -5,7 +5,7 @@ ################################################################################ RPM_VERSION_MAJOR = 4.18 -RPM_VERSION = $(RPM_VERSION_MAJOR).0 +RPM_VERSION = $(RPM_VERSION_MAJOR).1 RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 RPM_SITE = http://ftp.rpm.org/releases/rpm-$(RPM_VERSION_MAJOR).x RPM_DEPENDENCIES = \ From e3fd9ccde9d89282ec4eddb480a001dec7521d88 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Sun, 7 May 2023 22:16:36 +0200 Subject: [PATCH 0156/1167] package/cairomm1_14: use official website The website [1] states that the released version can be downloaded from the cairo release area [2], which also features a sha1 hash, but only provides xz archives (no gz). [1]: https://www.cairographics.org/cairomm/ [2]: https://www.cairographics.org/releases/ Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN (cherry picked from commit 9d392f43437e0ee0332cac66c9d0477230ed019f) Signed-off-by: Peter Korsgaard --- package/cairomm1_14/Config.in | 2 +- package/cairomm1_14/cairomm1_14.hash | 5 ++++- package/cairomm1_14/cairomm1_14.mk | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/cairomm1_14/Config.in b/package/cairomm1_14/Config.in index 6e767d24283..e369aa6f4ad 100644 --- a/package/cairomm1_14/Config.in +++ b/package/cairomm1_14/Config.in @@ -14,7 +14,7 @@ config BR2_PACKAGE_CAIROMM1_14 This is the last version before the API and ABI change introduced in 1.16.0 which requires C++17. - http://www.gtkmm.org/ + https://www.cairographics.org/cairomm/ comment "cairomm (1.14.x) needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" depends on BR2_USE_MMU diff --git a/package/cairomm1_14/cairomm1_14.hash b/package/cairomm1_14/cairomm1_14.hash index 521e7cc5466..6d58de360ab 100644 --- a/package/cairomm1_14/cairomm1_14.hash +++ b/package/cairomm1_14/cairomm1_14.hash @@ -1,3 +1,6 @@ +# From https://www.cairographics.org/releases/cairomm-1.14.4.tar.xz.sha1 +sha1 a58419bb9792a2c998631704ce5671c38e0c82a1 cairomm-1.14.4.tar.xz + # Locally computed -sha256 ee12b920b2d47cea1b6e20c367690d726eb22b4ca9fc711db329d03adcc0c8e0 cairomm-1.14.4.tar.gz +sha256 4749d25a2b2ef67cc0c014caaf5c87fa46792fc4b3ede186fb0fc932d2055158 cairomm-1.14.4.tar.xz sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm1_14/cairomm1_14.mk b/package/cairomm1_14/cairomm1_14.mk index 5d076ddf0a4..6502d34c5a4 100644 --- a/package/cairomm1_14/cairomm1_14.mk +++ b/package/cairomm1_14/cairomm1_14.mk @@ -7,8 +7,8 @@ CAIROMM1_14_VERSION = 1.14.4 CAIROMM1_14_LICENSE = LGPL-2.0+ CAIROMM1_14_LICENSE_FILES = COPYING -CAIROMM1_14_SOURCE = cairomm-$(CAIROMM1_14_VERSION).tar.gz -CAIROMM1_14_SITE = https://gitlab.freedesktop.org/cairo/cairomm/-/archive/$(CAIROMM1_14_VERSION) +CAIROMM1_14_SOURCE = cairomm-$(CAIROMM1_14_VERSION).tar.xz +CAIROMM1_14_SITE = https://cairographics.org/releases CAIROMM1_14_INSTALL_STAGING = YES CAIROMM1_14_DEPENDENCIES = cairo libglib2 libsigc2 host-pkgconf CAIROMM1_14_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false From ae1e0bf96a4957e6ef021b07b060ddcc269549c6 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Sun, 7 May 2023 22:22:58 +0200 Subject: [PATCH 0157/1167] package/cairomm: bump to version 1.16.2 The website [1] states that the released version can be downloaded from the cairo release area [2], which also features a sha1 hash, but only provides xz archives (no gz). [1]: https://www.cairographics.org/cairomm/ [2]: https://www.cairographics.org/releases/ Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN (cherry picked from commit c85f9f4a5e01c4b948c4ac0c915467f6c606942e) Signed-off-by: Peter Korsgaard --- package/cairomm/Config.in | 2 +- package/cairomm/cairomm.hash | 5 ++++- package/cairomm/cairomm.mk | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/cairomm/Config.in b/package/cairomm/Config.in index 75f6692b8ab..174f3967abd 100644 --- a/package/cairomm/Config.in +++ b/package/cairomm/Config.in @@ -11,7 +11,7 @@ config BR2_PACKAGE_CAIROMM help The cairomm package is a set of C++ bindings for Cairo. - http://www.gtkmm.org/ + https://www.cairographics.org/cairomm/ comment "cairomm needs a toolchain w/ C++, wchar, threads, gcc >= 7" depends on BR2_USE_MMU diff --git a/package/cairomm/cairomm.hash b/package/cairomm/cairomm.hash index d14a65c2d6f..254413af090 100644 --- a/package/cairomm/cairomm.hash +++ b/package/cairomm/cairomm.hash @@ -1,3 +1,6 @@ +# From https://www.cairographics.org/releases/cairomm-1.16.2.tar.xz.sha1 +sha1 c24339d5962e2bcbbea85b2fc66347e71fd3db8c cairomm-1.16.2.tar.xz + # Locally computed -sha256 bb86d855041bd46d31b03e43ea355d233de44034b39d4200725b1e0947e63e67 cairomm-1.16.1.tar.gz +sha256 6a63bf98a97dda2b0f55e34d1b5f3fb909ef8b70f9b8d382cb1ff3978e7dc13f cairomm-1.16.2.tar.xz sha256 bfe4a52dc4645385f356a8e83cc54216a293e3b6f1cb4f79f5fc0277abf937fd COPYING diff --git a/package/cairomm/cairomm.mk b/package/cairomm/cairomm.mk index 856c9d67fc2..571512878e2 100644 --- a/package/cairomm/cairomm.mk +++ b/package/cairomm/cairomm.mk @@ -4,10 +4,11 @@ # ################################################################################ -CAIROMM_VERSION = 1.16.1 +CAIROMM_VERSION = 1.16.2 CAIROMM_LICENSE = LGPL-2.0+ CAIROMM_LICENSE_FILES = COPYING -CAIROMM_SITE = https://gitlab.freedesktop.org/cairo/cairomm/-/archive/$(CAIROMM_VERSION) +CAIROMM_SOURCE = cairomm-$(CAIROMM_VERSION).tar.xz +CAIROMM_SITE = https://cairographics.org/releases CAIROMM_INSTALL_STAGING = YES CAIROMM_DEPENDENCIES = cairo libglib2 libsigc host-pkgconf CAIROMM_CONF_OPTS = -Dbuild-examples=false -Dbuild-tests=false From 1a2bb6fd2f1895039e0e19b1dc10b3d1403a5f89 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 28 Apr 2023 09:59:20 +0200 Subject: [PATCH 0158/1167] package/libgtk3: fix update-icon-cache on empty directory If both, hicolor-icon-theme (selected by libgtk3-demo) and adwaita-icon-theme is not selected, then the /usr/share/icons folder is empty, causing find to fail. Signed-off-by: Thomas Devoogdt Tested-by: Adrian Perez de Castro Reviewed-by: Adrian Perez de Castro Signed-off-by: Yann E. MORIN (cherry picked from commit d2f45dea4c4e3548c8938d69acb254c902bdd928) Signed-off-by: Peter Korsgaard --- package/libgtk3/libgtk3.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index b41049b0eea..ef31d71b6f4 100644 --- a/package/libgtk3/libgtk3.mk +++ b/package/libgtk3/libgtk3.mk @@ -146,8 +146,9 @@ endef # Create icon-theme.cache for each of the icon directories/themes # It's not strictly necessary but speeds up lookups define LIBGTK3_UPDATE_ICON_CACHE - find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ - -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; + [ ! -d $(TARGET_DIR)/usr/share/icons ] || \ + find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ + -exec $(HOST_DIR)/bin/gtk-update-icon-cache {} \; endef LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE From d1432aa62314a5d78db7e380729a44754d8d6227 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 8 May 2023 19:03:42 +0200 Subject: [PATCH 0159/1167] package/libass: bump version to 0.17.1 Release notes: https://github.com/libass/libass/releases/tag/0.17.1 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 9cc48fb94a4f3594f378f6fb5b6a98b0bbb80743) Signed-off-by: Peter Korsgaard --- package/libass/libass.hash | 2 +- package/libass/libass.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libass/libass.hash b/package/libass/libass.hash index beb7639b1f7..bf9b8251d75 100644 --- a/package/libass/libass.hash +++ b/package/libass/libass.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 971e2e1db59d440f88516dcd1187108419a370e64863f70687da599fdf66cc1a libass-0.17.0.tar.xz +sha256 f0da0bbfba476c16ae3e1cfd862256d30915911f7abaa1b16ce62ee653192784 libass-0.17.1.tar.xz sha256 f7e30699d02798351e7f839e3d3bfeb29ce65e44efa7735c225464c4fd7dfe9c COPYING diff --git a/package/libass/libass.mk b/package/libass/libass.mk index 1cc83103128..8b14c899c4d 100644 --- a/package/libass/libass.mk +++ b/package/libass/libass.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBASS_VERSION = 0.17.0 +LIBASS_VERSION = 0.17.1 LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz # Do not use the github helper here, the generated tarball is *NOT* # the same as the one uploaded by upstream for the release. From bff0536e4c642ff87c8a3f45a6d42d34a096b5fd Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Mon, 8 May 2023 10:25:42 +0200 Subject: [PATCH 0160/1167] package/glibmm2_66: bump to version 2.66.6 https://gitlab.gnome.org/GNOME/glibmm/-/raw/2.66.6/NEWS Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN (cherry picked from commit feb16bd9878bcde7d690a1887604ddc861f5f30d) Signed-off-by: Peter Korsgaard --- package/glibmm2_66/glibmm2_66.hash | 4 ++-- package/glibmm2_66/glibmm2_66.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/glibmm2_66/glibmm2_66.hash b/package/glibmm2_66/glibmm2_66.hash index b7d19b261ce..19272d2b907 100644 --- a/package/glibmm2_66/glibmm2_66.hash +++ b/package/glibmm2_66/glibmm2_66.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.5.sha256sum -sha256 7b384662dd6ec3b86c0570331d32af05db2bd99a791602b767b4a0b2566ec149 glibmm-2.66.5.tar.xz +# From https://download.gnome.org/sources/glibmm/2.66/glibmm-2.66.6.sha256sum +sha256 5358742598181e5351d7bf8da072bf93e6dd5f178d27640d4e462bc8f14e152f glibmm-2.66.6.tar.xz # License files, locally calculated sha256 3ea7fa7c5d9a3a113e950eca9cfb85107f096270d8e4dd99daa9d8abdebc60e7 COPYING sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING.tools diff --git a/package/glibmm2_66/glibmm2_66.mk b/package/glibmm2_66/glibmm2_66.mk index b58c7ca8df2..7f28342c525 100644 --- a/package/glibmm2_66/glibmm2_66.mk +++ b/package/glibmm2_66/glibmm2_66.mk @@ -5,7 +5,7 @@ ################################################################################ GLIBMM2_66_VERSION_MAJOR = 2.66 -GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).5 +GLIBMM2_66_VERSION = $(GLIBMM2_66_VERSION_MAJOR).6 GLIBMM2_66_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools) GLIBMM2_66_LICENSE_FILES = COPYING COPYING.tools GLIBMM2_66_SOURCE = glibmm-$(GLIBMM2_66_VERSION).tar.xz From 6bff385173bcd6628bd34a2c09c3253a6d057f8d Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Wed, 26 Apr 2023 10:08:24 +0200 Subject: [PATCH 0161/1167] package/mdio-tools: fix Config.in Add project's site and add a full stop at the end of the description. Signed-off-by: Yegor Yefremov Signed-off-by: Yann E. MORIN (cherry picked from commit 6ea396aef272fa107775ea8e4903506d2ffc99e0) Signed-off-by: Peter Korsgaard --- package/mdio-tools/Config.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/mdio-tools/Config.in b/package/mdio-tools/Config.in index 237f4454cc1..790c9c534a8 100644 --- a/package/mdio-tools/Config.in +++ b/package/mdio-tools/Config.in @@ -14,4 +14,6 @@ config BR2_PACKAGE_MDIO_TOOLS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1 select BR2_PACKAGE_LIBMNL help - Low-level debug tools for MDIO devices + Low-level debug tools for MDIO devices. + + https://github.com/wkz/mdio-tools From d9f2fa8e63c35bdd79412902546f46a825d01305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Tue, 25 Apr 2023 09:09:22 +0200 Subject: [PATCH 0162/1167] package/mupdf: fix building with zlib-ng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current mupdf version fails to build when zlib-ng is used as the zlib implementation. Add a patch to fix it. This fixes the following build failure raised since the bump to version 1.21.0 of the mupdf package in commit 3c2033cd2ace077e7dfaf58a2589b2a93a5fd7b0: source/fitz/encode-basic.c: In function 'deflate_write': source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function) 343 | newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n); | ^~~~~~~~ source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header ''; did you forget to '#include '? Fixes: http://autobuild.buildroot.net/results/87128e9967cff20078c65ab847877aa44cc409d9 Signed-off-by: Raphaël Mélotte Signed-off-by: Yann E. MORIN (cherry picked from commit b20eb56440fd2a7b8f578bf9eda89160c8053434) Signed-off-by: Peter Korsgaard --- ...issing-limits.h-include-for-UINT_MAX.patch | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch diff --git a/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch new file mode 100644 index 00000000000..95f2f86666d --- /dev/null +++ b/package/mupdf/0001-Add-missing-limits.h-include-for-UINT_MAX.patch @@ -0,0 +1,70 @@ +From ebce9f1b129ebc8f2b17afa02a4ffcb9453c11d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Mon, 24 Apr 2023 17:27:35 +0200 +Subject: [PATCH] Add missing limits.h include for UINT_MAX +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +encode-basic.c uses 'UINT_MAX', which is available in the 'limits.h' +header. + +In some configurations that build with zlib from [1], by chance +limits.h gets indirectly included when including 'z-imp.h' (the +includes are: 'z-imp.h' -> 'zlib.h' -> 'zconf.h' -> 'limits.h'), so +the build succeeds. + +When using other zlib implementations however (for example from [2]), +limits.h is not necessarily included indirectly, which leads to the +build failing in the following way: + +source/fitz/encode-basic.c: In function 'deflate_write': +source/fitz/encode-basic.c:343:27: error: 'UINT_MAX' undeclared (first use in this function) + 343 | newbufsize = n >= UINT_MAX ? UINT_MAX : deflateBound(&state->z, n); + | ^~~~~~~~ +source/fitz/encode-basic.c:26:1: note: 'UINT_MAX' is defined in header ''; did you forget to '#include '? + +Add the missing include, so that the build succeeds no matter if zlib +indirectly includes 'limit.h' or not. + +Similarly, also add it in output-ps.c where it's also missing. + +[1]: https://zlib.net/ +[2]: https://github.com/zlib-ng/zlib-ng + +Signed-off-by: Raphaël Mélotte +Upstream: https://bugs.ghostscript.com/show_bug.cgi?id=706667 +--- + source/fitz/encode-basic.c | 2 ++ + source/fitz/output-ps.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/source/fitz/encode-basic.c b/source/fitz/encode-basic.c +index 03a4ff76b..84f0c35e6 100644 +--- a/source/fitz/encode-basic.c ++++ b/source/fitz/encode-basic.c +@@ -24,6 +24,8 @@ + + #include "z-imp.h" + ++#include ++ + struct ahx + { + fz_output *chain; +diff --git a/source/fitz/output-ps.c b/source/fitz/output-ps.c +index ef22c3cd6..3dc8ea17d 100644 +--- a/source/fitz/output-ps.c ++++ b/source/fitz/output-ps.c +@@ -24,6 +24,8 @@ + + #include "z-imp.h" + ++#include ++ + typedef struct ps_band_writer_s + { + fz_band_writer super; +-- +2.39.1 + From a5ce02522a7c0c2ced03cd1b0350db68c1b28f6d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 24 Apr 2023 23:51:06 +0200 Subject: [PATCH 0163/1167] support/testing: new runtime test for bash Commit 2dff6e93ca2a (package/readline: add upstream patch to fix crash with invalid locale specification) fixed a regression in readline 8.2 [0], that could have been caught with a runtime test. readline is a library, so we need an executable that exercises readline. Since readline and bash are developped in tandem [1], it is only logical to use bash to test readline. Add a new runtime test for bash, that checks that we can indeed run an interactive shell, and that an non-existing locale does not cause the dreaded segfault. We do not use the default configuration, because it uses a uclibc toolchain, and we want to reproduce against a glibc one. [0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021109 [1] https://tiswww.case.edu/php/chet/readline/rltop.html#Bugs Signed-off-by: Yann E. MORIN (cherry picked from commit 511f28ae5ca0fbd3c997f5c460747a5d3e0ca24b) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_bash.py | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 support/testing/tests/package/test_bash.py diff --git a/support/testing/tests/package/test_bash.py b/support/testing/tests/package/test_bash.py new file mode 100644 index 00000000000..f0ee8cadc12 --- /dev/null +++ b/support/testing/tests/package/test_bash.py @@ -0,0 +1,47 @@ +import os + +import infra.basetest + + +class TestBash(infra.basetest.BRTest): + config = \ + """ + BR2_arm=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y + BR2_ENABLE_LOCALE_WHITELIST="" + BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y + BR2_PACKAGE_BASH=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 that we are indeed not (yet) running bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "", "Already running bash instead of busybox' sh") + + self.assertRunOk("bash -il") + # Twist! The above command is still runing, it's just that + # bash did display the prompt we expect. Check we are indeed + # actually bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "/bin/bash", "Not running bash") + # Exit bash, back to busybox' shell + self.emulator.run("exit 0") + + # Check that we are indeed no longer running bash + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "", "Still running bash instead of busybox' sh") + + # Try to run with a non-available locale + self.assertRunOk("LC_ALL=en_US bash -il") + out, _ = self.emulator.run('echo "${BASH}"') + self.assertEqual(out[0], "/bin/bash", "Not running bash") + self.emulator.run("exit 0") From 2b8e7f2e40b7ea93964f4d6aa845925f0749d3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Tue, 9 May 2023 13:58:29 +0200 Subject: [PATCH 0164/1167] package: busybox: backport fix for missing getrandom() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current Busybox version (1.36.0) fails to build with some libc/linux combinations where getrandom() is not available. Two fixes for glibc already exists upstream, so backport them here. A third one (submitted upstream, not part of the main branch yet) was needed to be able to compile with older musl and uClibc versions (or older kernels). This fixes the following build failure raised since commit d68b617993bd2f5c82a4936ed1e24e4fec6b94a2: miscutils/seedrng.c:45:24: fatal error: sys/random.h: No such file or directory #include Fixes: - http://autobuild.buildroot.net/results/44a0476b86c579e6aa658f156f0292958d40513c - http://autobuild.buildroot.net/results/ed028160db397581558fd8c96755621dd8298bb1 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624008 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624034 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624044 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624048 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624051 It also fixes the following (similar) build failure, raised since the same commit: miscutils/lib.a(seedrng.o): In function `seedrng_main': seedrng.c:(.text.seedrng_main+0x26c): undefined reference to `getrandom' seedrng.c:(.text.seedrng_main+0x2e8): undefined reference to `getrandom' collect2: error: ld returned 1 exit status Fixes: - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624028 - https://gitlab.com/buildroot.org/buildroot/-/jobs/4122624031 Signed-off-by: Raphaël Mélotte Signed-off-by: Yann E. MORIN (cherry picked from commit cd02f96b871c9bed5fec92605806668b2aca2bf4) Signed-off-by: Peter Korsgaard --- ...r-glibc-2.24-not-providing-getrandom.patch | 39 ++++++ ...glibc-2.24-not-providing-random-head.patch | 60 +++++++++ ...trandom-detection-for-non-glibc-libc.patch | 124 ++++++++++++++++++ 3 files changed, 223 insertions(+) create mode 100644 package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch create mode 100644 package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch create mode 100644 package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch diff --git a/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch new file mode 100644 index 00000000000..4a194612b46 --- /dev/null +++ b/package/busybox/0005-seedrng-fix-for-glibc-2.24-not-providing-getrandom.patch @@ -0,0 +1,39 @@ +From 200a9669fbf6f06894e4243cccc9fc11a1a6073a Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Mon, 10 Apr 2023 17:26:04 +0200 +Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing getrandom() + +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=200a9669fbf6f06894e4243cccc9fc11a1a6073a +--- + miscutils/seedrng.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 967741dc7..7cc855141 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -45,6 +45,20 @@ + #include + #include + ++/* Fix up glibc <= 2.24 not having getrandom() */ ++#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 ++#include ++# define getrandom(...) bb_getrandom(__VA_ARGS__) ++static ssize_t getrandom(void *buffer, size_t length, unsigned flags) ++{ ++# if defined(__NR_getrandom) ++ return syscall(__NR_getrandom, buffer, length, flags); ++# else ++ return ENOSYS; ++# endif ++} ++#endif ++ + #ifndef GRND_INSECURE + #define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ + #endif +-- +2.39.1 + diff --git a/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch new file mode 100644 index 00000000000..d7298848056 --- /dev/null +++ b/package/busybox/0006-seedrng-fix-for-glibc-2.24-not-providing-random-head.patch @@ -0,0 +1,60 @@ +From cb57abb46f06f4ede8d9ccbdaac67377fdf416cf Mon Sep 17 00:00:00 2001 +From: Thomas Devoogdt +Date: Mon, 10 Apr 2023 19:58:15 +0200 +Subject: [PATCH] seedrng: fix for glibc <= 2.24 not providing random header + + - dropped the wrong define (not sure why it was there) + - not available if glibc <= 2.24 + - GRND_NONBLOCK not defined if not included + - ret < 0 && errno == ENOSYS has to be true to get creditable set + +Signed-off-by: Thomas Devoogdt +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=cb57abb46f06f4ede8d9ccbdaac67377fdf416cf +--- + miscutils/seedrng.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) + +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 7cc855141..3bf6e2ea7 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -42,25 +42,31 @@ + #include "libbb.h" + + #include +-#include + #include + + /* Fix up glibc <= 2.24 not having getrandom() */ + #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 + #include +-# define getrandom(...) bb_getrandom(__VA_ARGS__) + static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + { + # if defined(__NR_getrandom) + return syscall(__NR_getrandom, buffer, length, flags); + # else +- return ENOSYS; ++ errno = ENOSYS; ++ return -1; + # endif + } ++#else ++#include ++#endif ++ ++/* Apparently some headers don't ship with this yet. */ ++#ifndef GRND_NONBLOCK ++#define GRND_NONBLOCK 0x0001 + #endif + + #ifndef GRND_INSECURE +-#define GRND_INSECURE 0x0004 /* Apparently some headers don't ship with this yet. */ ++#define GRND_INSECURE 0x0004 + #endif + + #define DEFAULT_SEED_DIR "/var/lib/seedrng" +-- +2.39.1 + diff --git a/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch new file mode 100644 index 00000000000..140b27cae67 --- /dev/null +++ b/package/busybox/0007-seedrng-fix-getrandom-detection-for-non-glibc-libc.patch @@ -0,0 +1,124 @@ +From b2d26d449ec855602b9a88f58c2eb675de0224f2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= +Date: Tue, 18 Apr 2023 15:54:43 +0200 +Subject: [PATCH v4] seedrng: fix getrandom() detection for non-glibc libc +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +glibc <= 2.24 does not provide getrandom(). A check for it has been +added in 200a9669fbf6f06894e4243cccc9fc11a1a6073a and fixed in +cb57abb46f06f4ede8d9ccbdaac67377fdf416cf. + +However, building with a libc other than glibc can lead to the same +problem as not every other libc has getrandom() either: + +- uClibc provides it from v1.0.2 onwards, but requires to define +_GNU_SOURCE (all versions - we already define it by default), and +stddef to be included first (when using uClibc < 1.0.35 - we already +include it through libbb.h). + +- musl libc has getrandom(), but only from version 1.1.20 onwards. As +musl does not provide __MUSL__ or version information, it's not +possible to check for it like we did for glibc. + +All of this makes it difficult (or impossible in case of musl) to +check what we need to do to have getrandom() based on each libc +versions. + +On top of that, getrandom() is also not available on older kernels. As +an example, when using a 3.10 kernel with uClibc 1.0.26, getrandom() +is declared so compiling works, but it fails at link time because +getrandom() is not defined. + +To make it easier, take a similar approach to what was done for the +crypt library: try to build a sample program to see if we have +getrandom(). To keep it compatible with different versions of +make (for reference see [1]), a variable for '#' is also introduced. + +Based on the new Makefile variable, we now either use the +libc-provided getrandom() when it's available, or use our own +implementation when it's not (like it was the case already for glibc < +2.25). + +This should fix compiling with many libc/kernel combinations. + +[1]: https://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b576b907b06aea5f4 + +Signed-off-by: Raphaël Mélotte +Upstream: http://lists.busybox.net/pipermail/busybox/2023-May/090317.html +--- +Changes v3 -> v4: + - use a variable for '#' for compatibility with GNU make 4.2.1 and earlier. + +Changes v2 -> v3: + - fix _GNU_SOURCE define location + +Changes v1 -> v2: + - move _GNU_SOURCE to bb_libtest.c + - remove GRND_NONBLOCK + +Note that I was not able to test every single combination, but I could +confirm it builds successfully for: +uClibc 10.0.24, linux headers 3.10 (libc getrandom NOT used) +uClibc 1.0.36, linux headers 4.9 (libc getrandom used) +musl 1.1.16, linux headers 4.12 (libc getrandom NOT used) +musl 1.2.1, linux headers (libc getrandom used) +glibc 2.25, linux headers 4.10 (libc getrandom used) + + Makefile.flags | 12 ++++++++++++ + miscutils/seedrng.c | 8 ++++---- + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/Makefile.flags b/Makefile.flags +index 1cec5ba20..0d437303a 100644 +--- a/Makefile.flags ++++ b/Makefile.flags +@@ -161,6 +161,18 @@ ifeq ($(RT_AVAILABLE),y) + LDLIBS += rt + endif + ++# GNU Make version 4.2.1 and earlier require number signs ('#') ++# inside function invocations to be escaped, while versions 4.3+ ++# require them to be unescaped. Use a variable for it so that it works ++# for both versions: ++C := \# ++# Not all libc versions have getrandom, so check for it: ++HAVE_GETRANDOM := $(shell printf '$Cdefine _GNU_SOURCE\n$Cinclude \n$Cinclude \nint main(void){char buf[256];\ngetrandom(buf,sizeof(buf),0);}' >bb_libtest.c; $(CC) $(CFLAGS) $(CFLAGS_busybox) -o /dev/null bb_libtest.c >/dev/null 2>&1 && echo "y"; rm bb_libtest.c) ++ ++ifeq ($(HAVE_GETRANDOM),y) ++CFLAGS += -DHAVE_GETRANDOM ++endif ++ + # libpam may use libpthread, libdl and/or libaudit. + # On some platforms that requires an explicit -lpthread, -ldl, -laudit. + # However, on *other platforms* it fails when some of those flags +diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c +index 3bf6e2ea7..2f1e18c32 100644 +--- a/miscutils/seedrng.c ++++ b/miscutils/seedrng.c +@@ -44,8 +44,10 @@ + #include + #include + +-/* Fix up glibc <= 2.24 not having getrandom() */ +-#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 24 ++/* Fix up some libc (e.g. glibc <= 2.24) not having getrandom() */ ++#if defined HAVE_GETRANDOM ++#include ++#else /* No getrandom */ + #include + static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + { +@@ -56,8 +58,6 @@ static ssize_t getrandom(void *buffer, size_t length, unsigned flags) + return -1; + # endif + } +-#else +-#include + #endif + + /* Apparently some headers don't ship with this yet. */ +-- +2.39.1 + From e505488a0e034c074bf5897b4788e45670e82f6c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 11 May 2023 20:22:15 +0200 Subject: [PATCH 0165/1167] package/python3: bump version to 3.11.3 Bugfix release, fixing a number of issues. For details, see the changelog: https://docs.python.org/release/3.11.3/whatsnew/changelog.html#python-3-11-3 Notice: This also includes security fixes, but these are for Windows-only issues. Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN (cherry picked from commit 3ab6053fee559a1670b65f7319d32616d5a90bb4) Signed-off-by: Peter Korsgaard --- package/python3/python3.hash | 2 +- package/python3/python3.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/python3/python3.hash b/package/python3/python3.hash index f235347efb5..b04ee7fa2cc 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af Python-3.11.2.tar.xz +sha256 8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e Python-3.11.3.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 56fe95cd071..ece5cad93e2 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).3 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From f71c30405022f39e5a965cfb14a6c0b7efc08854 Mon Sep 17 00:00:00 2001 From: Kris Bahnsen Date: Thu, 11 May 2023 10:59:13 -0700 Subject: [PATCH 0166/1167] package/wilc-firmware: bump to 16.1 According to release notes from Microchip, this fixes a memory leak in AP modes, fixes a failure with an undisclosed but specific AP, and re-certified with WFA for WILC1000. Signed-off-by: Kris Bahnsen Signed-off-by: Yann E. MORIN (cherry picked from commit 2003877ceb9724f0c92c4e894e9b461a940a747a) Signed-off-by: Peter Korsgaard --- package/wilc-firmware/wilc-firmware.hash | 2 +- package/wilc-firmware/wilc-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wilc-firmware/wilc-firmware.hash b/package/wilc-firmware/wilc-firmware.hash index 6e7850df16d..802cb4f9b18 100644 --- a/package/wilc-firmware/wilc-firmware.hash +++ b/package/wilc-firmware/wilc-firmware.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2c2e2927a65fe4d7ec2f9872fca35c6b7bf12090ac62116d63c5f17b95a3a786 wilc-firmware-wilc_linux_15_7.tar.gz +sha256 a06a6a46e03ca00d35da220f7a9f353cc650e5e5657a7988ea732913ad26d9a0 wilc-firmware-wilc_linux_16_1.tar.gz sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw diff --git a/package/wilc-firmware/wilc-firmware.mk b/package/wilc-firmware/wilc-firmware.mk index e31829d4301..12c825cf92e 100644 --- a/package/wilc-firmware/wilc-firmware.mk +++ b/package/wilc-firmware/wilc-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -WILC_FIRMWARE_VERSION = wilc_linux_15_7 +WILC_FIRMWARE_VERSION = wilc_linux_16_1 WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) WILC_FIRMWARE_LICENSE = PROPRIETARY From e8fa92e01695bfb6b2955f012c4bc08cacd02da6 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Wed, 10 May 2023 12:36:48 +0100 Subject: [PATCH 0167/1167] configs/versal_vck190_defconfig: set BR2_cortex_a72 The versal vc1902 on the vck190 evaluation board has an ARM Cortex A72 core. Signed-off-by: Neal Frager Reviewed-by: Luca Ceresoli Signed-off-by: Peter Korsgaard (cherry picked from commit e217cd28ece8bb07d5eb5c61f9b22b3de8480b3c) Signed-off-by: Peter Korsgaard --- configs/versal_vck190_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/versal_vck190_defconfig b/configs/versal_vck190_defconfig index 2808fa522b0..a393b681c86 100644 --- a/configs/versal_vck190_defconfig +++ b/configs/versal_vck190_defconfig @@ -1,4 +1,5 @@ BR2_aarch64=y +BR2_cortex_a72=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/versal/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/versal/post-image.sh" From 06d210fe5594fea3cecd23f975ce6568814bb2cb Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 11 Feb 2023 00:36:58 +0100 Subject: [PATCH 0168/1167] package/busybox: disable stack optimization for i386 target The toolchain-builder project reported an issue with Qemu 7.2.0 for x86-core2--glibc--bleeding-edge toolchain [1]: Run /sbin/init as init process random: fast init done EXT4-fs (vda): warning: mounting unchecked fs, running e2fsck is recommended EXT4-fs (vda): re-mounted. Opts: (null). Quota mode: disabled. Starting syslogd: OK traps: syslogd[52] general protection fault ip:b7e21465 sp:bfe59e6c error:0 in libc.so.6[b7d9b000+123000] Starting klogd: OK traps: klogd[56] general protection fault ip:b7e94465 sp:bf8f069c error:0 in libc.so.6[b7e0e000+123000] Running sysctl: traps: logger[62] general protection fault ip:b7e48b6c sp:bfd7d194 error:0 in libc.so.6[b7e05000+123000] Segmentation fault traps: logger[64] general protection fault ip:b7dd3b6c sp:bf9b8604 error:0 in libc.so.6[b7d90000+123000] Segmentation fault (Followed by a kernel panic.) Testing with the pevious Qemu release (7.1.0) allows to boot the system without any problem. Building qemu sources between 7.1.0 and 7.2.0 allows to identify the first "bad" commit [2] and report to the Qemu project [3]. Thanks to Qemu maintainers review, several issues was noticed: "The default i386 busybox build config does not respect glibc's requirements around stack alignment (see [4] for previous discussions and a workaround)." Disabling CONFIG_STACK_OPTIMIZATION_386 option (as suggested in the Gentoo bug report) fixed the issue! This option has been added and enabled by default in buxybox 1_29_0, so it was used since then the for Buildroot's qemu defconfig. Note: The x86-i686--glibc--bleeding-edge (generic x86) doesn't trigger the issue with CONFIG_STACK_OPTIMIZATION_386 enabled. Fixes: https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 [1] https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/3731683337 [2] https://gitlab.com/qemu-project/qemu/-/commit/958e1dd1300f37f18b2161dfb4eb806fc8c19b44 [3] https://gitlab.com/qemu-project/qemu/-/issues/1478 [4] https://bugs.gentoo.org/725674 Signed-off-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit f3fa74a8f745de7b60752e0b15432eb1f2b4c638) Signed-off-by: Peter Korsgaard --- package/busybox/busybox-minimal.config | 2 +- package/busybox/busybox.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/busybox/busybox-minimal.config b/package/busybox/busybox-minimal.config index 1fb4e39e21d..1e7ad1d357e 100644 --- a/package/busybox/busybox-minimal.config +++ b/package/busybox/busybox-minimal.config @@ -53,7 +53,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STACK_OPTIMIZATION_386 is not set CONFIG_STATIC_LIBGCC=y # diff --git a/package/busybox/busybox.config b/package/busybox/busybox.config index 4826fb82428..6e8bd2799d1 100644 --- a/package/busybox/busybox.config +++ b/package/busybox/busybox.config @@ -53,7 +53,7 @@ CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_LDFLAGS="" CONFIG_EXTRA_LDLIBS="" # CONFIG_USE_PORTABLE_CODE is not set -CONFIG_STACK_OPTIMIZATION_386=y +# CONFIG_STACK_OPTIMIZATION_386 is not set CONFIG_STATIC_LIBGCC=y # From a2c82a768eb26459991d7c2b7867554dffdc9208 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 12 May 2023 07:26:20 +0200 Subject: [PATCH 0169/1167] package/postgresql: security bump version to 15.3 Release notes: https://www.postgresql.org/about/news/postgresql-153-148-1311-1215-and-1120-released-2637/ Fixes CVE-2023-2454 & CVE-2023-2455. Signed-off-by: Bernd Kuhls Reviewed-by: Maxim Kochetkov Signed-off-by: Peter Korsgaard (cherry picked from commit 2c6206b2179eee98795a7a3a01d9432dd06f4e85) Signed-off-by: Peter Korsgaard --- package/postgresql/postgresql.hash | 4 ++-- package/postgresql/postgresql.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/postgresql/postgresql.hash b/package/postgresql/postgresql.hash index 3e89d3ec350..da6ec7f3117 100644 --- a/package/postgresql/postgresql.hash +++ b/package/postgresql/postgresql.hash @@ -1,4 +1,4 @@ -# From https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2.sha256 -sha256 99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7 postgresql-15.2.tar.bz2 +# From https://ftp.postgresql.org/pub/source/v15.3/postgresql-15.3.tar.bz2.sha256 +sha256 ffc7d4891f00ffbf5c3f4eab7fbbced8460b8c0ee63c5a5167133b9e6599d932 postgresql-15.3.tar.bz2 # License file, Locally calculated sha256 1a7d13c3ab31961b91ba256f77d6e82e0b54bf992253060fe93bdb5466df416a COPYRIGHT diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk index e46622c0e7a..ca11a8191ff 100644 --- a/package/postgresql/postgresql.mk +++ b/package/postgresql/postgresql.mk @@ -4,7 +4,7 @@ # ################################################################################ -POSTGRESQL_VERSION = 15.2 +POSTGRESQL_VERSION = 15.3 POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 POSTGRESQL_SITE = https://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) POSTGRESQL_LICENSE = PostgreSQL From de1dc331afd14766dceabdeac48119a45b572509 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 12 May 2023 07:28:19 +0200 Subject: [PATCH 0170/1167] package/php: bump version to 8.2.6 Changelog: https://www.php.net/ChangeLog-8.php#8.2.6 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 7b52d2817c935314136170645a90a9e8cb47dd03) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 6b1549958f8..96e8803cb27 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 800738c359b7f1e67e40c22713d2d90276bc85ba1c21b43d99edd43c254c5f76 php-8.2.5.tar.xz +sha256 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca php-8.2.6.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 7cebc178fe2..981da5b15d4 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.5 +PHP_VERSION = 8.2.6 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 52d5a88247817fb1a3cb2841ec6627c2876018ec Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 May 2023 10:28:36 +0200 Subject: [PATCH 0171/1167] uclibc: fix static builds Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard (cherry picked from commit 3f5a9d5cb9b519c7c1d7cc295430292a0976734c) Signed-off-by: Peter Korsgaard --- .../0001-gettimeofday-fix-static-build.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 package/uclibc/0001-gettimeofday-fix-static-build.patch diff --git a/package/uclibc/0001-gettimeofday-fix-static-build.patch b/package/uclibc/0001-gettimeofday-fix-static-build.patch new file mode 100644 index 00000000000..2ef5059f057 --- /dev/null +++ b/package/uclibc/0001-gettimeofday-fix-static-build.patch @@ -0,0 +1,29 @@ +From b19f8f360970ffd0c1a6ac41e07c66dc39790b16 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb +Date: Wed, 10 May 2023 08:35:25 +0200 +Subject: [PATCH] gettimeofday: fix static build + +Signed-off-by: Waldemar Brodkorb +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=b19f8f360970ffd0c1a6ac41e07c66dc39790b16 +--- + libc/sysdeps/linux/common/gettimeofday.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libc/sysdeps/linux/common/gettimeofday.c b/libc/sysdeps/linux/common/gettimeofday.c +index e5141088e..12473a8e6 100755 +--- a/libc/sysdeps/linux/common/gettimeofday.c ++++ b/libc/sysdeps/linux/common/gettimeofday.c +@@ -9,8 +9,9 @@ + #include + #include + ++#ifdef SHARED + #include "ldso.h" +- ++#endif + + + #ifdef __VDSO_SUPPORT__ +-- +2.30.2 + From 83137bd8ea8cfb35b0e5c99049997799a980cc10 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Mon, 27 Mar 2023 16:10:55 +0200 Subject: [PATCH 0172/1167] package/fluent-bit: bump to version 2.0.10 - Release Notes: https://fluentbit.io/announcements/v2.0.10/ Signed-off-by: Thomas Devoogdt Signed-off-by: Peter Korsgaard (cherry picked from commit 3668c1f381a1f48593c03142cb47f4e24b742e98) Signed-off-by: Peter Korsgaard --- package/fluent-bit/fluent-bit.hash | 2 +- package/fluent-bit/fluent-bit.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fluent-bit/fluent-bit.hash b/package/fluent-bit/fluent-bit.hash index 0caadcd56fa..d60531438a4 100644 --- a/package/fluent-bit/fluent-bit.hash +++ b/package/fluent-bit/fluent-bit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 393ad4a6ced48c327607653d610ef273843085a17b6e5c8013877abdf31e6945 fluent-bit-2.0.9.tar.gz +sha256 aad5176cb4dcadacacd379ca43160074c6690012d37c4749536ac3b977d50495 fluent-bit-2.0.10.tar.gz sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 LICENSE diff --git a/package/fluent-bit/fluent-bit.mk b/package/fluent-bit/fluent-bit.mk index 8ba16399bbb..319815f0565 100644 --- a/package/fluent-bit/fluent-bit.mk +++ b/package/fluent-bit/fluent-bit.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUENT_BIT_VERSION = 2.0.9 +FLUENT_BIT_VERSION = 2.0.10 FLUENT_BIT_SITE = $(call github,fluent,fluent-bit,v$(FLUENT_BIT_VERSION)) FLUENT_BIT_LICENSE = Apache-2.0 FLUENT_BIT_LICENSE_FILES = LICENSE From 07e3ba7ecc553c8a2a1c7e1241971180cd436adb Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 22 Apr 2023 11:06:23 +0200 Subject: [PATCH 0173/1167] package/qemu: change project and download URL to https Signed-off-by: Peter Seiderer Acked-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit 33bb76627b4bb8c70b90ebf78dbe24b3eceff729) Signed-off-by: Peter Korsgaard --- package/qemu/Config.in | 2 +- package/qemu/qemu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 154b98a5415..31cbf096441 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -43,7 +43,7 @@ menuconfig BR2_PACKAGE_QEMU Linux. When using KVM, QEMU can virtualize x86, server and embedded PowerPC, and S390 guests. - http://qemu.org/ + https://www.qemu.org/ if BR2_PACKAGE_QEMU diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index cc8dc42a243..47ea75681f0 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -8,7 +8,7 @@ # needs to be updated. QEMU_VERSION = 7.2.0 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz -QEMU_SITE = http://download.qemu.org +QEMU_SITE = https://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c QEMU_LICENSE_FILES = COPYING COPYING.LIB # NOTE: there is no top-level license file for non-(L)GPL licenses; From 73ff3453af0dbadc02ec58dc849c0a1df434a9f4 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 22 Apr 2023 11:06:24 +0200 Subject: [PATCH 0174/1167] package/qemu: bump version to 7.2.1 - remove 0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch (from upstream, see [1]) [1] https://gitlab.com/qemu-project/qemu/-/commit/e34f86a2f91c39d610d58baa6f4c9ed9a5a5d791 Signed-off-by: Peter Seiderer [yann.morin.1998@free.fr: regenerate .checkpackageignore] Signed-off-by: Yann E. MORIN (cherry picked from commit 99bc8f4abe42fe9358c9dff8706f17203c6ffa3e) Signed-off-by: Peter Korsgaard --- ...k-restore-of-env-flags-from-tb-flags.patch | 36 ------------------- package/qemu/qemu.hash | 2 +- package/qemu/qemu.mk | 2 +- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch diff --git a/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch b/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch deleted file mode 100644 index 8dc2dd8823d..00000000000 --- a/package/qemu/0003-target-sh4-Mask-restore-of-env-flags-from-tb-flags.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bc2331635ce18ff068d2bb1e493bc546e1f786e1 Mon Sep 17 00:00:00 2001 -From: Guenter Roeck -Date: Mon, 12 Dec 2022 09:03:17 -0600 -Subject: [PATCH] target/sh4: Mask restore of env->flags from tb->flags - -The values in env->flags are a subset of tb->flags. -Restore only the bits that belong. - -Cc: qemu-stable@nongnu.org -Fixes: ab419fd8a035 ("target/sh4: Fix TB_FLAG_UNALIGN") -Signed-off-by: Guenter Roeck -Message-ID: <20221212011345.GA2235238@roeck-us.net> -[rth: Reduce to only the the superh_cpu_synchronize_from_tb change] -Signed-off-by: Richard Henderson -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: Yann E. MORIN ---- - target/sh4/cpu.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/target/sh4/cpu.c b/target/sh4/cpu.c -index 951eb6b9c8..f0934b20fa 100644 ---- a/target/sh4/cpu.c -+++ b/target/sh4/cpu.c -@@ -47,7 +47,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, - SuperHCPU *cpu = SUPERH_CPU(cs); - - cpu->env.pc = tb_pc(tb); -- cpu->env.flags = tb->flags; -+ cpu->env.flags = tb->flags & TB_FLAG_ENVFLAGS_MASK; - } - - static void superh_restore_state_to_opc(CPUState *cs, --- -2.25.1 - diff --git a/package/qemu/qemu.hash b/package/qemu/qemu.hash index e671e1d184d..93f7c98f1c2 100644 --- a/package/qemu/qemu.hash +++ b/package/qemu/qemu.hash @@ -1,4 +1,4 @@ # Locally computed, tarball verified with GPG signature -sha256 5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 qemu-7.2.0.tar.xz +sha256 8c85699acf9d7a43a5fe29a64cdd56370b0c2d1ad074baf7098a824d17aad73b qemu-7.2.1.tar.xz sha256 6f04ae8364d0079a192b14635f4b1da294ce18724c034c39a6a41d1b09df6100 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 47ea75681f0..82858ca6a85 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -6,7 +6,7 @@ # When updating the version, check whether the list of supported targets # needs to be updated. -QEMU_VERSION = 7.2.0 +QEMU_VERSION = 7.2.1 QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.xz QEMU_SITE = https://download.qemu.org QEMU_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c From 7494a4c331569336e1a3e9ca34d97ac31916b127 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 22 Apr 2023 11:06:25 +0200 Subject: [PATCH 0175/1167] package/qemu: add patches to fix host libc-2.37 compile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add two upstream patches to fix host libc-2.37 compile (see [1], [2] for details) Fixes: In file included from /usr/include/linux/btrfs.h:29, from ../linux-user/syscall.c:163: /usr/include/linux/fs.h:50:8: error: redefinition of ‘struct file_clone_range’ 50 | struct file_clone_range { | ^~~~~~~~~~~~~~~~ ../linux-user/syscall.c:129:8: note: originally defined here 129 | struct file_clone_range { | ^~~~~~~~~~~~~~~~ [1] https://lists.openembedded.org/g/openembedded-core/message/177322 [2] https://lore.kernel.org/qemu-devel/20230110174901.2580297-1-berrange@redhat.com/ Signed-off-by: Peter Seiderer Reviewed-by: Romain Naour Signed-off-by: Yann E. MORIN (cherry picked from commit eac0e9cf82b7189b6bb2f2449a68abbcee2651d2) Signed-off-by: Peter Korsgaard --- ...er-add-more-compat-ioctl-definitions.patch | 73 +++++++++++++++++ ...r-fix-compat-with-glibc-2.36-sys-mou.patch | 82 +++++++++++++++++++ 2 files changed, 155 insertions(+) create mode 100644 package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch create mode 100644 package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch diff --git a/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch b/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch new file mode 100644 index 00000000000..2d303cd0127 --- /dev/null +++ b/package/qemu/0003-Revert-linux-user-add-more-compat-ioctl-definitions.patch @@ -0,0 +1,73 @@ +From 274f00f33411caee51973a9f7701daf194da5a0a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Tue, 10 Jan 2023 12:49:00 -0500 +Subject: [PATCH] Revert "linux-user: add more compat ioctl definitions" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit c5495f4ecb0cdaaf2e9dddeb48f1689cdb520ca0. + +glibc has fixed (in 2.36.9000-40-g774058d729) the problem +that caused a clash when both sys/mount.h annd linux/mount.h +are included, and backported this to the 2.36 stable release +too: + + https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +It is saner for QEMU to remove the workaround it applied for +glibc 2.36 and expect distros to ship the 2.36 maint release +with the fix. This avoids needing to add a further workaround +to QEMU to deal with the fact that linux/brtfs.h now also pulls +in linux/mount.h via linux/fs.h since Linux 6.1 + +Signed-off-by: Daniel P. Berrangé +Reviewed-by: Marc-André Lureau +Message-Id: <20230110174901.2580297-2-berrange@redhat.com> +Signed-off-by: Laurent Vivier + +Upstream: https://gitlab.com/qemu-project/qemu/-/commit/9f0246539ae84a5e21efd1cc4516fc343f08115a +Signed-off-by: Peter Seiderer +--- + linux-user/syscall.c | 25 ------------------------- + 1 file changed, 25 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 24b25759be..10af5e0d8e 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -111,31 +111,6 @@ + #define FS_IOC32_SETFLAGS _IOW('f', 2, int) + #define FS_IOC32_GETVERSION _IOR('v', 1, int) + #define FS_IOC32_SETVERSION _IOW('v', 2, int) +- +-#define BLKGETSIZE64 _IOR(0x12,114,size_t) +-#define BLKDISCARD _IO(0x12,119) +-#define BLKIOMIN _IO(0x12,120) +-#define BLKIOOPT _IO(0x12,121) +-#define BLKALIGNOFF _IO(0x12,122) +-#define BLKPBSZGET _IO(0x12,123) +-#define BLKDISCARDZEROES _IO(0x12,124) +-#define BLKSECDISCARD _IO(0x12,125) +-#define BLKROTATIONAL _IO(0x12,126) +-#define BLKZEROOUT _IO(0x12,127) +- +-#define FIBMAP _IO(0x00,1) +-#define FIGETBSZ _IO(0x00,2) +- +-struct file_clone_range { +- __s64 src_fd; +- __u64 src_offset; +- __u64 src_length; +- __u64 dest_offset; +-}; +- +-#define FICLONE _IOW(0x94, 9, int) +-#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range) +- + #else + #include + #endif +-- +2.25.1 + diff --git a/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch b/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch new file mode 100644 index 00000000000..2a36a5cbb41 --- /dev/null +++ b/package/qemu/0004-Revert-linux-user-fix-compat-with-glibc-2.36-sys-mou.patch @@ -0,0 +1,82 @@ +From e07973ca745958da739f8ece80273da48f94f031 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= +Date: Tue, 10 Jan 2023 12:49:01 -0500 +Subject: [PATCH] Revert "linux-user: fix compat with glibc >= 2.36 + sys/mount.h" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532. + +glibc has fixed (in 2.36.9000-40-g774058d729) the problem +that caused a clash when both sys/mount.h annd linux/mount.h +are included, and backported this to the 2.36 stable release +too: + + https://sourceware.org/glibc/wiki/Release/2.36#Usage_of_.3Clinux.2Fmount.h.3E_and_.3Csys.2Fmount.h.3E + +It is saner for QEMU to remove the workaround it applied for +glibc 2.36 and expect distros to ship the 2.36 maint release +with the fix. This avoids needing to add a further workaround +to QEMU to deal with the fact that linux/brtfs.h now also pulls +in linux/mount.h via linux/fs.h since Linux 6.1 + +Signed-off-by: Daniel P. Berrangé +Reviewed-by: Marc-André Lureau +Message-Id: <20230110174901.2580297-3-berrange@redhat.com> +Signed-off-by: Laurent Vivier + +Upstream: https://gitlab.com/qemu-project/qemu/-/commit/6003159ce18faad4e1bc7bf9c85669019cd4950e +Signed-off-by: Peter Seiderer +--- + linux-user/syscall.c | 18 ------------------ + meson.build | 2 -- + 2 files changed, 20 deletions(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 10af5e0d8e..d974c76b60 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -95,25 +95,7 @@ + #include + #include + #include +- +-#ifdef HAVE_SYS_MOUNT_FSCONFIG +-/* +- * glibc >= 2.36 linux/mount.h conflicts with sys/mount.h, +- * which in turn prevents use of linux/fs.h. So we have to +- * define the constants ourselves for now. +- */ +-#define FS_IOC_GETFLAGS _IOR('f', 1, long) +-#define FS_IOC_SETFLAGS _IOW('f', 2, long) +-#define FS_IOC_GETVERSION _IOR('v', 1, long) +-#define FS_IOC_SETVERSION _IOW('v', 2, long) +-#define FS_IOC_FIEMAP _IOWR('f', 11, struct fiemap) +-#define FS_IOC32_GETFLAGS _IOR('f', 1, int) +-#define FS_IOC32_SETFLAGS _IOW('f', 2, int) +-#define FS_IOC32_GETVERSION _IOR('v', 1, int) +-#define FS_IOC32_SETVERSION _IOW('v', 2, int) +-#else + #include +-#endif + #include + #if defined(CONFIG_FIEMAP) + #include +diff --git a/meson.build b/meson.build +index b88867ca9d..39e83bbafe 100644 +--- a/meson.build ++++ b/meson.build +@@ -2032,8 +2032,6 @@ config_host_data.set('HAVE_OPTRESET', + cc.has_header_symbol('getopt.h', 'optreset')) + config_host_data.set('HAVE_IPPROTO_MPTCP', + cc.has_header_symbol('netinet/in.h', 'IPPROTO_MPTCP')) +-config_host_data.set('HAVE_SYS_MOUNT_FSCONFIG', +- cc.has_header_symbol('sys/mount.h', 'FSCONFIG_SET_FLAG')) + + # has_member + config_host_data.set('HAVE_SIGEV_NOTIFY_THREAD_ID', +-- +2.25.1 + From 54b9f2e4a39a8dc89a1a9390a86aa3f8f864a057 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Wed, 22 Mar 2023 20:14:53 -0300 Subject: [PATCH 0176/1167] package/qemu: do not build the guest agent for the host It does not make sense to build it for the host. Signed-off-by: Carlos Santos Signed-off-by: Yann E. MORIN (cherry picked from commit 97064a5eaa5b235ae754dd0abe639d11a8bff0f6) Signed-off-by: Peter Korsgaard --- package/qemu/qemu.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index 82858ca6a85..72a0160f866 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -474,6 +474,7 @@ define HOST_QEMU_CONFIGURE_CMDS --disable-vnc-sasl \ --enable-slirp \ --enable-tools \ + --disable-guest-agent \ $(HOST_QEMU_OPTS) endef From a23eee38f7139559dbf24f6826670b23e3e2e497 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 6 May 2023 23:25:31 +0200 Subject: [PATCH 0177/1167] utils/check-package: check ignored files exist When an ignored file is removed (e.g. a package patch is no longer needed after a version bump), the corresponding entry in the ignore list is no longer needed. However, we currently only validate that an ignored *test* still fails, not that a ignore files is now missing. Add a new test to check-package that does that check, and add a test-case for that check. Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski (cherry picked from commit 5eac4f81eb1cfaf6bd8d07a5d78a48de28ae8e4c) Signed-off-by: Peter Korsgaard --- utils/check-package | 4 ++++ utils/checkpackagelib/lib_ignore.py | 14 ++++++++++++++ utils/checkpackagelib/test_lib_ignore.py | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 utils/checkpackagelib/lib_ignore.py create mode 100644 utils/checkpackagelib/test_lib_ignore.py diff --git a/utils/check-package b/utils/check-package index 5974781104b..00121b32961 100755 --- a/utils/check-package +++ b/utils/check-package @@ -11,6 +11,7 @@ import sys import checkpackagelib.base import checkpackagelib.lib_config import checkpackagelib.lib_hash +import checkpackagelib.lib_ignore import checkpackagelib.lib_mk import checkpackagelib.lib_patch import checkpackagelib.lib_shellscript @@ -104,6 +105,7 @@ def get_lib_from_filetype(fname): CONFIG_IN_FILENAME = re.compile(r"Config\.\S*$") DO_CHECK_INTREE = re.compile(r"|".join([ + r".checkpackageignore", r"Config.in", r"arch/", r"boot/", @@ -136,6 +138,8 @@ def get_lib_from_filename(fname): if os.path.basename(fname) == "external.mk" and \ os.path.exists(fname[:-2] + "desc"): return None + if fname == ".checkpackageignore": + return checkpackagelib.lib_ignore if CONFIG_IN_FILENAME.search(fname): return checkpackagelib.lib_config if fname.endswith(".hash"): diff --git a/utils/checkpackagelib/lib_ignore.py b/utils/checkpackagelib/lib_ignore.py new file mode 100644 index 00000000000..f3698fc3b4d --- /dev/null +++ b/utils/checkpackagelib/lib_ignore.py @@ -0,0 +1,14 @@ +# See utils/checkpackagelib/readme.txt before editing this file. + +import os + +from checkpackagelib.base import _CheckFunction + + +class IgnoreMissingFile(_CheckFunction): + def check_line(self, lineno, text): + fields = text.split() + if not os.path.exists(fields[0]): + return ["{}:{}: ignored file {} is missing" + .format(self.filename, lineno, fields[0]), + text] diff --git a/utils/checkpackagelib/test_lib_ignore.py b/utils/checkpackagelib/test_lib_ignore.py new file mode 100644 index 00000000000..6cd856d6694 --- /dev/null +++ b/utils/checkpackagelib/test_lib_ignore.py @@ -0,0 +1,18 @@ +import pytest +import checkpackagelib.test_util as util +import checkpackagelib.lib_ignore as m + + +IgnoreMissingFile = [ + ('missing ignored file', + '.checkpackageignore', + 'this-file-does-not-exist SomeTest', + [['.checkpackageignore:1: ignored file this-file-does-not-exist is missing', + 'this-file-does-not-exist SomeTest']]), + ] + + +@pytest.mark.parametrize('testname,filename,string,expected', IgnoreMissingFile) +def test_IgnoreMissingFile(testname, filename, string, expected): + warnings = util.check_file(m.IgnoreMissingFile, filename, string) + assert warnings == expected From 6b293cf0aba93174bd3a9ec8c714a2be8475b610 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Wed, 26 Apr 2023 12:41:02 +0200 Subject: [PATCH 0178/1167] boot/uboot: document that the zynqmp pmufw can be in ELF format This feature was added in commit d07e6b7071cf ("boot/uboot/uboot.mk: add pmufw.elf support"), document it in kconfig. Signed-off-by: Luca Ceresoli Signed-off-by: Yann E. MORIN (cherry picked from commit e1e30504164700e9dc7d0bce9d1b4f546923c9c2) Signed-off-by: Peter Korsgaard --- boot/uboot/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index f5c20f51688..085397d03d0 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -492,6 +492,8 @@ config BR2_TARGET_UBOOT_ZYNQMP_PMUFW (e.g. http://...), and it will be downloaded and used from the download directory. + The PMU firmware binary can be either in ELF or BIN format. + If empty, the generated boot.bin will not contain a PMU firmware. From 8016b8a34a1bc5a6dd82f2d22d1c5e075df4fd57 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 13 May 2023 19:52:20 +0200 Subject: [PATCH 0179/1167] package/intel-microcode: security bump version to 20230512 Release notes: https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/releases/tag/microcode-20230512 https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1905910.html "There's a new version 20230512 out which according to changelog fixes an undisclosed security issues for numerous platforms." Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit d2c62b64bd3ba661badb70c05ce6c1d5b781975a) 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 acec71000fb..3f12b71191e 100644 --- a/package/intel-microcode/intel-microcode.hash +++ b/package/intel-microcode/intel-microcode.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3a3cfe2c7642339af9f4c2ad69f5f367dfa4cd1f7f9fd4124dedefb7803591d4 intel-microcode-20230214.tar.gz +sha256 58f3321dcf900175d87d5b39455138c2a24e69df4ba997fb44e3e0d19e531ad1 intel-microcode-20230512.tar.gz sha256 03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12 license diff --git a/package/intel-microcode/intel-microcode.mk b/package/intel-microcode/intel-microcode.mk index 6e7d66f4820..48c6340af84 100644 --- a/package/intel-microcode/intel-microcode.mk +++ b/package/intel-microcode/intel-microcode.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_MICROCODE_VERSION = 20230214 +INTEL_MICROCODE_VERSION = 20230512 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 24905d4d935d643e27754e4d550c43475b342ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Thu, 20 Apr 2023 16:45:35 +0200 Subject: [PATCH 0180/1167] package/python-pymupdf: add missing host swig dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It appears that python-pymupdf needs swig when building since mupdf was bumped to 1.18.0 in commit f00da714a20a7826dda67d66f2a6b6ef858ef3e3. This was not noticed before because when building on a machine where swig is already available outside buildroot, it is used and the build succeeds. This fixes the following build failure: swigging fitz/fitz.i to fitz/fitz_wrap.c swig -python -w509 -o fitz/fitz_wrap.c fitz/fitz.i error: command 'swig' failed: No such file or directory make: *** [package/pkg-generic.mk:293: /home/buildroot/autobuild/instance-2/output-1/build/python-pymupdf-1.21.1/.stamp_built] Error 1 Fixes: - http://autobuild.buildroot.net/results/c689a385d984b87b63f3f2ff30338049774b1bf2 - http://autobuild.buildroot.net/results/cf268d3631330a8288fb8ad2af009abb7f1ca6b0 Signed-off-by: Raphaël Mélotte Signed-off-by: Yann E. MORIN (cherry picked from commit a650d714341c0e2900dac492c02d3b5701c87c8d) Signed-off-by: Peter Korsgaard --- package/python-pymupdf/Config.in | 1 + package/python-pymupdf/python-pymupdf.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-pymupdf/Config.in b/package/python-pymupdf/Config.in index b3f9565238f..ecaa5496b51 100644 --- a/package/python-pymupdf/Config.in +++ b/package/python-pymupdf/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_PYTHON_PYMUPDF depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mupdf -> harfbuzz depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # mupdf -> harfbuzz depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_HOST_SWIG select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_MUPDF select BR2_PACKAGE_ZLIB diff --git a/package/python-pymupdf/python-pymupdf.mk b/package/python-pymupdf/python-pymupdf.mk index 70448e8d906..03fc8bc4fbb 100644 --- a/package/python-pymupdf/python-pymupdf.mk +++ b/package/python-pymupdf/python-pymupdf.mk @@ -12,7 +12,7 @@ PYTHON_PYMUPDF_SETUP_TYPE = setuptools PYTHON_PYMUPDF_LICENSE = AGPL-3.0+ PYTHON_PYMUPDF_LICENSE_FILES = COPYING # No license file included in pip, but it's present on github -PYTHON_PYMUPDF_DEPENDENCIES = freetype mupdf zlib +PYTHON_PYMUPDF_DEPENDENCIES = freetype host-swig mupdf zlib PYTHON_PYMUPDF_ENV = CFLAGS="-I$(STAGING_DIR)/usr/include/mupdf -I$(STAGING_DIR)/usr/include/freetype2" From 4adbdb65c33ccb95a70dabeba6af8f71ba8b0eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Sat, 13 May 2023 21:45:30 +0200 Subject: [PATCH 0181/1167] package/mupdf: drop CVE ignores MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Back in commit 1fb64680bffb (package/mupdf: bump to version 1.20.3), we no longer carry the two patches that were fixing two CVEs. But the commit forgot to rop the exclusion of those two CVEs. Signed-off-by: Raphaël Mélotte [yann.morin.1998@free.fr: offload to its own commit, write commit log] Signed-off-by: Yann E. MORIN (cherry picked from commit 952fdd8fb1561f123480c781a60f7f4c597f331f) Signed-off-by: Peter Korsgaard --- package/mupdf/mupdf.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/package/mupdf/mupdf.mk b/package/mupdf/mupdf.mk index d6cc407c49f..4c35ba500ef 100644 --- a/package/mupdf/mupdf.mk +++ b/package/mupdf/mupdf.mk @@ -22,12 +22,6 @@ MUPDF_DEPENDENCIES = \ xlib_libX11 \ zlib -# 0002-Bug-703366-Fix-double-free-of-object-during-linearization.patch -MUPDF_IGNORE_CVES += CVE-2021-3407 - -# 0003-Bug-703791-Stay-within-hash-table-max-key-size-in-cached-color-converter.patch -MUPDF_IGNORE_CVES += CVE-2021-37220 - # The pkg-config name for gumbo-parser is `gumbo`. MUPDF_PKG_CONFIG_PACKAGES = \ freetype2 \ From 89c2a12022c4fa05500414044bd71421dc731cee Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 12 Apr 2023 15:26:00 -0700 Subject: [PATCH 0182/1167] package/libnftnl: bump to version 1.2.5 Also: Switch to tar.xz as the package is not distributed as a .bz2 any longer. Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit eeff8d24e3fbfa85dabeee31a7623838093fa30b) Signed-off-by: Peter Korsgaard --- package/libnftnl/libnftnl.hash | 2 +- package/libnftnl/libnftnl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libnftnl/libnftnl.hash b/package/libnftnl/libnftnl.hash index 113110fc1b2..0cb3917f2d3 100644 --- a/package/libnftnl/libnftnl.hash +++ b/package/libnftnl/libnftnl.hash @@ -1,3 +1,3 @@ # From http://www.netfilter.org/projects/libnftnl/downloads.html -sha256 e916ea9b79f9518560b9a187251a7c042442a9ecbce7f36be7908888605d0255 libnftnl-1.2.3.tar.bz2 +sha256 966de0a8120c8a53db859889749368bfb2cba0c4f0b4c1a30d264eccc45f1226 libnftnl-1.2.5.tar.xz sha256 98193898c663001eff2fdcfb676e210c13042bc1a05e8d570c363efa396f8e24 COPYING diff --git a/package/libnftnl/libnftnl.mk b/package/libnftnl/libnftnl.mk index fd87f700919..a7045337d0d 100644 --- a/package/libnftnl/libnftnl.mk +++ b/package/libnftnl/libnftnl.mk @@ -4,9 +4,9 @@ # ################################################################################ -LIBNFTNL_VERSION = 1.2.3 +LIBNFTNL_VERSION = 1.2.5 LIBNFTNL_SITE = https://netfilter.org/projects/libnftnl/files -LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 +LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.xz LIBNFTNL_LICENSE = GPL-2.0+ LIBNFTNL_LICENSE_FILES = COPYING LIBNFTNL_INSTALL_STAGING = YES From bcddc639d08716f285ceb24a735ce4f918d28352 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 12 Apr 2023 15:26:01 -0700 Subject: [PATCH 0183/1167] package/nftables: bump to version 1.0.7 Other changes: - Switch to tar.xz as the package is not distributed as a .bz2 any longer. - Update the sha256sum of the license file, as it has been updated to include the following text: "Original author of nftables distributed the code under the terms of the GPL version 2 *only*. New code though is moving to GPL version 2 or any later which is the preferred license for this project these days." The author has also changed from Patrick McHardy to Pablo Neira Ayuso Signed-off-by: Adam Duskett Signed-off-by: Yann E. MORIN (cherry picked from commit d1b8e723fd1805f2de6b6401438a13db6e249fa4) Signed-off-by: Peter Korsgaard --- package/nftables/nftables.hash | 4 ++-- package/nftables/nftables.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nftables/nftables.hash b/package/nftables/nftables.hash index 5e5134b61d1..7e1e856229f 100644 --- a/package/nftables/nftables.hash +++ b/package/nftables/nftables.hash @@ -1,3 +1,3 @@ # From https://netfilter.org/projects/nftables/downloads.html -sha256 8d1b4b18393af43698d10baa25d2b9b6397969beecac7816c35dd0714e4de50a nftables-1.0.5.tar.bz2 -sha256 c17bc4fa5b2434c6f283ffcb2312e5bf3c7cdf5787b79505f094d8de734ac53e COPYING +sha256 c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412 nftables-1.0.7.tar.xz +sha256 4ee1e51baf5f3166712fa0c3e01338c7257e50ddef245d28bb14ad68f6070ba5 COPYING diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 9d60736d7f7..b0a14bd4297 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -4,8 +4,8 @@ # ################################################################################ -NFTABLES_VERSION = 1.0.5 -NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 +NFTABLES_VERSION = 1.0.7 +NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.xz NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files NFTABLES_DEPENDENCIES = libmnl libnftnl host-pkgconf $(TARGET_NLS_DEPENDENCIES) NFTABLES_LICENSE = GPL-2.0 From f3ba4a27285912d6e7bc040ca96b54391f090024 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 6 May 2023 23:46:18 +0200 Subject: [PATCH 0184/1167] utils/docker-run: make it work in workdirs/woktrees It is quite customary to use a single repository with multiple workdirs, one for each active branch, with either the aging 'git new-workdir' or the more recent 'git worktree'. However, in a workdir/worktree, most entries in .git/ are only symlinks to the actual files in the main repository. Currently, utils/docker-run only bind-mounts the current working copy. If that is a workdir/worktree, then it is going to be missing the actual git data, resulting in errors like: $ ./utils/docker-run make check-package fatal: not a git repository (or any parent up to mount point [....]/buildroot) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). No files to check style make: *** [Makefile:1257: check-package] Error 1 So, we also bind-mount the actual git directory. If that is a subdir of the current working copy, then it is already mounted and thus the bind-mount is superfluous but harmless; for simplicity, we mount it unconditionally. Signed-off-by: Yann E. MORIN Cc: Ricardo Martincoski (cherry picked from commit 791c163b2f9f07d4c02b18eabd9b195918e1c603) Signed-off-by: Peter Korsgaard --- utils/docker-run | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/docker-run b/utils/docker-run index 135a1451b62..17c587a484b 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -2,6 +2,8 @@ set -o errexit -o pipefail DIR=$(dirname "${0}") MAIN_DIR=$(readlink -f "${DIR}/..") +# GIT_DIR to support workdirs/worktrees +GIT_DIR="$(dirname "$(realpath "${MAIN_DIR}/.git/config")")" # shellcheck disable=SC2016 IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') @@ -11,6 +13,7 @@ declare -a docker_opts=( --rm --user "$(id -u):$(id -g)" --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" + --mount "type=bind,src=${GIT_DIR},dst=${GIT_DIR}" --workdir "${MAIN_DIR}" ) if tty -s; then From 98e72152960472723f7e041615ec54c0c8d25a02 Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Wed, 15 Mar 2023 09:46:21 +0100 Subject: [PATCH 0185/1167] package/sdl2_mixer: bump version to 2.6.3 Signed-off-by: Luke D. Jones Signed-off-by: Yann E. MORIN (cherry picked from commit b1b8d5bf1b6468725a420fcaffa042303200ece6) Signed-off-by: Peter Korsgaard --- package/sdl2_mixer/sdl2_mixer.hash | 2 +- package/sdl2_mixer/sdl2_mixer.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sdl2_mixer/sdl2_mixer.hash b/package/sdl2_mixer/sdl2_mixer.hash index f3bab151f22..98c5fda6af5 100644 --- a/package/sdl2_mixer/sdl2_mixer.hash +++ b/package/sdl2_mixer/sdl2_mixer.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b4cf5a382c061cd75081cf246c2aa2f9df8db04bdda8dcdc6b6cca55bede2419 SDL2_mixer-2.0.4.tar.gz +sha256 7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f SDL2_mixer-2.6.3.tar.gz sha256 113727180e7956cb9718b03b41da85b63ea54743a33047071a623bf672895a10 COPYING.txt diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk index f349b8ca80c..425380bf5dd 100644 --- a/package/sdl2_mixer/sdl2_mixer.mk +++ b/package/sdl2_mixer/sdl2_mixer.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_MIXER_VERSION = 2.0.4 +SDL2_MIXER_VERSION = 2.6.3 SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release SDL2_MIXER_LICENSE = Zlib From 1e2f14d750ff4115f20ae5c2543b0002503da71d Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Mon, 15 May 2023 09:35:02 +0200 Subject: [PATCH 0186/1167] package/sdl2_mixer: fix license hash b1b8d5b ("package/sdl2_mixer: bump version to 2.6.3") forgot to update the hash of the license file. In 2021 the file was renamed from COPYING.txt to LICENSE.txt in two commits ([0] and [1]). The copyright year was subsequently updated for 2022 [2] and 2023 [3]. License is still Zlib - no changes there. [0]: https://github.com/libsdl-org/SDL_mixer/commit/0f84f242643a913ba81bd6c260c39064c432afd3 [1]: https://github.com/libsdl-org/SDL_mixer/commit/371bf1575913828c46212e9220d4a4685ed66bb5 [2]: https://github.com/libsdl-org/SDL_mixer/commit/3f5a0502e0394aa967179d53e180f31cf038e032 [3]: https://github.com/libsdl-org/SDL_mixer/commit/6fdd4d469b4065ddfb701530d2ea602efaa772b2 Fixes: - http://autobuild.buildroot.net/results/302cbd0adc2c6190d8923b9449e26a3c519d2326 Signed-off-by: Daniel Lang Signed-off-by: Peter Korsgaard (cherry picked from commit 4f4fb695a47cb50a0645a68aa03e27bdb3d73afe) Signed-off-by: Peter Korsgaard --- package/sdl2_mixer/sdl2_mixer.hash | 2 +- package/sdl2_mixer/sdl2_mixer.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/sdl2_mixer/sdl2_mixer.hash b/package/sdl2_mixer/sdl2_mixer.hash index 98c5fda6af5..4592014d7f3 100644 --- a/package/sdl2_mixer/sdl2_mixer.hash +++ b/package/sdl2_mixer/sdl2_mixer.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f SDL2_mixer-2.6.3.tar.gz -sha256 113727180e7956cb9718b03b41da85b63ea54743a33047071a623bf672895a10 COPYING.txt +sha256 1852c8549e3d154687197d46abababd3e8faae035f19991b2ca850fa3a43ad57 LICENSE.txt diff --git a/package/sdl2_mixer/sdl2_mixer.mk b/package/sdl2_mixer/sdl2_mixer.mk index 425380bf5dd..074e2822054 100644 --- a/package/sdl2_mixer/sdl2_mixer.mk +++ b/package/sdl2_mixer/sdl2_mixer.mk @@ -8,7 +8,7 @@ SDL2_MIXER_VERSION = 2.6.3 SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release SDL2_MIXER_LICENSE = Zlib -SDL2_MIXER_LICENSE_FILES = COPYING.txt +SDL2_MIXER_LICENSE_FILES = LICENSE.txt SDL2_MIXER_INSTALL_STAGING = YES SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf From b74ddc2f040cff416557fdf1eb5952c8afe9f3cd Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 13 May 2023 20:50:57 +0200 Subject: [PATCH 0187/1167] package/tzdata: bump version to 2023c tzdata and tzcode (for zic) are released in lock-step, as they go together, so we update both simultaneously. Signed-off-by: Yann E. MORIN (cherry picked from commit 179ae2fa6b4acb49fe164dc0a2de28b21fee695f) Signed-off-by: Peter Korsgaard --- package/tzdata/tzdata.hash | 2 +- package/tzdata/tzdata.mk | 2 +- package/zic/zic.hash | 2 +- package/zic/zic.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index aadd320063d..3422655a711 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ # From https://mm.icann.org/pipermail/tz-announce/2022-October/000075.html -sha512 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6 tzdata2022f.tar.gz +sha512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 tzdata2023c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/tzdata/tzdata.mk b/package/tzdata/tzdata.mk index 45bd7cf6e6d..08f3c83bd1f 100644 --- a/package/tzdata/tzdata.mk +++ b/package/tzdata/tzdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -TZDATA_VERSION = 2022f +TZDATA_VERSION = 2023c TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz TZDATA_SITE = https://www.iana.org/time-zones/repository/releases TZDATA_STRIP_COMPONENTS = 0 diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 40f68f02996..6a7f9f2f94e 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ # From https://mm.icann.org/pipermail/tz-announce/2022-October/000075.html -sha512 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b tzcode2022f.tar.gz +sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.mk b/package/zic/zic.mk index 229afaadc21..a915f6d2565 100644 --- a/package/zic/zic.mk +++ b/package/zic/zic.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZIC_VERSION = 2022f +ZIC_VERSION = 2023c ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz ZIC_SITE = https://www.iana.org/time-zones/repository/releases ZIC_STRIP_COMPONENTS = 0 From 4f676aa2bc239c62fc91619a4fe2f36f7b62f674 Mon Sep 17 00:00:00 2001 From: Daniel Lang Date: Sun, 14 May 2023 15:36:37 +0200 Subject: [PATCH 0188/1167] package/{tzdata,zic}: fix hash origin URL 179ae2f ("package/tzdata: bump version to 2023c") forgot to update the URL of the hash files. Signed-off-by: Daniel Lang Signed-off-by: Yann E. MORIN (cherry picked from commit ab0fda316e66cc098912ec87c629dfa20a2745ab) Signed-off-by: Peter Korsgaard --- package/tzdata/tzdata.hash | 2 +- package/zic/zic.hash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tzdata/tzdata.hash b/package/tzdata/tzdata.hash index 3422655a711..5488625ddd2 100644 --- a/package/tzdata/tzdata.hash +++ b/package/tzdata/tzdata.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2022-October/000075.html +# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html sha512 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 tzdata2023c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE diff --git a/package/zic/zic.hash b/package/zic/zic.hash index 6a7f9f2f94e..a2720a27baa 100644 --- a/package/zic/zic.hash +++ b/package/zic/zic.hash @@ -1,4 +1,4 @@ -# From https://mm.icann.org/pipermail/tz-announce/2022-October/000075.html +# From https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html sha512 fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 tzcode2023c.tar.gz # Locally computed: sha256 0613408568889f5739e5ae252b722a2659c02002839ad970a63dc5e9174b27cf LICENSE From 703937a6937045056f35118746378d1f251ad851 Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Mon, 15 May 2023 08:59:14 +0900 Subject: [PATCH 0189/1167] DEVELOPERS: Update email address for Damien Le Moal Change my email address to dlemoal@kernel.org. Signed-off-by: Damien Le Moal Signed-off-by: Peter Korsgaard (cherry picked from commit 7e655f81d43c0776567c1fc6d3815cc3b63e93a0) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 5421f76bd91..03182c847ae 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -662,7 +662,7 @@ N: Damien Lanson F: package/libvdpau/ F: package/log4cpp/ -N: Damien Le Moal +N: Damien Le Moal F: package/python-kflash/ F: board/canaan/ F: configs/canaan_kd233_defconfig From 32b856cbd48ff59d4014ecbaf87a94336181e6db Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 16 May 2023 08:40:34 +0200 Subject: [PATCH 0190/1167] package/libssh: security bump to version 0.10.5 Fixes the following security issues: - CVE-2023-1667: Potential NULL dereference during rekeying with algorithm guessing https://www.libssh.org/security/advisories/CVE-2023-1667.txt - CVE-2023-2283: Authorization bypass in pki_verify_data_signature https://www.libssh.org/security/advisories/CVE-2023-2283.txt Signed-off-by: Peter Korsgaard (cherry picked from commit 3ec773ba91acc4673a39afebbb904c800a534ebf) Signed-off-by: Peter Korsgaard --- package/libssh/libssh.hash | 4 ++-- package/libssh/libssh.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libssh/libssh.hash b/package/libssh/libssh.hash index 90bc4c82d86..0d611918421 100644 --- a/package/libssh/libssh.hash +++ b/package/libssh/libssh.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://www.libssh.org/files/0.10/libssh-0.10.4.tar.xz.asc +# https://www.libssh.org/files/0.10/libssh-0.10.5.tar.xz.asc # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D -sha256 07392c54ab61476288d1c1f0a7c557b50211797ad00c34c3af2bbc4dbc4bd97d libssh-0.10.4.tar.xz +sha256 b60e2ff7f367b9eee2b5634d3a63303ddfede0e6a18dfca88c44a8770e7e4234 libssh-0.10.5.tar.xz sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 5deb64b82e4..3be6c6adaf3 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -5,7 +5,7 @@ ################################################################################ LIBSSH_VERSION_MAJOR = 0.10 -LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).4 +LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR) LIBSSH_LICENSE = LGPL-2.1 From 0240980c52f13734750bc6e5a4d8004a3d3b2028 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 16 May 2023 10:01:17 +0200 Subject: [PATCH 0191/1167] package/webkitgtk: fix GCC version in comment Commit 4c7fcbbe75de5c535e8d5dd7182900b6d09e2b03 should have set it to GCC 8. Signed-off-by: Thomas Devoogdt Reviewed-by: Adrian Perez de Castro Signed-off-by: Peter Korsgaard (cherry picked from commit fd5afab7b643997e89e1804de686a3935f8dd724) Signed-off-by: Peter Korsgaard --- package/webkitgtk/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/webkitgtk/Config.in b/package/webkitgtk/Config.in index 976341093e5..23c0bf41db8 100644 --- a/package/webkitgtk/Config.in +++ b/package/webkitgtk/Config.in @@ -21,7 +21,7 @@ comment "webkitgtk needs libgtk3 and a toolchain w/ C++, wchar, threads, dynamic depends on !BR2_BINFMT_FLAT depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 || \ !BR2_HOST_GCC_AT_LEAST_4_9 depends on BR2_USE_MMU From 8391404e2304ee976ad4e654cf6f17c76854f9bf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 19:57:14 +0200 Subject: [PATCH 0192/1167] package/libcurl: security bump version to 8.1.1 Changelog: https://curl.se/changes.html Version 8.1.0 fixes the following CVEs: CVE-2023-28319: https://curl.se/docs/CVE-2023-28319.html CVE-2023-28320: https://curl.se/docs/CVE-2023-28320.html CVE-2023-28321: https://curl.se/docs/CVE-2023-28321.html CVE-2023-28322: https://curl.se/docs/CVE-2023-28322.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit f32ddbbcf3f1d96290d1130be999b13eea006f71) 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 8a29e7b977c..12d356118b7 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.0.1.tar.xz.asc +# https://curl.se/download/curl-8.1.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0 curl-8.0.1.tar.xz +sha256 08a948e061929645597c1ef7194e07b308b22084ff03fa7400b465e6c05149e5 curl-8.1.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 0f7ae640f64..93e839798bf 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.0.1 +LIBCURL_VERSION = 8.1.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 942b715a851a3321398d14372708d0f96182e0fe Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 27 May 2023 18:33:02 +0200 Subject: [PATCH 0193/1167] package/busybox: fix busybox lineedit signal handling Since the Busybox version bump to 1.36.0 the TestS6 fails during the test teardown. Backport an upstream patch fixing signal handling (SIGWINCH), see [1]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819388 [1] https://bugs.busybox.net/show_bug.cgi?id=15256 Signed-off-by: Romain Naour [Peter: use upstream commit as-is] Signed-off-by: Peter Korsgaard (cherry picked from commit b6ce18b5ac78474611cdea07b887f4f83bc78648) Signed-off-by: Peter Korsgaard --- ...CH-and-SIGCHLD-in-hush-interrupting-.patch | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch diff --git a/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch b/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch new file mode 100644 index 00000000000..8ebb487ec6d --- /dev/null +++ b/package/busybox/0008-shell-fix-SIGWINCH-and-SIGCHLD-in-hush-interrupting-.patch @@ -0,0 +1,103 @@ +From 93e0898c663a533082b5f3c2e7dcce93ec47076d Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Thu, 26 Jan 2023 12:56:33 +0100 +Subject: [PATCH] shell: fix SIGWINCH and SIGCHLD (in hush) interrupting line + input, closes 15256 + +function old new delta +record_pending_signo 32 63 +31 +lineedit_read_key 231 224 -7 +------------------------------------------------------------------------------ +(add/remove: 0/0 grow/shrink: 1/1 up/down: 31/-7) Total: 24 bytes + +Signed-off-by: Denys Vlasenko +Upstream: https://git.busybox.net/busybox/commit/?id=93e0898c663a533082b5f3c2e7dcce93ec47076d +Signed-off-by: Romain Naour +--- + libbb/lineedit.c | 17 ++++++++++------- + shell/ash.c | 3 ++- + shell/hush.c | 10 ++++++++-- + 3 files changed, 20 insertions(+), 10 deletions(-) + +diff --git a/libbb/lineedit.c b/libbb/lineedit.c +index d6b2e76ff..b942f540a 100644 +--- a/libbb/lineedit.c ++++ b/libbb/lineedit.c +@@ -2180,7 +2180,8 @@ static int lineedit_read_key(char *read_key_buffer, int timeout) + * "\xff\n",pause,"ls\n" invalid and thus won't lose "ls". + * + * If LI_INTERRUPTIBLE, return -1 if got EINTR in poll() +- * inside read_key, or if bb_got_signal != 0 (IOW: if signal ++ * inside read_key and bb_got_signal became != 0, ++ * or if bb_got_signal != 0 (IOW: if signal + * arrived before poll() is reached). + * + * Note: read_key sets errno to 0 on success. +@@ -2197,14 +2198,16 @@ static int lineedit_read_key(char *read_key_buffer, int timeout) + IF_FEATURE_EDITING_WINCH(S.ok_to_redraw = 0;) + if (errno != EINTR) + break; ++ /* It was EINTR. Repeat read_key() unless... */ + if (state->flags & LI_INTERRUPTIBLE) { +- /* LI_INTERRUPTIBLE bails out on EINTR, +- * but nothing really guarantees that bb_got_signal +- * is nonzero. Follow the least surprise principle: ++ /* LI_INTERRUPTIBLE bails out on EINTR ++ * if bb_got_signal became nonzero. ++ * (It may stay zero: for example, our SIGWINCH ++ * handler does not set it. This is used for signals ++ * which should not interrupt line editing). + */ +- if (bb_got_signal == 0) +- bb_got_signal = 255; +- goto ret; ++ if (bb_got_signal != 0) ++ goto ret; /* will return -1 */ + } + } + +diff --git a/shell/ash.c b/shell/ash.c +index 18ccc1329..5f8c8ea19 100644 +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -10821,7 +10821,8 @@ preadfd(void) + again: + /* For shell, LI_INTERRUPTIBLE is set: + * read_line_input will abort on either +- * getting EINTR in poll(), or if it sees bb_got_signal != 0 ++ * getting EINTR in poll() and bb_got_signal became != 0, ++ * or if it sees bb_got_signal != 0 + * (IOW: if signal arrives before poll() is reached). + * Interactive testcases: + * (while kill -INT $$; do sleep 1; done) & +diff --git a/shell/hush.c b/shell/hush.c +index d111f0cc5..f064b8fd2 100644 +--- a/shell/hush.c ++++ b/shell/hush.c +@@ -1946,7 +1946,12 @@ static void record_pending_signo(int sig) + { + sigaddset(&G.pending_set, sig); + #if ENABLE_FEATURE_EDITING +- bb_got_signal = sig; /* for read_line_input: "we got a signal" */ ++ if (sig != SIGCHLD ++ || (G_traps && G_traps[SIGCHLD] && G_traps[SIGCHLD][0]) ++ /* ^^^ if SIGCHLD, interrupt line reading only if it has a trap */ ++ ) { ++ bb_got_signal = sig; /* for read_line_input: "we got a signal" */ ++ } + #endif + #if ENABLE_HUSH_FAST + if (sig == SIGCHLD) { +@@ -2669,7 +2674,8 @@ static int get_user_input(struct in_str *i) + } else { + /* For shell, LI_INTERRUPTIBLE is set: + * read_line_input will abort on either +- * getting EINTR in poll(), or if it sees bb_got_signal != 0 ++ * getting EINTR in poll() and bb_got_signal became != 0, ++ * or if it sees bb_got_signal != 0 + * (IOW: if signal arrives before poll() is reached). + * Interactive testcases: + * (while kill -INT $$; do sleep 1; done) & +-- +2.30.2 + From 072b93d6fb136d007ab4e4c54bb31b2498a8747f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 30 May 2023 22:45:41 +0200 Subject: [PATCH 0194/1167] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 073d6dbcb19bd7bce3be203ccfa88524ea61af6e) [Peter: drop 6.3.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 6337e098b4d..c62f85e644f 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.30" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.31" 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 19066fcbdb0..550a3a5cec3 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 1bf254c4ca9ebccb25328296584fb5e87ad635ae0c1cc1deb0b5bb37a4608813 linux-6.1.30.tar.xz +sha256 e86917bba1990e967943645484182a64ba325f98b114a1906cc1d50992e073c1 linux-6.1.31.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 4a4e98d21149d781867a6d44855f708b02f03cfe233d8026a0af9c9841b3b9ca linux-5.15.113.tar.xz -sha256 da839a4bf1f6c964b9bde593bd58928f106f53690ff677e226bc50cf368b0c29 linux-5.10.180.tar.xz -sha256 c3cf664feeeee47e0f0c45c53705568f73692c37a3ff7f11c1b15e59610feb04 linux-5.4.243.tar.xz +sha256 e981ea5d219f77735bf5a3f7e84a8af578df8ac3e1c4ff1b0649e2b0795277d2 linux-5.15.114.tar.xz +sha256 ace6ceb73f5f2504bc1bcb9b8cd5b55d6ff8e90a81ee244ad2315fdd671ba4e7 linux-5.10.181.tar.xz +sha256 90f5280e95ed7b374ad6f3979ed08008e29a051e5f372d367c06ed75b002a21b linux-5.4.244.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 047316d20c6c97ad41c40477c7e1ab0bea434243e17bfc72155801b123cc51f4 linux-4.19.283.tar.xz -sha256 a346c5c34c06caeb28063b6379a28ec1f4111fa438ecd933a55f696fe362c99d linux-4.14.315.tar.xz +sha256 7fb9ee20c7e52f9be6d9f501e8498a22f4b364abfde136143749a77e597fd03e linux-4.19.284.tar.xz +sha256 ac8318f1c1d387e23ccfa760ec042943372df23e3c4e2408177fb5a3f6488f76 linux-4.14.316.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 98e60d74f8b..fe7d9330c68 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.315" if BR2_KERNEL_HEADERS_4_14 - default "4.19.283" if BR2_KERNEL_HEADERS_4_19 - default "5.4.243" if BR2_KERNEL_HEADERS_5_4 - default "5.10.180" if BR2_KERNEL_HEADERS_5_10 - default "5.15.113" if BR2_KERNEL_HEADERS_5_15 - default "6.1.30" if BR2_KERNEL_HEADERS_6_1 + default "4.14.316" if BR2_KERNEL_HEADERS_4_14 + default "4.19.284" if BR2_KERNEL_HEADERS_4_19 + default "5.4.244" if BR2_KERNEL_HEADERS_5_4 + default "5.10.181" if BR2_KERNEL_HEADERS_5_10 + default "5.15.114" if BR2_KERNEL_HEADERS_5_15 + default "6.1.31" if BR2_KERNEL_HEADERS_6_1 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 017794abd6c9eec1a4f3d08d1d4fd03501828d79 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 31 May 2023 15:46:00 +0200 Subject: [PATCH 0195/1167] DEVELOPERS: update etienne carriere e-mail address Updates my e-mail address. Signed-off-by: Etienne Carriere Signed-off-by: Peter Korsgaard (cherry picked from commit 08e92de0447591f61266ee10f982f4ad0545154d) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 03182c847ae..3366e2b2a42 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -860,7 +860,7 @@ F: package/szip/ N: Esben Haabendal F: package/python-kiwisolver/ -N: Etienne Carriere +N: Etienne Carriere F: boot/optee-os/ F: package/optee-benchmark/ F: package/optee-client/ From b30617a79ba8722961d396fa551b5469e1761b8e Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Thu, 1 Jun 2023 18:11:46 +0200 Subject: [PATCH 0196/1167] package/libopenssl: security bump to version 1.1.1u fix CVE-2023-2650 Possible DoS translating ASN.1 object identifiers Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 2bcfcec50285659c9921e8457fc893c8195e32a5) Signed-off-by: Peter Korsgaard --- ...Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch | 2 +- ...Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch | 2 +- .../0007-Fixup-support-for-io_pgetevents_time64-syscall.patch | 2 +- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch index c51a3cd684e..ef40b0353a3 100644 --- a/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch +++ b/package/libopenssl/0003-Introduce-the-OPENSSL_NO_MADVISE-to-disable-call-to-.patch @@ -13,7 +13,7 @@ diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index 9e0f670..32c7282 100644 --- a/crypto/mem_sec.c +++ b/crypto/mem_sec.c -@@ -485,7 +485,7 @@ static int sh_init(size_t size, int minsize) +@@ -491,7 +491,7 @@ static int sh_init(size_t size, int minsize) if (mlock(sh.arena, sh.arena_size) < 0) ret = 2; #endif diff --git a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch b/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch index b5070ad74cc..9f34e1f5fb7 100644 --- a/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch +++ b/package/libopenssl/0004-Configure-use-ELFv2-ABI-on-some-ppc64-big-endian-sys.patch @@ -21,7 +21,7 @@ diff --git a/Configure b/Configure index 5a699836f3..f9152b1702 100755 --- a/Configure +++ b/Configure -@@ -1417,6 +1417,10 @@ my %predefined_CXX = $config{CXX} +@@ -1424,6 +1424,10 @@ my %predefined_CXX = $config{CXX} ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX}) : (); diff --git a/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch b/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch index 4313eecd6d1..7b003e48363 100644 --- a/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch +++ b/package/libopenssl/0007-Fixup-support-for-io_pgetevents_time64-syscall.patch @@ -23,7 +23,7 @@ diff --git a/engines/e_afalg.c b/engines/e_afalg.c index 9480d7c24b..4e9d67db2d 100644 --- a/engines/e_afalg.c +++ b/engines/e_afalg.c -@@ -124,27 +124,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb) +@@ -121,27 +121,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb) return syscall(__NR_io_submit, ctx, n, iocb); } diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index ebc56b11dd9..708926de803 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256 -sha256 8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1u.tar.gz.sha256 +sha256 e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6 openssl-1.1.1u.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 6e84f061756..178979f43b1 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1t +LIBOPENSSL_VERSION = 1.1.1u LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From a26b7d84d29ce777cec035f1fb3c02ecdcafa173 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 30 May 2023 21:27:56 +0200 Subject: [PATCH 0197/1167] package/gcc: bump to version 12.3 Remove upstream patch. See announce: https://gcc.gnu.org/pipermail/gcc-announce/2023/000176.html Runtime tested: https://gitlab.com/kubu93/buildroot/-/pipelines/882178578 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 0a623d4955a0c62037710aca545abc10b41153d6) Signed-off-by: Peter Korsgaard --- package/gcc/12.2.0/0002-fix-condvar.patch | 82 ------------------- ...le-split-stack-for-non-thread-builds.patch | 0 package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 +- 4 files changed, 3 insertions(+), 85 deletions(-) delete mode 100644 package/gcc/12.2.0/0002-fix-condvar.patch rename package/gcc/{12.2.0 => 12.3.0}/0001-disable-split-stack-for-non-thread-builds.patch (100%) diff --git a/package/gcc/12.2.0/0002-fix-condvar.patch b/package/gcc/12.2.0/0002-fix-condvar.patch deleted file mode 100644 index 5044942e9f7..00000000000 --- a/package/gcc/12.2.0/0002-fix-condvar.patch +++ /dev/null @@ -1,82 +0,0 @@ -From ee4af2ed0b7322884ec4ff537564683c3749b813 Mon Sep 17 00:00:00 2001 -From: Jonathan Wakely -Date: Thu, 22 Dec 2022 09:56:47 +0000 -Subject: [PATCH] libstdc++: Avoid recursion in __nothrow_wait_cv::wait - [PR105730] - -The commit r12-5877-g9e18a25331fa25 removed the incorrect -noexcept-specifier from std::condition_variable::wait and gave the new -symbol version @@GLIBCXX_3.4.30. It also redefined the original symbol -std::condition_variable::wait(unique_lock&)@GLIBCXX_3.4.11 as an -alias for a new symbol, __gnu_cxx::__nothrow_wait_cv::wait, which still -has the incorrect noexcept guarantee. That __nothrow_wait_cv::wait is -just a wrapper around the real condition_variable::wait which adds -noexcept and so terminates on a __forced_unwind exception. - -This doesn't work on uclibc, possibly due to a dynamic linker bug. When -__nothrow_wait_cv::wait calls the condition_variable::wait function it -binds to the alias symbol, which means it just calls itself recursively -until the stack overflows. - -This change avoids the possibility of a recursive call by changing the -__nothrow_wait_cv::wait function so that instead of calling -condition_variable::wait it re-implements it. This requires accessing -the private _M_cond member of condition_variable, so we need to use the -trick of instantiating a template with the member-pointer of the private -member. - -libstdc++-v3/ChangeLog: - - PR libstdc++/105730 - * src/c++11/compatibility-condvar.cc (__nothrow_wait_cv::wait): - Access private data member of base class and call its wait - member. - -Signed-off-by: Gleb Mazovetskiy ---- - .../src/c++11/compatibility-condvar.cc | 22 ++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/libstdc++-v3/src/c++11/compatibility-condvar.cc b/libstdc++-v3/src/c++11/compatibility-condvar.cc -index e3a8b8403ca..3cef3bc0714 100644 ---- a/libstdc++-v3/src/c++11/compatibility-condvar.cc -+++ b/libstdc++-v3/src/c++11/compatibility-condvar.cc -@@ -67,6 +67,24 @@ _GLIBCXX_END_NAMESPACE_VERSION - && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT) - namespace __gnu_cxx _GLIBCXX_VISIBILITY(default) - { -+namespace -+{ -+ // Pointer-to-member for private std::condition_variable::_M_cond member. -+ std::__condvar std::condition_variable::* __base_member; -+ -+ template -+ struct cracker -+ { static std::__condvar std::condition_variable::* value; }; -+ -+ // Initializer for this static member also initializes __base_member. -+ template -+ std::__condvar std::condition_variable::* -+ cracker::value = __base_member = X; -+ -+ // Explicit instantiation is allowed to access the private member. -+ template class cracker<&std::condition_variable::_M_cond>; -+} -+ - struct __nothrow_wait_cv : std::condition_variable - { - void wait(std::unique_lock&) noexcept; -@@ -76,7 +94,9 @@ __attribute__((used)) - void - __nothrow_wait_cv::wait(std::unique_lock& lock) noexcept - { -- this->condition_variable::wait(lock); -+ // In theory this could be simply this->std::condition_variable::wait(lock) -+ // but with uclibc that binds to the @GLIBCXX_3.4.11 symbol, see PR 105730. -+ (this->*__base_member).wait(*lock.mutex()); - } - } // namespace __gnu_cxx - --- -2.31.1 - diff --git a/package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch b/package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch similarity index 100% rename from package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index cd1b9fa46d8..dca1579319c 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -88,7 +88,7 @@ config BR2_GCC_VERSION default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE default "10.4.0" if BR2_GCC_VERSION_10_X default "11.3.0" if BR2_GCC_VERSION_11_X - default "12.2.0" if BR2_GCC_VERSION_12_X + default "12.3.0" if BR2_GCC_VERSION_12_X default "arc-2020.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 666124fa6db..9082d25b78b 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -4,8 +4,8 @@ sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 gcc-10.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-11.3.0/sha512.sum sha512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 gcc-11.3.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.2.0/sha512.sum -sha512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173 gcc-12.2.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum +sha512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204 gcc-12.3.0.tar.xz # Locally calculated (fetched from Github) sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz From 75b55ffc466b0114c5fc0edaa6c2e322baedf64b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 30 May 2023 21:27:57 +0200 Subject: [PATCH 0198/1167] package/gcc: bump to version 11.4 Add Upstream tag to backported patches. Remove patches merged in gcc 11.4. See announce: https://gcc.gnu.org/pipermail/gcc-announce/2023/000177.html Runtime tested: https://gitlab.com/kubu93/buildroot/-/pipelines/882299806 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit f1e3d02cd4d9ba04b9aea8bf10a960104d171773) Signed-off-by: Peter Korsgaard --- .../11.3.0/0005-rs6000-Improve-.machine.patch | 120 ------------------ ...e-rs6000_cpu-for-.machine-ppc-and-pp.patch | 68 ---------- ...-mcmodel-option-to-handle-large-GOTs.patch | 12 +- ...-cmodel-large-when-building-crtstuff.patch | 12 +- ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 8 +- ...le-split-stack-for-non-thread-builds.patch | 2 +- ...machine-names-in-__has_include-.-PR.patch} | 8 +- package/gcc/Config.in.host | 2 +- package/gcc/gcc.hash | 4 +- 9 files changed, 30 insertions(+), 206 deletions(-) delete mode 100644 package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch delete mode 100644 package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch rename package/gcc/{11.3.0 => 11.4.0}/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch (95%) rename package/gcc/{11.3.0 => 11.4.0}/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch (88%) rename package/gcc/{11.3.0 => 11.4.0}/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch (81%) rename package/gcc/{11.3.0 => 11.4.0}/0004-disable-split-stack-for-non-thread-builds.patch (92%) rename package/gcc/{11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch => 11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch} (96%) diff --git a/package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch b/package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch deleted file mode 100644 index 82a667ab7b9..00000000000 --- a/package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch +++ /dev/null @@ -1,120 +0,0 @@ -From ca2c3a7d3db7a699c358d3408f820396dd536fc8 Mon Sep 17 00:00:00 2001 -From: Segher Boessenkool -Date: Tue, 1 Mar 2022 17:04:29 +0000 -Subject: [PATCH] rs6000: Improve .machine - -This adds more correct .machine for most older CPUs. It should be -conservative in the sense that everything we handled before we handle at -least as well now. This does not yet revamp the server CPU handling, it -is too risky at this point in time. - -Tested on powerpc64-linux {-m32,-m64}. Also manually tested with all --mcpu=, and the output of that passed through the GNU assembler. - -2022-03-04 Segher Boessenkool - - * config/rs6000/rs6000.c (rs6000_machine_from_flags): Restructure a - bit. Handle most older CPUs. - -(cherry picked from commit 77eccbf39ed55297802bb66dff5f62507a7239e3) -(cherry picked from commit fc7e603edc67c66a14f893f3b5a0a34e7d26f77c) -Signed-off-by: Romain Naour ---- - gcc/config/rs6000/rs6000.c | 81 +++++++++++++++++++++++++------------- - 1 file changed, 54 insertions(+), 27 deletions(-) - -diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c -index 0421dc7adb3..0a55c979c36 100644 ---- a/gcc/config/rs6000/rs6000.c -+++ b/gcc/config/rs6000/rs6000.c -@@ -5742,33 +5742,60 @@ const char *rs6000_machine; - const char * - rs6000_machine_from_flags (void) - { -- /* For some CPUs, the machine cannot be determined by ISA flags. We have to -- check them first. */ -- switch (rs6000_cpu) -- { -- case PROCESSOR_PPC8540: -- case PROCESSOR_PPC8548: -- return "e500"; -- -- case PROCESSOR_PPCE300C2: -- case PROCESSOR_PPCE300C3: -- return "e300"; -- -- case PROCESSOR_PPCE500MC: -- return "e500mc"; -- -- case PROCESSOR_PPCE500MC64: -- return "e500mc64"; -- -- case PROCESSOR_PPCE5500: -- return "e5500"; -- -- case PROCESSOR_PPCE6500: -- return "e6500"; -- -- default: -- break; -- } -+ /* e300 and e500 */ -+ if (rs6000_cpu == PROCESSOR_PPCE300C2 || rs6000_cpu == PROCESSOR_PPCE300C3) -+ return "e300"; -+ if (rs6000_cpu == PROCESSOR_PPC8540 || rs6000_cpu == PROCESSOR_PPC8548) -+ return "e500"; -+ if (rs6000_cpu == PROCESSOR_PPCE500MC) -+ return "e500mc"; -+ if (rs6000_cpu == PROCESSOR_PPCE500MC64) -+ return "e500mc64"; -+ if (rs6000_cpu == PROCESSOR_PPCE5500) -+ return "e5500"; -+ if (rs6000_cpu == PROCESSOR_PPCE6500) -+ return "e6500"; -+ -+ /* 400 series */ -+ if (rs6000_cpu == PROCESSOR_PPC403) -+ return "\"403\""; -+ if (rs6000_cpu == PROCESSOR_PPC405) -+ return "\"405\""; -+ if (rs6000_cpu == PROCESSOR_PPC440) -+ return "\"440\""; -+ if (rs6000_cpu == PROCESSOR_PPC476) -+ return "\"476\""; -+ -+ /* A2 */ -+ if (rs6000_cpu == PROCESSOR_PPCA2) -+ return "a2"; -+ -+ /* Cell BE */ -+ if (rs6000_cpu == PROCESSOR_CELL) -+ return "cell"; -+ -+ /* Titan */ -+ if (rs6000_cpu == PROCESSOR_TITAN) -+ return "titan"; -+ -+ /* 500 series and 800 series */ -+ if (rs6000_cpu == PROCESSOR_MPCCORE) -+ return "\"821\""; -+ -+ /* 600 series and 700 series, "classic" */ -+ if (rs6000_cpu == PROCESSOR_PPC601 || rs6000_cpu == PROCESSOR_PPC603 -+ || rs6000_cpu == PROCESSOR_PPC604 || rs6000_cpu == PROCESSOR_PPC604e -+ || rs6000_cpu == PROCESSOR_PPC750 || rs6000_cpu == PROCESSOR_POWERPC) -+ return "ppc"; -+ -+ /* Classic with AltiVec, "G4" */ -+ if (rs6000_cpu == PROCESSOR_PPC7400 || rs6000_cpu == PROCESSOR_PPC7450) -+ return "\"7450\""; -+ -+ /* The older 64-bit CPUs */ -+ if (rs6000_cpu == PROCESSOR_PPC620 || rs6000_cpu == PROCESSOR_PPC630 -+ || rs6000_cpu == PROCESSOR_RS64A || rs6000_cpu == PROCESSOR_POWERPC64) -+ return "ppc64"; - - HOST_WIDE_INT flags = rs6000_isa_flags; - --- -2.34.3 - diff --git a/package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch b/package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch deleted file mode 100644 index 43fed4c19ff..00000000000 --- a/package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 6de33ed642f119f1e2543095dd56e4a94f97c27f Mon Sep 17 00:00:00 2001 -From: Segher Boessenkool -Date: Fri, 11 Mar 2022 21:15:18 +0000 -Subject: [PATCH] rs6000: Do not use rs6000_cpu for .machine ppc and ppc64 - (PR104829) - -Fixes: 77eccbf39ed5 - -rs6000.h has - #define PROCESSOR_POWERPC PROCESSOR_PPC604 - #define PROCESSOR_POWERPC64 PROCESSOR_RS64A -which means that if you use things like -mcpu=powerpc -mvsx it will no -longer work after my latest .machine patch. This causes GCC build errors -in some cases, not a good idea (even if the errors are actually -pre-existing: using -mvsx with a machine that does not have VSX cannot -work properly). - -2022-03-11 Segher Boessenkool - - PR target/104829 - * config/rs6000/rs6000.c (rs6000_machine_from_flags): Don't output - "ppc" and "ppc64" based on rs6000_cpu. - -(cherry picked from commit 80fcc4b6afee72443bef551064826b3b4b6785e6) -(cherry picked from commit d87e0e297b1cba73a0c055d2a3e9267d288f435a) -Signed-off-by: Romain Naour ---- - gcc/config/rs6000/rs6000.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c -index 0a55c979c36..7e5cdd34840 100644 ---- a/gcc/config/rs6000/rs6000.c -+++ b/gcc/config/rs6000/rs6000.c -@@ -5782,20 +5782,28 @@ rs6000_machine_from_flags (void) - if (rs6000_cpu == PROCESSOR_MPCCORE) - return "\"821\""; - -+#if 0 -+ /* This (and ppc64 below) are disabled here (for now at least) because -+ PROCESSOR_POWERPC, PROCESSOR_POWERPC64, and PROCESSOR_COMMON -+ are #define'd as some of these. Untangling that is a job for later. */ -+ - /* 600 series and 700 series, "classic" */ - if (rs6000_cpu == PROCESSOR_PPC601 || rs6000_cpu == PROCESSOR_PPC603 - || rs6000_cpu == PROCESSOR_PPC604 || rs6000_cpu == PROCESSOR_PPC604e -- || rs6000_cpu == PROCESSOR_PPC750 || rs6000_cpu == PROCESSOR_POWERPC) -+ || rs6000_cpu == PROCESSOR_PPC750) - return "ppc"; -+#endif - - /* Classic with AltiVec, "G4" */ - if (rs6000_cpu == PROCESSOR_PPC7400 || rs6000_cpu == PROCESSOR_PPC7450) - return "\"7450\""; - -+#if 0 - /* The older 64-bit CPUs */ - if (rs6000_cpu == PROCESSOR_PPC620 || rs6000_cpu == PROCESSOR_PPC630 -- || rs6000_cpu == PROCESSOR_RS64A || rs6000_cpu == PROCESSOR_POWERPC64) -+ || rs6000_cpu == PROCESSOR_RS64A) - return "ppc64"; -+#endif - - HOST_WIDE_INT flags = rs6000_isa_flags; - --- -2.34.3 - diff --git a/package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch b/package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch similarity index 95% rename from package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch rename to package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch index 4888f7e3207..f927cd007d1 100644 --- a/package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch +++ b/package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch @@ -1,4 +1,4 @@ -From 7a20b4574f06472086c786bd1b078ee962cdb02c Mon Sep 17 00:00:00 2001 +From 35c0801efa26bf248d278b5711b77a19e95b2f57 Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Tue, 6 Apr 2021 05:47:17 +0900 Subject: [PATCH] or1k: Add mcmodel option to handle large GOTs @@ -28,7 +28,11 @@ gcc/ChangeLog: * config/or1k/or1k.opt (mcmodel=): New option. * doc/invoke.texi (OpenRISC Options): Document mcmodel. +Uptream: eff8110674ef193481d3657456a262beeb9951ff + Signed-off-by: Giulio Benetti +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- gcc/config/or1k/or1k-opts.h | 30 ++++++++++++++++++++++++++++++ gcc/config/or1k/or1k.c | 11 +++++++++-- @@ -166,7 +170,7 @@ index 6bd0f3eee6d..cc23e3b8856 100644 Target RejectNegative Mask(CMOV) Enable generation of conditional move (l.cmov) instructions. By default the diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index 35508efb4ef..a1b7608a3aa 100644 +index f1217812280..90c6186fc14 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -1136,7 +1136,8 @@ Objective-C and Objective-C++ Dialects}. @@ -179,7 +183,7 @@ index 35508efb4ef..a1b7608a3aa 100644 @emph{PDP-11 Options} @gccoptlist{-mfpu -msoft-float -mac0 -mno-ac0 -m40 -m45 -m10 @gol -@@ -26443,6 +26444,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, +@@ -26444,6 +26445,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli}, @code{l.slli}) instructions. By default extra instructions will be generated to store the immediate to a register first. @@ -196,5 +200,5 @@ index 35508efb4ef..a1b7608a3aa 100644 @end table -- -2.35.1 +2.34.3 diff --git a/package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch b/package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch similarity index 88% rename from package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch rename to package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch index 716f007a24f..eb451751356 100644 --- a/package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch +++ b/package/gcc/11.4.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch @@ -1,4 +1,4 @@ -From c544a63928406b706b8493fd9b8ca2136b433cf0 Mon Sep 17 00:00:00 2001 +From f75178ccd2f5e4d73e27cccffffada859b87be7d Mon Sep 17 00:00:00 2001 From: Stafford Horne Date: Wed, 21 Apr 2021 05:33:15 +0900 Subject: [PATCH] or1k: Use cmodel=large when building crtstuff @@ -21,7 +21,11 @@ libgcc/ChangeLog: * config.host (or1k-*, tmake_file): Add or1k/t-crtstuff. * config/or1k/t-crtstuff: New file. +Upstream: da8a9d695b3c4b9397b5d9a27660bfa48af8d707 + Signed-off-by: Giulio Benetti +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- libgcc/config.host | 4 ++-- libgcc/config/or1k/t-crtstuff | 2 ++ @@ -29,10 +33,10 @@ Signed-off-by: Giulio Benetti create mode 100644 libgcc/config/or1k/t-crtstuff diff --git a/libgcc/config.host b/libgcc/config.host -index f2dc7e266f4..6f193c32fbd 100644 +index 45f8e19ada4..5523345abb0 100644 --- a/libgcc/config.host +++ b/libgcc/config.host -@@ -1132,12 +1132,12 @@ nios2-*-*) +@@ -1150,12 +1150,12 @@ nios2-*-*) extra_parts="$extra_parts crti.o crtn.o" ;; or1k-*-linux*) @@ -56,5 +60,5 @@ index 00000000000..dcae7f3498e +# Compile crtbeginS.o and crtendS.o with -mcmodel=large +CRTSTUFF_T_CFLAGS_S += -mcmodel=large -- -2.35.1 +2.34.3 diff --git a/package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch b/package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch similarity index 81% rename from package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch rename to package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch index e33dec3ff6c..cb407c78fc1 100644 --- a/package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch +++ b/package/gcc/11.4.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch @@ -1,4 +1,4 @@ -From 8ef5787701f4d7cf46a27771d38ab54af2499e25 Mon Sep 17 00:00:00 2001 +From 48ced46a5f81f49737ea13d11a099e03062cf141 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 27 Mar 2020 21:23:53 +0100 Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed @@ -8,7 +8,11 @@ is defined. Added the CPP_SPEC definition to correct this. Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 +Upstream: cac2f69cdad434ad5cb60f5fe931d45cd82ef476 + Signed-off-by: Bernd Kuhls +[Romain: add Upstream tag] +Signed-off-by: Romain Naour --- gcc/config/or1k/linux.h | 2 ++ 1 file changed, 2 insertions(+) @@ -27,5 +31,5 @@ index 196f3f3c8f0..0cbdc934af1 100644 #define LINK_SPEC "%{h*} \ %{static:-Bstatic} \ -- -2.35.1 +2.34.3 diff --git a/package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch b/package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch similarity index 92% rename from package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch rename to package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch index dba2d02d7f3..817997e925e 100644 --- a/package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch +++ b/package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch @@ -1,4 +1,4 @@ -From 3b9d7d397fa6dc290eb05bffca80968efb6ec2e5 Mon Sep 17 00:00:00 2001 +From 590ef1956786bfd49dae7a5e2fed67509d06f36b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 25 Jul 2022 00:29:55 +0200 Subject: [PATCH] disable split-stack for non-thread builds diff --git a/package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch b/package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch similarity index 96% rename from package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch rename to package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch index 4e93f6ab96f..88bc26e0d7e 100644 --- a/package/gcc/11.3.0/0007-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch +++ b/package/gcc/11.4.0/0005-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch @@ -1,4 +1,4 @@ -From de3f4ee9a5bd2adcb5ff2e1690db2567fda1473c Mon Sep 17 00:00:00 2001 +From 3e878f9d1c473f91a1377193d4d8d2616357bed1 Mon Sep 17 00:00:00 2001 From: Xi Ruoyao Date: Mon, 28 Jun 2021 13:54:58 +0800 Subject: [PATCH] fixinc: don't "fix" machine names in __has_include(...) @@ -93,10 +93,10 @@ index 5b23a8b640d..404b420f302 100644 with the appropriate underscores, then leave it alone. We want exactly two leading and trailing underscores. */ diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def -index 066bef99162..b7ad6982e96 100644 +index c2f54d1189a..b2841d384f3 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def -@@ -3154,7 +3154,8 @@ fix = { +@@ -3201,7 +3201,8 @@ fix = { c_fix = machine_name; test_text = "/* MACH_DIFF: */\n" @@ -120,5 +120,5 @@ index cf95321fb86..8b3accaf04e 100644 #endif /* MACHINE_NAME_CHECK */ -- -2.37.3 +2.34.3 diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index dca1579319c..b6adf1f127e 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -87,7 +87,7 @@ config BR2_GCC_VERSION string default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE default "10.4.0" if BR2_GCC_VERSION_10_X - default "11.3.0" if BR2_GCC_VERSION_11_X + default "11.4.0" if BR2_GCC_VERSION_11_X default "12.3.0" if BR2_GCC_VERSION_12_X default "arc-2020.09-release" if BR2_GCC_VERSION_ARC diff --git a/package/gcc/gcc.hash b/package/gcc/gcc.hash index 9082d25b78b..f478962af84 100644 --- a/package/gcc/gcc.hash +++ b/package/gcc/gcc.hash @@ -2,8 +2,8 @@ sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280 gcc-8.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-10.4.0/sha512.sum sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648 gcc-10.4.0.tar.xz -# From https://gcc.gnu.org/pub/gcc/releases/gcc-11.3.0/sha512.sum -sha512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7 gcc-11.3.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-11.4.0/sha512.sum +sha512 a5018bf1f1fa25ddf33f46e720675d261987763db48e7a5fdf4c26d3150a8abcb82fdc413402df1c32f2e6b057d9bae6bdfa026defc4030e10144a8532e60f14 gcc-11.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum sha512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204 gcc-12.3.0.tar.xz From 268152267ee62ffc91e8a4daf1eb03667c1f44ca Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Mon, 29 May 2023 13:43:56 +0000 Subject: [PATCH 0199/1167] package/earlyoom: fix daemon executable path in the init script earlyoom.mk file explicitly sets 'PREFIX=/usr', and the init script fails to start earlyoom because of a nonexistent executable path: # /etc/init.d/S02earlyoom start start-stop-daemon: unable to stat /bin/earlyoom (No such file or directory) FAIL Signed-off-by: Sergey Bobrenok Signed-off-by: Peter Korsgaard (cherry picked from commit b2fb3a7e2a06c10092280081e45b2b8841add5d2) Signed-off-by: Peter Korsgaard --- package/earlyoom/S02earlyoom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/earlyoom/S02earlyoom b/package/earlyoom/S02earlyoom index c02495af90e..35624f3c72f 100644 --- a/package/earlyoom/S02earlyoom +++ b/package/earlyoom/S02earlyoom @@ -9,7 +9,7 @@ EARLYOOM_ARGS="" start() { printf() 'Starting %s: ' "$DAEMON" - start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/bin/$DAEMON" \ + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $EARLYOOM_ARGS status=$? if [ "$status" -eq 0 ]; then From 0afd81fbf53d2cfb5aa491f601d2581143fed5e9 Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Mon, 29 May 2023 13:44:00 +0000 Subject: [PATCH 0200/1167] package/earlyoom: restore missing startup message in the init script '/etc/init.d/S02earlyoom start' simply prints 'OK' instead of 'Starting earlyoom: OK' because of a typo in the printf function call. Signed-off-by: Sergey Bobrenok Signed-off-by: Peter Korsgaard (cherry picked from commit 281a80dc934d3e8d8e780b04276cfe38b4bea9d5) Signed-off-by: Peter Korsgaard --- package/earlyoom/S02earlyoom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/earlyoom/S02earlyoom b/package/earlyoom/S02earlyoom index 35624f3c72f..ac1734109ef 100644 --- a/package/earlyoom/S02earlyoom +++ b/package/earlyoom/S02earlyoom @@ -8,7 +8,7 @@ EARLYOOM_ARGS="" [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" start() { - printf() 'Starting %s: ' "$DAEMON" + printf 'Starting %s: ' "$DAEMON" start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \ -- $EARLYOOM_ARGS status=$? From cc7beaea3d51ccf117189c83dec1aeba7ef488ea Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Mon, 29 May 2023 13:44:02 +0000 Subject: [PATCH 0201/1167] package/earlyoom: unhardcode package version in CFLAGS 'earlyoom --help' still says 'earlyoom 1.6' though it's already version 1.7. '-DVERSION' flag value should be either unhardcoded, either updated with each package version bump. Signed-off-by: Sergey Bobrenok Signed-off-by: Peter Korsgaard (cherry picked from commit 239dd7dcbda1b2c86a29491158fa089e06efca33) Signed-off-by: Peter Korsgaard --- package/earlyoom/earlyoom.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/earlyoom/earlyoom.mk b/package/earlyoom/earlyoom.mk index c7042a054e0..808b9c49fa3 100644 --- a/package/earlyoom/earlyoom.mk +++ b/package/earlyoom/earlyoom.mk @@ -11,7 +11,7 @@ EARLYOOM_LICENSE_FILES = LICENSE EARLYOOM_BUILD_TARGETS = earlyoom.service earlyoom EARLYOOM_INSTALL_TARGETS = install-default install-bin -EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"1.6\"' +EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"$(EARLYOOM_VERSION)\"' EARLYOOM_MAKE_OPTS = \ $(TARGET_CONFIGURE_OPTS) \ From bd2261081f789ea07706c9ee0046320d30434d7b Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 21:01:07 +0200 Subject: [PATCH 0202/1167] package/python-executing: new package Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 91b7bd01eca709c0bd7fa94c147f82082f054c94) Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-executing/Config.in | 7 +++++++ package/python-executing/python-executing.hash | 5 +++++ package/python-executing/python-executing.mk | 16 ++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-executing/Config.in create mode 100644 package/python-executing/python-executing.hash create mode 100644 package/python-executing/python-executing.mk diff --git a/package/Config.in b/package/Config.in index 4da083d35f2..3a9c6a1440d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1050,6 +1050,7 @@ menu "External python modules" source "package/python-engineio/Config.in" source "package/python-entrypoints/Config.in" source "package/python-esptool/Config.in" + source "package/python-executing/Config.in" source "package/python-falcon/Config.in" source "package/python-filelock/Config.in" source "package/python-fire/Config.in" diff --git a/package/python-executing/Config.in b/package/python-executing/Config.in new file mode 100644 index 00000000000..e1f8f8efdf2 --- /dev/null +++ b/package/python-executing/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_EXECUTING + bool "python-executing" + help + Get the currently executing AST node of a frame, and other + information. + + https://github.com/alexmojaki/executing diff --git a/package/python-executing/python-executing.hash b/package/python-executing/python-executing.hash new file mode 100644 index 00000000000..40fd43b5fd4 --- /dev/null +++ b/package/python-executing/python-executing.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/executing/json +md5 e6fa9a6abf00555ccc8a6b3524729238 executing-1.2.0.tar.gz +sha256 19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107 executing-1.2.0.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-executing/python-executing.mk b/package/python-executing/python-executing.mk new file mode 100644 index 00000000000..4c968323ea6 --- /dev/null +++ b/package/python-executing/python-executing.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-executing +# +################################################################################ + +PYTHON_EXECUTING_VERSION = 1.2.0 +PYTHON_EXECUTING_SOURCE = executing-$(PYTHON_EXECUTING_VERSION).tar.gz +PYTHON_EXECUTING_SITE = https://files.pythonhosted.org/packages/8f/ac/89ff37d8594b0eef176b7cec742ac868fef853b8e18df0309e3def9f480b +PYTHON_EXECUTING_SETUP_TYPE = setuptools +PYTHON_EXECUTING_LICENSE = MIT +PYTHON_EXECUTING_LICENSE_FILES = LICENSE.txt + +PYTHON_EXECUTING_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From 310d23040aef9b0f85878310b5ed4d989c2e6777 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 21:01:08 +0200 Subject: [PATCH 0203/1167] package/python-pure-eval: new package Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit c8e93f4a6b91ad42add41618b775a30dbfc79338) Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-pure-eval/Config.in | 6 ++++++ package/python-pure-eval/python-pure-eval.hash | 5 +++++ package/python-pure-eval/python-pure-eval.mk | 16 ++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 package/python-pure-eval/Config.in create mode 100644 package/python-pure-eval/python-pure-eval.hash create mode 100644 package/python-pure-eval/python-pure-eval.mk diff --git a/package/Config.in b/package/Config.in index 3a9c6a1440d..440c8e92ff2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1188,6 +1188,7 @@ menu "External python modules" source "package/python-psycopg2/Config.in" source "package/python-ptyprocess/Config.in" source "package/python-pudb/Config.in" + source "package/python-pure-eval/Config.in" source "package/python-py/Config.in" source "package/python-pyaes/Config.in" source "package/python-pyalsa/Config.in" diff --git a/package/python-pure-eval/Config.in b/package/python-pure-eval/Config.in new file mode 100644 index 00000000000..f6ccd6056dc --- /dev/null +++ b/package/python-pure-eval/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_PURE_EVAL + bool "python-pure-eval" + help + Safely evaluate AST nodes without side effects. + + http://github.com/alexmojaki/pure_eval diff --git a/package/python-pure-eval/python-pure-eval.hash b/package/python-pure-eval/python-pure-eval.hash new file mode 100644 index 00000000000..5bf5dcb749c --- /dev/null +++ b/package/python-pure-eval/python-pure-eval.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/pure_eval/json +md5 212fd27ca2c58d9effddec69748d738a pure_eval-0.2.2.tar.gz +sha256 2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3 pure_eval-0.2.2.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-pure-eval/python-pure-eval.mk b/package/python-pure-eval/python-pure-eval.mk new file mode 100644 index 00000000000..f139ea270fc --- /dev/null +++ b/package/python-pure-eval/python-pure-eval.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-pure-eval +# +################################################################################ + +PYTHON_PURE_EVAL_VERSION = 0.2.2 +PYTHON_PURE_EVAL_SOURCE = pure_eval-$(PYTHON_PURE_EVAL_VERSION).tar.gz +PYTHON_PURE_EVAL_SITE = https://files.pythonhosted.org/packages/97/5a/0bc937c25d3ce4e0a74335222aee05455d6afa2888032185f8ab50cdf6fd +PYTHON_PURE_EVAL_SETUP_TYPE = setuptools +PYTHON_PURE_EVAL_LICENSE = MIT +PYTHON_PURE_EVAL_LICENSE_FILES = LICENSE.txt + +PYTHON_PURE_EVAL_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From 776a6e293f338bdfd2beb4b424f5d34762250d91 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 21:01:09 +0200 Subject: [PATCH 0204/1167] package/python-asttokens: new package Signed-off-by: Romain Naour [Peter: fix alphabetical ordering] Signed-off-by: Peter Korsgaard (cherry picked from commit aa5c233c36bcc8fd51c84f7776c1b3a2875a3d98) Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-asttokens/Config.in | 7 +++++++ package/python-asttokens/python-asttokens.hash | 5 +++++ package/python-asttokens/python-asttokens.mk | 16 ++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-asttokens/Config.in create mode 100644 package/python-asttokens/python-asttokens.hash create mode 100644 package/python-asttokens/python-asttokens.mk diff --git a/package/Config.in b/package/Config.in index 440c8e92ff2..a452699a473 100644 --- a/package/Config.in +++ b/package/Config.in @@ -967,6 +967,7 @@ menu "External python modules" source "package/python-arrow/Config.in" source "package/python-asgiref/Config.in" source "package/python-asn1crypto/Config.in" + source "package/python-asttokens/Config.in" source "package/python-async-generator/Config.in" source "package/python-async-lru/Config.in" source "package/python-async-timeout/Config.in" diff --git a/package/python-asttokens/Config.in b/package/python-asttokens/Config.in new file mode 100644 index 00000000000..2732b8124bc --- /dev/null +++ b/package/python-asttokens/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_ASTTOKENS + bool "python-asttokens" + select BR2_PACKAGE_PYTHON_SIX # runtime + help + Annotate AST trees with source code positions. + + https://github.com/gristlabs/asttokens diff --git a/package/python-asttokens/python-asttokens.hash b/package/python-asttokens/python-asttokens.hash new file mode 100644 index 00000000000..6529e4db412 --- /dev/null +++ b/package/python-asttokens/python-asttokens.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/asttokens/json +md5 a9ae6ae0f85398e511bcb9ec87695eed asttokens-2.2.1.tar.gz +sha256 4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3 asttokens-2.2.1.tar.gz +# Locally computed sha256 checksums +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/python-asttokens/python-asttokens.mk b/package/python-asttokens/python-asttokens.mk new file mode 100644 index 00000000000..8a8ce1ddd92 --- /dev/null +++ b/package/python-asttokens/python-asttokens.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-asttokens +# +################################################################################ + +PYTHON_ASTTOKENS_VERSION = 2.2.1 +PYTHON_ASTTOKENS_SOURCE = asttokens-$(PYTHON_ASTTOKENS_VERSION).tar.gz +PYTHON_ASTTOKENS_SITE = https://files.pythonhosted.org/packages/c8/e3/b0b4f32162621126fbdaba636c152c6b6baec486c99f48686e66343d638f +PYTHON_ASTTOKENS_SETUP_TYPE = setuptools +PYTHON_ASTTOKENS_LICENSE = Apache-2.0 +PYTHON_ASTTOKENS_LICENSE_FILES = LICENSE + +PYTHON_ASTTOKENS_DEPENDENCIES = host-python-setuptools-scm + +$(eval $(python-package)) From 0d1bc9caa92f792ab6f83645acd261bd65deb6de Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 21:01:10 +0200 Subject: [PATCH 0205/1167] package/python-stack-data: new package Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit a1c55ea6dd4e7b93e4720206fc1ea390933ef675) Signed-off-by: Peter Korsgaard --- package/Config.in | 1 + package/python-stack-data/Config.in | 10 ++++++++++ package/python-stack-data/python-stack-data.hash | 5 +++++ package/python-stack-data/python-stack-data.mk | 14 ++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 package/python-stack-data/Config.in create mode 100644 package/python-stack-data/python-stack-data.hash create mode 100644 package/python-stack-data/python-stack-data.mk diff --git a/package/Config.in b/package/Config.in index a452699a473..e9e8d93d6b1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1308,6 +1308,7 @@ menu "External python modules" source "package/python-sqlalchemy/Config.in" source "package/python-sqliteschema/Config.in" source "package/python-sqlparse/Config.in" + source "package/python-stack-data/Config.in" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" diff --git a/package/python-stack-data/Config.in b/package/python-stack-data/Config.in new file mode 100644 index 00000000000..508eb9cf132 --- /dev/null +++ b/package/python-stack-data/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_STACK_DATA + bool "python-stack-data" + select BR2_PACKAGE_PYTHON_ASTTOKENS # runtime + select BR2_PACKAGE_PYTHON_EXECUTING # runtime + select BR2_PACKAGE_PYTHON_PURE_EVAL # runtime + help + Extract data from python stack frames and tracebacks + for informative displays. + + http://github.com/alexmojaki/stack_data diff --git a/package/python-stack-data/python-stack-data.hash b/package/python-stack-data/python-stack-data.hash new file mode 100644 index 00000000000..6decd3ca8eb --- /dev/null +++ b/package/python-stack-data/python-stack-data.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/stack_data/json +md5 bf86c3c81a0158e1e7f3979da5a0033b stack_data-0.6.2.tar.gz +sha256 32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815 stack_data-0.6.2.tar.gz +# Locally computed sha256 checksums +sha256 a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181 LICENSE.txt diff --git a/package/python-stack-data/python-stack-data.mk b/package/python-stack-data/python-stack-data.mk new file mode 100644 index 00000000000..494ce8f4546 --- /dev/null +++ b/package/python-stack-data/python-stack-data.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-stack-data +# +################################################################################ + +PYTHON_STACK_DATA_VERSION = 0.6.2 +PYTHON_STACK_DATA_SOURCE = stack_data-$(PYTHON_STACK_DATA_VERSION).tar.gz +PYTHON_STACK_DATA_SITE = https://files.pythonhosted.org/packages/db/18/aa7f2b111aeba2cd83503254d9133a912d7f61f459a0c8561858f0d72a56 +PYTHON_STACK_DATA_SETUP_TYPE = setuptools +PYTHON_STACK_DATA_LICENSE = MIT +PYTHON_STACK_DATA_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From 30e241390f65e9eab6f1dbcb0f7de9bd63b71166 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 28 May 2023 21:01:11 +0200 Subject: [PATCH 0206/1167] package/python-ipython: add missing dependencies As reported [1], the test TestIPythonPy3 fail since it was updated to 8.6.0 release just after 2022.11. ModuleNotFoundError: No module named 'stack_data' Indeed there is no such python3-stack-data in Buildroot. For example, Fedora packaging added python3-stack-data while updating to ipython 8.0.1. With python-stack-data added, the test TestIPythonPy3 still fail with: ModuleNotFoundError: No module named 'sqlite3' Since ipython 8 sqlite3 fallback imports has been removed [2]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819089 [1] http://lists.busybox.net/pipermail/buildroot/2023-May/668086.html [2] https://github.com/ipython/ipython/commit/7a0bdabecfa745b60c3a711e1da2df378687e746 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 8d93c999a39344bb3b73a21490cc4e0122ef5923) Signed-off-by: Peter Korsgaard --- package/python-ipython/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-ipython/Config.in b/package/python-ipython/Config.in index 3de49ae5742..c217efcfd1e 100644 --- a/package/python-ipython/Config.in +++ b/package/python-ipython/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PYTHON_IPYTHON bool "python-ipython" + select BR2_PACKAGE_PYTHON3_SQLITE # runtime select BR2_PACKAGE_PYTHON_BACKCALL # runtime select BR2_PACKAGE_PYTHON_DECORATOR # runtime select BR2_PACKAGE_PYTHON_JEDI # runtime @@ -7,6 +8,7 @@ config BR2_PACKAGE_PYTHON_IPYTHON select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime select BR2_PACKAGE_PYTHON_PYGMENTS # runtime select BR2_PACKAGE_PYTHON_PEXPECT # runtime + select BR2_PACKAGE_PYTHON_STACK_DATA # runtime select BR2_PACKAGE_PYTHON_TRAITLETS # runtime help IPython is a command shell for interactive computing in From bf9fab41ac548b0bbeacc987c90c42a9d2501ebe Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 15 Feb 2023 14:47:12 -0800 Subject: [PATCH 0207/1167] package/openjdk{-bin}: bump versions to 11.0.18+10 and 17.0.6+10 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni (cherry picked from commit cc0d6bdd66e477ee0e3de0538e37d49bdfd7a9e6) Signed-off-by: Peter Korsgaard --- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- ...ARCv2-ISA-processors-support-to-Zero.patch | 20 +++++++++---------- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) rename package/openjdk/{17.0.1+12 => 17.0.6+10}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (83%) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 4d3942125f6..241ca34a043 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 288f34e3ba8a4838605636485d0365ce23e57d5f2f68997ac4c2e4c01967cd48 OpenJDK17U-jdk_x64_linux_hotspot_17.0.2_8.tar.gz -sha256 302caf29f73481b2b914ba2b89705036010c65eb9bc8d7712b27d6e9bedf6200 OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.2_8.tar.gz +sha256 a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289 OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz +sha256 9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 43fb84f8063ad9bf6b6d694a67b8f64c8827552b920ec5ce794dfe5602edffe7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.14.1_1.tar.gz -sha256 79572f5172c6a040591d34632f98a20ed148702bbce2f57649e8ac01c0d2e3db OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.14.1_1.tar.gz +sha256 4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz +sha256 04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index 608a0bc3ac1..c3eb0b05e60 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.2_8 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.14.1_1 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 83% rename from package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index 1ef523a4196..dfd3b07beac 100644 --- a/package/openjdk/17.0.1+12/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -23,8 +23,8 @@ diff --git a/make/autoconf/libraries.m4 b/make/autoconf/libraries.m4 index 5120918aed2..f7a99955874 100644 --- a/make/autoconf/libraries.m4 +++ b/make/autoconf/libraries.m4 -@@ -122,6 +122,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], - BASIC_JVM_LIBS="$BASIC_JVM_LIBS -lpthread" +@@ -146,6 +146,14 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES], + fi fi + # Libatomic library @@ -55,7 +55,7 @@ index c0f2446dbd7..dc416ece885 100644 arm*) VAR_CPU=arm VAR_CPU_ARCH=arm -@@ -478,6 +484,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], +@@ -563,6 +569,8 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER], HOTSPOT_$1_CPU_DEFINE=PPC64 # The cpu defines below are for zero, we don't support them directly. @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1858,6 +1858,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1879,6 +1882,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1906,6 +1910,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,12 +95,12 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1926,7 +1932,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { - static Elf32_Half running_arch_code=EM_RISCV; +@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { + static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ -- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc -+ AARCH64, ALPHA, ARC, ARM, AMD64, IA32, IA64, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc +- AARCH64, ALPHA, ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc ++ AARCH64, ALPHA, ARC ARM, AMD64, IA32, IA64, LOONGARCH, M68K, MIPS, MIPSEL, PARISC, __powerpc__, __powerpc64__, RISCV, S390, SH, __sparc #endif // Identify compatibility class for VM's architecture and library's architecture diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 293787792d7..0a67e7a3ecc 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 2fdd23261526362d4aaf58323441d4c31d29de2e374ba94bbf2727a00adc0ea7 openjdk-17.0.2+8.tar.gz -sha256 0e859cc03378439023e17ee82aecee5a52265fb38906a8bebf16027aa2b2bcf5 openjdk-11.0.14.1+1.tar.gz +sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz +sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 42d52d57c47..0fe506bbfd0 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.2+8 +OPENJDK_VERSION_MINOR = 0.6+10 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.14.1+1 +OPENJDK_VERSION_MINOR = 0.18+10 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) From cc8e88480aae2096271d22c98d23342057b1d527 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 18 May 2023 14:07:47 -0700 Subject: [PATCH 0208/1167] package/openjdk{-bin}: security bump versions to 11.0.19+7 and 17.0.7+7 Fixes the following security issues: * CVEs - CVE-2023-21930 - CVE-2023-21937 - CVE-2023-21938 - CVE-2023-21939 - CVE-2023-21954 - CVE-2023-21967 - CVE-2023-21968 * Security fixes - JDK-8287404: Improve ping times - JDK-8288436: Improve Xalan supports - JDK-8294474: Better AES support - JDK-8295304: Runtime support improvements - JDK-8296676, JDK-8296622: Improve String platform support - JDK-8296684: Improve String platform support - JDK-8296692: Improve String platform support - JDK-8296832: Improve Swing platform support - JDK-8297371: Improve UTF8 representation redux - JDK-8298191: Enhance object reclamation process - JDK-8298310: Enhance TLS session negotiation - JDK-8298667: Improved path handling - JDK-8299129: Enhance NameService lookups For details, see the announcements: https://mail.openjdk.org/pipermail/jdk-updates-dev/2023-April/021899.html https://mail.openjdk.org/pipermail/jdk-updates-dev/2023-April/021900.html Signed-off-by: Adam Duskett Signed-off-by: Peter Korsgaard (cherry picked from commit 0cd8abda1bb64a87a5195fa6fc214b6b47147acb) Signed-off-by: Peter Korsgaard --- package/openjdk-bin/openjdk-bin.hash | 8 ++++---- package/openjdk-bin/openjdk-bin.mk | 4 ++-- .../0001-Add-ARCv2-ISA-processors-support-to-Zero.patch | 8 ++++---- package/openjdk/openjdk.hash | 4 ++-- package/openjdk/openjdk.mk | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) rename package/openjdk/{17.0.6+10 => 17.0.7+7}/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch (94%) diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash index 241ca34a043..eb9d7396e3e 100644 --- a/package/openjdk-bin/openjdk-bin.hash +++ b/package/openjdk-bin/openjdk-bin.hash @@ -1,10 +1,10 @@ # https://github.com/adoptium/temurin17-binaries/releases -sha256 a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289 OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz -sha256 9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz +sha256 e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz +sha256 0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz # From https://github.com/adoptium/temurin11-binaries/releases -sha256 4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7 OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz -sha256 04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz +sha256 5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581 OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz +sha256 0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254 OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz # Locally calculated sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk index c3eb0b05e60..dad846534b1 100644 --- a/package/openjdk-bin/openjdk-bin.mk +++ b/package/openjdk-bin/openjdk-bin.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) HOST_OPENJDK_BIN_VERSION_MAJOR = 17 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.7_7 else HOST_OPENJDK_BIN_VERSION_MAJOR = 11 -HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10 +HOST_OPENJDK_BIN_VERSION_MINOR = 0.19_7 endif ifeq ($(HOSTARCH),x86_64) diff --git a/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch b/package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch similarity index 94% rename from package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch rename to package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch index dfd3b07beac..a8ea5aff65b 100644 --- a/package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch +++ b/package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch @@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c index b08caf4d5d3..2bf084895ba 100644 --- a/src/hotspot/os/linux/os_linux.cpp +++ b/src/hotspot/os/linux/os_linux.cpp -@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1676,6 +1676,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { #ifndef EM_AARCH64 #define EM_AARCH64 183 /* ARM AARCH64 */ #endif @@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644 #ifndef EM_RISCV #define EM_RISCV 243 /* RISC-V */ #endif -@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1700,6 +1703,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { {EM_SH, EM_SH, ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"}, #endif {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"}, @@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644 // we only support 64 bit z architecture {EM_S390, EM_S390, ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"}, {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"}, -@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1728,6 +1732,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_PPC; #elif (defined AARCH64) static Elf32_Half running_arch_code=EM_AARCH64; @@ -95,7 +95,7 @@ index b08caf4d5d3..2bf084895ba 100644 #elif (defined ARM) static Elf32_Half running_arch_code=EM_ARM; #elif (defined S390) -@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { +@@ -1750,7 +1756,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) { static Elf32_Half running_arch_code=EM_LOONGARCH; #else #error Method os::dll_load requires that one of following is defined:\ diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash index 0a67e7a3ecc..3b362896282 100644 --- a/package/openjdk/openjdk.hash +++ b/package/openjdk/openjdk.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472 openjdk-17.0.6+10.tar.gz -sha256 04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1 openjdk-11.0.18+10.tar.gz +sha256 43b80a5aec5fce908e80858e9b34efdf1b49255a12ce303650325af65141d3e8 openjdk-17.0.7+7.tar.gz +sha256 25fd9ab3042a284aa4e6348969403016404bc2706a4a02c149a0054fbe477337 openjdk-11.0.19+7.tar.gz sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 0fe506bbfd0..39d461a87cd 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -6,10 +6,10 @@ ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y) OPENJDK_VERSION_MAJOR = 17 -OPENJDK_VERSION_MINOR = 0.6+10 +OPENJDK_VERSION_MINOR = 0.7+7 else OPENJDK_VERSION_MAJOR = 11 -OPENJDK_VERSION_MINOR = 0.18+10 +OPENJDK_VERSION_MINOR = 0.19+7 endif OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR) OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION)) From 1ffa895fb0d72fd723acb668306f361c3a6058b7 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 16 May 2023 13:57:50 -0700 Subject: [PATCH 0209/1167] package/containerd: bump version to v1.6.21 https://github.com/containerd/containerd/releases/tag/v1.6.21 Signed-off-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit bab89b35f018a332c7d42ed6e6cb8d72fdeac4b2) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 65a87f25fab..345a7b16ffa 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 819086ccdca44cfc5f108e226c7a9294d8fad3eb32031a621623da80dedbfb11 containerd-1.6.20.tar.gz +sha256 9452e95455d03a00d78ae0587595d0c18555bae7912068269efa25a724efe713 containerd-1.6.21.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index bc1dd58611f..83489a3abfa 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.20 +CONTAINERD_VERSION = 1.6.21 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From d0dcbfed161cf7e0ad2647a721c73f5ec6e7495a Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Tue, 23 May 2023 10:56:20 +0200 Subject: [PATCH 0210/1167] package/mpd: update to version 0.23.13 - Bug fixes in input, archive/zzip, database/simple, decoder, output/pipewire, process termination - determine systemd unit directories via pkg-config - support libfmt 10 Change log: https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.23.13/NEWS Commit: https://github.com/MusicPlayerDaemon/MPD/commit/9027e5c Tested on: i386 (build, run) Aarch64 (build, run) Signed-off-by: Andreas Ziegler Signed-off-by: Peter Korsgaard (cherry picked from commit 502dcf46af1be88a4ac5973efc9f8eb95c461bf6) Signed-off-by: Peter Korsgaard --- package/mpd/mpd.hash | 2 +- package/mpd/mpd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index 2521238f64d..8683b02e3b2 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7 mpd-0.23.12.tar.xz +sha256 a96b01e6fbbb7e8ab25eb7c15d5c811c62eb19b76d143a802f51674791f1d519 mpd-0.23.13.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 6c25c9b46f9..d73072a439b 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).12 +MPD_VERSION = $(MPD_VERSION_MAJOR).13 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt From bceba1ab30a055abd3a3e6ef24771e7c555e9c63 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Jun 2023 18:44:00 +0200 Subject: [PATCH 0211/1167] package/libcurl: bump version to 8.1.2 Changelog: https://curl.se/changes.html#8_1_2 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit e7d40576fad6784164b668776d81547edd8fafdd) 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 12d356118b7..18b2dbfd862 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.1.1.tar.xz.asc +# https://curl.se/download/curl-8.1.2.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 08a948e061929645597c1ef7194e07b308b22084ff03fa7400b465e6c05149e5 curl-8.1.1.tar.xz +sha256 31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6 curl-8.1.2.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 93e839798bf..2be3415cb87 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.1.1 +LIBCURL_VERSION = 8.1.2 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From b81ac67a1c0b70bffc8de2a7a940ea95558b9b9d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 3 Jun 2023 12:55:09 +0200 Subject: [PATCH 0212/1167] package/minidlna: bump version to 1.3.3 Release notes: https://sourceforge.net/p/minidlna/git/ci/master/tree/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 4ba8a13d7bbfcdfce85f6a38ec4f5df291f25c7b) Signed-off-by: Peter Korsgaard --- package/minidlna/minidlna.hash | 6 +++--- package/minidlna/minidlna.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/minidlna/minidlna.hash b/package/minidlna/minidlna.hash index e55e5473d3d..b78dd5b4dda 100644 --- a/package/minidlna/minidlna.hash +++ b/package/minidlna/minidlna.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.2/ -sha1 71750adadc34490d52f0b9a930c2731a47f9772d minidlna-1.3.2.tar.gz +# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.3/ +sha1 2d42028d2ca5ae04affdb96cb414314867e179ea minidlna-1.3.3.tar.gz # Locally computed -sha256 222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0 minidlna-1.3.2.tar.gz +sha256 39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4 minidlna-1.3.3.tar.gz sha256 79146b7f558e56510b9a714ff75318c05ab93aeccfd6597497b9bce212cf92ea COPYING sha256 94876d7886116e176e702b4902bd9f19731a6883db5f229ac2a7058a22aa6529 LICENCE.miniupnpd diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 6ca72d92408..1609695ebff 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -4,7 +4,7 @@ # ################################################################################ -MINIDLNA_VERSION = 1.3.2 +MINIDLNA_VERSION = 1.3.3 MINIDLNA_SITE = https://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION) MINIDLNA_LICENSE = GPL-2.0, BSD-3-Clause MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd From f69bf649fc94c167df0ec05ed8803eb99622eb22 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Wed, 31 May 2023 12:40:08 +0100 Subject: [PATCH 0213/1167] board/kria/kv260/kv260.sh: remove trailing spaces Signed-off-by: Neal Frager [Arnout: update .checkpackageignore] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 6aa637737fd04cbf0f69fb0d2b9eeeba029c8570) Signed-off-by: Peter Korsgaard --- board/zynqmp/kria/kv260/kv260.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh index e3467f30686..e03d67d8b0a 100755 --- a/board/zynqmp/kria/kv260/kv260.sh +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -1,8 +1,8 @@ #!/bin/sh # This is a temporary work around for generating kv260 u-boot.itb. -# The problem is there is no way to currently configure u-boot to apply -# the carrier board dtb overlay during build, so all kv260 carrier board +# The problem is there is no way to currently configure u-boot to apply +# the carrier board dtb overlay during build, so all kv260 carrier board # drivers are missing. # This will be removed when u-boot can build the kv260 u-boot.itb natively. From 74d8b44ee05c8c1d87edd47deb3a054c01aad54a Mon Sep 17 00:00:00 2001 From: Witold Lipieta Date: Fri, 26 May 2023 11:42:19 +0200 Subject: [PATCH 0214/1167] package/python-matplotlib: add Pillow dependency Pillow is mandatory dependency since version 3.3.0. Signed-off-by: Witold Lipieta Signed-off-by: Arnout Vandecappelle (cherry picked from commit 465f670e6cd550660e8b0b935f03a2be275b0c53) Signed-off-by: Peter Korsgaard --- package/python-matplotlib/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-matplotlib/Config.in b/package/python-matplotlib/Config.in index b9367776627..8a9281b8e7f 100644 --- a/package/python-matplotlib/Config.in +++ b/package/python-matplotlib/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB select BR2_PACKAGE_PYTHON_DATEUTIL # runtime select BR2_PACKAGE_PYTHON_KIWISOLVER # runtime select BR2_PACKAGE_PYTHON_NUMPY # runtime + select BR2_PACKAGE_PYTHON_PILLOW # runtime select BR2_PACKAGE_PYTHON_PYPARSING # runtime select BR2_PACKAGE_PYTHON3_ZLIB # runtime select BR2_PACKAGE_QHULL From 20b899f38a9e8bdda11aa865167188d3d78ce89c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 24 May 2023 15:16:42 +0200 Subject: [PATCH 0215/1167] support/testing: test_clang: update to the next LTS kernel (4.19.x) The kernel 4.16.7 curently used by the test doesn't build with host bison (GNU Bison 3.7.5) probably due a missing fix [1] in 4.16.x branch. Since kernel 4.16 is EOL, bump to the next LTS kernel (4.19.x) in order to ease backport to previous Buildroot releases. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4114986744 [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d59fbbd09d5d6bdf4ea1f0b4090d175e081ff421 Signed-off-by: Romain Naour Signed-off-by: Arnout Vandecappelle (cherry picked from commit 1c54f2170b32da05dbec8b410de3a5cba916c9e9) Signed-off-by: Peter Korsgaard --- support/testing/tests/package/test_clang.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/tests/package/test_clang.py b/support/testing/tests/package/test_clang.py index df3990c6be8..f36faa059a5 100644 --- a/support/testing/tests/package/test_clang.py +++ b/support/testing/tests/package/test_clang.py @@ -14,7 +14,7 @@ class TestClangCompilerRT(infra.basetest.BRTest): BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y - BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.283" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y From 056ef01371b8c776f7d4c32bed4287126cb90e8b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 17:33:47 +0200 Subject: [PATCH 0216/1167] package/mesa3d: needs gcc >= 8 Needed since upstream commit https://github.com/Mesa3D/mesa/commit/f9057cea517e01e05f08f00a741aad5bae154d62 which was first released with mesa3d-22.3.0, added to buildroot with commit e4a1183d8f7d8422dbc23432248b984745a428b7. Fixes: http://autobuild.buildroot.net/results/011/01109560288f933019eea726a91c4109fbcca794/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 51b60c8acf3f4b534d0954b801f1034491b59c94) Signed-off-by: Peter Korsgaard --- package/intel-mediadriver/Config.in | 5 +++-- package/mesa3d/Config.in | 16 +++++----------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/package/intel-mediadriver/Config.in b/package/intel-mediadriver/Config.in index 537e4abd2f7..c59437ec73e 100644 --- a/package/intel-mediadriver/Config.in +++ b/package/intel-mediadriver/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER depends on BR2_x86_64 depends on !BR2_STATIC_LIBS # mesa3d, libva depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # mesa3d depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d @@ -28,7 +29,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER_GEN8 endif # BR2_PACKAGE_INTEL_MEDIADRIVER -comment "intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL" +comment "intel-mediadriver needs a toolchain w/ dynamic library, gcc >= 8, C++, NPTL" depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index cae2161aa34..e21bbbe3e4a 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -4,7 +4,7 @@ menuconfig BR2_PACKAGE_MESA3D depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_SYNC_1 depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND @@ -24,7 +24,6 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future @@ -33,10 +32,9 @@ config BR2_PACKAGE_MESA3D_LLVM depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm select BR2_PACKAGE_LLVM -comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5" +comment "llvm support needs a toolchain w/ wchar, threads, C++, dynamic library, host gcc >= 5" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_5 \ + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ || !BR2_HOST_GCC_AT_LEAST_5 @@ -393,11 +391,7 @@ config BR2_PACKAGE_PROVIDES_LIBOPENCL endif # BR2_PACKAGE_MESA3D -comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library" +comment "mesa3d needs a toolchain w/ gcc >=8, C++, NPTL, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - BR2_STATIC_LIBS + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8 depends on BR2_TOOLCHAIN_HAS_SYNC_1 - -comment "mesa3d needs a toolchain w/ gcc >= 7" - depends on BR2_m68k - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7 From 426a4509bb2d38b3cfcf9410b5e9a1e19442fcfc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 18:03:58 +0200 Subject: [PATCH 0217/1167] package/mesa3d: fix build error with the i915 Gallium driver The error was introduced by mesa3d commit https://cgit.freedesktop.org/mesa/mesa/commit/?id=dfd20f002f388be3f168938bc1f25e91bb08bf98 which was first introduced in mesa3d 23.0.0, added with buildroot commit 89944e2c459d45dd4271c49e35dd4a13dfd850a4 Fixes: http://autobuild.buildroot.net/results/9c1/9c1407ca5be221dbb3ee03d2a95ada65bb7eb36b/ Signed-off-by: Bernd Kuhls [Arnout: - rename 0005 -> 0006 - another patch was added in parallel; - use gitlab instead of cgit for upstream link ] Signed-off-by: Arnout Vandecappelle (cherry picked from commit 11db2d6fde313fc832baef38a25b4a24c31375ce) Signed-off-by: Peter Korsgaard --- ...5-Gallium-driver-includes-Intel-sour.patch | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch diff --git a/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch b/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch new file mode 100644 index 00000000000..6831bdafd36 --- /dev/null +++ b/package/mesa3d/0006-meson-ensure-i915-Gallium-driver-includes-Intel-sour.patch @@ -0,0 +1,46 @@ +From cd861b7f38e448822ce765aee61304d1e0a3a8b5 Mon Sep 17 00:00:00 2001 +From: James Knight +Date: Thu, 13 Apr 2023 16:38:51 -0400 +Subject: meson: ensure i915 Gallium driver includes Intel sources + +Ensure builds flag the use of Intel sources when the i915 Gallium driver +is configured (`-Dgallium-drivers=i915`). Otherwise, a build may fail if +other Intel-based configuration options are not enabled: + + ./src/gallium/winsys/i915/drm/meson.build:21:0: ERROR: Unknown variable "libintel_common". + +Signed-off-by: James Knight +Part-of: + +Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/cd861b7f38e448822ce765aee61304d1e0a3a8b5 + +Signed-off-by: Bernd Kuhls +--- + meson.build | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +(limited to 'meson.build') + +diff --git a/meson.build b/meson.build +index 23d2d965b37..a3e3c5478a8 100644 +--- a/meson.build ++++ b/meson.build +@@ -245,7 +245,14 @@ with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental') + with_any_vk = _vulkan_drivers.length() != 0 + + with_any_broadcom = with_gallium_vc4 or with_gallium_v3d or with_broadcom_vk +-with_any_intel = with_intel_vk or with_intel_hasvk or with_gallium_iris or with_gallium_crocus or with_intel_tools ++with_any_intel = [ ++ with_gallium_crocus, ++ with_gallium_i915, ++ with_gallium_iris, ++ with_intel_hasvk, ++ with_intel_tools, ++ with_intel_vk, ++].contains(true) + + if with_swrast_vk and not with_gallium_softpipe + error('swrast vulkan requires gallium swrast') +-- +cgit v1.2.1 + From ac5af7b883dc162a590795114b14bd54c7e2d502 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 16 May 2023 21:48:53 +0200 Subject: [PATCH 0218/1167] package/vdr: Fix patch for uclibc build uClibc-ng 1.0.42 added support for getloadavg: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=ad3a130dad88ad7a59dcd965b0cf9bd0d713595e leading to build errors of the vdr package: skinlcars.c:1105:12: error: 'int getloadavg(double*, int)' was declared 'extern' and later 'static' [-fpermissive] since its version bump in buildroot: https://git.busybox.net/buildroot/commit/?id=61ae6add9e5d4761536fa4ff24150d5f8f82a61d Fixes: http://autobuild.buildroot.net/results/d3a/d3a65044fabdafa1b6d75a508eae006a2cfebdc0/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit f3b46aa2aa5636a5d6d578b6960dc380740fd775) Signed-off-by: Peter Korsgaard --- package/vdr/0001-getloadavg.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/vdr/0001-getloadavg.patch b/package/vdr/0001-getloadavg.patch index 9e6316e2842..f6ba84c9e51 100644 --- a/package/vdr/0001-getloadavg.patch +++ b/package/vdr/0001-getloadavg.patch @@ -14,7 +14,7 @@ diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c +/* uclibc and dietlibc do not have this junk -ReneR */ +#if defined (__UCLIBC__) || defined (__dietlibc__) -+static int getloadavg (double loadavg[], int nelem) ++int getloadavg (double loadavg[], int nelem) +{ + int fd; + From e9a74dd240741ae61a2c0ad6e6e71230caa53400 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 16 May 2023 21:48:54 +0200 Subject: [PATCH 0219/1167] package/vdr: reformatted patches git-formatted patches due to the upstream repo using git: http://git.tvdr.de/?p=vdr.git Sent patches upstream and added Upstream: tags. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit c9b2e252ca2eb76fc49eb7aafe0dfbc674b2c743) Signed-off-by: Peter Korsgaard --- ...compat.patch => 0002-Fix-musl-build.patch} | 49 ++++++++++++------ package/vdr/0003-Include-limits.h.patch | 51 +++++++++++++++++++ package/vdr/0003-include-missing-limits.patch | 30 ----------- ...at_cntr-is-an-internal-symbol-of-som.patch | 2 + 4 files changed, 87 insertions(+), 45 deletions(-) rename package/vdr/{0002-musl-compat.patch => 0002-Fix-musl-build.patch} (77%) create mode 100644 package/vdr/0003-Include-limits.h.patch delete mode 100644 package/vdr/0003-include-missing-limits.patch diff --git a/package/vdr/0002-musl-compat.patch b/package/vdr/0002-Fix-musl-build.patch similarity index 77% rename from package/vdr/0002-musl-compat.patch rename to package/vdr/0002-Fix-musl-build.patch index b6f8f414a96..8c0b8d663bc 100644 --- a/package/vdr/0002-musl-compat.patch +++ b/package/vdr/0002-Fix-musl-build.patch @@ -1,12 +1,28 @@ -Fix musl build +From fb44386acc2497ac250364bc08cebc26ded816cf Mon Sep 17 00:00:00 2001 +From: Carlo Landmeter +Date: Tue, 16 May 2023 19:57:39 +0200 +Subject: [PATCH] Fix musl build Downloaded from https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch +Initial commit: +https://git.alpinelinux.org/aports/commit/?id=140248605cee4a0160f80b47ce77a823be2f740a + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029744.html + Signed-off-by: Bernd Kuhls +--- + i18n.h | 2 +- + osd.c | 2 +- + thread.c | 4 +++- + tools.c | 4 ++-- + tools.h | 14 ++++++++++++-- + vdr.c | 6 ++++++ + 6 files changed, 25 insertions(+), 7 deletions(-) diff --git a/i18n.h b/i18n.h -index f8ad9de..b002bbf 100644 +index 03deb6f2..85ce4077 100644 --- a/i18n.h +++ b/i18n.h @@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void); @@ -19,7 +35,7 @@ index f8ad9de..b002bbf 100644 ///< the current language. If no translation is available, the original ///< string will be returned. diff --git a/osd.c b/osd.c -index 524700a..ef975f5 100644 +index 47bda686..0d360c81 100644 --- a/osd.c +++ b/osd.c @@ -12,7 +12,7 @@ @@ -32,10 +48,10 @@ index 524700a..ef975f5 100644 #include "tools.h" diff --git a/thread.c b/thread.c -index 47eb977..58dba43 100644 +index 93eb8c0d..6e854541 100644 --- a/thread.c +++ b/thread.c -@@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter) +@@ -160,7 +160,9 @@ cRwLock::cRwLock(bool PreferWriter) writeLockThreadId = 0; pthread_rwlockattr_t attr; pthread_rwlockattr_init(&attr); @@ -45,7 +61,7 @@ index 47eb977..58dba43 100644 pthread_rwlock_init(&rwlock, &attr); } -@@ -205,7 +207,7 @@ cMutex::cMutex(void) +@@ -210,7 +212,7 @@ cMutex::cMutex(void) locked = 0; pthread_mutexattr_t attr; pthread_mutexattr_init(&attr); @@ -55,10 +71,10 @@ index 47eb977..58dba43 100644 } diff --git a/tools.c b/tools.c -index 754673d..fef9d2d 100644 +index d04033b1..8b161eec 100644 --- a/tools.c +++ b/tools.c -@@ -640,7 +640,7 @@ char *ReadLink(const char *FileName) +@@ -672,7 +672,7 @@ char *ReadLink(const char *FileName) { if (!FileName) return NULL; @@ -67,7 +83,7 @@ index 754673d..fef9d2d 100644 if (!TargetName) { if (errno == ENOENT) // file doesn't exist TargetName = strdup(FileName); -@@ -1528,7 +1528,7 @@ +@@ -1562,7 +1562,7 @@ cReadDir::~cReadDir() struct dirent *cReadDir::Next(void) { if (directory) { @@ -77,7 +93,7 @@ index 754673d..fef9d2d 100644 #else while ((result = readdir(directory)) != NULL) { diff --git a/tools.h b/tools.h -index 73cca5a..03f5fd1 100644 +index ff6169ee..60eda179 100644 --- a/tools.h +++ b/tools.h @@ -28,6 +28,16 @@ @@ -97,7 +113,7 @@ index 73cca5a..03f5fd1 100644 typedef unsigned char uchar; extern int SysLogLevel; -@@ -400,7 +410,7 @@ +@@ -444,7 +454,7 @@ class cReadDir { private: DIR *directory; struct dirent *result; @@ -106,7 +122,7 @@ index 73cca5a..03f5fd1 100644 union { // according to "The GNU C Library Reference Manual" struct dirent d; char b[offsetof(struct dirent, d_name) + NAME_MAX + 1]; -@@ -738,7 +748,7 @@ public: +@@ -818,7 +828,7 @@ public: data[i] = T(0); size = 0; } @@ -116,10 +132,10 @@ index 73cca5a..03f5fd1 100644 qsort(data, size, sizeof(T), Compare); } diff --git a/vdr.c b/vdr.c -index 8a49471..c2a82aa 100644 +index 1bdc51ab..0f426e61 100644 --- a/vdr.c +++ b/vdr.c -@@ -670,12 +670,18 @@ int main(int argc, char *argv[]) +@@ -661,12 +661,18 @@ int main(int argc, char *argv[]) } } else if (Terminal) { @@ -137,4 +153,7 @@ index 8a49471..c2a82aa 100644 +#endif } - isyslog("VDR version %s started", VDRVERSION); + // Set user id in case we were started as root: +-- +2.39.2 + diff --git a/package/vdr/0003-Include-limits.h.patch b/package/vdr/0003-Include-limits.h.patch new file mode 100644 index 00000000000..7ddfd1703c5 --- /dev/null +++ b/package/vdr/0003-Include-limits.h.patch @@ -0,0 +1,51 @@ +From a4a3d9b012c12cd8aaa2526f0eacdcffcdd9f8f1 Mon Sep 17 00:00:00 2001 +From: Roberto Oliveira +Date: Tue, 16 May 2023 20:01:18 +0200 +Subject: [PATCH] Include limits.h + +vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined +in limits.h. +Needs to be explicitly included on ppc64le and for all archs for debug build. + +Downloaded from +https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch + +Initial commits: +https://git.alpinelinux.org/aports/commit/?id=c9d8942ccf4825fd734b5f37157a49fc4f0b4339 +https://git.alpinelinux.org/aports/commit/?id=47965644c390b1be1117769b1e08b31858267e9a + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029743.html + +Signed-off-by: Bernd Kuhls +--- + config.h | 1 + + tools.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/config.h b/config.h +index 72dd3d2a..b9ea769f 100644 +--- a/config.h ++++ b/config.h +@@ -19,6 +19,7 @@ + #include "i18n.h" + #include "font.h" + #include "tools.h" ++#include + + // VDR's own version number: + +diff --git a/tools.c b/tools.c +index 8b161eec..56a2e0dd 100644 +--- a/tools.c ++++ b/tools.c +@@ -27,6 +27,7 @@ extern "C" { + #include + #include "i18n.h" + #include "thread.h" ++#include + + int SysLogLevel = 3; + +-- +2.39.2 + diff --git a/package/vdr/0003-include-missing-limits.patch b/package/vdr/0003-include-missing-limits.patch deleted file mode 100644 index c2efe291e6a..00000000000 --- a/package/vdr/0003-include-missing-limits.patch +++ /dev/null @@ -1,30 +0,0 @@ -vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined -in limits.h. -Needs to be explicitly included on ppc64le and for all archs for debug build. - -Downloaded from -https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch - -Signed-off-by: Bernd Kuhls ----- - ---- a/config.h -+++ b/config.h -@@ -19,6 +19,7 @@ - #include "i18n.h" - #include "font.h" - #include "tools.h" -+#include - - // VDR's own version number: - ---- a/tools.c -+++ b/tools.c -@@ -27,6 +27,7 @@ - #include - #include "i18n.h" - #include "thread.h" -+#include - - int SysLogLevel = 3; - diff --git a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch index 9cc45a96c16..7b1a4c2c05e 100644 --- a/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch +++ b/package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch @@ -10,6 +10,8 @@ anything because musl has a basic NLS implementation. Even gettext-tiny defines _nl_msg_cat_cntr as a dummy symbol in its stub libintl-musl implementation. +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029745.html + Signed-off-by: Thomas Petazzoni --- i18n.c | 2 ++ From fcb704ecfc1d42a7382bd5cedb1a2b03e23569fe Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 16 May 2023 21:48:55 +0200 Subject: [PATCH 0220/1167] package/vdr: fix musl build Fixes: http://autobuild.buildroot.net/results/bdacedd845a2bf4db9826f0d3868f6b48d456d2a/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 579f5a9782ee8694f4939c6a4f3efe51b476b487) Signed-off-by: Peter Korsgaard --- package/vdr/0005-Fix-musl-build.patch | 37 +++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 package/vdr/0005-Fix-musl-build.patch diff --git a/package/vdr/0005-Fix-musl-build.patch b/package/vdr/0005-Fix-musl-build.patch new file mode 100644 index 00000000000..390e78eab56 --- /dev/null +++ b/package/vdr/0005-Fix-musl-build.patch @@ -0,0 +1,37 @@ +From 075472ec580e03cc89971f0c118cb363776a304d Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls +Date: Tue, 16 May 2023 20:22:12 +0200 +Subject: [PATCH] Fix musl build + +malloc_trim is a GNU extension and therefore not present in non-glibc C +libraries such as musl. Wrapping this in an ifdef fixes musl builds. + +Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029742.html + +Signed-off-by: Bernd Kuhls +--- + vdr.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/vdr.c b/vdr.c +index 0f426e61..bc4902de 100644 +--- a/vdr.c ++++ b/vdr.c +@@ -1588,12 +1588,14 @@ int main(int argc, char *argv[]) + cSchedules::Cleanup(); + // Plugins housekeeping: + PluginManager.Housekeeping(); ++#if defined(__GLIBC__) + // Memory cleanup: + static time_t LastMemoryCleanup = 0; + if ((Now - LastMemoryCleanup) > MEMCLEANUPDELTA) { + malloc_trim(0); + LastMemoryCleanup = Now; + } ++#endif + } + } + +-- +2.39.2 + From 952bf976b230cd1ce92281b81716a4a899525fcc Mon Sep 17 00:00:00 2001 From: itzwam Date: Wed, 24 May 2023 15:20:36 +0200 Subject: [PATCH 0221/1167] package/bird: bump to version 2.0.12 Bugfix release, with "Important bugfixes". For details, see the announcement: https://bird.network.cz/pipermail/bird-users/2023-January/016560.html Signed-off-by: Itz 'toinux' Wam Signed-off-by: Peter Korsgaard (cherry picked from commit eb940ab43d6ec8b0703182fd491e3ef9c57acc6e) Signed-off-by: Peter Korsgaard --- package/bird/bird.hash | 2 +- package/bird/bird.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bird/bird.hash b/package/bird/bird.hash index 3e00a1993db..a62fbba630e 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6 bird-2.0.11.tar.gz +sha256 3ec462a237d06d1f4455d6ec00a42f0b1686061fc988e5c89a841d01dd753b53 bird-2.0.12.tar.gz sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index 1295358fb9d..f1b2ee6c5ea 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIRD_VERSION = 2.0.11 +BIRD_VERSION = 2.0.12 BIRD_SITE = https://bird.network.cz/download BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README From 675142ca66fecdf38dbf1862092aafe7b0f822ea Mon Sep 17 00:00:00 2001 From: Titouan Christophe Date: Mon, 5 Jun 2023 08:24:51 +0200 Subject: [PATCH 0222/1167] package/redis: security bump to v7.0.11 From the release notes (see https://github.com/redis/redis/blob/7.0/00-RELEASENOTES): ================================================================================ Redis 7.0.11 Released Mon Apr 17 16:00:00 IST 2023 ================================================================================ Upgrade urgency: SECURITY, contains fixes to security issues. Security Fixes: * (CVE-2023-28856) Authenticated users can use the HINCRBYFLOAT command to create an invalid hash field that will crash Redis on access ... ================================================================================ Redis 7.0.10 Released Mon Mar 20 16:00:00 IST 2023 ================================================================================ Upgrade urgency: SECURITY, contains fixes to security issues. Security Fixes: * (CVE-2023-28425) Specially crafted MSETNX command can lead to assertion and denial-of-service ... ================================================================================ Redis 7.0.9 Released Tue Feb 28 12:00:00 IST 2023 ================================================================================ Upgrade urgency: SECURITY, contains fixes to security issues. Security Fixes: * (CVE-2023-25155) Specially crafted SRANDMEMBER, ZRANDMEMBER, and HRANDFIELD commands can trigger an integer overflow, resulting in a runtime assertion and termination of the Redis server process. * (CVE-2022-36021) String matching commands (like SCAN or KEYS) with a specially crafted pattern to trigger a denial-of-service attack on Redis, causing it to hang and consume 100% CPU time. ... ================================================================================ Redis 7.0.8 Released Mon Jan 16 12:00:00 IDT 2023 ================================================================================ Upgrade urgency: SECURITY, contains fixes to security issues. Security Fixes: * (CVE-2022-35977) Integer overflow in the Redis SETRANGE and SORT/SORT_RO commands can drive Redis to OOM panic * (CVE-2023-22458) Integer overflow in the Redis HRANDFIELD and ZRANDMEMBER commands can lead to denial-of-service ... Signed-off-by: Titouan Christophe Signed-off-by: Peter Korsgaard (cherry picked from commit c29bf1d2db5afb8a0109260ed2477fa8fc49c2ba) Signed-off-by: Peter Korsgaard --- package/redis/redis.hash | 2 +- package/redis/redis.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/redis/redis.hash b/package/redis/redis.hash index eb8c21be985..69bfc1475fc 100644 --- a/package/redis/redis.hash +++ b/package/redis/redis.hash @@ -1,5 +1,5 @@ # From https://github.com/redis/redis-hashes/blob/master/README -sha256 8d327d7e887d1bb308fc37aaf717a0bf79f58129e3739069aaeeae88955ac586 redis-7.0.7.tar.gz +sha256 ce250d1fba042c613de38a15d40889b78f7cb6d5461a27e35017ba39b07221e3 redis-7.0.11.tar.gz # Locally calculated sha256 97f0a15b7bbae580d2609dad2e11f1956ae167be296ab60f4691ab9c30ee9828 COPYING diff --git a/package/redis/redis.mk b/package/redis/redis.mk index b08be115387..e5d3de8eb9b 100644 --- a/package/redis/redis.mk +++ b/package/redis/redis.mk @@ -4,7 +4,7 @@ # ################################################################################ -REDIS_VERSION = 7.0.7 +REDIS_VERSION = 7.0.11 REDIS_SITE = http://download.redis.io/releases REDIS_LICENSE = BSD-3-Clause (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE_FILES = COPYING From e6c1cb257e0a32f5d0dcb2014f10a1689983fe5a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 3 Jun 2023 23:06:42 +0200 Subject: [PATCH 0223/1167] package/perl-http-message: add missing reverse dependency from perl-clone Commit [1] added dependency on perl-clone but forgot to propagate the reverse dependency on !BR2_STATIC_LIBS. Fixes: WARNING: unmet direct dependencies detected for BR2_PACKAGE_PERL_CLONE Depends on [n]: BR2_PACKAGE_PERL [=y] && !BR2_STATIC_LIBS [=y] Selected by [y]: - BR2_PACKAGE_PERL_HTTP_MESSAGE [=y] && BR2_PACKAGE_PERL [=y] http://autobuild.buildroot.org/results/5d5/5d503aaa94b56523c684be7946123921747ebf52 [1] 742258fec06df18782e4bd75b00ca530120312cb Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 35dea785ef6a4c3f3faa91b20da60aef15d1bcdd) Signed-off-by: Peter Korsgaard --- package/perl-http-cookies/Config.in | 4 ++++ package/perl-http-daemon/Config.in | 4 ++++ package/perl-http-message/Config.in | 4 ++++ package/perl-http-negotiate/Config.in | 4 ++++ package/perl-plack/Config.in | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/package/perl-http-cookies/Config.in b/package/perl-http-cookies/Config.in index 3ca461bf833..147d9521bb7 100644 --- a/package/perl-http-cookies/Config.in +++ b/package/perl-http-cookies/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_PERL_HTTP_COOKIES bool "perl-http-cookies" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime help HTTP cookie jars. https://github.com/libwww-perl/HTTP-Cookies + +comment "perl-http-cookies needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-daemon/Config.in b/package/perl-http-daemon/Config.in index 0c7ffe723aa..4d6277a7996 100644 --- a/package/perl-http-daemon/Config.in +++ b/package/perl-http-daemon/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_HTTP_DAEMON bool "perl-http-daemon" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_DATE # runtime select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime select BR2_PACKAGE_PERL_LWP_MEDIATYPES # runtime @@ -7,3 +8,6 @@ config BR2_PACKAGE_PERL_HTTP_DAEMON A simple http server class. https://github.com/libwww-perl/HTTP-Daemon + +comment "perl-http-daemon needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-message/Config.in b/package/perl-http-message/Config.in index 3c6849487ad..e2cb42f9411 100644 --- a/package/perl-http-message/Config.in +++ b/package/perl-http-message/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE bool "perl-http-message" + depends on !BR2_STATIC_LIBS # perl-clone select BR2_PACKAGE_PERL_CLONE # runtime select BR2_PACKAGE_PERL_ENCODE_LOCALE # runtime select BR2_PACKAGE_PERL_HTTP_DATE # runtime @@ -10,3 +11,6 @@ config BR2_PACKAGE_PERL_HTTP_MESSAGE HTTP style message (base class). https://github.com/libwww-perl/HTTP-Message + +comment "perl-http-message needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-http-negotiate/Config.in b/package/perl-http-negotiate/Config.in index c519ede2df0..2e82ce5ad27 100644 --- a/package/perl-http-negotiate/Config.in +++ b/package/perl-http-negotiate/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_PERL_HTTP_NEGOTIATE bool "perl-http-negotiate" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_HTTP_MESSAGE # runtime help choose a variant to serve. https://metacpan.org/release/HTTP-Negotiate + +comment "perl-http-negotiate needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/perl-plack/Config.in b/package/perl-plack/Config.in index c81ac4a444f..420f8257e5e 100644 --- a/package/perl-plack/Config.in +++ b/package/perl-plack/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PERL_PLACK bool "perl-plack" + depends on !BR2_STATIC_LIBS # perl-http-message -> perl-clone select BR2_PACKAGE_PERL_APACHE_LOGFORMAT_COMPILER # runtime select BR2_PACKAGE_PERL_COOKIE_BAKER # runtime select BR2_PACKAGE_PERL_DEVEL_STACKTRACE # runtime @@ -19,3 +20,6 @@ config BR2_PACKAGE_PERL_PLACK toolkit). https://github.com/plack/Plack + +comment "perl-plack needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS From d934ce827caa3e1696acdd56277cca347cd73fbd Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Jun 2023 21:53:45 +0200 Subject: [PATCH 0224/1167] support/testing/infra/emulator.py: fix typo in comment Artefact (British) and Artifact (American) are both valid spelling but ARTIFACTS_URL is used in the emulator code. Surprisingly, the url actually use "artefacts" http://autobuild.buildroot.net/artefacts Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit e0e64e9edeafd6467d20d211463ad28b20705503) Signed-off-by: Peter Korsgaard --- support/testing/infra/emulator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/testing/infra/emulator.py b/support/testing/infra/emulator.py index 53876f828cc..02cf4861280 100644 --- a/support/testing/infra/emulator.py +++ b/support/testing/infra/emulator.py @@ -20,7 +20,7 @@ def __init__(self, builddir, downloaddir, logtofile, timeout_multiplier): # # kernel: path to the kernel image, or the special string # 'builtin'. 'builtin' means a pre-built kernel image will be - # downloaded from ARTEFACTS_URL and suitable options are + # downloaded from ARTIFACTS_URL and suitable options are # automatically passed to qemu and added to the kernel cmdline. So # far only armv5, armv7 and i386 builtin kernels are available. # If None, then no kernel is used, and we assume a bootable device From ac08c880a57423ea5eb7301ee1311d5e1ca4e751 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Jun 2023 12:21:49 +0200 Subject: [PATCH 0225/1167] configs/qemu s390x: increase image size to 120M The default kernel configuration for s390x enable a lot of drivers by default so increase the image site to 120M. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4364600444 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard (cherry picked from commit 757251a0deeb28cf4a682bb9db5a438be4c0f925) Signed-off-by: Peter Korsgaard --- configs/qemu_s390x_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/qemu_s390x_defconfig b/configs/qemu_s390x_defconfig index 6bbcca0896d..591e6e33693 100644 --- a/configs/qemu_s390x_defconfig +++ b/configs/qemu_s390x_defconfig @@ -9,6 +9,7 @@ BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" # BR2_TARGET_ROOTFS_TAR is not set # Linux headers same as kernel From 737a68f384771600561792960502f0f5ac242fa7 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 6 Jun 2023 15:42:37 +0100 Subject: [PATCH 0226/1167] board/zynq: fix shellcheck issues This patch cleans up board/zynq shellcheck issues. Signed-off-by: Neal Frager [Peter: use ${} for variables, quotes around entire word] Signed-off-by: Peter Korsgaard (cherry picked from commit 7db2ab3041150ee382a257c6c7ce686f9ba24ce9) Signed-off-by: Peter Korsgaard --- board/zynq/post-build.sh | 4 ++-- board/zynq/post-image.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/zynq/post-build.sh b/board/zynq/post-build.sh index 9fd8bbf2c8d..810fe998794 100755 --- a/board/zynq/post-build.sh +++ b/board/zynq/post-build.sh @@ -3,6 +3,6 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -install -m 0644 -D $BOARD_DIR/extlinux.conf $BINARIES_DIR/extlinux.conf +install -m 0644 -D "${BOARD_DIR}/extlinux.conf" "${BINARIES_DIR}/extlinux.conf" diff --git a/board/zynq/post-image.sh b/board/zynq/post-image.sh index ac74286cf6d..627c8ac41a7 100755 --- a/board/zynq/post-image.sh +++ b/board/zynq/post-image.sh @@ -6,10 +6,10 @@ FIRST_DT=$(sed -n \ 's/^BR2_LINUX_KERNEL_INTREE_DTS_NAME="\([a-z0-9\-]*\).*"$/\1/p' \ - ${BR2_CONFIG}) + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" From 457cc3325859afad28f761dc30281e916157a536 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Tue, 6 Jun 2023 18:54:59 +0100 Subject: [PATCH 0227/1167] board/zynqmp: fix shellcheck issues This patch cleans up board/zynqmp shellcheck issues. Signed-off-by: Neal Frager [Peter: wrap long lines, use quotes around entire word] Signed-off-by: Peter Korsgaard (cherry picked from commit 48c3d9f396dd7a9fa426e3f7ddbff65a6270aeaf) Signed-off-by: Peter Korsgaard --- board/zynqmp/kria/kv260/kv260.sh | 10 +++++++--- board/zynqmp/post-build.sh | 7 +++---- board/zynqmp/post-image.sh | 8 ++++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/board/zynqmp/kria/kv260/kv260.sh b/board/zynqmp/kria/kv260/kv260.sh index e03d67d8b0a..dc92c51d43e 100755 --- a/board/zynqmp/kria/kv260/kv260.sh +++ b/board/zynqmp/kria/kv260/kv260.sh @@ -6,7 +6,11 @@ # drivers are missing. # This will be removed when u-boot can build the kv260 u-boot.itb natively. -UBOOT_DIR=$4 +UBOOT_DIR="$4" -fdtoverlay -o ${UBOOT_DIR}/fit-dtb.blob -i ${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb ${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo -${UBOOT_DIR}/tools/mkimage -E -f ${UBOOT_DIR}/u-boot.its -B 0x8 ${BINARIES_DIR}/u-boot.itb +fdtoverlay -o "${UBOOT_DIR}/fit-dtb.blob" \ + -i "${UBOOT_DIR}/arch/arm/dts/zynqmp-smk-k26-revA.dtb" \ + "${UBOOT_DIR}/arch/arm/dts/zynqmp-sck-kv-g-revB.dtbo" + +"${UBOOT_DIR}/tools/mkimage" -E -f "${UBOOT_DIR}/u-boot.its" \ + -B 0x8 "${BINARIES_DIR}/u-boot.itb" diff --git a/board/zynqmp/post-build.sh b/board/zynqmp/post-build.sh index 0713bd1b05b..747991e3f1d 100755 --- a/board/zynqmp/post-build.sh +++ b/board/zynqmp/post-build.sh @@ -3,14 +3,13 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" -CONSOLE=$2 -ROOT=$3 +CONSOLE="$2" +ROOT="$3" mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" label linux kernel /Image devicetree /system.dtb - append console=${CONSOLE} root=/dev/${ROOT} rw rootwait + append console="${CONSOLE}" root="/dev/${ROOT}" rw rootwait __HEADER_EOF diff --git a/board/zynqmp/post-image.sh b/board/zynqmp/post-image.sh index c5de2db8207..f44b66342d4 100755 --- a/board/zynqmp/post-image.sh +++ b/board/zynqmp/post-image.sh @@ -6,10 +6,10 @@ FIRST_DT=$(sed -nr \ -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ - ${BR2_CONFIG}) + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" +BOARD_DIR="$(dirname "$0")" -support/scripts/genimage.sh -c $BOARD_DIR/genimage.cfg +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" From f13dcd6c651df81f241b74e42c64588d6db2a862 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 6 Jun 2023 21:56:00 +0200 Subject: [PATCH 0228/1167] package/go: security bump to version 1.9.10 Fixes the following security issues: - cmd/go: cgo code injection The go command may generate unexpected code at build time when using cgo. This may result in unexpected behavior when running a go program which uses cgo. This may occur when running an untrusted module which contains directories with newline characters in their names. Modules which are retrieved using the go command, i.e. via "go get", are not affected (modules retrieved using GOPATH-mode, i.e. GO111MODULE=off, may be affected). Thanks to Juho Nurminen of Mattermost for reporting this issue. This is CVE-2023-29402 and Go issue https://go.dev/issue/60167. - runtime: unexpected behavior of setuid/setgid binaries The Go runtime didn't act any differently when a binary had the setuid/setgid bit set. On Unix platforms, if a setuid/setgid binary was executed with standard I/O file descriptors closed, opening any files could result in unexpected content being read/written with elevated prilieges. Similarly if a setuid/setgid program was terminated, either via panic or signal, it could leak the contents of its registers. Thanks to Vincent Dehors from Synacktiv for reporting this issue. This is CVE-2023-29403 and Go issue https://go.dev/issue/60272. - cmd/go: improper sanitization of LDFLAGS The go command may execute arbitrary code at build time when using cgo. This may occur when running "go get" on a malicious module, or when running any other command which builds untrusted code. This is can by triggered by linker flags, specified via a "#cgo LDFLAGS" directive. Thanks to Juho Nurminen of Mattermost for reporting this issue. This is CVE-2023-29404 and CVE-2023-29405 and Go issues https://go.dev/issue/60305 and https://go.dev/issue/60306. Signed-off-by: Peter Korsgaard (cherry picked from commit 620ce32227b0722c9c68c5d0cd42d8600a18ca6b) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index ffe42bf3959..874737ea2d3 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 131190a4697a70c5b1d232df5d3f55a3f9ec0e78e40516196ffb3f09ae6a5744 go1.19.9.src.tar.gz +sha256 13755bcce529747d5f2930dee034730c86d02bd3e521ab3e2bbede548d3b953f go1.19.10.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 89c3577982c..545d2117b7d 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.9 +GO_VERSION = 1.19.10 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 4956d620df14156baba1ef98610d5887612c254d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Jun 2023 19:50:23 +0200 Subject: [PATCH 0229/1167] {linux, linux-headers}: bump 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 2b0c6c0b7261937027a4f294a2d3c8c0a51eb722) [Peter: drop 6.3.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 8 ++++---- package/linux-headers/Config.in.host | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index c62f85e644f..264cc58f591 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.31" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.32" 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 550a3a5cec3..9a58be36ff8 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,9 +1,9 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 e86917bba1990e967943645484182a64ba325f98b114a1906cc1d50992e073c1 linux-6.1.31.tar.xz +sha256 7c88b7a09ba2b9e47b78eba2b32b1db6a4d89636f7ddd586545f9671a2521a6c linux-6.1.32.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 e981ea5d219f77735bf5a3f7e84a8af578df8ac3e1c4ff1b0649e2b0795277d2 linux-5.15.114.tar.xz -sha256 ace6ceb73f5f2504bc1bcb9b8cd5b55d6ff8e90a81ee244ad2315fdd671ba4e7 linux-5.10.181.tar.xz -sha256 90f5280e95ed7b374ad6f3979ed08008e29a051e5f372d367c06ed75b002a21b linux-5.4.244.tar.xz +sha256 1b076860779235e90519e867c1ec78c7a34d1125d8fdba787ff495c7c14f1214 linux-5.15.115.tar.xz +sha256 de8ec58929460e3a14c1b0502f4a449f24c988a7a4a03ff04a82fb2d665fe9f6 linux-5.10.182.tar.xz +sha256 9607881878fbd21e0dec4e8192b0f6352d17fd74c3ec23ffe6b0a24093efb1a4 linux-5.4.245.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 7fb9ee20c7e52f9be6d9f501e8498a22f4b364abfde136143749a77e597fd03e linux-4.19.284.tar.xz sha256 ac8318f1c1d387e23ccfa760ec042943372df23e3c4e2408177fb5a3f6488f76 linux-4.14.316.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index fe7d9330c68..6289e8400f3 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -386,10 +386,10 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.316" if BR2_KERNEL_HEADERS_4_14 default "4.19.284" if BR2_KERNEL_HEADERS_4_19 - default "5.4.244" if BR2_KERNEL_HEADERS_5_4 - default "5.10.181" if BR2_KERNEL_HEADERS_5_10 - default "5.15.114" if BR2_KERNEL_HEADERS_5_15 - default "6.1.31" if BR2_KERNEL_HEADERS_6_1 + default "5.4.245" if BR2_KERNEL_HEADERS_5_4 + default "5.10.182" if BR2_KERNEL_HEADERS_5_10 + default "5.15.115" if BR2_KERNEL_HEADERS_5_15 + default "6.1.32" if BR2_KERNEL_HEADERS_6_1 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 a6d7d40579cdefaa965fc283dfa96fc645029d82 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Jun 2023 11:56:06 +0200 Subject: [PATCH 0230/1167] support/dependencies: introduce BR2_HOST_CMAKE_AT_LEAST Some packages (e.g. libjxl) requires a quite recent cmake version, that is not yet available in most distributions, especially those LTS versions. Currently, when we bump the minimum cmake version we require, it gets bumped for all packages, regardless of their own minimum required version, which means that a given configuration will trigger the build of our host-cmake even if the packages that require it are not enabled and those that are would be content with the system-provided cmake. Since host-cmake can take quite some time to build, this can get a bit annoying to pay the price of a host-cmake build that would otherwise not be needed. Some packages even use an alternative build system when available since they requires a more recent version of cmake than the our minimum cmake version (wpewebkit use Ninja: 78d499409f71d8a22b0632c8ebc06f67ee6ae6dd). We introduce config options that packages can select to indicate what minimal cmake version they require, and use that version as the required minimal version required by the current configuration [0]. We would like to ensure that the currently selected minimum cmake version is indeed lower (or equal) to the cmake version we package, but that is not possible: dependencies.mk is parsed before we parse packages, so we do not yet know the cmake version we have, and we can't invert the parsing order as we need to know the required dependencies before we parse packages (so that we can build their dependency rules in Makefile). So we can only add comments in both places, that refer to the other location. [0] note that this is yet not optimal, as in such a case, host-cmake would be in the dependency chain of all cmake-based packages, even for those packages that do not require it. The optimum would be for each package to gain such a dependency on an as-needed basis, but this is by far more complex to achieve, and would only speed up cases where a single package is built from scratch (e.g. with: make clean; make foo), which is not worth optimising (yet?) Signed-off-by: Romain Naour Cc: Julien Olivain Cc: Arnout Vandecappelle Cc: Peter Korsgaard Cc: Yann E. MORIN Cc: Thomas Petazzoni Signed-off-by: Peter Korsgaard (cherry picked from commit 53beb8fc1a4f3ba20ea6c856b4ec8506570f17c1) Signed-off-by: Peter Korsgaard --- package/cmake/Config.in.host | 27 ++++++++++++++++++++++++ package/cmake/cmake.mk | 1 + support/dependencies/check-host-cmake.mk | 12 ++++++----- 3 files changed, 35 insertions(+), 5 deletions(-) diff --git a/package/cmake/Config.in.host b/package/cmake/Config.in.host index b2e210ee2cb..5de076537bc 100644 --- a/package/cmake/Config.in.host +++ b/package/cmake/Config.in.host @@ -9,3 +9,30 @@ config BR2_PACKAGE_HOST_CMAKE the compiler environment of your choice. http://www.cmake.org/ + +# The minimum system cmake version we expect if 3.18 as provided by +# Debian bullseye, that we use in our reference build docker image. +config BR2_HOST_CMAKE_AT_LEAST_3_19 + bool + +config BR2_HOST_CMAKE_AT_LEAST_3_20 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_19 + +config BR2_HOST_CMAKE_AT_LEAST_3_21 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_20 + +config BR2_HOST_CMAKE_AT_LEAST_3_22 + bool + select BR2_HOST_CMAKE_AT_LEAST_3_21 + +# This order guarantees that the highest version is set, as kconfig +# stops affecting a value on the first matching default. +config BR2_HOST_CMAKE_AT_LEAST + string + default "3.22" if BR2_HOST_CMAKE_AT_LEAST_3_22 + default "3.21" if BR2_HOST_CMAKE_AT_LEAST_3_21 + default "3.20" if BR2_HOST_CMAKE_AT_LEAST_3_20 + default "3.19" if BR2_HOST_CMAKE_AT_LEAST_3_19 + default "3.18" diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 053658fad60..56c92e53e9a 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,6 +4,7 @@ # ################################################################################ +# When updating the version, please also update BR2_HOST_CMAKE_AT_LEAST_X_Y CMAKE_VERSION_MAJOR = 3.22 CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk index 5760e4ded1f..e3676903198 100644 --- a/support/dependencies/check-host-cmake.mk +++ b/support/dependencies/check-host-cmake.mk @@ -1,9 +1,11 @@ -# Set this to either 3.18 or higher, depending on the highest minimum -# version required by any of the packages bundled in Buildroot. If a -# package is bumped or a new one added, and it requires a higher -# version, our cmake infra will catch it and build its own. +# The cmake minimum version is set to either 3.18 or higher, +# depending on the highest minimum version required by any +# of the packages bundled in Buildroot. If a package is +# bumped or a new one added, and it requires a higher +# cmake version than the one provided by the host, our +# cmake infra will catch it and build its own. # -BR2_CMAKE_VERSION_MIN = 3.18 +BR2_CMAKE_VERSION_MIN = $(BR2_HOST_CMAKE_AT_LEAST) BR2_CMAKE_CANDIDATES ?= cmake cmake3 BR2_CMAKE ?= $(call suitable-host-package,cmake,\ From 5fab4b32bbdaec13c94daaf53591e6190cce4851 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 5 Jun 2023 11:56:07 +0200 Subject: [PATCH 0231/1167] package/libjxl: requires host-cmake >= 3.19 libjxl requires cmake 3.19 since version v0.7 due to the new behavior of cmake [1]. -- Configuring done CMake Error at cmake/FindLCMS2.cmake:40 (add_library): INTERFACE_LIBRARY targets may only have whitelisted properties. The property "INCLUDE_DIRECTORIES" is not allowed. Call Stack (most recent call first): third_party/CMakeLists.txt:114 (find_package) The portability issue has already been reported upstream [2]. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4322819095 [1] https://gitlab.kitware.com/cmake/cmake/-/commit/afb998704e67d3d3ce5b24c112cb06e770fca78d [2] https://github.com/libjxl/libjxl/issues/1425 Signed-off-by: Romain Naour Cc: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit a4fec34ba231b78ea24a6480c31aa45132b40784) Signed-off-by: Peter Korsgaard --- package/libjxl/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/libjxl/Config.in b/package/libjxl/Config.in index da04b89f9b8..923560298fc 100644 --- a/package/libjxl/Config.in +++ b/package/libjxl/Config.in @@ -7,6 +7,7 @@ config BR2_PACKAGE_LIBJXL # libjxl fail to link statically due to libatomic issue depends on !BR2_STATIC_LIBS depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_81426 + select BR2_HOST_CMAKE_AT_LEAST_3_19 select BR2_PACKAGE_BROTLI select BR2_PACKAGE_HIGHWAY select BR2_PACKAGE_LCMS2 From 17289b98e1f72b3ed148f60472edbd8e0f63d4ec Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Jun 2023 19:17:08 +0200 Subject: [PATCH 0232/1167] package/libdeflate: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccGKQdKj.s: Assembler messages: /tmp/ccGKQdKj.s:199: Error: invalid constant (7) after fixup /tmp/ccGKQdKj.s:327: Error: invalid constant (0) after fixup /tmp/ccGKQdKj.s:338: Error: invalid constant (1) after fixup /tmp/ccGKQdKj.s:345: Error: invalid constant (20) after fixup /tmp/ccGKQdKj.s:354: Error: invalid constant (20) after fixup /tmp/ccGKQdKj.s:372: Error: invalid constant (20) after fixup /tmp/ccGKQdKj.s:528: Error: invalid constant (3f) after fixup /tmp/ccGKQdKj.s:531: Error: invalid constant (3f) after fixup /tmp/ccGKQdKj.s:202: Error: invalid constant (20000) after fixup /tmp/ccGKQdKj.s:482: Error: invalid constant (20000) after fixup /tmp/ccGKQdKj.s:549: Error: invalid constant (20000) after fixup Fixes: http://autobuild.buildroot.net/results/0103d64a4a6a9b0a708bfb77bf1714edc7acc714/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 62200879d49c085b120f37ce31d9123ebcc5895a) Signed-off-by: Peter Korsgaard --- package/libdeflate/libdeflate.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk index 67e97c6e5ec..c09a0333251 100644 --- a/package/libdeflate/libdeflate.mk +++ b/package/libdeflate/libdeflate.mk @@ -9,8 +9,17 @@ LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION)) LIBDEFLATE_LICENSE = MIT LIBDEFLATE_LICENSE_FILES = COPYING LIBDEFLATE_INSTALL_STAGING = YES + +LIBDEFLATE_CFLAGS = -D_DEFAULT_SOURCE + +# Thumb build is broken, build in ARM mode, since all architectures +# that support Thumb1 also support ARM. +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBDEFLATE_CFLAGS += -marm +endif + LIBDEFLATE_CONF_OPTS = \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -D_DEFAULT_SOURCE" + -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) $(LIBDEFLATE_CFLAGS)" ifeq ($(BR2_SHARED_LIBS),y) LIBDEFLATE_CONF_OPTS += \ From 4fa90a2f6dd39ab18ff4da103fac44bb3ddec531 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 7 Jun 2023 19:35:14 +0200 Subject: [PATCH 0233/1167] package/php: Fix GCC 12 -Og Fixes: http://autobuild.buildroot.net/results/316451459139e250ba2d0c7b554606fd97eebd9a/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 29e79c1f54407d0bb6cd9a3a27c65a4cbe3ccdcd) Signed-off-by: Peter Korsgaard --- package/php/0006-xxhash-h-Fix-GCC-12-Og.patch | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 package/php/0006-xxhash-h-Fix-GCC-12-Og.patch diff --git a/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch new file mode 100644 index 00000000000..9b5b9966cd5 --- /dev/null +++ b/package/php/0006-xxhash-h-Fix-GCC-12-Og.patch @@ -0,0 +1,94 @@ +From adcb38b1ffa8e401293e5028ee5af586fd304e00 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 12 Apr 2023 13:33:07 +0800 +Subject: [PATCH] xxhash.h: Fix GCC 12 -Og + +Change whether to inline XXH3_hashLong_withSecret to a config option + +Ref: https://github.com/Cyan4973/xxHash/commit/ace22bddc7a366a5dd8a71e8b8247694530684ec + +Signed-off-by: Mingli Yu + +Closes GH-11062. + +Upstream: https://github.com/php/php-src/commit/adcb38b1ffa8e401293e5028ee5af586fd304e00 + +Signed-off-by: Bernd Kuhls +--- + ext/hash/xxhash/xxhash.h | 35 +++++++++++++++++++++++++++++++++-- + 1 file changed, 33 insertions(+), 2 deletions(-) + +diff --git a/ext/hash/xxhash/xxhash.h b/ext/hash/xxhash/xxhash.h +index b5bd286496c7..8e816c0584eb 100644 +--- a/ext/hash/xxhash/xxhash.h ++++ b/ext/hash/xxhash/xxhash.h +@@ -1375,6 +1375,23 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, + */ + # define XXH_NO_INLINE_HINTS 0 + ++/*! ++ * @def XXH3_INLINE_SECRET ++ * @brief Determines whether to inline the XXH3 withSecret code. ++ * ++ * When the secret size is known, the compiler can improve the performance ++ * of XXH3_64bits_withSecret() and XXH3_128bits_withSecret(). ++ * ++ * However, if the secret size is not known, it doesn't have any benefit. This ++ * happens when xxHash is compiled into a global symbol. Therefore, if ++ * @ref XXH_INLINE_ALL is *not* defined, this will be defined to 0. ++ * ++ * Additionally, this defaults to 0 on GCC 12+, which has an issue with function pointers ++ * that are *sometimes* force inline on -Og, and it is impossible to automatically ++ * detect this optimization level. ++ */ ++# define XXH3_INLINE_SECRET 0 ++ + /*! + * @def XXH32_ENDJMP + * @brief Whether to use a jump for `XXH32_finalize`. +@@ -1439,6 +1456,15 @@ XXH3_128bits_reset_withSecretandSeed(XXH3_state_t* statePtr, + # endif + #endif + ++#ifndef XXH3_INLINE_SECRET ++# if (defined(__GNUC__) && !defined(__clang__) && __GNUC__ >= 12) \ ++ || !defined(XXH_INLINE_ALL) ++# define XXH3_INLINE_SECRET 0 ++# else ++# define XXH3_INLINE_SECRET 1 ++# endif ++#endif ++ + #ifndef XXH32_ENDJMP + /* generally preferable for performance */ + # define XXH32_ENDJMP 0 +@@ -1515,6 +1541,11 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + # define XXH_NO_INLINE static + #endif + ++#if XXH3_INLINE_SECRET ++# define XXH3_WITH_SECRET_INLINE XXH_FORCE_INLINE ++#else ++# define XXH3_WITH_SECRET_INLINE XXH_NO_INLINE ++#endif + + + /* ************************************* +@@ -4465,7 +4496,7 @@ XXH3_hashLong_64b_internal(const void* XXH_RESTRICT input, size_t len, + * so that the compiler can properly optimize the vectorized loop. + * This makes a big performance difference for "medium" keys (<1 KB) when using AVX instruction set. + */ +-XXH_FORCE_INLINE XXH64_hash_t ++XXH3_WITH_SECRET_INLINE XXH64_hash_t + XXH3_hashLong_64b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, const xxh_u8* XXH_RESTRICT secret, size_t secretLen) + { +@@ -5263,7 +5294,7 @@ XXH3_hashLong_128b_default(const void* XXH_RESTRICT input, size_t len, + * It's important for performance to pass @secretLen (when it's static) + * to the compiler, so that it can properly optimize the vectorized loop. + */ +-XXH_FORCE_INLINE XXH128_hash_t ++XXH3_WITH_SECRET_INLINE XXH128_hash_t + XXH3_hashLong_128b_withSecret(const void* XXH_RESTRICT input, size_t len, + XXH64_hash_t seed64, + const void* XXH_RESTRICT secret, size_t secretLen) From 206dda4f2b177029fb81f4b96f4c239ddeba431b Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 13 Jun 2023 09:28:05 +0200 Subject: [PATCH 0234/1167] package/cups: security bump to version 2.4.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following security issues: - CVE-2023-32324: Heap buffer overflow in cupsd https://github.com/OpenPrinting/cups/security/advisories/GHSA-cxc6-w2g7-69p7 And a number of other fixes, see the release notes for details: https://github.com/OpenPrinting/cups/releases/tag/v2.4.3 In addition, 2.4.4 fixes a segfault regression in 2.4.3: https://github.com/OpenPrinting/cups/releases/tag/v2.4.4 Update NOTICE hash for a change in copyright years: -Copyright © 2020-2022 by OpenPrinting +Copyright © 2020-2023 by OpenPrinting Signed-off-by: Peter Korsgaard (cherry picked from commit 38bef5fbc8c609241bb0fbcde310f5eb296537ae) Signed-off-by: Peter Korsgaard --- package/cups/cups.hash | 4 ++-- package/cups/cups.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cups/cups.hash b/package/cups/cups.hash index ba220e903e1..cc6fe254462 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,4 +1,4 @@ # Locally calculated: -sha256 f03ccb40b087d1e30940a40e0141dcbba263f39974c20eb9f2521066c9c6c908 cups-2.4.2-source.tar.gz +sha256 209259e8fe8df9112af49f4e5765f50dad6da1f869296de41d6eaab1b98003cb cups-2.4.4-source.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE -sha256 7a7bd639e3a8457ae40b0dcfb74ea3cc6a8132b06c726142e993625d33eb6de5 NOTICE +sha256 5320b6e3c252423e4153eb2dd63e57e3b630afb21139f44e43b02d85fe33e279 NOTICE diff --git a/package/cups/cups.mk b/package/cups/cups.mk index fed2aa809f1..7bbea9a2189 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.4.2 +CUPS_VERSION = 2.4.4 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/OpenPrinting/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = Apache-2.0 with GPL-2.0/LGPL-2.0 exception From 9da144a812f8744e99fffc7f9771fb39b416b090 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Mon, 12 Jun 2023 01:36:15 +0200 Subject: [PATCH 0235/1167] package/graphicsmagick: security bump to version 1.3.40 Fixes the following security issues: 1.3.39: - oss-fuzz: Several security fixes originating from oss-fuzz testing. - ALL: Replace strcpy() with strlcpy(), replace strcat() with strlcat(), replace sprintf() with snprintf(). Prefer using bounded string functions. This change is made for the purpose of increasing safety than to address any existing demonstrated concern. 1.3.40: - DCX: Fixed heap overflow when writing more than 1023 scenes, and also eliminated use of uninitialized memory. Signed-off-by: Grzegorz Blach [Peter: mark as security fix, extend commit message] Signed-off-by: Peter Korsgaard (cherry picked from commit fd3ff0761c741723afc556f5eaf96e1941264eb4) Signed-off-by: Peter Korsgaard --- package/graphicsmagick/graphicsmagick.hash | 2 +- package/graphicsmagick/graphicsmagick.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/graphicsmagick/graphicsmagick.hash b/package/graphicsmagick/graphicsmagick.hash index 80130da5d66..a894aedf118 100644 --- a/package/graphicsmagick/graphicsmagick.hash +++ b/package/graphicsmagick/graphicsmagick.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d60cd9db59351d2b9cb19beb443170acaa28f073d13d258f67b3627635e32675 GraphicsMagick-1.3.38.tar.xz +sha256 97dc1a9d4e89c77b25a3b24505e7ff1653b88f9bfe31f189ce10804b8efa7746 GraphicsMagick-1.3.40.tar.xz sha256 0a20e661de942ebe115a354d0ec6d1d42b93856ea765f813f350a5ce5024cdb7 Copyright.txt diff --git a/package/graphicsmagick/graphicsmagick.mk b/package/graphicsmagick/graphicsmagick.mk index dbaa8ddf704..76b826ceef5 100644 --- a/package/graphicsmagick/graphicsmagick.mk +++ b/package/graphicsmagick/graphicsmagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRAPHICSMAGICK_VERSION = 1.3.38 +GRAPHICSMAGICK_VERSION = 1.3.40 GRAPHICSMAGICK_SOURCE = GraphicsMagick-$(GRAPHICSMAGICK_VERSION).tar.xz GRAPHICSMAGICK_SITE = https://downloads.sourceforge.net/project/graphicsmagick/graphicsmagick/$(GRAPHICSMAGICK_VERSION) GRAPHICSMAGICK_LICENSE = MIT From 0d8a19a2ae475ac23ec5f66b217c5349351e49ac Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 14 Jun 2023 16:35:19 +0200 Subject: [PATCH 0236/1167] package/qemu: qemu systems emulation needs fdt when building for all targets defconfig fragment to reproduce the issue: BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y BR2_PACKAGE_QEMU=y BR2_PACKAGE_QEMU_SYSTEM=y ERROR: Problem encountered: fdt not available but required by targets aarch64-softmmu, arm-softmmu, i386-softmmu, loongarch64-softmmu, microblaze-softmmu, microblazeel-softmmu, mips64el-softmmu, nios2-softmmu, or1k-softmmu, ppc-softmmu, ppc64-softmmu, riscv32-softmmu, riscv64-softmmu, rx-softmmu, x86_64-softmmu Commit [1] select BR2_PACKAGE_QEMU_FDT for each individual emulator targets but forgot to select is when BR2_PACKAGE_QEMU_CHOOSE_TARGETS is not set (building for all targets). Fixes: http://autobuild.buildroot.org/results/e44/e444a02b899d325a9d99daed96b8cb96108383e7 [1] 44be514b21fd94096702b80c62d46c31d72f15a5 Signed-off-by: Romain Naour Cc: Carlos Santos Cc: Yann E. MORIN Signed-off-by: Peter Korsgaard (cherry picked from commit 59df3875b5e965872007ac22245aa6e048576644) Signed-off-by: Peter Korsgaard --- package/qemu/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qemu/Config.in b/package/qemu/Config.in index 31cbf096441..de6475e7197 100644 --- a/package/qemu/Config.in +++ b/package/qemu/Config.in @@ -53,6 +53,7 @@ config BR2_PACKAGE_QEMU_SYSTEM bool "Enable systems emulation" depends on !BR2_STATIC_LIBS # dtc select BR2_PACKAGE_PIXMAN + select BR2_PACKAGE_QEMU_FDT if !BR2_PACKAGE_QEMU_CHOOSE_TARGETS help Say 'y' to build system emulators/virtualisers. From 01466d0dc656e075799f6daa9dcaf066c5d8c3a2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Jun 2023 20:07:57 +0200 Subject: [PATCH 0237/1167] package/x11r7/xlib_libX11: security bump version to 1.8.6 Fixes CVE-2023-3138: https://lists.x.org/archives/xorg-announce/2023-June/003406.html Release notes: https://lists.x.org/archives/xorg-announce/2023-June/003407.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 89585576728ebf9362394ae6e26df595098f8bbc) Signed-off-by: Peter Korsgaard --- package/x11r7/xlib_libX11/xlib_libX11.hash | 6 +++--- package/x11r7/xlib_libX11/xlib_libX11.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xlib_libX11/xlib_libX11.hash b/package/x11r7/xlib_libX11/xlib_libX11.hash index ed68164d5fe..f443d947a47 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.hash +++ b/package/x11r7/xlib_libX11/xlib_libX11.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2023-February/003318.html -sha256 c9a287a5aefa9804ce3cfafcf516fe96ed3f7e8e45c0e2ee59e84c86757df518 libX11-1.8.4.tar.xz -sha512 3150a47498b0cb012482ee02efeaae16d9e736288f2b3f917be912e1613d56ad6b4ab180de8820305deb2b95dfd993633f43a65344d75979d6b86bdf110cb63e libX11-1.8.4.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-June/003407.html +sha256 59535b7cc6989ba806a022f7e8533b28c4397b9d86e9d07b6df0c0703fa25cc9 libX11-1.8.6.tar.xz +sha512 b94a578003078a42cea43d80fae2c54a3aaa30f706088bb3546331e9abfc180131cafb37887117abcc5b6116992e299974981eef96ecfcf883cc8a1aba4d1ade libX11-1.8.6.tar.xz # Locally computed sha256 2e7012a140f000735a7172674a2d314398d79622444fba65d108b029b29ab283 COPYING diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk index add16f49dbf..75199f1a3d6 100644 --- a/package/x11r7/xlib_libX11/xlib_libX11.mk +++ b/package/x11r7/xlib_libX11/xlib_libX11.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBX11_VERSION = 1.8.4 +XLIB_LIBX11_VERSION = 1.8.6 XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.xz XLIB_LIBX11_SITE = https://xorg.freedesktop.org/archive/individual/lib XLIB_LIBX11_LICENSE = MIT From 4d816fecc16bf9ba226b31ce50050899d6832ca9 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Jun 2023 18:20:49 +0200 Subject: [PATCH 0238/1167] DEVELOPERS: Update email address for Bernd Kuhls Signed-off-by: Bernd Kuhls Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 8ef7b2069dd6462508c3c61373fe2802761c4d63) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 3366e2b2a42..55e3494f4c8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -311,7 +311,7 @@ F: package/taskd/ N: Benjamin Kamath F: package/lapack/ -N: Bernd Kuhls +N: Bernd Kuhls F: package/alsa-lib/ F: package/alsa-utils/ F: package/apache/ From 837561824e954a6cd28fd4274de14f7179018841 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Jun 2023 08:04:19 +0200 Subject: [PATCH 0239/1167] package/python-docker: needs python-packaging after bump to 6.0.1 Commit d680db0ba77dab (package/python-docker: bump to version 6.0.1) forgot to add the new dependency on python-packaging, leading to runtime errors: import docker File "/usr/lib/python3.11/site-packages/docker/__init__.py", line 2, in File "/usr/lib/python3.11/site-packages/docker/api/__init__.py", line 2, in File "/usr/lib/python3.11/site-packages/docker/api/client.py", line 10, in File "/usr/lib/python3.11/site-packages/docker/auth.py", line 7, in File "/usr/lib/python3.11/site-packages/docker/utils/__init__.py", line 3, in File "/usr/lib/python3.11/site-packages/docker/utils/decorators.py", line 4, in File "/usr/lib/python3.11/site-packages/docker/utils/utils.py", line 9, in ModuleNotFoundError: No module named 'packaging' Signed-off-by: Peter Korsgaard (cherry picked from commit 1dcabece6fb8755c7a2786bde8cc75040bc3fbcb) Signed-off-by: Peter Korsgaard --- package/python-docker/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-docker/Config.in b/package/python-docker/Config.in index b2296f42eb9..ae5a7a51819 100644 --- a/package/python-docker/Config.in +++ b/package/python-docker/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_DOCKER bool "python-docker" # docker-engine may be running on another host, so no other dependency select BR2_PACKAGE_PYTHON3_SSL # runtime + select BR2_PACKAGE_PYTHON_PACKAGING # runtime select BR2_PACKAGE_PYTHON_REQUESTS # runtime select BR2_PACKAGE_PYTHON_SIX # runtime select BR2_PACKAGE_PYTHON_WEBSOCKET_CLIENT # runtime From c92cc8796ed951f0604e9272677a9cdfcd93680f Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Jun 2023 15:54:53 +0200 Subject: [PATCH 0240/1167] Update for 2023.02.2 Signed-off-by: Peter Korsgaard --- CHANGES | 40 ++++++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 55dcc830de9..3b2199f4470 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,43 @@ +2023.02.2, released June 16th, 2023 + + Important / security related fixes. + + Infrastructure: Add BR2_HOST_CMAKE_AT_LEAST_* for packages + needing a newer host-cmake than what is currently enforced + (3.18) - Up to the version provided by the cmake package (3.22). + + utils/docker-run: Now correctly handles git + workdirs/worktrees. + + Defconfigs: QEMU s390x: Bump rootfs size to make room for + kernel modules, Stm32f4xx: Tweak config to save RAM, Xilinx + Versal vck190: Use correct (A72) CPU variant + + Updated/fixed packages: atkmm, bird, busybox, cairomm1_14, + cmake, containerd, crudini, cups, delve, docker-cli, + docker-engine, earlyoom, edid-decode, fluent-bit, freeswitch, + gcc, gdb, glibmm_2_66, gnupg2, go, gptfdisk, graphicsmagick, + intel-microcode, libass, libcurl, libdeflate, libgeos, + libgtk3, libjxl, libnftl, libopenssl, libressl, libssh, llvm, + lua, mesa3d, micropython, minidlna, moby-buildkit, mpd, mupdf, + ncurses, nftables, openjdk, openjdk-bin, php, postgresql, + python-can, python-django, python-django, python-ipython, + python-matplotlib, python-mupdf, python-requests, python3, + qemu, redis, rpm, runc, sdl2_mixer, tzdata, uclibc, vdr, + wilc-firmware, xapp_xcalc, xapp_xdpyinfo, xapp_xinput, + xapp_xwininfo, xdata_xbitmaps, xdata_xcursor-themes, + xdriver_xf86-input-mouse, xdriver_xf86-video-ark, + xdriver_xf86-video-geode, xdriver_xf86-video-neomagic, + xfont_encodings, xlib_libX11, xlib_libXaw, xlib_libXi, + xlib_libXfixes, xlib_libXft, xlib_libXpm, zfs, znc + + New packages: perl-clone, perl-http-message, python-asttokens, + python-executing, python-pure-eval, python-stack-data + + Issues resolved (http://bugs.uclibc.org): + + #15421: qemu_aarch64_ebbr_defconfig: Missing Linux kernel source code + 2023.02.1, released May 9th, 2023 Important / security related fixes. diff --git a/Makefile b/Makefile index 000f1dcec01..7fcd9e6bcb2 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02.1 +export BR2_VERSION := 2023.02.2 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1683664000 +BR2_VERSION_EPOCH = 1686923000 # 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 d1b75ed405d..5bc7a2c012c 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.02.1' +RELEASE='2023.02.2' ### Change here for more memory/cores ### VM_MEMORY=2048 From 4dd25fa7e1b63aae272f7501be0c85cd82383f12 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 16 Jun 2023 08:04:20 +0200 Subject: [PATCH 0241/1167] support/testing: add python-docker test Python-docker needs a working docker setup to do anything useful, so add it to the existing docker_compose (which tests docker and docker-compose) rather than adding a completely new test. Signed-off-by: Peter Korsgaard Reviewed-by: Christian Stewart Signed-off-by: Peter Korsgaard (cherry picked from commit 0bb63c6f5adc07532da494d1118dd7b6f061fb00) Signed-off-by: Peter Korsgaard --- .../testing/tests/package/sample_python_docker.py | 12 ++++++++++++ support/testing/tests/package/test_docker_compose.py | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 support/testing/tests/package/sample_python_docker.py diff --git a/support/testing/tests/package/sample_python_docker.py b/support/testing/tests/package/sample_python_docker.py new file mode 100644 index 00000000000..a69097b4125 --- /dev/null +++ b/support/testing/tests/package/sample_python_docker.py @@ -0,0 +1,12 @@ +import docker + +client = docker.from_env() +info = client.info() +images = client.images.list() + +assert len(images) > 0 + +print('Version:', info['ServerVersion']) +print('Images:') +for i in images: + print(i.tags[0]) diff --git a/support/testing/tests/package/test_docker_compose.py b/support/testing/tests/package/test_docker_compose.py index 38b669fc6d6..16027c9c3ad 100644 --- a/support/testing/tests/package/test_docker_compose.py +++ b/support/testing/tests/package/test_docker_compose.py @@ -4,6 +4,8 @@ class TestDockerCompose(infra.basetest.BRTest): + scripts = ["conf/docker-compose.yml", + "tests/package/sample_python_docker.py"] config = \ """ BR2_x86_64=y @@ -18,6 +20,8 @@ class TestDockerCompose(infra.basetest.BRTest): BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.262" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="{}" + BR2_PACKAGE_PYTHON3=y + BR2_PACKAGE_PYTHON_DOCKER=y BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_DOCKER_CLI=y BR2_PACKAGE_DOCKER_COMPOSE=y @@ -27,7 +31,7 @@ class TestDockerCompose(infra.basetest.BRTest): # BR2_TARGET_ROOTFS_TAR is not set """.format( infra.filepath("tests/package/copy-sample-script-to-target.sh"), - infra.filepath("conf/docker-compose.yml"), + " ".join([infra.filepath(i) for i in scripts]), infra.filepath("conf/docker-compose-kernel.config")) def wait_for_dockerd(self): @@ -46,6 +50,9 @@ def docker_compose_test(self): self.assertRunOk('wget -q -O /tmp/busybox http://127.0.0.1/busybox', 120) self.assertRunOk('cmp /bin/busybox /tmp/busybox', 120) + def python_docker_test(self): + self.assertRunOk('python3 ./sample_python_docker.py', 120) + def test_run(self): kernel = os.path.join(self.builddir, "images", "bzImage") rootfs = os.path.join(self.builddir, "images", "rootfs.ext2") @@ -62,3 +69,4 @@ def test_run(self): self.wait_for_dockerd() self.docker_test() self.docker_compose_test() + self.python_docker_test() From 062810a14458e746e711c7372ade1c1ff0357ae2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 22:48:17 +0200 Subject: [PATCH 0242/1167] package/php: security bump version to 8.2.7 Changelog: https://www.php.net/ChangeLog-8.php#8.2.7 Release notes: https://www.php.net/releases/8_2_7.php Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit af9a5bd7bc98200f3f4ca64692f93b10e6cfb05b) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 96e8803cb27..4fe77f1c5ba 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 10b796f0ed45574229851212b30a596a76e70ae365322bcaaaf9c00fa7d58cca php-8.2.6.tar.xz +sha256 4b9fb3dcd7184fe7582d7e44544ec7c5153852a2528de3b6754791258ffbdfa0 php-8.2.7.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 981da5b15d4..3bb27f1306f 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.6 +PHP_VERSION = 8.2.7 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 8258204b63aa2cee9dc8658efa19a3f52b6b05ef Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 20:52:52 +0200 Subject: [PATCH 0243/1167] package/gnupg2: bump version to 2.4.2 Added sha256 hash provided by upstream. Release notes: https://lists.gnupg.org/pipermail/gnupg-announce/2023q2/000479.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit bfffbd7ed871332d2300684afd1c177e0209ca92) Signed-off-by: Peter Korsgaard --- package/gnupg2/gnupg2.hash | 10 ++++------ package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index baee8241045..aa71881f419 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,5 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2023q2/000478.html -sha1 d7d021101361a5e1166a6c0cc1731276e7134547 gnupg-2.4.1.tar.bz2 -# Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.4.1.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 76b71e5aeb443bfd910ce9cbc8281b617c8341687afb67bae455877972b59de8 gnupg-2.4.1.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 3efd495a94dc81fd0ea8788bef6c69d1f13cedd7 gnupg-2.4.2.tar.bz2 +sha256 97eb47df8ae5a3ff744f868005a090da5ab45cb48ee9836dbf5ee739a4e5cf49 gnupg-2.4.2.tar.bz2 +# Locally calculated sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index f7c7ae847c1..760af3b05e3 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.4.1 +GNUPG2_VERSION = 2.4.2 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From 8c6a443a4c387e023ec772db5f6657994e6c0aca Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 20:52:53 +0200 Subject: [PATCH 0244/1167] package/libgcrypt: bump to version 1.10.2 Release notes: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob;f=NEWS;h=c9a239615f8070427a96688b1be40a81e59e9b8a;hb=1c5cbacf3d88dded5063e959ee68678ff7d0fa56 Added upstream sha1 & sha256 hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 9440d72ca9b95be2214a51d092ba59d0653f6148) Signed-off-by: Peter Korsgaard --- package/libgcrypt/libgcrypt.hash | 8 ++++---- package/libgcrypt/libgcrypt.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libgcrypt/libgcrypt.hash b/package/libgcrypt/libgcrypt.hash index 96f5e6b76c0..cfbf9eaf17d 100644 --- a/package/libgcrypt/libgcrypt.hash +++ b/package/libgcrypt/libgcrypt.hash @@ -1,5 +1,5 @@ -# Locally calculated after checking signature -# https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 ef14ae546b0084cd84259f61a55e07a38c3b53afc0f546bffcef2f01baffe9de libgcrypt-1.10.1.tar.bz2 +# From https://www.gnupg.org/download/integrity_check.html +sha1 0b9555960d84a09ea14e52360808f2e02e9c12d2 libgcrypt-1.10.2.tar.bz2 +sha256 3b9c02a004b68c256add99701de00b383accccf37177e0d6c58289664cce0c03 libgcrypt-1.10.2.tar.bz2 +# Locally calculated sha256 ca0061fc1381a3ab242310e4b3f56389f28e3d460eb2fd822ed7a21c6f030532 COPYING.LIB diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 9232debb3a5..4fffe5360e1 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.10.1 +LIBGCRYPT_VERSION = 1.10.2 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPL-2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB From d05bd63736a50370a635072514032aa85ecb8a7b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 20:52:54 +0200 Subject: [PATCH 0245/1167] package/libgpg-error: bump version to 1.47 Release notes: https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=NEWS;h=9be1b714e05dbd7de7b822d9dbbd998f6bc26025;hb=a25cea92798a5ece3f49924911507f5335915ecc Added upstream sha1 & sha256 hashes. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 51885982ff8ae213e1d678bc64b954e67b85d096) Signed-off-by: Peter Korsgaard --- package/libgpg-error/libgpg-error.hash | 8 ++------ package/libgpg-error/libgpg-error.mk | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index ffe27e9d99c..5c445ba0b27 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,10 +1,6 @@ # From https://www.gnupg.org/download/integrity_check.html -sha1 a6e5efdd72e848aab4064e5ef4c6835ba344bcf1 libgpg-error-1.46.tar.bz2 - -# Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.46.tar.bz2.sig -# using key 6DAA6E64A76D2840571B4902528897B826403ADA -sha256 b7e11a64246bbe5ef37748de43b245abd72cfcd53c9ae5e7fc5ca59f1c81268d libgpg-error-1.46.tar.bz2 +sha1 94668233fd7bd8e7c0ec5e363134cd53c575da60 libgpg-error-1.47.tar.bz2 +sha256 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb libgpg-error-1.47.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index 3ab8535a9ce..60e3da9de14 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.46 +LIBGPG_ERROR_VERSION = 1.47 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ From 5ff04ccda20e5aa56298745a4ff82d9255414584 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 20:59:31 +0200 Subject: [PATCH 0246/1167] package/libxslt: bump to version 1.1.38 Release notes: https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.38.news Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 6794f14d485dbfd93ef167ba46d24e7095003729) 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 c771e1fd7ef..458c1388d32 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.37.sha256sum -sha256 3a4b27dc8027ccd6146725950336f1ec520928f320f144eb5fa7990ae6123ab4 libxslt-1.1.37.tar.xz +# From https://download.gnome.org/sources/libxslt/1.1/libxslt-1.1.38.sha256sum +sha256 1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1 libxslt-1.1.38.tar.xz # Hash for license file: sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 COPYING diff --git a/package/libxslt/libxslt.mk b/package/libxslt/libxslt.mk index 95b0325c94f..ec066fbfa22 100644 --- a/package/libxslt/libxslt.mk +++ b/package/libxslt/libxslt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXSLT_VERSION = 1.1.37 +LIBXSLT_VERSION = 1.1.38 LIBXSLT_SOURCE = libxslt-$(LIBXSLT_VERSION).tar.xz LIBXSLT_SITE = https://download.gnome.org/sources/libxslt/1.1 LIBXSLT_INSTALL_STAGING = YES From 844d2f76261a9cb378fc2a19313d14ad691caff6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 9 Jun 2023 16:40:26 +0200 Subject: [PATCH 0247/1167] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit ed4792aaec66c963ca780b256c6c9f487a432c6b) [Peter: drop 6.3.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 264cc58f591..2c81f9ba8f7 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.32" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.33" 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 9a58be36ff8..f09d9809232 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 7c88b7a09ba2b9e47b78eba2b32b1db6a4d89636f7ddd586545f9671a2521a6c linux-6.1.32.tar.xz +sha256 b87d6ba8ea7328e8007a7ea9171d1aa0d540d95eacfcab09578e0a3b623dd2cd linux-6.1.33.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 1b076860779235e90519e867c1ec78c7a34d1125d8fdba787ff495c7c14f1214 linux-5.15.115.tar.xz -sha256 de8ec58929460e3a14c1b0502f4a449f24c988a7a4a03ff04a82fb2d665fe9f6 linux-5.10.182.tar.xz -sha256 9607881878fbd21e0dec4e8192b0f6352d17fd74c3ec23ffe6b0a24093efb1a4 linux-5.4.245.tar.xz +sha256 f617c9d1bb5326cc93495938f43eb8cb9aea9d2f451e5a99bce2893f296e179a linux-5.15.116.tar.xz +sha256 409497c635caf49614de21950ec091eb621a5d5fe1f63fc418ef68ac38b56119 linux-5.10.183.tar.xz +sha256 0938790a858fd0af6aa6b27a3bdf4c5d4a46aba60e6178156980d58bef7ed9ea linux-5.4.246.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 7fb9ee20c7e52f9be6d9f501e8498a22f4b364abfde136143749a77e597fd03e linux-4.19.284.tar.xz -sha256 ac8318f1c1d387e23ccfa760ec042943372df23e3c4e2408177fb5a3f6488f76 linux-4.14.316.tar.xz +sha256 aaa1775359c7a066ec70852ea2709fe7e7109517b7d895f34e237132db8edc16 linux-4.19.285.tar.xz +sha256 8cf28f5aae6f77fa718861c415d646a189a7f9493ef0ccb461575a092af03c30 linux-4.14.317.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 6289e8400f3..a9b48c22a82 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.316" if BR2_KERNEL_HEADERS_4_14 - default "4.19.284" if BR2_KERNEL_HEADERS_4_19 - default "5.4.245" if BR2_KERNEL_HEADERS_5_4 - default "5.10.182" if BR2_KERNEL_HEADERS_5_10 - default "5.15.115" if BR2_KERNEL_HEADERS_5_15 - default "6.1.32" if BR2_KERNEL_HEADERS_6_1 + default "4.14.317" if BR2_KERNEL_HEADERS_4_14 + default "4.19.285" if BR2_KERNEL_HEADERS_4_19 + default "5.4.246" if BR2_KERNEL_HEADERS_5_4 + default "5.10.183" if BR2_KERNEL_HEADERS_5_10 + default "5.15.116" if BR2_KERNEL_HEADERS_5_15 + default "6.1.33" if BR2_KERNEL_HEADERS_6_1 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 a7bab4b191424fa880daf19a4b37e44ee68bcb73 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 10:54:43 +0200 Subject: [PATCH 0248/1167] package/libcap: security bump version to 2.69 Fixes - CVE-2023-2602 https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=bc6b36682f188020ee4770fae1d41bde5b2c97bb - CVE-2023-2603 https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=422bec25ae4a1ab03fd4d6f728695ed279173b18 Updated license hash due to an upstream commit which added a SPDX header: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/commit/?id=70998415a87587f31063a26a1e52c6f7806b7834 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 3fc82816b4a898e51a45e46d77b0bc1fec397a22) Signed-off-by: Peter Korsgaard --- package/libcap/libcap.hash | 4 ++-- package/libcap/libcap.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash index 5fc81739057..0f1501d31bc 100644 --- a/package/libcap/libcap.hash +++ b/package/libcap/libcap.hash @@ -1,5 +1,5 @@ # https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 73e350020cc31fe15360879d19384ffa3395a825f065fcf6bda3a5cdf965bebd libcap-2.65.tar.xz +sha256 f311f8f3dad84699d0566d1d6f7ec943a9298b28f714cae3c931dfd57492d7eb libcap-2.69.tar.xz # Hash for license file: -sha256 f58c80bcce8c929db39a23c32e924876e3311f3ffa54f66076c38056d38fa59b License +sha256 68467e731f4744bd6e0bb69e8df9c3a994e09cd6b203d0c41327ac6d079c581d License diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk index 728a6ba6ccf..c9727c75c96 100644 --- a/package/libcap/libcap.mk +++ b/package/libcap/libcap.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCAP_VERSION = 2.65 +LIBCAP_VERSION = 2.69 LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz LIBCAP_LICENSE = GPL-2.0 or BSD-3-Clause From 05eed171de96d199210d6d18632a25d9c0755470 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Sat, 10 Jun 2023 14:25:15 +0200 Subject: [PATCH 0249/1167] package/libgtk3: bump to version 3.24.38 Signed-off-by: Francois Perrad Signed-off-by: Peter Korsgaard (cherry picked from commit 043d0e6f6ca0e99ab36bf845a56a416850d70fb1) 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 22c37bf6056..4d6c210c62d 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.37.sha256sum -sha256 6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57 gtk+-3.24.37.tar.xz +# From https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.38.sha256sum +sha256 ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7 gtk+-3.24.38.tar.xz # Hash for license file: sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c COPYING diff --git a/package/libgtk3/libgtk3.mk b/package/libgtk3/libgtk3.mk index ef31d71b6f4..e53d2aa0400 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).37 +LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).38 LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz LIBGTK3_SITE = https://download.gnome.org/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) LIBGTK3_LICENSE = LGPL-2.0+ From 08f414e1ed116f9a5cba024c1c2c6f0346bb61ad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 10 Jun 2023 17:38:19 +0200 Subject: [PATCH 0250/1167] package/ghostscript: security bump version to 10.01.1 Switch tarball to .xz Fixes CVE-2023-28879: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-28879 Release notes: https://ghostscript.readthedocs.io/en/latest/News.html?utm_source=ghostscript&utm_medium=website&utm_content=inline-link Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 1116fd46a477c58472e98b797dc67c96020883e1) Signed-off-by: Peter Korsgaard --- package/ghostscript/ghostscript.hash | 4 ++-- package/ghostscript/ghostscript.mk | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index ca26a38a02f..30c45a5a74a 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9561/SHA512SUMS -sha512 f498384af80654c040635564b8bc9a64c4bb5b0769bb00aade4042bbe9117c482362dc1a1fac72db3ce9487dd5a5bb8fb81b35b360680fe598df33dfbbe79499 ghostscript-9.56.1.tar.gz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10011/SHA512SUMS +sha512 d944be9e8aef68d1176d64c40db6fa86d55d0c9e30047f2147c02806ab61cfe9ac2cb00d4e5b218ff3c51cc6ed47ceffe1bac4dd9d4cc1760b7974f30c6c2735 ghostscript-10.01.1.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 5bf8b08966c..03fc9ef0162 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,8 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 9.56.1 +GHOSTSCRIPT_VERSION = 10.01.1 +GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 GHOSTSCRIPT_LICENSE_FILES = LICENSE From bbb1a6e7152491a6a2cb75da7fc6dd8954a05a26 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 8 Jun 2023 18:53:05 +0200 Subject: [PATCH 0251/1167] package/python3: security bump version to 3.11.4 Rebased two patches. Changelog: https://docs.python.org/release/3.11.4/whatsnew/changelog.html#python-3-11-4 Fixes the following security problems: - gh-99889: Fixed a security in flaw in uu.decode() that could allow for directory traversal based on the input if no out_file was specified. - gh-104049: Do not expose the local on-disk location in directory indexes produced by http.client.SimpleHTTPRequestHandler. - gh-102153: urllib.parse.urlsplit() now strips leading C0 control and space characters following the specification for URLs defined by WHATWG in response to CVE-2023-24329. Patch by Illia Volochii. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit b7b11d7e94e316632fcc8ec49831e7b372cc055a) Signed-off-by: Peter Korsgaard --- .../0012-Add-an-option-to-disable-lib2to3.patch | 8 +++++--- ...4-Add-an-option-to-disable-the-tk-module.patch | 15 +++++++++------ package/python3/python3.hash | 2 +- package/python3/python3.mk | 2 +- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/package/python3/0012-Add-an-option-to-disable-lib2to3.patch b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch index 0085d5a63f3..228b86a90ba 100644 --- a/package/python3/0012-Add-an-option-to-disable-lib2to3.patch +++ b/package/python3/0012-Add-an-option-to-disable-lib2to3.patch @@ -12,6 +12,8 @@ Signed-off-by: Samuel Martin Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Bernd Kuhls: ported to Python 3.11.4] +Signed-off-by: Bernd Kuhls --- Makefile.pre.in | 17 ++++++++++++----- configure.ac | 6 ++++++ @@ -48,9 +50,9 @@ index 403380e181..f5d0573067 100644 - lib2to3/tests/data \ - lib2to3/tests/data/fixers \ - lib2to3/tests/data/fixers/myfixes \ - test test/audiodata \ - test/capath test/cjkencodings \ - test/data test/decimaltestdata \ + test \ + test/audiodata \ + test/capath \ @@ -2013,6 +2010,14 @@ ifeq (@PYDOC@,yes) LIBSUBDIRS += pydoc_data endif diff --git a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch index 04f7e34435a..b89e1d27bce 100644 --- a/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch +++ b/package/python3/0014-Add-an-option-to-disable-the-tk-module.patch @@ -9,6 +9,8 @@ Signed-off-by: Samuel Martin Signed-off-by: Andrey Smirnov [ Adam Duskett: ported to Python 3.10.0 ] Signed-off-by: Adam Duskett +[ Bernd Kuhls: ported to Python 3.11.4] +Signed-off-by: Bernd Kuhls --- Makefile.pre.in | 10 +++++++--- configure.ac | 9 +++++++++ @@ -26,14 +28,15 @@ index 9f4cdf14cf..4f83911200 100644 tomllib \ turtledemo \ unittest \ -@@ -2001,8 +2000,6 @@ TESTSUBDIRS= ctypes/test \ - test/tracedmodules \ - test/xmltestdata test/xmltestdata/c14n-20 \ +@@ -2038,9 +2038,6 @@ + test/xmltestdata \ + test/xmltestdata/c14n-20 \ test/ziptestdata \ -- tkinter/test tkinter/test/test_tkinter \ +- tkinter/test \ +- tkinter/test/test_tkinter \ - tkinter/test/test_ttk \ - unittest/test unittest/test/testmock - + unittest/test \ + unittest/test/testmock ifeq (@PYDOC@,yes) @@ -2021,6 +2018,13 @@ ifeq (@SQLITE3@,yes) LIBSUBDIRS += sqlite3 diff --git a/package/python3/python3.hash b/package/python3/python3.hash index b04ee7fa2cc..6c43e01a448 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e Python-3.11.3.tar.xz +sha256 2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6 Python-3.11.4.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index ece5cad93e2..bdb7cfd22f1 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -5,7 +5,7 @@ ################################################################################ PYTHON3_VERSION_MAJOR = 3.11 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).3 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).4 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From 678af7a6a81f361e38838896af46376e3f859ece Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 17 Jun 2023 23:42:55 +0200 Subject: [PATCH 0252/1167] package/jhead: security bump to version 3.08 Fixes the following security issue: - CVE-2022-41751: Jhead 3.06.0.1 allows attackers to execute arbitrary OS commands by placing them in a JPEG filename and then using the regeneration -rgt50 option. Update readme.txt hash after a minor tweak of the text: https://github.com/Matthias-Wandel/jhead/commit/a0eed69daa6ad4b824eb81fb6e3be95de3f783c2 Signed-off-by: Peter Korsgaard (cherry picked from commit 39ffadd6ae8c472e083c431a957ec575c1cebce2) Signed-off-by: Peter Korsgaard --- package/jhead/jhead.hash | 4 ++-- package/jhead/jhead.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/jhead/jhead.hash b/package/jhead/jhead.hash index bd9c8560d5f..1fe856198dc 100644 --- a/package/jhead/jhead.hash +++ b/package/jhead/jhead.hash @@ -1,3 +1,3 @@ # Locally calculated from download (no sig, hash) -sha256 5c5258c3d7a840bf831e22174e4a24cb1de3baf442f7cb73d5ab31b4ae0b0058 jhead-3.06.0.1.tar.gz -sha256 8b709512c737fc0c1e1024800b9a44c54d14ab02132c636a66c3ac66955c3e95 readme.txt +sha256 999a81b489c7b2a7264118f194359ecf4c1b714996a2790ff6d5d2f3940f1e9f jhead-3.08.tar.gz +sha256 b3971a74d00c834bc7f112d8a0027b25663fd1637a21381a3e5df4bd2b614dff readme.txt diff --git a/package/jhead/jhead.mk b/package/jhead/jhead.mk index a206e2fe342..f07739bc213 100644 --- a/package/jhead/jhead.mk +++ b/package/jhead/jhead.mk @@ -4,7 +4,7 @@ # ################################################################################ -JHEAD_VERSION = 3.06.0.1 +JHEAD_VERSION = 3.08 JHEAD_SITE = $(call github,Matthias-Wandel,jhead,$(JHEAD_VERSION)) JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt From b89e4aacfcae1c45891d643e7661010eb4c2c6f5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 15 Jun 2023 18:31:12 +0200 Subject: [PATCH 0253/1167] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 88108f9793f5824fa058b878974f234ebe834325) [Peter: drop 6.3.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 2c81f9ba8f7..1af36ee2f47 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.33" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.34" 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 f09d9809232..c052a37d895 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 b87d6ba8ea7328e8007a7ea9171d1aa0d540d95eacfcab09578e0a3b623dd2cd linux-6.1.33.tar.xz +sha256 84c638ee9a36e30ef879e2944c5adfc2523a5a1553951b40e8cf4d873426d90a patch-6.1.33.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 f617c9d1bb5326cc93495938f43eb8cb9aea9d2f451e5a99bce2893f296e179a linux-5.15.116.tar.xz -sha256 409497c635caf49614de21950ec091eb621a5d5fe1f63fc418ef68ac38b56119 linux-5.10.183.tar.xz -sha256 0938790a858fd0af6aa6b27a3bdf4c5d4a46aba60e6178156980d58bef7ed9ea linux-5.4.246.tar.xz +sha256 c8c39191dc89ccb8f0fd05e4b06c9bcc77672156bdc64fe445d2109c116a3432 patch-5.15.117.xz +sha256 1bde9f3d8bace93e634ca0841fca14fcbd7b6d53cf877ee3e7f18778bf842455 patch-5.10.184.xz +sha256 5e627d9086f539e65c91f6e5c59c8bb66b59f9d369173dc0ccb14f70795d1876 patch-5.4.247.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 aaa1775359c7a066ec70852ea2709fe7e7109517b7d895f34e237132db8edc16 linux-4.19.285.tar.xz -sha256 8cf28f5aae6f77fa718861c415d646a189a7f9493ef0ccb461575a092af03c30 linux-4.14.317.tar.xz +sha256 663669feee6ad4814704bf6dcc89ebbf64e1862f4dc231bc6327e33acea99823 patch-4.19.286.xz +sha256 faa5db19c03aaa96417c2c3e76fbc10886d25b9f26179ff653e3c29f6707840f patch-4.14.318.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 a9b48c22a82..a23e97f5fa8 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.317" if BR2_KERNEL_HEADERS_4_14 - default "4.19.285" if BR2_KERNEL_HEADERS_4_19 - default "5.4.246" if BR2_KERNEL_HEADERS_5_4 - default "5.10.183" if BR2_KERNEL_HEADERS_5_10 - default "5.15.116" if BR2_KERNEL_HEADERS_5_15 - default "6.1.33" if BR2_KERNEL_HEADERS_6_1 + default "4.14.318" if BR2_KERNEL_HEADERS_4_14 + default "4.19.286" if BR2_KERNEL_HEADERS_4_19 + default "5.4.247" if BR2_KERNEL_HEADERS_5_4 + default "5.10.184" if BR2_KERNEL_HEADERS_5_10 + default "5.15.117" if BR2_KERNEL_HEADERS_5_15 + default "6.1.34" if BR2_KERNEL_HEADERS_6_1 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 6dcfb24bed0502e8ecdf7e0a06fdbbe37985fb94 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Jun 2023 15:34:10 +0200 Subject: [PATCH 0254/1167] linux: fix kernel hashes Fixes commit which added hashes for wrong files: https://git.busybox.net/buildroot/commit/?id=88108f9793f5824fa058b878974f234ebe834325 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit d4a96ee46e3656b95151ab8e27d3fd3407e4633a) Signed-off-by: Peter Korsgaard --- linux/linux.hash | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/linux.hash b/linux/linux.hash index c052a37d895..0abaef4856b 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 84c638ee9a36e30ef879e2944c5adfc2523a5a1553951b40e8cf4d873426d90a patch-6.1.33.xz +sha256 b26f7cbcbf8031efc49f11f236f372fc34a4fd5fc6ad3151b893d1aa038ed603 linux-6.1.34.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 c8c39191dc89ccb8f0fd05e4b06c9bcc77672156bdc64fe445d2109c116a3432 patch-5.15.117.xz -sha256 1bde9f3d8bace93e634ca0841fca14fcbd7b6d53cf877ee3e7f18778bf842455 patch-5.10.184.xz -sha256 5e627d9086f539e65c91f6e5c59c8bb66b59f9d369173dc0ccb14f70795d1876 patch-5.4.247.xz +sha256 a9a8331f3c0e004b40a41f30d688b53bf85405597ac41c2c89be7f4fbcf7239f linux-5.15.117.tar.xz +sha256 77a9bebc1d1fa057212a3ac62c2a0784aafcdef149032df8898ebc9ed3c62908 linux-5.10.184.tar.xz +sha256 33010d4f02314dd4eb51ab5d09f49ce970f2cfefe9f2133a2e085cac5dfffed7 linux-5.4.247.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 663669feee6ad4814704bf6dcc89ebbf64e1862f4dc231bc6327e33acea99823 patch-4.19.286.xz -sha256 faa5db19c03aaa96417c2c3e76fbc10886d25b9f26179ff653e3c29f6707840f patch-4.14.318.xz +sha256 47841504f334b24fe411270954423202ed84e21251edf5a61d40bde59051089d linux-4.19.286.tar.xz +sha256 c63a327e799b8a30ca96167f66100d4d7788338ac0a8cf5fc492c97e303211bc linux-4.14.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 From 4c248eb4d85cbcf46b46e332e91b8586a2876709 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 May 2023 16:23:18 +0200 Subject: [PATCH 0255/1167] package/hwdata: install to staging hwdata provides a .pc file, which other packages can look up to find the location where hwdata files are, and use them at build time. This is the case for the upcoming libdisplay-info package, which requires the hwdata's PNP IDs at build time. However, installing the .pc file is not enough. Indeed, meson (which libdisplay-info uses) will look for the corresponding data files in datadir, which it locates relative to the sysroot, which is our staging. So, we also need to install the hwdata files in staging. Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit f36c57728aa43df2355db731d90712a5a29cc501) Signed-off-by: Peter Korsgaard --- package/hwdata/hwdata.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 00fe6c14552..4bda6c73293 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -8,6 +8,7 @@ HWDATA_VERSION = 0.365 HWDATA_SITE = $(call github,vcrhonek,hwdata,v$(HWDATA_VERSION)) HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE +HWDATA_INSTALL_STAGING = YES HWDATA_FILES = \ $(if $(BR2_PACKAGE_HWDATA_IAB_OUI_TXT),iab.txt oui.txt) \ @@ -15,7 +16,22 @@ HWDATA_FILES = \ $(if $(BR2_PACKAGE_HWDATA_PNP_IDS),pnp.ids) \ $(if $(BR2_PACKAGE_HWDATA_USB_IDS),usb.ids) +define HWDATA_CONFIGURE_CMDS + (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure) +endef + +define HWDATA_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) hwdata.pc +endef + ifneq ($(strip $(HWDATA_FILES)),) +define HWDATA_INSTALL_STAGING_CMDS + $(INSTALL) -D -m 0644 $(@D)/hwdata.pc \ + $(STAGING_DIR)/usr/lib/pkgconfig/hwdata.pc + $(INSTALL) -d -m 755 $(STAGING_DIR)/usr/share/hwdata + $(INSTALL) -m 644 -t $(STAGING_DIR)/usr/share/hwdata \ + $(addprefix $(@D)/,$(HWDATA_FILES)) +endef define HWDATA_INSTALL_TARGET_CMDS $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/hwdata $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/share/hwdata \ From 115f51407e48d981a2d4ff7a51cc2d7d413e7739 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 19 Jun 2023 19:20:46 +0200 Subject: [PATCH 0256/1167] package/check: switch to cmake The autoconf-build system fails to properly detect vsnprintf checking for vsnprintf... yes checking whether vsnprintf is C99 compliant... no which leads to a build error snprintf.c:495:1: error: inlining failed in call to 'always_inline' 'rpl_vsnprintf.localalias': function not inlinable Building with cmake fixes the problem: -- Looking for vsnprintf -- Looking for vsnprintf - found The cmake build system has an option to disable checkmk, so we don't need to remove it from target anymore. Fixes: http://autobuild.buildroot.net/results/e55/e5562513226de902dae642526165b1555a540144/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 6dfc789f4f21367bc5f4b5454db0922821a765bc) Signed-off-by: Peter Korsgaard --- package/check/check.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/package/check/check.mk b/package/check/check.mk index ccffd08ee39..d3977154df2 100644 --- a/package/check/check.mk +++ b/package/check/check.mk @@ -10,12 +10,6 @@ CHECK_INSTALL_STAGING = YES CHECK_DEPENDENCIES = host-pkgconf CHECK_LICENSE = LGPL-2.1+ CHECK_LICENSE_FILES = COPYING.LESSER -CHECK_CONF_OPTS = --disable-build-docs +CHECK_CONF_OPTS = -DBUILD_TESTING=OFF -DINSTALL_CHECKMK=OFF -# Having checkmk in the target makes no sense -define CHECK_REMOVE_CHECKMK - rm -f $(TARGET_DIR)/usr/bin/checkmk -endef -CHECK_POST_INSTALL_TARGET_HOOKS += CHECK_REMOVE_CHECKMK - -$(eval $(autotools-package)) +$(eval $(cmake-package)) From 989da60ac49366c715fa1319aded0e1dea59236c Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Jun 2023 16:47:27 +0200 Subject: [PATCH 0257/1167] package/python-django: security bump to version 4.1.9 Fixes the following security issues: - CVE-2023-31047: Potential bypass of validation when uploading multiple files using one form field https://www.djangoproject.com/weblog/2023/may/03/security-releases/ In addition, 4.1.8 fixed a bug related to secrets rotation: https://docs.djangoproject.com/en/4.2/releases/4.1.8/ Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit fa1d011a05c526c06b27edd388378e255b2f055c) 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 cb03b33bfe8..922f468a67a 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 626f96c63ddfab24bab90d80c87a7aad Django-4.1.7.tar.gz -sha256 44f714b81c5f190d9d2ddad01a532fe502fa01c4cb8faf1d081f4264ed15dcd8 Django-4.1.7.tar.gz +md5 1a6f4e5318e3272deaa9cfd61e252fab Django-4.1.9.tar.gz +sha256 e9f074a84930662104871bfcea55c3c180c50a0a47739db82435deae6cbaf032 Django-4.1.9.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 e8c91cf51f4..fa58f657978 100644 --- a/package/python-django/python-django.mk +++ b/package/python-django/python-django.mk @@ -4,10 +4,10 @@ # ################################################################################ -PYTHON_DJANGO_VERSION = 4.1.7 +PYTHON_DJANGO_VERSION = 4.1.9 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/9f/a7/07939866241b7e8f8d3bf164b7d6ad428163723e29dd472700f8ab0e5fd5 +PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/11/ea/8b514434c57c3bef89a475b75f74d768471d8e1bc61f4e5c79daeae9b5ef PYTHON_DJANGO_LICENSE = BSD-3-Clause PYTHON_DJANGO_LICENSE_FILES = LICENSE From 4a5deaea87b92b5fb54164a7964da120e85a99d0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Jun 2023 16:36:17 +0200 Subject: [PATCH 0258/1167] package/c-ares: security bump to version 1.19.1 Fixes the following security issues: - CVE-2023-32067: High. 0-byte UDP payload causes Denial of Service - CVE-2023-31147 Moderate. Insufficient randomness in generation of DNS query IDs - CVE-2023-31130. Moderate. Buffer Underwrite in ares_inet_net_pton() - CVE-2023-31124. Low. AutoTools does not set CARES_RANDOM_FILE during cross compilation Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 0afcfe5a48bd0cb33b1431bb92a5b43ba1109270) Signed-off-by: Peter Korsgaard --- package/c-ares/c-ares.hash | 2 +- package/c-ares/c-ares.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/c-ares/c-ares.hash b/package/c-ares/c-ares.hash index edf891674ba..3e1573f2cfe 100644 --- a/package/c-ares/c-ares.hash +++ b/package/c-ares/c-ares.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 bfceba37e23fd531293829002cac0401ef49a6dc55923f7f92236585b7ad1dd3 c-ares-1.19.0.tar.gz +sha256 321700399b72ed0e037d0074c629e7741f6b2ec2dda92956abe3e9671d3e268e c-ares-1.19.1.tar.gz # Hash for license file sha256 db4eb63fe09daebdf57d3f79b091bb5ee5070c0d761040e83264e648d307af4c LICENSE.md diff --git a/package/c-ares/c-ares.mk b/package/c-ares/c-ares.mk index 4332fc6919d..46b8acd6736 100644 --- a/package/c-ares/c-ares.mk +++ b/package/c-ares/c-ares.mk @@ -4,7 +4,7 @@ # ################################################################################ -C_ARES_VERSION = 1.19.0 +C_ARES_VERSION = 1.19.1 C_ARES_SITE = http://c-ares.haxx.se/download C_ARES_INSTALL_STAGING = YES C_ARES_CONF_OPTS = --with-random=/dev/urandom From 74fa4b795fed372c16bd31ffd281432b2e89a473 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 19 Jun 2023 16:32:20 +0200 Subject: [PATCH 0259/1167] package/nodejs: security bump to version 16.20.0 Fixes the following security issues: - CVE-2023-23918: Node.js Permissions policies can be bypassed via process.mainModule (High) - CVE-2023-23919: Node.js OpenSSL error handling issues in nodejs crypto library (Medium) - CVE-2023-23920: Node.js insecure loading of ICU data through ICU\_DATA environment variable (Low) - CVE-2023-23936: Fetch API in Node.js did not protect against CRLF injection in host headers (Medium) https://github.com/nodejs/undici/security/advisories/GHSA-5r9g-qh6m-jxff - CVE-2023-24807: Regular Expression Denial of Service in Headers in Node.js fetch API (Low) https://github.com/nodejs/undici/security/advisories/GHSA-r6ch-mqf9-qc9w For more details, see the advisory: https://nodejs.org/en/blog/vulnerability/february-2023-security-releases Update LICENSE hash after an update of the openssl license snippet: https://github.com/nodejs/node/commit/e7ed56f501389978e4619ab697a812631c4061ff Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit a240f9da855fc4a01ae1a1a755722f8fc3773705) Signed-off-by: Peter Korsgaard --- package/nodejs/nodejs.hash | 6 +++--- package/nodejs/nodejs.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 4408782248e..6ab4c53e79d 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v16.18.1/SHASUMS256.txt -sha256 1f8051a88f86f42064f4415fe7a980e59b0a502ecc8def583f6303bc4d445238 node-v16.18.1.tar.xz +# From https://nodejs.org/dist/v16.20.0/SHASUMS256.txt +sha256 e0990f992234e40a51fe11f92c3816c93a77e1b081145d3dd762cd1026345349 node-v16.20.0.tar.xz # Hash for license file -sha256 0bec08634ba79b5404f6b7f92ea850f3c2a06e27e6f83f2267e4f5e55ae33334 LICENSE +sha256 ba325815d3df8819bebaf37cad67d6e1f82271e1e4a1189b53abd28e261977d6 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 367d5d20587..225b3717862 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,7 +4,7 @@ # ################################################################################ -NODEJS_VERSION = 16.18.1 +NODEJS_VERSION = 16.20.0 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = \ From 18fb407dc4fca2fc89e824fe0a5fcbb17407e5db Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 5 Jun 2023 01:33:24 -0600 Subject: [PATCH 0260/1167] package/python-requests: security bump to version 2.31.0 Fixes the following security issue: - CVE-2023-32681: Unintended leak of Proxy-Authorization header https://github.com/psf/requests/security/advisories/GHSA-j8r2-6x86-q33q Signed-off-by: James Hilliard Signed-off-by: Arnout Vandecappelle (cherry picked from commit c94922beac62e66a993e0a6bc14567af4827d8d1) [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- package/python-requests/python-requests.hash | 4 ++-- package/python-requests/python-requests.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-requests/python-requests.hash b/package/python-requests/python-requests.hash index b6f696000b5..c4aeabb25da 100644 --- a/package/python-requests/python-requests.hash +++ b/package/python-requests/python-requests.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/requests/json -md5 09b752e0b0a672d805ae54455c128d42 requests-2.28.2.tar.gz -sha256 98b1b2782e3c6c4904938b84c0eb932721069dfdb9134313beff7c83c2df24bf requests-2.28.2.tar.gz +md5 941e175c276cd7d39d098092c56679a4 requests-2.31.0.tar.gz +sha256 942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 requests-2.31.0.tar.gz # Locally computed sha256 checksums sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b LICENSE diff --git a/package/python-requests/python-requests.mk b/package/python-requests/python-requests.mk index 8f9f4b2db4b..2c74db37113 100644 --- a/package/python-requests/python-requests.mk +++ b/package/python-requests/python-requests.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_REQUESTS_VERSION = 2.28.2 +PYTHON_REQUESTS_VERSION = 2.31.0 PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/9d/ee/391076f5937f0a8cdf5e53b701ffc91753e87b07d66bae4a09aa671897bf +PYTHON_REQUESTS_SITE = https://files.pythonhosted.org/packages/9d/be/10918a2eac4ae9f02f6cfe6414b7a155ccd8f7f9d4380d62fd5b955065c3 PYTHON_REQUESTS_SETUP_TYPE = setuptools PYTHON_REQUESTS_LICENSE = Apache-2.0 PYTHON_REQUESTS_LICENSE_FILES = LICENSE From dd653e4e6af1de9c47e711637e2f22ef01daf928 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 11:06:08 +0200 Subject: [PATCH 0261/1167] =?UTF-8?q?DEVELOPERS:=20remove=20Jos=C3=A9=20Pe?= =?UTF-8?q?kkarinen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit E-mails are bouncing: : host ASPMX.L.GOOGLE.com[74.125.133.26] said: 550-5.1.1 The email account that you tried to reach does not exist. Please try 550-5.1.1 double-checking the recipient's email address for typos or 550-5.1.1 unnecessary spaces. Learn more at 550 5.1.1 Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 5206492d6a749191fc9395479438a35007417cc2) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 55e3494f4c8..338a4013ead 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1613,19 +1613,6 @@ N: José Luis Salvador Rufo F: package/zfs/ F: support/testing/tests/package/test_zfs.py -N: José Pekkarinen -F: package/alfred/ -F: package/avocado/ -F: package/bmx7/ -F: package/opensc/ -F: package/python-aexpect/ -F: package/python-alembic/ -F: package/python-lark/ -F: package/softhsm2/ -F: support/testing/tests/package/sample_python_aexpect.py -F: support/testing/tests/package/test_avocado.py -F: support/testing/tests/package/test_python_aexpect.py - N: Joseph Kogut F: package/at-spi2-atk/ F: package/at-spi2-core/ From 94a381ed47fd536a3b383bd8433d16766c2b3195 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 10:13:08 +0200 Subject: [PATCH 0262/1167] package/fftw: bump version to 3.3.10 Release notes: http://fftw.org/release-notes.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit d521d6b756864b926f5eb98c111a8989347ee0e6) Signed-off-by: Peter Korsgaard --- package/fftw/fftw.hash | 6 +++--- package/fftw/fftw.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/fftw/fftw.hash b/package/fftw/fftw.hash index b07aad8f184..9e7364d76c7 100644 --- a/package/fftw/fftw.hash +++ b/package/fftw/fftw.hash @@ -1,5 +1,5 @@ -# From http://www.fftw.org/fftw-3.3.8.tar.gz.md5sum -md5 8aac833c943d8e90d51b697b27d4384d fftw-3.3.8.tar.gz +# From http://fftw.org/fftw-3.3.10.tar.gz.md5sum +md5 8ccbf6a5ea78a16dbc3e1306e234cc5c fftw-3.3.10.tar.gz # Locally computed -sha256 6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303 fftw-3.3.7.tar.gz +sha256 56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467 fftw-3.3.10.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/fftw/fftw.mk b/package/fftw/fftw.mk index 279244a5dce..1bb537aeb80 100644 --- a/package/fftw/fftw.mk +++ b/package/fftw/fftw.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFTW_VERSION = 3.3.8 +FFTW_VERSION = 3.3.10 FFTW_SITE = http://www.fftw.org FFTW_INSTALL_STAGING = YES FFTW_LICENSE = GPL-2.0+ From df7c755a55d532e565500a5b1cd855d35c2c1fbc Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 16:18:46 +0200 Subject: [PATCH 0263/1167] package/heimdal: Use perl module JSON:PP, part of core, instead of JSON package Fixes: http://autobuild.buildroot.net/results/48b/48b52d205150e30e522b40d1c7b51f339ae8b0db/ This patch ports the existing patch for the samba4 package: https://git.busybox.net/buildroot/tree/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch Signed-off-by: Bernd Kuhls Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 770f097ee6f22e48ee4ceba517bd8bb75bc419fa) Signed-off-by: Peter Korsgaard --- ...JSON-PP-part-of-core-instead-of-JSON.patch | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch diff --git a/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch new file mode 100644 index 00000000000..7323ac70df0 --- /dev/null +++ b/package/heimdal/0001-Use-perl-module-JSON-PP-part-of-core-instead-of-JSON.patch @@ -0,0 +1,57 @@ +From f6fdb0a28e3bfcb3fd0aa1c81ad59c5411c0d660 Mon Sep 17 00:00:00 2001 +From: Andrew Sim +Date: Sat, 10 Jun 2023 09:00:24 +0200 +Subject: [PATCH] Use perl module JSON:PP, part of core, instead of JSON + package + +This patch removes the need for an external package. + +Ported from +https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch +https://github.com/openwrt/packages/commit/402f4ba4eff65b80a9deaa6085256112bec4d67b#diff-208d4e0345c9d29fbec23d6f655ba794afd3052f5cb8dd73944db72ce81b847b + +Upstream: https://github.com/heimdal/heimdal/pull/1176 + +Signed-off-by: Bernd Kuhls +--- + cf/make-proto.pl | 4 ++-- + configure.ac | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/cf/make-proto.pl b/cf/make-proto.pl +index 36a040ce6..4af21916b 100644 +--- a/cf/make-proto.pl ++++ b/cf/make-proto.pl +@@ -4,7 +4,7 @@ + use Getopt::Std; + use File::Compare; + +-use JSON; ++use JSON::PP + + my $comment = 0; + my $doxygen = 0; +@@ -70,7 +70,7 @@ if($opt_x) { + my $EXP; + local $/; + open(EXP, '<', $opt_x) || die "open ${opt_x}"; +- my $obj = JSON->new->utf8->decode(); ++ my $obj = JSON::PP->new->utf8->decode(); + close $EXP; + + foreach my $x (keys %$obj) { +diff --git a/configure.ac b/configure.ac +index cedb4c01f..cecd030e6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,6 @@ if ! test -f "$srcdir/lib/asn1/der-protos.h" || + AC_KRB_PROG_PERL + AC_KRB_PERL_MOD(Getopt::Std) + AC_KRB_PERL_MOD(File::Compare) +- AC_KRB_PERL_MOD(JSON) + fi + + AC_KRB_PROG_YACC +-- +2.39.2 + From d24a21ff539b4c4bcec6bfe8bc169ab25fd02998 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Fri, 23 Jun 2023 01:11:36 -0600 Subject: [PATCH 0264/1167] package/python-cryptography: bump to version 39.0.2 Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN (cherry picked from commit adabd0b8b03c36c660784b685a49ac7d41c9b472) Signed-off-by: Peter Korsgaard --- package/python-cryptography/python-cryptography.hash | 2 +- package/python-cryptography/python-cryptography.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-cryptography/python-cryptography.hash b/package/python-cryptography/python-cryptography.hash index a23944a06f6..e0830147500 100644 --- a/package/python-cryptography/python-cryptography.hash +++ b/package/python-cryptography/python-cryptography.hash @@ -1,5 +1,5 @@ # Locally calculated after vendoring -sha256 531348679f144d118156be5b17ddac750974cdcd9f44bb0a7cfd7ddcfee79c80 cryptography-39.0.1.tar.gz +sha256 405c9a6271e1a088ea0b432bc2094e2e8baadb2241e192ce9c73a7cc9793b127 cryptography-39.0.2.tar.gz # Locally computed sha256 checksums sha256 43dad2cc752ab721cd9a9f36ece70fb53ab7713551f2d3d8694d8e8c5a06d6e2 LICENSE sha256 aac73b3148f6d1d7111dbca32099f68d26c644c6813ae1e4f05f6579aa2663fe LICENSE.APACHE diff --git a/package/python-cryptography/python-cryptography.mk b/package/python-cryptography/python-cryptography.mk index a130b2d10d9..67aa20742dd 100644 --- a/package/python-cryptography/python-cryptography.mk +++ b/package/python-cryptography/python-cryptography.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CRYPTOGRAPHY_VERSION = 39.0.1 +PYTHON_CRYPTOGRAPHY_VERSION = 39.0.2 PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/6a/f5/a729774d087e50fffd1438b3877a91e9281294f985bda0fd15bf99016c78 +PYTHON_CRYPTOGRAPHY_SITE = https://files.pythonhosted.org/packages/fa/f3/f4b8c175ea9a1de650b0085858059050b7953a93d66c97ed89b93b232996 PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3-Clause PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD From aa50601298b349b4c6d2aed9e7734a835cf1d564 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 22 Jun 2023 19:24:45 +0200 Subject: [PATCH 0265/1167] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 11ca48bc4bb6f1be7fb22bb87507a99bd1e446f4) [Peter: drop 6.3.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 1af36ee2f47..0e92e6446a0 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.34" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.35" 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 0abaef4856b..f18592d0a09 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 b26f7cbcbf8031efc49f11f236f372fc34a4fd5fc6ad3151b893d1aa038ed603 linux-6.1.34.tar.xz +sha256 be368143bc5d0dc73dd3e8c6191630c1620520379baf6f47c16116b2c0bc26ac linux-6.1.35.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 a9a8331f3c0e004b40a41f30d688b53bf85405597ac41c2c89be7f4fbcf7239f linux-5.15.117.tar.xz -sha256 77a9bebc1d1fa057212a3ac62c2a0784aafcdef149032df8898ebc9ed3c62908 linux-5.10.184.tar.xz -sha256 33010d4f02314dd4eb51ab5d09f49ce970f2cfefe9f2133a2e085cac5dfffed7 linux-5.4.247.tar.xz +sha256 4e6bf4dadb04d5d11d1d4cc37c0eabcf33bc333b7dd3dc2143c3099a823eb5b3 linux-5.15.118.tar.xz +sha256 280662ec8dc8738cf947ad66e748141abd58cbe3b5ed66b7f2b153222b7c7090 linux-5.10.185.tar.xz +sha256 3abed132e76c6575733acba39eaa54f6d8f4b1dc951b0e601a33959743b13e35 linux-5.4.248.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 47841504f334b24fe411270954423202ed84e21251edf5a61d40bde59051089d linux-4.19.286.tar.xz -sha256 c63a327e799b8a30ca96167f66100d4d7788338ac0a8cf5fc492c97e303211bc linux-4.14.318.tar.xz +sha256 286a9b8c75bff7bdf66985e12a3a650b2bd638a776a5a6e93415930855662a73 linux-4.19.287.tar.xz +sha256 aca4750f02f4090b753c1445db44dfa90de535eca73a7b0a7aa4453f65ba1ff9 linux-4.14.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 a23e97f5fa8..e05a9e12b77 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.318" if BR2_KERNEL_HEADERS_4_14 - default "4.19.286" if BR2_KERNEL_HEADERS_4_19 - default "5.4.247" if BR2_KERNEL_HEADERS_5_4 - default "5.10.184" if BR2_KERNEL_HEADERS_5_10 - default "5.15.117" if BR2_KERNEL_HEADERS_5_15 - default "6.1.34" if BR2_KERNEL_HEADERS_6_1 + default "4.14.319" if BR2_KERNEL_HEADERS_4_14 + default "4.19.287" if BR2_KERNEL_HEADERS_4_19 + default "5.4.248" if BR2_KERNEL_HEADERS_5_4 + default "5.10.185" if BR2_KERNEL_HEADERS_5_10 + default "5.15.118" if BR2_KERNEL_HEADERS_5_15 + default "6.1.35" if BR2_KERNEL_HEADERS_6_1 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 bd0608468c6d92552c1f35b5c566b88e1965e614 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:05 +0200 Subject: [PATCH 0266/1167] package/x11r7/xdriver_xf86-video-dummy: bump version to 0.4.1 Release notes: https://lists.x.org/archives/xorg-announce/2023-May/003394.html Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit db45cc593e66598b4d345dd348b0bfe2b388b557) Signed-off-by: Peter Korsgaard --- .../xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash | 6 +++--- .../xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash index eed28d3fde3..6d7d0b4bc20 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-April/003155.html -sha256 e78ceae5c8c0588c7cb658f2afc3a9fac9ef665b52a75b01f8e9c5449a4e1e5a xf86-video-dummy-0.4.0.tar.xz -sha512 1150a84c4f17215b9c579d8ce9399d547a01970bf7b5396653f14beb13a62deefe3008bf3ad6a2c5c0f46da4cbc0b840c18a7dff339e3b882d108183fa1d30d9 xf86-video-dummy-0.4.0.tar.xz +# From https://lists.x.org/archives/xorg-announce/2023-May/003394.html +sha256 351920a7fd0f759a3ac972a5999b3ffed46f07fb52a99f319bfb5b6a59d3dfaf xf86-video-dummy-0.4.1.tar.xz +sha512 ff7fd8b668e5e9f40a5d27f82599b7a455a8162fc1a247195335c17980f00ce10ae6b2c062239cbaa67d8684c86174f85b398dd7f7065d36f69294bd6f2469de xf86-video-dummy-0.4.1.tar.xz # Locally calculated sha256 e29aa81e74563d14e5633963107c030e74e8352ea7dafee1a9d7e19b7d0e887b COPYING diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk index e863b1e5062..f7f05c7c418 100644 --- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk +++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.4.0 +XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.4.1 XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.xz XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_DUMMY_LICENSE = MIT From d2ebcac1075acc478f5f0b338a8dcff3739181e5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 16:56:17 +0200 Subject: [PATCH 0267/1167] DEVELOPERS: remove Bernd Kuhls from package/x11r7/ Remove packages which are no longer runtime-tested here. Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 2aa3f61b5b3ee115dec3ca6639ff9e8bfa00b306) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 1 - 1 file changed, 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 338a4013ead..7e4d6ef764f 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -471,7 +471,6 @@ F: package/vdr-plugin-vnsiserver/ F: package/vlc/ F: package/vnstat/ F: package/waylandpp/ -F: package/x11r7/ F: package/x264/ F: package/x265/ F: package/xmrig/ From 474354c08df492c94ca9b607f0355d89e4d2466b Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Thu, 22 Jun 2023 07:36:17 +0200 Subject: [PATCH 0268/1167] package/python-dbus-fast: drop python-async-timeout dependency async-timeout dependency was dropped upstream for Python 3.11 (see [1]). [1] https://github.com/Bluetooth-Devices/dbus-fast/commit/1b5c9e1cb94d19925776d91196cf1b657264c494 Signed-off-by: Marcin Niestroj Signed-off-by: Arnout Vandecappelle (cherry picked from commit d39ca323887c7cf4222e00fa42c2c3cd7bb8e95e) Signed-off-by: Peter Korsgaard --- package/python-dbus-fast/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-dbus-fast/Config.in b/package/python-dbus-fast/Config.in index c9562fecfa0..b7168106d7a 100644 --- a/package/python-dbus-fast/Config.in +++ b/package/python-dbus-fast/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_PYTHON_DBUS_FAST bool "python-dbus-fast" select BR2_PACKAGE_HOST_PYTHON_CYTHON select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime - select BR2_PACKAGE_PYTHON_ASYNC_TIMEOUT # runtime help A faster version of dbus-next, a DBus library for Python with asyncio support. From 19fc429a864be5234305bf093d4f3fd234da52d5 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 25 Jun 2023 19:47:06 +0200 Subject: [PATCH 0269/1167] package/dbus: security bump to version 1.2.28 Fixes the following security issues: - CVE-2023-34969: Fix an assertion failure in dbus-daemon when a privileged Monitoring connection (dbus-monitor, busctl monitor, gdbus monitor or similar) is active, and a message from the bus driver cannot be delivered to a client connection due to rules or outgoing message quota. This is a denial of service if triggered maliciously by a local attacker. - Fix an incorrect assertion that could be used to crash dbus-daemon or other users of DBusServer prior to authentication, if libdbus was compiled with assertions enabled. For details, see the NEWS file: https://gitlab.freedesktop.org/dbus/dbus/blob/dbus-1.12/NEWS Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (cherry picked from commit 52ae2a4e1d10da4ea46bc730db69a40d79eb835a) Signed-off-by: Peter Korsgaard --- package/dbus/dbus.hash | 4 ++-- package/dbus/dbus.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dbus/dbus.hash b/package/dbus/dbus.hash index 17c70004bad..0e48d4dafde 100644 --- a/package/dbus/dbus.hash +++ b/package/dbus/dbus.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.24.tar.gz.asc +# https://dbus.freedesktop.org/releases/dbus/dbus-1.12.28.tar.gz.asc # using key 36EC5A6448A4F5EF79BEFE98E05AE1478F814C4F -sha256 bc42d196c1756ac520d61bf3ccd6f42013617def45dd1e591a6091abf51dca38 dbus-1.12.24.tar.gz +sha256 9da1e3f2b73f75eec0a9e4509d64be43909d1f2853fe809528a0a53984d76420 dbus-1.12.28.tar.gz # Locally calculated sha256 0e46f54efb12d04ab5c33713bacd0e140c9a35b57ae29e03c853203266e8f3a1 COPYING diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index b3a79c431d8..99d2c4301c6 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -6,7 +6,7 @@ # When updating dbus, check if there are changes in session.conf and # system.conf, and update the versions in the dbus-broker package accordingly. -DBUS_VERSION = 1.12.24 +DBUS_VERSION = 1.12.28 DBUS_SITE = https://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFL-2.1 or GPL-2.0+ (library, tools), GPL-2.0+ (tools) DBUS_LICENSE_FILES = COPYING From d0126da06ba98565a25393934e96388c100cc7d2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Jun 2023 19:57:05 +0200 Subject: [PATCH 0270/1167] package/quickjs: disable on microblaze quickjs unconditionally uses FE_{DOWN,UP}WARD and so fails to build on microblaze since its addition in commit 5d50793659acb95050c110d5fc05399df20ce30b Fixes: http://autobuild.buildroot.net/results/3b1/3b1b1f91998bfdec65f3e6fb8931df9c8871b953/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 72bb3e89aa3152d47584682f7a699ddb94d4abc5) Signed-off-by: Peter Korsgaard --- package/quickjs/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in index dc466241bac..292dba86d00 100644 --- a/package/quickjs/Config.in +++ b/package/quickjs/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_QUICKJS bool "quickjs" + depends on !BR2_microblaze # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2 depends on !BR2_STATIC_LIBS # No way to check for fenv support. @@ -15,6 +16,7 @@ config BR2_PACKAGE_QUICKJS https://bellard.org/quickjs/ comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" + depends on !BR2_microblaze depends on !BR2_nios2 depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ From 6cc3d49997255831546f90606acc1845779fe626 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 25 Jun 2023 19:57:06 +0200 Subject: [PATCH 0271/1167] package/quickjs: disable on sh* quickjs unconditionally uses FE_{DOWN,UP}WARD and so fails to build on sh* since its addition in commit 5d50793659acb95050c110d5fc05399df20ce30b Fixes: sh4: http://autobuild.buildroot.net/results/46d/46d7da58a857939ee3a33f60ab64ad278157c3bd/ sh4a: http://autobuild.buildroot.net/results/b1d/b1db05e79e5505c6606524e54e159224b633eac2/ sh4aeb: http://autobuild.buildroot.net/results/c30/c307a1b67142405f81c9276056b28bea366f2ccf/ sh4eb: http://autobuild.buildroot.net/results/945/945b508385ba5aa25f982f8a8493628fa828e472/ Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit 1880a061e8a34b759a62da9ef0eed8ab566c88dd) Signed-off-by: Peter Korsgaard --- package/quickjs/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/quickjs/Config.in b/package/quickjs/Config.in index 292dba86d00..fd174bc6573 100644 --- a/package/quickjs/Config.in +++ b/package/quickjs/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_QUICKJS bool "quickjs" depends on !BR2_microblaze # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_nios2 # fenv.h lacks FE_{DOWN,UP}WARD on nios2 + depends on !BR2_sh # fenv.h lacks FE_{DOWN,UP}WARD depends on !BR2_STATIC_LIBS # No way to check for fenv support. depends on !BR2_TOOLCHAIN_USES_UCLIBC @@ -18,6 +19,7 @@ config BR2_PACKAGE_QUICKJS comment "quickjs needs a glibc or musl toolchain w/ gcc >= 4.9, host gcc >= 4.9, dynamic library" depends on !BR2_microblaze depends on !BR2_nios2 + depends on !BR2_sh depends on BR2_USE_MMU depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_UCLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_HOST_GCC_AT_LEAST_4_9 From ecf53c5e0fea0f64288981826500c83e46ae96f1 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Tue, 20 Jun 2023 10:38:12 -0700 Subject: [PATCH 0272/1167] package/alsa-plugins: fix dependencies for the alsa plugin package The alsa-utils will remove and create the /usr/share/alsa dir as a whole and since the alsa plugins needs to add config into this same directory it should come after those install steps. Also, the bluez alsa needs the plugins installed to find them during the configuration phases - so, interlock the plugins when configured. Signed-off-by: Charles Hardin Signed-off-by: Arnout Vandecappelle (cherry picked from commit 3223a34ee546ca1e15d022cf0ae6253187a79af9) Signed-off-by: Peter Korsgaard --- package/alsa-plugins/alsa-plugins.mk | 4 ++++ package/bluez-alsa/bluez-alsa.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/package/alsa-plugins/alsa-plugins.mk b/package/alsa-plugins/alsa-plugins.mk index 5728ebfe37b..d23a81c5eed 100644 --- a/package/alsa-plugins/alsa-plugins.mk +++ b/package/alsa-plugins/alsa-plugins.mk @@ -20,6 +20,10 @@ ALSA_PLUGINS_CONF_OPTS = \ --disable-maemo-resource-manager \ --with-speex=no +ifeq ($(BR2_PACKAGE_ALSA_UTILS),y) +ALSA_PLUGINS_DEPENDENCIES += alsa-utils +endif + ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) ALSA_PLUGINS_CONF_OPTS += --enable-samplerate ALSA_PLUGINS_DEPENDENCIES += libsamplerate diff --git a/package/bluez-alsa/bluez-alsa.mk b/package/bluez-alsa/bluez-alsa.mk index 83dfce61776..649810b0ad4 100644 --- a/package/bluez-alsa/bluez-alsa.mk +++ b/package/bluez-alsa/bluez-alsa.mk @@ -20,6 +20,10 @@ BLUEZ_ALSA_CONF_OPTS = \ --with-alsaplugindir=/usr/lib/alsa-lib \ --with-alsaconfdir=/etc/alsa/conf.d +ifeq ($(BR2_PACKAGE_ALSA_PLUGINS),y) +BLUEZ_ALSA_DEPENDENCIES += alsa-plugins +endif + ifeq ($(BR2_PACKAGE_FDK_AAC),y) BLUEZ_ALSA_DEPENDENCIES += fdk-aac BLUEZ_ALSA_CONF_OPTS += --enable-aac From a65eb8c871ad7bd17ead79035bccb97838f6d0be Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 25 Jun 2023 22:37:35 +0200 Subject: [PATCH 0273/1167] package/tiff: security bump to version 4.5.1 Fixes the following security issues: - CVE-2023-1916: A flaw was found in tiffcrop, a program distributed by the libtiff package. A specially crafted tiff file can lead to an out-of-bounds read in the extractImageSection function in tools/tiffcrop.c, resulting in a denial of service and limited information disclosure. This issue affects libtiff versions 4.x. - CVE-2023-25434: libtiff 4.5.0 is vulnerable to Buffer Overflow via extractContigSamplesBytes() at /libtiff/tools/tiffcrop.c:3215. - CVE-2023-26965: loadImage() in tools/tiffcrop.c in LibTIFF through 4.5.0 has a heap-based use after free via a crafted TIFF image Drop the now upstream 0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch. Signed-off-by: Peter Korsgaard (cherry picked from commit cb496970c0c7117f9f00d8495e234871f2bae4c1) Signed-off-by: Peter Korsgaard --- ...rect-simple-copy-paste-error-Fix-488.patch | 28 ------------------- package/tiff/tiff.hash | 2 +- package/tiff/tiff.mk | 5 +--- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch diff --git a/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch b/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch deleted file mode 100644 index 73c0d10ffc4..00000000000 --- a/package/tiff/0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 97d65859bc29ee334012e9c73022d8a8e55ed586 Mon Sep 17 00:00:00 2001 -From: Su Laus -Date: Sat, 21 Jan 2023 15:58:10 +0000 -Subject: [PATCH] tiffcrop: Correct simple copy paste error. Fix #488. - -[Retrieved from: -https://gitlab.com/libtiff/libtiff/-/commit/97d65859bc29ee334012e9c73022d8a8e55ed586] -Signed-off-by: Fabrice Fontaine ---- - tools/tiffcrop.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/tiffcrop.c b/tools/tiffcrop.c -index 14fa18da..7db69883 100644 ---- a/tools/tiffcrop.c -+++ b/tools/tiffcrop.c -@@ -8591,7 +8591,7 @@ static int processCropSelections(struct image_data *image, - cropsize + NUM_BUFF_OVERSIZE_BYTES); - else - { -- prev_cropsize = seg_buffs[0].size; -+ prev_cropsize = seg_buffs[i].size; - if (prev_cropsize < cropsize) - { - next_buff = _TIFFrealloc( --- -GitLab - diff --git a/package/tiff/tiff.hash b/package/tiff/tiff.hash index 73732892a54..0fa503a02a9 100644 --- a/package/tiff/tiff.hash +++ b/package/tiff/tiff.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 tiff-4.5.0.tar.gz +sha256 d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b tiff-4.5.1.tar.gz sha256 0780558a8bfba0af1160ec1ff11ade4f41c0d7deafd6ecfc796b492a788e380d LICENSE.md diff --git a/package/tiff/tiff.mk b/package/tiff/tiff.mk index f9754a4b490..0006f461a02 100644 --- a/package/tiff/tiff.mk +++ b/package/tiff/tiff.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIFF_VERSION = 4.5.0 +TIFF_VERSION = 4.5.1 TIFF_SITE = http://download.osgeo.org/libtiff TIFF_LICENSE = tiff license TIFF_LICENSE_FILES = LICENSE.md @@ -12,9 +12,6 @@ TIFF_CPE_ID_VENDOR = libtiff TIFF_CPE_ID_PRODUCT = libtiff TIFF_INSTALL_STAGING = YES -# 0001-tiffcrop-Correct-simple-copy-paste-error-Fix-488.patch -TIFF_IGNORE_CVES += CVE-2022-48281 - # webp has a (optional) dependency on tiff, so we can't have webp # support in tiff, or that would create a circular dependency. TIFF_CONF_OPTS = \ From 77d944f083f4f6494642abc2b4278b112e8595d7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Apr 2023 14:14:35 +0200 Subject: [PATCH 0274/1167] package/dav1d: bump version to 1.1.0 Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Switched _SITE to https. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 3ed1653bfb4f90a7dce5c463a1d76d007d46e7c6) Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 35d753fc27e..cbeebc579db 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From http://download.videolan.org/pub/videolan/dav1d/1.0.0/dav1d-1.0.0.tar.xz.sha256 -sha256 51737db7e4897e599684f873a4725176dd3c779e639411d7c4fce134bb5ebb82 dav1d-1.0.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.1.0/dav1d-1.1.0.tar.xz.sha256 +sha256 fb57aae7875f28c30fb3dbae4a3683d27e2f91dde09ce5c60c22cef9bc58dfd1 dav1d-1.1.0.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 2d42cdcb677..5fe603fc1ca 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,9 +4,9 @@ # ################################################################################ -DAV1D_VERSION = 1.0.0 +DAV1D_VERSION = 1.1.0 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz -DAV1D_SITE = http://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) +DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause DAV1D_LICENSE_FILES = COPYING DAV1D_INSTALL_STAGING = YES From 2b087c7c28f1d2bb441986e447b2186d3ed66c9e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 8 May 2023 18:47:44 +0200 Subject: [PATCH 0275/1167] package/dav1d: bump version to 1.2.0 Additionally fxes a security issue: - CVE-2023-32570: VideoLAN dav1d before 1.2.0 has a thread_task.c race condition that can lead to an application crash, related to dav1d_decode_frame_exit. Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 37fd4ee80a408d8fa810eb1926cac111acbba811) [Peter: mention security fix] Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index cbeebc579db..1af699dbe36 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From https://download.videolan.org/pub/videolan/dav1d/1.1.0/dav1d-1.1.0.tar.xz.sha256 -sha256 fb57aae7875f28c30fb3dbae4a3683d27e2f91dde09ce5c60c22cef9bc58dfd1 dav1d-1.1.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.2.0/dav1d-1.2.0.tar.xz.sha256 +sha256 231bed8bc1bb28a41d88da6b4c2c118de84b92e5f1d67caffa1b7f81aaea8c6e dav1d-1.2.0.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index 5fe603fc1ca..f8d4464cd4f 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.1.0 +DAV1D_VERSION = 1.2.0 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause From 3c81f3293d31719f6cb7df5a601c05611152ac65 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 6 Jun 2023 20:11:48 +0200 Subject: [PATCH 0276/1167] package/dav1d: bump version to 1.2.1 Release notes: https://code.videolan.org/videolan/dav1d/-/blob/master/NEWS Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 199301a6d59af20f6a7bb6da0d22bffb64baaea4) Signed-off-by: Peter Korsgaard --- package/dav1d/dav1d.hash | 4 ++-- package/dav1d/dav1d.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/dav1d/dav1d.hash b/package/dav1d/dav1d.hash index 1af699dbe36..68757060bfe 100644 --- a/package/dav1d/dav1d.hash +++ b/package/dav1d/dav1d.hash @@ -1,4 +1,4 @@ -# From https://download.videolan.org/pub/videolan/dav1d/1.2.0/dav1d-1.2.0.tar.xz.sha256 -sha256 231bed8bc1bb28a41d88da6b4c2c118de84b92e5f1d67caffa1b7f81aaea8c6e dav1d-1.2.0.tar.xz +# From https://download.videolan.org/pub/videolan/dav1d/1.2.1/dav1d-1.2.1.tar.xz.sha256 +sha256 4e33eb61ec54c768a16da0cf8fa0928b4c4593f5f804a3c887d4a21c318340b2 dav1d-1.2.1.tar.xz # Locally computed sha256 b327887de263238deaa80c34cdd2ff3e0ba1d35db585ce14a37ce3e74ee389e9 COPYING diff --git a/package/dav1d/dav1d.mk b/package/dav1d/dav1d.mk index f8d4464cd4f..670a81d1c85 100644 --- a/package/dav1d/dav1d.mk +++ b/package/dav1d/dav1d.mk @@ -4,7 +4,7 @@ # ################################################################################ -DAV1D_VERSION = 1.2.0 +DAV1D_VERSION = 1.2.1 DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION) DAV1D_LICENSE = BSD-2-Clause From 7b1e6c0220f827981c8675ed701e9a98995345aa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 26 Jun 2023 08:52:31 +0200 Subject: [PATCH 0277/1167] package/wireshark: security bump to version 4.0.6 Fixes the following security issues: - CVE-2023-1992: The RPC over RDMA dissector could crash https://www.wireshark.org/security/wnpa-sec-2023-09.html - CVE-2023-1993: The LISP dissector could go into a large loop https://www.wireshark.org/security/wnpa-sec-2023-10.html - CVE-2023-1994: The GQUIC dissector could crash https://www.wireshark.org/security/wnpa-sec-2023-11.html - CVE-2023-2855: The Candump log file parser could crash https://www.wireshark.org/security/wnpa-sec-2023-12.html - CVE-2023-2857: The BLF file parser could crash https://www.wireshark.org/security/wnpa-sec-2023-13.html - The GDSDB dissector could go into an infinite loop https://www.wireshark.org/security/wnpa-sec-2023-14.html - CVE-2023-2858: The NetScaler file parser could crash https://www.wireshark.org/security/wnpa-sec-2023-15.html - CVE-2023-2856: The VMS TCPIPtrace file parser could crash https://www.wireshark.org/security/wnpa-sec-2023-16.html - CVE-2023-2854: The BLF file parser could crash https://www.wireshark.org/security/wnpa-sec-2023-17.html - CVE-2023-0666: The RTPS dissector could crash https://www.wireshark.org/security/wnpa-sec-2023-18.html - CVE-2023-0668: The IEEE C37.118 Synchrophasor dissector could crash https://www.wireshark.org/security/wnpa-sec-2023-19.html - The XRA dissector could go into an infinite loo https://www.wireshark.org/security/wnpa-sec-2023-20.html [Peter: refer to SIGNATURES files now that it is again fixed] Signed-off-by: Peter Korsgaard (cherry picked from commit af25796d49cf36ad0cd3a4bf6fc71eed6b10d450) Signed-off-by: Peter Korsgaard --- package/wireshark/wireshark.hash | 6 +++--- package/wireshark/wireshark.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index d89caa5de81..6598f51f53d 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,6 +1,6 @@ -# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.4.txt -sha1 ae3c28d6966c420ee3a8d058ea212a1b6adab50f wireshark-4.0.4.tar.xz -sha256 a4a09f6564f00639036ffe5064ac4dc2176adfa3e484c539c9c73f835436e74b wireshark-4.0.4.tar.xz +# From https://www.wireshark.org/download/src/all-versions/SIGNATURES-4.0.6.txt +sha1 a60b6f8063df2a711932ba869ae86e6476087cf0 wireshark-4.0.6.tar.xz +sha256 0079097a1b17ebc7250a73563f984c13327dac5016b7d53165810fbcca4bd884 wireshark-4.0.6.tar.xz # Locally calculated sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index f5a8e1f0706..80a986cfa32 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 4.0.4 +WIRESHARK_VERSION = 4.0.6 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 9af2e541e301892f7edb66179cf3160b4081a060 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 16:49:23 +0200 Subject: [PATCH 0278/1167] package/bind: security bump version to 9.16.42 Changelog: https://ftp.isc.org/isc/bind9/9.16.42/CHANGES Fixes CVE-2023-2911 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 5ce72a74d2163a455c499701b16bc0f4350ad935) Signed-off-by: Peter Korsgaard --- package/bind/bind.hash | 4 ++-- package/bind/bind.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/bind/bind.hash b/package/bind/bind.hash index 32804b5ce03..a8c15f2a12e 100644 --- a/package/bind/bind.hash +++ b/package/bind/bind.hash @@ -1,4 +1,4 @@ -# Verified from https://ftp.isc.org/isc/bind9/9.16.38/bind-9.16.38.tar.xz.asc +# Verified from https://ftp.isc.org/isc/bind9/9.16.42/bind-9.16.42.tar.xz.asc # with key AADBBA5074F1402F7B69D56BC5B4EE931A9F9DFD -sha256 8df44c9d9a84a28ab8b49d55f3c33b624b90ef8f6a8b9ee6a4c33cc17c14c50f bind-9.16.38.tar.xz +sha256 a8b51c6bfdf3ab6885102f764c2418e037897b7ea46a09f8f07876fa11a6c0b3 bind-9.16.42.tar.xz sha256 13491a682dc0f5ee2273cebd3949e2be62f9470fe659419a03a308d4f444773b COPYRIGHT diff --git a/package/bind/bind.mk b/package/bind/bind.mk index 70987a98238..f46d1a8a544 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIND_VERSION = 9.16.38 +BIND_VERSION = 9.16.42 BIND_SOURCE= bind-$(BIND_VERSION).tar.xz BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION) # bind does not support parallel builds. From 0741fd01fa2f76a89f45b9b8a99aac508dbd128b Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Mon, 26 Jun 2023 18:20:57 +0200 Subject: [PATCH 0279/1167] package/agentpp: fix build error due to type mismatch This was supposedly fixed by commit 5f06ecf5e151 ("package/agentpp: security bump to version 4.6.0") but has kept happening so far. No public place for contributions, thus this patch has been sent to private e-mail. Fixes: http://autobuild.buildroot.net/results/e8abd6bdc62a028955915706b03d72239786c703/ http://autobuild.buildroot.net/results/24441fb679fbf5f913c9b6431c98aec596ead587/ Signed-off-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni (cherry picked from commit d68f6e3042d50139f773950d679a0f83f9bb94c0) Signed-off-by: Peter Korsgaard --- ...mpx-fix-const-nonconst-type-mismatch.patch | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch diff --git a/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch b/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch new file mode 100644 index 00000000000..07981eff3e8 --- /dev/null +++ b/package/agentpp/0001-Snmpx-fix-const-nonconst-type-mismatch.patch @@ -0,0 +1,51 @@ +From 7e541e6dba8d4976bbb490838a09b569f38b047d Mon Sep 17 00:00:00 2001 +From: Luca Ceresoli +Date: Mon, 26 Jun 2023 17:45:00 +0200 +Subject: [PATCH] Snmpx: fix const/nonconst type mismatch + +Fixes build failure: + + snmp_pp_ext.cpp:1176:28: error: binding reference of type 'Snmp_pp::Pdu&' to 'const Snmp_pp::Pdu' discards qualifiers + 1176 | status = snmpmsg.load( pdu, community, version); + | ^~~ + +Fixes: + http://autobuild.buildroot.net/results/e8abd6bdc62a028955915706b03d72239786c703/ + http://autobuild.buildroot.net/results/24441fb679fbf5f913c9b6431c98aec596ead587/ + +Signed-off-by: Luca Ceresoli +Upstream: sent to katz.agentpp.com@magenta.de and support@agentpp.com +--- + include/agent_pp/snmp_pp_ext.h | 2 +- + src/snmp_pp_ext.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/agent_pp/snmp_pp_ext.h b/include/agent_pp/snmp_pp_ext.h +index 7c5a6783ee70..d8a46060db98 100644 +--- a/include/agent_pp/snmp_pp_ext.h ++++ b/include/agent_pp/snmp_pp_ext.h +@@ -807,7 +807,7 @@ public: + * SNMP_CLASS_SUCCESS on success and SNMP_CLASS_ERROR, + * SNMP_CLASS_TL_FAILED on failure. + */ +- int send (Pdux const &, NS_SNMP UdpAddress const &, NS_SNMP snmp_version, NS_SNMP OctetStr const &); ++ int send (Pdux &, NS_SNMP UdpAddress const &, NS_SNMP snmp_version, NS_SNMP OctetStr const &); + #endif + + /** +diff --git a/src/snmp_pp_ext.cpp b/src/snmp_pp_ext.cpp +index 54a29ec8ea28..b61cbf056246 100644 +--- a/src/snmp_pp_ext.cpp ++++ b/src/snmp_pp_ext.cpp +@@ -1203,7 +1203,7 @@ int Snmpx::send (Pdux &pdu, SnmpTarget* target) + + #else // _SNMPv3 is not defined + +-int Snmpx::send (Pdux const &pdu, ++int Snmpx::send (Pdux &pdu, + UdpAddress const &udp_address, + snmp_version version, + OctetStr const &community) +-- +2.34.1 + From e7188504c3c0ee74a858b51fa5e0a8fd23c47f2d Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 19 Jun 2023 20:17:18 +0200 Subject: [PATCH 0280/1167] package/fluidsynth: bump to version 2.3.3 For change log since v2.3.2, see: - https://github.com/FluidSynth/fluidsynth/releases/tag/v2.3.3 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 2c9b853093f44c45348947783297ed79e40101f2) 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 0f8f04d6768..382a54abadf 100644 --- a/package/fluidsynth/fluidsynth.hash +++ b/package/fluidsynth/fluidsynth.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 cd610810f30566e28fb98c36501f00446a06fa6bae3dc562c8cd3868fe1c0fc7 fluidsynth-2.3.2.tar.gz +sha256 321f7d3f72206b2522f30a1cb8ad1936fd4533ffc4d29dd335b1953c9fb371e6 fluidsynth-2.3.3.tar.gz sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE diff --git a/package/fluidsynth/fluidsynth.mk b/package/fluidsynth/fluidsynth.mk index 854ed000321..52f8ec489fe 100644 --- a/package/fluidsynth/fluidsynth.mk +++ b/package/fluidsynth/fluidsynth.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLUIDSYNTH_VERSION = 2.3.2 +FLUIDSYNTH_VERSION = 2.3.3 FLUIDSYNTH_SITE = $(call github,FluidSynth,fluidsynth,v$(FLUIDSYNTH_VERSION)) FLUIDSYNTH_LICENSE = LGPL-2.1+ FLUIDSYNTH_LICENSE_FILES = LICENSE From b1223386bf603b2ab008599e1e0b6b51133439b7 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 19 Mar 2023 11:14:19 +0100 Subject: [PATCH 0281/1167] package/qt6: bump version to 6.4.3 For details see [1]. [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.4.3/release-note.md Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni (cherry picked from commit a8467289111843e070816c9ffb2004baa74ffead) Signed-off-by: Peter Korsgaard --- package/qt6/qt6.mk | 2 +- package/qt6/qt6base/qt6base.hash | 4 ++-- package/qt6/qt6serialbus/qt6serialbus.hash | 4 ++-- package/qt6/qt6serialport/qt6serialport.hash | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 431bb8c9d32..1edb252c967 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -5,7 +5,7 @@ ################################################################################ QT6_VERSION_MAJOR = 6.4 -QT6_VERSION = $(QT6_VERSION_MAJOR).2 +QT6_VERSION = $(QT6_VERSION_MAJOR).3 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 63af3738366..cb111bd405f 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 -sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256 +sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash index be01f13363e..98c89319626 100644 --- a/package/qt6/qt6serialbus/qt6serialbus.hash +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialbus-everywhere-src-6.4.2.tar.xz.sha256 -sha256 604013657c7327899aa50748deb4bcb5e545ab37ff4964795b9e6f617d48bf1b qtserialbus-everywhere-src-6.4.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256 +sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index 1eaa3d61505..9341978d862 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtserialport-everywhere-src-6.4.2.tar.xz.sha256 -sha256 336d95919037800184b3c3de8ccb6f62954b20f3756c05adce8d5010504340fa qtserialport-everywhere-src-6.4.2.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256 +sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt From d69773edb42e89cb3abe078df3d85aebb163ba6a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 1 Jul 2023 20:06:55 +0200 Subject: [PATCH 0282/1167] package/gupnp: fix build with newer versions of libxml2 Fixes: http://autobuild.buildroot.net/results/b26/b267c4137edebc504757b6275824c748cce3d894/ libxml2 deprecated the function xmlRecoverMemory with commit https://github.com/GNOME/libxml2/commit/51035c539edf67de93ced3cf037bb1f2b298e526 first included in versions 2.11.0. Buildroot bumped libxml2 to the 2.11 branch with commit dfe1ca7872a45bcdc825ff0900d7fd929097a635. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 4f9ce6dbf6c76398d5d1e4e8cc3b883e83d55394) Signed-off-by: Peter Korsgaard --- .../0001-all-Drop-xmlRecoverMemory.patch | 113 ++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 package/gupnp/0001-all-Drop-xmlRecoverMemory.patch diff --git a/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch new file mode 100644 index 00000000000..46e09c267ee --- /dev/null +++ b/package/gupnp/0001-all-Drop-xmlRecoverMemory.patch @@ -0,0 +1,113 @@ +From c3d084736cca81dd4ec05f7e4b634050eb6e8525 Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Thu, 4 May 2023 19:14:29 +0200 +Subject: [PATCH] all: Drop xmlRecoverMemory + +use xmlReadMemory, also use NONET flat + +Upstream: https://gitlab.gnome.org/GNOME/gupnp/-/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d + +Signed-off-by: Bernd Kuhls +[Bernd: backported to branch gupnp-1.4] +--- + libgupnp/gupnp-control-point.c | 7 +++++-- + libgupnp/gupnp-service-info.c | 8 ++++++-- + libgupnp/gupnp-service-proxy-action.c | 7 +++++-- + libgupnp/gupnp-service-proxy.c | 7 +++++-- + libgupnp/gupnp-service.c | 7 +++++-- + 5 files changed, 26 insertions(+), 10 deletions(-) + +diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c +index deb4b42..17c485a 100644 +--- a/libgupnp/gupnp-control-point.c ++++ b/libgupnp/gupnp-control-point.c +@@ -613,8 +613,11 @@ got_description_url (SoupSession *session, + xmlDoc *xml_doc; + + /* Parse response */ +- xml_doc = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ xml_doc = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (xml_doc) { + doc = gupnp_xml_doc_new (xml_doc); + +diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c +index 9a9f4de..1c7489e 100644 +--- a/libgupnp/gupnp-service-info.c ++++ b/libgupnp/gupnp-service-info.c +@@ -592,8 +592,12 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session, + if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { + xmlDoc *scpd; + +- scpd = xmlRecoverMemory (msg->response_body->data, +- msg->response_body->length); ++ scpd = xmlReadMemory (msg->response_body->data, ++ msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); ++ + if (scpd) { + introspection = gupnp_service_introspection_new (scpd); + +diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c +index f089152..079219f 100644 +--- a/libgupnp/gupnp-service-proxy-action.c ++++ b/libgupnp/gupnp-service-proxy-action.c +@@ -87,8 +87,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy, + } + + /* Parse response */ +- response = xmlRecoverMemory (action->msg->response_body->data, +- action->msg->response_body->length); ++ response = xmlReadMemory (action->msg->response_body->data, ++ action->msg->response_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + + if (!response) { + if (action->msg->status_code == SOUP_STATUS_OK) { +diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c +index 5dd1bfc..eed9882 100644 +--- a/libgupnp/gupnp-service-proxy.c ++++ b/libgupnp/gupnp-service-proxy.c +@@ -1561,8 +1561,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server, + } + + /* Parse the actual XML message content */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + /* Failed */ + g_warning ("Failed to parse NOTIFY message body"); +diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c +index 2794ebc..e82daaa 100644 +--- a/libgupnp/gupnp-service.c ++++ b/libgupnp/gupnp-service.c +@@ -1002,8 +1002,11 @@ control_server_handler (SoupServer *server, + *end = '\0'; + + /* Parse action_node */ +- doc = xmlRecoverMemory (msg->request_body->data, +- msg->request_body->length); ++ doc = xmlReadMemory (msg->request_body->data, ++ msg->request_body->length, ++ NULL, ++ NULL, ++ XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST); + +-- +2.39.2 + From f5315e59bdb59469573becc1bd80402cd3dbdf08 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 1 Jul 2023 20:18:51 +0200 Subject: [PATCH 0283/1167] package/rygel: fix Config.in comment Move the comment out of the if-clause and include the python3 dependency Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit e539853fc31a8228a2ad86eca243fd6b4ade0cff) Signed-off-by: Peter Korsgaard --- package/rygel/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/rygel/Config.in b/package/rygel/Config.in index 30e84305370..e160068a556 100644 --- a/package/rygel/Config.in +++ b/package/rygel/Config.in @@ -52,12 +52,12 @@ comment "gstreamer1 needs gst1-editing-services" endchoice -comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" +endif # BR2_PACKAGE_RYGEL + +comment "rygel needs python3 and a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8" depends on BR2_USE_MMU depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_HOST_GCC_AT_LEAST_8 - -endif # BR2_PACKAGE_RYGEL + !BR2_HOST_GCC_AT_LEAST_8 || !BR2_PACKAGE_PYTHON3 From ca8d533b478fa6fdbc37268a285d855dd5e7a5ea Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 27 Jun 2023 16:34:01 +0200 Subject: [PATCH 0284/1167] configs/nitrogen*: add missing pylibfdt u-boot dependency Needed by binman. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271714 https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271716 https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271718 https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271719 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni (cherry picked from commit ce8bf14ff61199c61577ee79f6745616466bc6f7) Signed-off-by: Peter Korsgaard --- configs/nitrogen8m_defconfig | 1 + configs/nitrogen8mm_defconfig | 1 + configs/nitrogen8mn_defconfig | 1 + configs/nitrogen8mp_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/nitrogen8m_defconfig b/configs/nitrogen8m_defconfig index 6c490f195ba..4ae3f45ff11 100644 --- a/configs/nitrogen8m_defconfig +++ b/configs/nitrogen8m_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/nitrogen8mm_defconfig b/configs/nitrogen8mm_defconfig index 27cdc9e19e5..0d0482458ba 100644 --- a/configs/nitrogen8mm_defconfig +++ b/configs/nitrogen8mm_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/nitrogen8mn_defconfig b/configs/nitrogen8mn_defconfig index 775bdecd90a..ae53f5ce04e 100644 --- a/configs/nitrogen8mn_defconfig +++ b/configs/nitrogen8mn_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y diff --git a/configs/nitrogen8mp_defconfig b/configs/nitrogen8mp_defconfig index 0767ab13753..105d572a7fc 100644 --- a/configs/nitrogen8mp_defconfig +++ b/configs/nitrogen8mp_defconfig @@ -44,6 +44,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-b BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_SPL=y From 2927ab2135001b9bfb88143c150cc92b809fbb25 Mon Sep 17 00:00:00 2001 From: Gary Bisson Date: Tue, 27 Jun 2023 16:34:00 +0200 Subject: [PATCH 0285/1167] configs/nitrogen*: add missing openssl u-boot dependency Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271709 https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271710 https://gitlab.com/buildroot.org/buildroot/-/jobs/4519271712 Signed-off-by: Gary Bisson Signed-off-by: Thomas Petazzoni (cherry picked from commit 717762b5f59a821d527fc5c5f307bc6b70c40661) Signed-off-by: Peter Korsgaard --- configs/nitrogen6sx_defconfig | 1 + configs/nitrogen6x_defconfig | 1 + configs/nitrogen7_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/nitrogen6sx_defconfig b/configs/nitrogen6sx_defconfig index 967d064f1c5..2b12b169a09 100644 --- a/configs/nitrogen6sx_defconfig +++ b/configs/nitrogen6sx_defconfig @@ -28,6 +28,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" diff --git a/configs/nitrogen6x_defconfig b/configs/nitrogen6x_defconfig index 1cded537657..903d0abd9f6 100644 --- a/configs/nitrogen6x_defconfig +++ b/configs/nitrogen6x_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" diff --git a/configs/nitrogen7_defconfig b/configs/nitrogen7_defconfig index d1e81d90fde..718d203319f 100644 --- a/configs/nitrogen7_defconfig +++ b/configs/nitrogen7_defconfig @@ -27,6 +27,7 @@ BR2_TARGET_UBOOT_CUSTOM_TARBALL=y BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7" BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/boot.cmd" From 0a45615f653bb100381e18d48050f848e314f735 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Jun 2023 19:29:25 +0200 Subject: [PATCH 0286/1167] package/haproxy: fix build on aarch64 Fixes: http://autobuild.buildroot.net/results/07c/07ccb8c45c709a4b6ed32aafa33cd04e74174b11/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7fde35212c49f0d6e274cbcb6f3f5c871bf13398) Signed-off-by: Peter Korsgaard --- ...mic.h-may-need-compiler.h-on-ARMv8.2.patch | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch diff --git a/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch new file mode 100644 index 00000000000..b3b1f732abc --- /dev/null +++ b/package/haproxy/0001-BUILD-atomic-atomic.h-may-need-compiler.h-on-ARMv8.2.patch @@ -0,0 +1,36 @@ +From 5ab3c61932af7619518169da744ba6346f060405 Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Thu, 8 Dec 2022 08:32:57 +0100 +Subject: [PATCH] BUILD: atomic: atomic.h may need compiler.h on ARMv8.2-a + +We get a build error in ncbuf.c when building for ARMv8.2-a because ncbuf +has minimal includes and among them bug.h which includes atomic.h. Atomic.h +may use "forceinline" without including compiler.h, hence the build error. +It was verified that adding it doesn't inflate the total headers. + +Since all other C files include api.h which already covers this, there's +no real need to bapkport this. The issue was already there in 2.3 though. + +Upstream: https://git.haproxy.org/?p=haproxy.git;a=commitdiff;h=5ab3c61932af7619518169da744ba6346f060405#patch1 + +Signed-off-by: Bernd Kuhls +--- + include/haproxy/atomic.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/haproxy/atomic.h b/include/haproxy/atomic.h +index f60be95..7e3c826 100644 +--- a/include/haproxy/atomic.h ++++ b/include/haproxy/atomic.h +@@ -23,6 +23,8 @@ + #ifndef _HAPROXY_ATOMIC_H + #define _HAPROXY_ATOMIC_H + ++#include ++ + /* A few notes for the macros and functions here: + * - this file is painful to edit, most operations exist in 3 variants, + * no-thread, threads with gcc<4.7, threads with gcc>=4.7. Be careful when +-- +1.7.10.4 + From 44d6104ece3a4cd8093a985f4b4390d1b27c4223 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Jun 2023 19:29:26 +0200 Subject: [PATCH 0287/1167] package/haproxy: bump version to 2.6.14 Changelog: http://www.haproxy.org/download/2.6/src/CHANGELOG Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f43f9c6ea67536e0052cd1974ac2a7a48524c7d4) Signed-off-by: Peter Korsgaard --- package/haproxy/haproxy.hash | 4 ++-- package/haproxy/haproxy.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/haproxy/haproxy.hash b/package/haproxy/haproxy.hash index f5540ee44a2..20048da7ece 100644 --- a/package/haproxy/haproxy.hash +++ b/package/haproxy/haproxy.hash @@ -1,5 +1,5 @@ -# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.9.tar.gz.sha256 -sha256 f01a1c5f465dc1b5cd175d0b28b98beb4dfe82b5b5b63ddcc68d1df433641701 haproxy-2.6.9.tar.gz +# From: http://www.haproxy.org/download/2.6/src/haproxy-2.6.14.tar.gz.sha256 +sha256 bd3dd9fa60391ca09e1225e1ac3163e45be83c3f54f2fd76a30af289cc6e4fd4 haproxy-2.6.14.tar.gz # Locally computed: sha256 0717ca51fceaa25ac9e5ccc62e0c727dcf27796057201fb5fded56a25ff6ca28 LICENSE sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a doc/lgpl.txt diff --git a/package/haproxy/haproxy.mk b/package/haproxy/haproxy.mk index 012c1dfdb67..2b8920efa6b 100644 --- a/package/haproxy/haproxy.mk +++ b/package/haproxy/haproxy.mk @@ -5,7 +5,7 @@ ################################################################################ HAPROXY_VERSION_MAJOR = 2.6 -HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).9 +HAPROXY_VERSION = $(HAPROXY_VERSION_MAJOR).14 HAPROXY_SITE = http://www.haproxy.org/download/$(HAPROXY_VERSION_MAJOR)/src HAPROXY_LICENSE = GPL-2.0+ and LGPL-2.1+ with exceptions HAPROXY_LICENSE_FILES = LICENSE doc/lgpl.txt doc/gpl.txt From bfc4e616e37626d16b229f48a6a6e211b3a64320 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Jun 2023 19:01:10 +0200 Subject: [PATCH 0288/1167] package/assimp: needs gcc >= 7 Fixes: http://autobuild.buildroot.net/results/d6c/d6caf3c2c0fd670e70950d3e89629df39f8ce596/ After adding various fixes for the autobuilder error and subsequent build errors this build error can only be fixed by using gcc >= 7: output/build/assimp-5.2.5/code/AssetLib/Obj/ObjFileParser.cpp:55:23: fatal error: string_view: No such file or directory Usage of string_view was added in version 5.2.5 by upstream commit https://github.com/assimp/assimp/commit/f6bcb160d08af267778fbc59b480ce5d9c52c92c which was added to buildroot by commit 7d843d9cc0064d6690cfc000e579f575e2c0cc4d Removed BR2_TOOLCHAIN_HAS_GCC_BUG_64735 which is only valid for gcc < 7 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 6dad3a709c7b36fd72cf90adb1e344201f3db96c) Signed-off-by: Peter Korsgaard --- package/assimp/Config.in | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/assimp/Config.in b/package/assimp/Config.in index 5ffb50cd79c..4bddb3598d8 100644 --- a/package/assimp/Config.in +++ b/package/assimp/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_ASSIMP bool "assimp" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB_FORCE_LIBZLIB help @@ -14,8 +14,6 @@ config BR2_PACKAGE_ASSIMP http://www.assimp.org -comment "assimp needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - -comment "assimp needs exception_ptr" - depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +comment "assimp needs a toolchain w/ C++, wchar, gcc >= 7" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_7 From 4808ca56c9de0f5929f1588ab0aca1392cce2b56 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 11 Jun 2023 15:16:28 +0200 Subject: [PATCH 0289/1167] package/{binutils, gdb}: switch to https urls for archives hashes FTP urls doesn't work anymore with Firefox [1] and Google Chrome [2], switch to https urls. [1] https://blog.mozilla.org/addons/2020/04/13/what-to-expect-for-the-upcoming-deprecation-of-ftp-in-firefox/ [2] https://chromestatus.com/feature/6246151319715840 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit bd17127b4aea85893f3697753745b5498aa27c7a) Signed-off-by: Peter Korsgaard --- package/binutils/binutils.hash | 2 +- package/gdb/gdb.hash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 1a8574de92b..5d45813b5ac 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,4 +1,4 @@ -# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum +# From https://gcc.gnu.org/pub/binutils/releases/sha512.sum sha512 5c11aeef6935860a6819ed3a3c93371f052e52b4bdc5033da36037c1544d013b7f12cb8d561ec954fe7469a68f1b66f1a3cd53d5a3af7293635a90d69edd15e7 binutils-2.37.tar.xz sha512 8bf0b0d193c9c010e0518ee2b2e5a830898af206510992483b427477ed178396cd210235e85fd7bd99a96fc6d5eedbeccbd48317a10f752b7336ada8b2bb826d binutils-2.38.tar.xz sha512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3 binutils-2.39.tar.xz diff --git a/package/gdb/gdb.hash b/package/gdb/gdb.hash index 04c7d02d2f6..36e2685a25d 100644 --- a/package/gdb/gdb.hash +++ b/package/gdb/gdb.hash @@ -1,4 +1,4 @@ -# From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum +# From https://gcc.gnu.org/pub/gdb/releases/sha512.sum sha512 3653762ac008e065c37cd641653184c9ff7ce51ee2222ade1122bec9d6cc64dffd4fb74888ef11ac1942064a08910e96b7865112ad37f4602eb0a16bed074caa gdb-10.2.tar.xz sha512 07e9026423438049b11f4f784d57401ece4e940570f613bd6958b3714fe7fbc2c048470bcce3e7d7d9f93331cdf3881d30dcc964cb113a071143a02b28e5b127 gdb-11.2.tar.xz sha512 425568d2e84672177d0fb87b1ad7daafdde097648d605e30cf0656970f66adc6a82ca2d83375ea4be583e9683a340e5bfdf5819668ddf66728200141ae50ff2d gdb-12.1.tar.xz From 20969cb303541937d22754ad6ecbb7cfe9edba76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Mon, 3 Jul 2023 11:10:00 +0200 Subject: [PATCH 0290/1167] package/pkgconf: fix download URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to problems with the registrar (dynadot) [1], the dereferenced.org domain got stolen and is up for auction. While sorting that out, the official download site has changed to a different domain [2]. Update PKGCONF_SITE to the new location. There's an upstream bug to track the issue [3]. [1] https://social.treehouse.systems/@ariadne/110643909699308207 [2] https://github.com/pkgconf/pkgconf/commit/437c2a3218bfcb1cae7fa38a4ccd0cb29575ff07 [3] https://github.com/pkgconf/pkgconf/issues/302 Fixes: https://bugs.busybox.net/show_bug.cgi?id=15673 Signed-off-by: Sébastien Szymanski Signed-off-by: Arnout Vandecappelle (cherry picked from commit ef95ec920cbae32e5a525d887b7a279440d96f11) Signed-off-by: Peter Korsgaard --- package/pkgconf/pkgconf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/pkgconf/pkgconf.mk b/package/pkgconf/pkgconf.mk index e9587fae6b2..1d73b691e17 100644 --- a/package/pkgconf/pkgconf.mk +++ b/package/pkgconf/pkgconf.mk @@ -5,7 +5,7 @@ ################################################################################ PKGCONF_VERSION = 1.6.3 -PKGCONF_SITE = https://distfiles.dereferenced.org/pkgconf +PKGCONF_SITE = https://distfiles.ariadne.space/pkgconf PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.xz PKGCONF_LICENSE = pkgconf license PKGCONF_LICENSE_FILES = COPYING From 607450ac62d2b258164baa130915eb0701c575f6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 12:31:21 +0200 Subject: [PATCH 0291/1167] package/python-pyicu: fix build Fixes: http://autobuild.buildroot.net/results/977/977c043615603dd3541e23b81c5f11374606aff6/ Set environment variables to cross-compile friendly values, this prevents icu-config picking up host libraries: https://gitlab.pyicu.org/main/pyicu/-/blob/main/setup.py#L89 https://gitlab.pyicu.org/main/pyicu/-/blob/main/setup.py#L179 https://gitlab.pyicu.org/main/pyicu/-/blob/main/setup.py#L216 This follows the upstream build docs: https://gitlab.pyicu.org/main/pyicu#building-pyicu Signed-off-by: Bernd Kuhls Signed-off-by: Arnout Vandecappelle (cherry picked from commit c15e60c106bc852a4cd1f987357580e70e6c28ef) Signed-off-by: Peter Korsgaard --- package/python-pyicu/python-pyicu.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/python-pyicu/python-pyicu.mk b/package/python-pyicu/python-pyicu.mk index 512b2f857f0..53e4a15c4f5 100644 --- a/package/python-pyicu/python-pyicu.mk +++ b/package/python-pyicu/python-pyicu.mk @@ -12,4 +12,10 @@ PYTHON_PYICU_LICENSE_FILES = LICENSE PYTHON_PYICU_DEPENDENCIES = icu PYTHON_PYICU_SETUP_TYPE = setuptools +PYTHON_PYICU_ENV += \ + ICU_VERSION="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --modversion`" \ + PYICU_CFLAGS="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --variable=CXXFLAGS`" \ + PYICU_LFLAGS="`$(PKG_CONFIG_HOST_BINARY) icu-i18n --libs-only-L` \ + `$(PKG_CONFIG_HOST_BINARY) icu-i18n --libs-only-l`" + $(eval $(python-package)) From c25ec8829c582d8a1de54ff726157c77d24b9a73 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 3 Jul 2023 18:21:21 +0200 Subject: [PATCH 0292/1167] package/taglib: bump to version 1.13.1 Release notes: https://mail.kde.org/pipermail/taglib-devel/2023-July/003066.html Changelog: https://taglib.org/#taglib-1131-release---jul-1-2023 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 261c5894b0a83f738322daa0de96cd668e1f2f9a) Signed-off-by: Peter Korsgaard --- package/taglib/taglib.hash | 2 +- package/taglib/taglib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/taglib/taglib.hash b/package/taglib/taglib.hash index 7d1b2e8422c..e83aa451f33 100644 --- a/package/taglib/taglib.hash +++ b/package/taglib/taglib.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 58f08b4db3dc31ed152c04896ee9172d22052bc7ef12888028c01d8b1d60ade0 taglib-1.13.tar.gz +sha256 c8da2b10f1bfec2cd7dbfcd33f4a2338db0765d851a50583d410bacf055cfd0b taglib-1.13.1.tar.gz sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING.MPL diff --git a/package/taglib/taglib.mk b/package/taglib/taglib.mk index c6878910026..9bdf05b85d4 100644 --- a/package/taglib/taglib.mk +++ b/package/taglib/taglib.mk @@ -4,7 +4,7 @@ # ################################################################################ -TAGLIB_VERSION = 1.13 +TAGLIB_VERSION = 1.13.1 TAGLIB_SITE = http://taglib.github.io/releases TAGLIB_INSTALL_STAGING = YES TAGLIB_LICENSE = LGPL-2.1 or MPL-1.1 From 78333aa89a7303a7c69955c0b8c410fed0707901 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 14:33:19 +0200 Subject: [PATCH 0293/1167] package/mpir: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccuwJnnt.s:124: Error: selected processor does not support `umull ip,r6,r2,r1' in Thumb mode /tmp/ccuwJnnt.s:159: Error: selected processor does not support `umull ip,r0,r7,r1' in Thumb mode Fixes: http://autobuild.buildroot.net/results/610/61094bc7b7eb1d1e49bf8fcd1864b5cd3d7c4499/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit ff037fe5430738e85d9c2270883e71cd77e99ff3) Signed-off-by: Peter Korsgaard --- package/mpir/mpir.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mpir/mpir.mk b/package/mpir/mpir.mk index 91f704d30cd..5dbd760aa1f 100644 --- a/package/mpir/mpir.mk +++ b/package/mpir/mpir.mk @@ -36,4 +36,8 @@ ifeq ($(BR2_powerpc64le),y) MPIR_CONF_ENV += MPN_PATH="generic" endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +MPIR_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + $(eval $(autotools-package)) From 2f9f55b000531d360cf95c4be0cc7ed26dded98a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 2 Jul 2023 17:02:32 +0200 Subject: [PATCH 0294/1167] package/sconeserver: re-add dependency to pcre While pcre was an optional dependency with autoconf [1] upstream removed the HAVE_LIBPCRE defines with the introduction of cmake [2] breaking the build without pcre after buildroot switched to cmake with commit 8b42bbf30a914b0fd40a4518e61ac7bc511a7deb. Fixes: http://autobuild.buildroot.net/results/a15/a15db87c8cec195905b6bcc2cbd3da59ad8aa3b9/ [1] https://github.com/sconemad/sconeserver/commit/98ec61436c9ea68ffe2d70a818c1175dcafa2a79 [2] https://github.com/sconemad/sconeserver/commit/0cb655721d7f8aa5d6d14fc1dfce18c518ce2419 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 8539a2075c268eef7fc1742603ca48ecca14ee5e) Signed-off-by: Peter Korsgaard --- package/sconeserver/Config.in | 1 + package/sconeserver/sconeserver.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/sconeserver/Config.in b/package/sconeserver/Config.in index 3040dddbbbe..0e8a9950905 100644 --- a/package/sconeserver/Config.in +++ b/package/sconeserver/Config.in @@ -3,6 +3,7 @@ menuconfig BR2_PACKAGE_SCONESERVER depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on !BR2_STATIC_LIBS # dlopen() + select BR2_PACKAGE_PCRE select BR2_PACKAGE_ZLIB help Sconeserver is a modular, object-orientated and extremely diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk index bfbd5dc6ede..89abc8d3b29 100644 --- a/package/sconeserver/sconeserver.mk +++ b/package/sconeserver/sconeserver.mk @@ -10,7 +10,7 @@ SCONESERVER_LICENSE = GPL-2.0+ SCONESERVER_LICENSE_FILES = COPYING SCONESERVER_DEPENDENCIES = \ host-pkgconf \ - $(if $(BR2_PACKAGE_PCRE),pcre) \ + pcre \ zlib # disable image as it fails to build with ImageMagick # disable markdown module because its git submodule cmark From dbacf9108a6852d8a35a5c69dcbc98d5cc5fc296 Mon Sep 17 00:00:00 2001 From: Marcin Niestroj Date: Sun, 2 Jul 2023 14:22:35 +0200 Subject: [PATCH 0295/1167] configs/chiliboard: uboot needs openssl Fixes uboot build errors: In file included from tools/imagetool.h:24, from tools/aisimage.c:7: include/image.h:1383:12: fatal error: openssl/evp.h: No such file or directory 1383 | # include | Signed-off-by: Marcin Niestroj Signed-off-by: Thomas Petazzoni (cherry picked from commit 7ee2bd48f11ec9362f6bdbec29a733296b7a01e7) Signed-off-by: Peter Korsgaard --- configs/grinn_chiliboard_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/grinn_chiliboard_defconfig b/configs/grinn_chiliboard_defconfig index e7862d17380..a5a8f7a65f2 100644 --- a/configs/grinn_chiliboard_defconfig +++ b/configs/grinn_chiliboard_defconfig @@ -18,6 +18,7 @@ BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard" +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_FORMAT_CUSTOM=y BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="spl/u-boot-spl.bin" From ae7b3485986a1f495e6a932777be2c7a607edcdf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Jun 2023 17:21:48 +0200 Subject: [PATCH 0296/1167] package/libgcrypt: disable asm on i386 Fixes: http://autobuild.buildroot.net/results/933/93330f9e1867b1ddc1de19b57d70d223b6f23994/ Code failing to build on i386 was added in libgcrypt-10.0.0 https://github.com/gpg/libgcrypt/commit/9d909cb67e70fd792926ac1e2ab305b2cc96bc27 which was added in buildroot with commit d96b9ed0738bae270c479bdaf21eebd4c1f9930d Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit cef05ae1566a4a62915362a46f17ace581908881) Signed-off-by: Peter Korsgaard --- package/libgcrypt/libgcrypt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index 4fffe5360e1..b74838b6499 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -21,8 +21,8 @@ LIBGCRYPT_CONF_OPTS = \ $(if $(BR2_OPTIMIZE_0),--disable-ppc-crypto-support,) \ --with-gpg-error-prefix=$(STAGING_DIR)/usr -# Libgcrypt doesn't support assembly for coldfire -ifeq ($(BR2_m68k_cf),y) +# disable asm for broken archs +ifeq ($(BR2_i386)$(BR2_m68k_cf),y) LIBGCRYPT_CONF_OPTS += --disable-asm endif From cd4e89f76d25749cd654cb115e5112ba0878a19d Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Mon, 26 Jun 2023 09:05:35 +0200 Subject: [PATCH 0297/1167] package/gnuradio: fix build with python-pybind > 2.10.0 Since commit 0e82c360942907f5a2f379e64e0d211aaff80774 (and since release 2.10.1), a new variable called PYBIND11_PYTHONLIBS_OVERWRITE was introduced and set to ON by default. According to comment before this option: "Overwrite cached values read from Python library (classic search). Turn off if cross-compiling and manually setting these values." In buildroot's context this option must be disabled to keep variables provided by buildroot and lib/app. Fixes: - http://autobuild.buildroot.net/results/7423df5db5237d94bb49e32698828d4fe470e39b/ Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Arnout Vandecappelle (cherry picked from commit 11aa7ac8fa3a21dc2476dd09539ea3cf3e48f03d) Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index d9218b533d6..1453b784937 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -116,6 +116,9 @@ ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python3 python-pybind \ host-python-numpy host-python-packaging GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON +# mandatory to avoid pybind11 to overwrite variables provided +# by gnuradio and buildroot +GNURADIO_CONF_OPTS += -DPYBIND11_PYTHONLIBS_OVERWRITE=OFF # mandatory to install python modules in site-packages and to use # correct path for python libraries GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ From ed716fc0c656ea4bf1d468c46b5992ba911f0663 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 16:41:16 +0200 Subject: [PATCH 0298/1167] {linux, linux-headers}: bump 4.{14, 19}.x / 5.{4, 10, 15}.x / 6.{1, 3}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 3512b76f2ec3612a3329bad6da5e82064fd06e6a) [Peter: drop 6.3.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 0e92e6446a0..5dccc7fe8be 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.35" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.36" 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 f18592d0a09..d2f71da15b1 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 be368143bc5d0dc73dd3e8c6191630c1620520379baf6f47c16116b2c0bc26ac linux-6.1.35.tar.xz +sha256 d8ca0e300f30b9ff70c6e1497c638a1dac1407f45d3655e9c62c6e45a08afe6b linux-6.1.36.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 4e6bf4dadb04d5d11d1d4cc37c0eabcf33bc333b7dd3dc2143c3099a823eb5b3 linux-5.15.118.tar.xz -sha256 280662ec8dc8738cf947ad66e748141abd58cbe3b5ed66b7f2b153222b7c7090 linux-5.10.185.tar.xz -sha256 3abed132e76c6575733acba39eaa54f6d8f4b1dc951b0e601a33959743b13e35 linux-5.4.248.tar.xz +sha256 7aa5a0fd3520947e5599e811d28acdc30e36446c016c7dcee3793e6d1cbecfcf linux-5.15.119.tar.xz +sha256 1e60296a135d272bb7ce645f6ae68fbd4ffd1972cb4b82c38c6faa1172481be3 linux-5.10.186.tar.xz +sha256 dc5458462c6edbe3473fc6dee80fbe0841df7c177fe0546c2f131e5918f5351d linux-5.4.249.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 286a9b8c75bff7bdf66985e12a3a650b2bd638a776a5a6e93415930855662a73 linux-4.19.287.tar.xz -sha256 aca4750f02f4090b753c1445db44dfa90de535eca73a7b0a7aa4453f65ba1ff9 linux-4.14.319.tar.xz +sha256 33ebd0c445b58c814428558496b65a192410f000096b0e2e6f5d813ecd95e3eb linux-4.19.288.tar.xz +sha256 ed82679c0c6e600db80050d09e2294fb28b61cf27dc98657296c7eb5250a7625 linux-4.14.320.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 e05a9e12b77..cc3cd16d126 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -384,12 +384,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "4.14.319" if BR2_KERNEL_HEADERS_4_14 - default "4.19.287" if BR2_KERNEL_HEADERS_4_19 - default "5.4.248" if BR2_KERNEL_HEADERS_5_4 - default "5.10.185" if BR2_KERNEL_HEADERS_5_10 - default "5.15.118" if BR2_KERNEL_HEADERS_5_15 - default "6.1.35" if BR2_KERNEL_HEADERS_6_1 + default "4.14.320" if BR2_KERNEL_HEADERS_4_14 + default "4.19.288" if BR2_KERNEL_HEADERS_4_19 + default "5.4.249" if BR2_KERNEL_HEADERS_5_4 + default "5.10.186" if BR2_KERNEL_HEADERS_5_10 + default "5.15.119" if BR2_KERNEL_HEADERS_5_15 + default "6.1.36" if BR2_KERNEL_HEADERS_6_1 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 a5c2bafb4ffcdb8df389ef1282a7cb69726f7279 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 5 Jul 2023 18:46:14 +0200 Subject: [PATCH 0299/1167] board/raspberrypi: handle dtb overlays for all variants Most rpi defconfigs use dtb overlays, but not rpi0 / rpi2 - Making it harder to use overlays on those boards as the genimage files have to be tweaked. To fix this, create the rpi-firmware/overlays directory in the post-build script if needed and unconditionally include it in the genimage files so rpi0/rpi2 works consistently with the other variants. Signed-off-by: Peter Korsgaard (cherry picked from commit 6021f3678b44d43da7057e3135da842cde1ffa05) Signed-off-by: Peter Korsgaard --- board/raspberrypi/genimage-raspberrypi0.cfg | 1 + board/raspberrypi/genimage-raspberrypi2.cfg | 1 + board/raspberrypi/post-build.sh | 3 +++ 3 files changed, 5 insertions(+) diff --git a/board/raspberrypi/genimage-raspberrypi0.cfg b/board/raspberrypi/genimage-raspberrypi0.cfg index 1fa3f5096fd..313f85f651c 100644 --- a/board/raspberrypi/genimage-raspberrypi0.cfg +++ b/board/raspberrypi/genimage-raspberrypi0.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "zImage" } } diff --git a/board/raspberrypi/genimage-raspberrypi2.cfg b/board/raspberrypi/genimage-raspberrypi2.cfg index acd23e7ca8f..dad92755375 100644 --- a/board/raspberrypi/genimage-raspberrypi2.cfg +++ b/board/raspberrypi/genimage-raspberrypi2.cfg @@ -7,6 +7,7 @@ image boot.vfat { "rpi-firmware/config.txt", "rpi-firmware/fixup.dat", "rpi-firmware/start.elf", + "rpi-firmware/overlays", "zImage" } } diff --git a/board/raspberrypi/post-build.sh b/board/raspberrypi/post-build.sh index 5e5eb711007..b24256fceab 100755 --- a/board/raspberrypi/post-build.sh +++ b/board/raspberrypi/post-build.sh @@ -9,3 +9,6 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then sed -i '/GENERIC_SERIAL/a\ tty1::respawn:/sbin/getty -L tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab fi + +# exnsure overlays exists for genimage +mkdir -p "${BINARIES_DIR}/rpi-firmware/overlays" From 85e26ef14f568e87a788f03992f56a726cb6b815 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 1 Jun 2023 18:36:01 +0200 Subject: [PATCH 0300/1167] package/busybox: bump version to 1.36.1 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit a7e4f557f5c5874c84d6ae2e28d752603e18ab3f) Signed-off-by: Peter Korsgaard --- package/busybox/busybox.hash | 4 ++-- package/busybox/busybox.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/busybox/busybox.hash b/package/busybox/busybox.hash index 6d1c36906dd..6eba365ecc7 100644 --- a/package/busybox/busybox.hash +++ b/package/busybox/busybox.hash @@ -1,5 +1,5 @@ -# From https://busybox.net/downloads/busybox-1.35.0.tar.bz2.sha256 -sha256 542750c8af7cb2630e201780b4f99f3dcceeb06f505b479ec68241c1e6af61a5 busybox-1.36.0.tar.bz2 +# From https://busybox.net/downloads/busybox-1.36.1.tar.bz2.sha256 +sha256 b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314 busybox-1.36.1.tar.bz2 # Locally computed sha256 bbfc9843646d483c334664f651c208b9839626891d8f17604db2146962f43548 LICENSE sha256 b5a136ed67798e51fe2e0ca0b2a21cb01b904ff0c9f7d563a6292e276607e58f archival/libarchive/bz/LICENSE diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index fd4f3c17c5a..eb5e7ad9222 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -4,7 +4,7 @@ # ################################################################################ -BUSYBOX_VERSION = 1.36.0 +BUSYBOX_VERSION = 1.36.1 BUSYBOX_SITE = https://www.busybox.net/downloads BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 BUSYBOX_LICENSE = GPL-2.0, bzip2-1.0.4 From 09cf509494bf8c499ade879f2ff1a827a6b735f3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 7 Jul 2023 07:34:42 +0200 Subject: [PATCH 0301/1167] package/php: bump version to 8.2.8 Changelog: https://www.php.net/ChangeLog-8.php#8.2.8 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 3ca3304276bd155d3d29fb87f227866bd7f32ec7) Signed-off-by: Peter Korsgaard --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/php/php.hash b/package/php/php.hash index 4fe77f1c5ba..9fb4aebec14 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 4b9fb3dcd7184fe7582d7e44544ec7c5153852a2528de3b6754791258ffbdfa0 php-8.2.7.tar.xz +sha256 cfe1055fbcd486de7d3312da6146949aae577365808790af6018205567609801 php-8.2.8.tar.xz # License file sha256 080d0d0cca64181ef8bf1df9fba0c6f0c485f78f79540c479a45b593bb3b33b5 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 3bb27f1306f..6a2a6ae71b1 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.2.7 +PHP_VERSION = 8.2.8 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 52c7029cd72d267588c8b74cdb360c94a1fb23f1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 11:50:57 +0200 Subject: [PATCH 0302/1167] package/fwts: fix build with BR2_OPTIMIZE_0 Fixes: http://autobuild.buildroot.net/results/fab/fabd031d38cb618cdb11b4a86cd853b0da61695b/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 4a239f14efdd4eb0fcbf89d403cde4dd31205a41) Signed-off-by: Peter Korsgaard --- package/fwts/fwts.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index f04c7a848fc..3af54a1afdf 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -15,6 +15,10 @@ FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf libglib2 libbsd \ $(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \ $(if $(BR2_PACKAGE_DTC),dtc) +ifeq ($(BR2_OPTIMIZE_0),y) +FWTS_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -O1" +endif + ifeq ($(BR2_PACKAGE_FWTS_EFI_RUNTIME_MODULE),y) FWTS_MODULE_SUBDIRS = efi_runtime $(eval $(kernel-module)) From 863fc630862cbe7d73ee30a87a2222cc3adc5b1c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 16:51:18 +0200 Subject: [PATCH 0303/1167] utils/genrandconfig: disable cramfs images Fixes build error: warning: estimate of required size (upper bound) is 1374MB, but maximum image size is 272MB, we might die prematurely mkcramfs: filesystem too big Fixes: http://autobuild.buildroot.net/results/d47/d47f9b462707dffe1b6665f143701303b04e2adc/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit af5ccec266dbb7925ac12622f379dacb20087ddd) Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 2b0baedf310..0938260c1be 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -512,6 +512,9 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_OPTEE_OS=y\n') configlines.remove('BR2_TARGET_OPTEE_OS_PLATFORM=""\n') + if 'BR2_TARGET_ROOTFS_CRAMFS=y\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_CRAMFS=y\n') + if 'BR2_TARGET_ROOTFS_EXT2=y\n' in configlines and \ 'BR2_TARGET_ROOTFS_EXT2_SIZE="60M"\n' in configlines: configlines.remove('BR2_TARGET_ROOTFS_EXT2_SIZE="60M"\n') From 9d355495f8097fb9f7aef6ecf6c4b5e6cd3c8d0e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Jul 2023 09:55:42 +0200 Subject: [PATCH 0304/1167] package/mesa3d-demos: needs C++ Reference: https://gitlab.freedesktop.org/mesa/demos/-/blob/main/meson.build#L21 Fixes: http://autobuild.buildroot.net/results/90e/90e98fa0f37462cadea0fcbff9feabad5554587d/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c1a7079a2387738044dd76105267d6477418df48) Signed-off-by: Peter Korsgaard --- package/mesa3d-demos/Config.in | 6 ++++++ package/piglit/Config.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/mesa3d-demos/Config.in b/package/mesa3d-demos/Config.in index b716cf57991..7848bb6faf6 100644 --- a/package/mesa3d-demos/Config.in +++ b/package/mesa3d-demos/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_MESA3D_DEMOS bool "mesa3d-demos" + depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL @@ -10,3 +11,8 @@ config BR2_PACKAGE_MESA3D_DEMOS OpenGL demos from the Mesa 3D project. http://mesa3d.org + +comment "mesa3d-demos needs a toolchain with C++" + depends on !BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ + || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG diff --git a/package/piglit/Config.in b/package/piglit/Config.in index 5e957a555ac..22d1c7c28e7 100644 --- a/package/piglit/Config.in +++ b/package/piglit/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_PIGLIT BR2_PACKAGE_WAFFLE_SUPPORTS_WAYLAND || \ BR2_PACKAGE_WAFFLE_SUPPORTS_X11_EGL || \ BR2_PACKAGE_WAFFLE_SUPPORTS_GBM - depends on BR2_INSTALL_LIBSTDCPP # python-numpy + depends on BR2_INSTALL_LIBSTDCPP # mesa3d-demos, python-numpy depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBPNG From eb62b3fc914621a84c616a72de27549f33427511 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 6 Jul 2023 18:49:57 +0200 Subject: [PATCH 0305/1167] {linux, linux-headers}: bump 5.15.x / 6.{1, 3, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 88a2e0c473fe78ba571bf48fb4e9cc94c86a3df4) [Peter: drop 6.3.x/6.4.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 5dccc7fe8be..352fa76379e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.36" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.38" 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 d2f71da15b1..04466406300 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 d8ca0e300f30b9ff70c6e1497c638a1dac1407f45d3655e9c62c6e45a08afe6b linux-6.1.36.tar.xz +sha256 f9a4f91b609f7d332a5f2be01ab86336fa00149fae6bdc19f16fa19f78802d43 linux-6.1.38.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 7aa5a0fd3520947e5599e811d28acdc30e36446c016c7dcee3793e6d1cbecfcf linux-5.15.119.tar.xz +sha256 6499089eae6b271063cb3e873ab7f4ba0543cfb21dcc9c54d9bcf5357db683f6 linux-5.15.120.tar.xz sha256 1e60296a135d272bb7ce645f6ae68fbd4ffd1972cb4b82c38c6faa1172481be3 linux-5.10.186.tar.xz sha256 dc5458462c6edbe3473fc6dee80fbe0841df7c177fe0546c2f131e5918f5351d linux-5.4.249.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index cc3cd16d126..7b054a2e411 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -388,8 +388,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.288" if BR2_KERNEL_HEADERS_4_19 default "5.4.249" if BR2_KERNEL_HEADERS_5_4 default "5.10.186" if BR2_KERNEL_HEADERS_5_10 - default "5.15.119" if BR2_KERNEL_HEADERS_5_15 - default "6.1.36" if BR2_KERNEL_HEADERS_6_1 + default "5.15.120" if BR2_KERNEL_HEADERS_5_15 + default "6.1.38" if BR2_KERNEL_HEADERS_6_1 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 dc7000f0de50a21355198d6ce814143a9d5af582 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 17 Jul 2023 23:07:52 +0200 Subject: [PATCH 0306/1167] Update for 2023.02.3 Signed-off-by: Peter Korsgaard --- CHANGES | 24 ++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 3b2199f4470..b5cb5e76651 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,27 @@ +2023.02.3, released July 17th, 2023 + + Important / security related fixes. + + Defconfigs: Chiliboard: fix build on hosts without openssl + development headers. + Nitrogen*: fix build on hosts without openssl or pylibfdt. + Raspberrypi: Handle DTB overlays for all variants + + Updated/fixed packages: agentpp, alsa-plugins, assimp, bind, + busybox, dbus, c-ares, check, dav1d, fluidsynth, fftw, fwts, + ghostscript, gnupg2, gnuradio, gupnp, haproxy, heimdal, + hwdata, jhead, libcap, libgcrypt, libgpg-error, libgtk3, + libxslt, mesa3d-demos, mpir, nodejs, php, pkgconf, + python-cryptography, python-dbus-fast, python-django, + python-pyicu, python-requests, python3, qt6, quickjs, + sconeserver, taglib, tiff, wireshark, xdriver_xf86-video-dummy + + Issues resolved (http://bugs.uclibc.org): + + #15643: ERROR: No hash found for linux-6.3.8.tar.xz + #15673: PKGCONF_SITE in pkgconf.mk points to parked domain + #15682: pkgconf: no longer able to download source from... + 2023.02.2, released June 16th, 2023 Important / security related fixes. diff --git a/Makefile b/Makefile index 7fcd9e6bcb2..7309fd99761 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02.2 +export BR2_VERSION := 2023.02.3 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1686923000 +BR2_VERSION_EPOCH = 1689628000 # 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 5bc7a2c012c..250766fb1d5 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.02.2' +RELEASE='2023.02.3' ### Change here for more memory/cores ### VM_MEMORY=2048 From 0cf3f7aed93ec0f49ab153a4b99e25b604f65c68 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 13:22:46 +0200 Subject: [PATCH 0307/1167] DEVELOPERS: add Bernd Kuhls to various packages Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7d271346e560dd08faf7c4e51c4b46517d5f2638) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 7e4d6ef764f..a540317ae96 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -329,11 +329,13 @@ F: package/dht/ F: package/dovecot/ F: package/dovecot-pigeonhole/ F: package/dtv-scan-tables/ +F: package/ethtool/ F: package/eudev/ F: package/exim/ F: package/fetchmail/ F: package/ffmpeg/ F: package/flac/ +F: package/flatbuffers/ F: package/freeswitch/ F: package/freeswitch-mod-bcg729/ F: package/freetype/ @@ -355,6 +357,7 @@ F: package/intel-microcode/ F: package/jsoncpp/ F: package/kodi* F: package/lame/ +F: package/lcms2/ F: package/leafnode2/ F: package/libaacs/ F: package/libasplib/ @@ -362,6 +365,7 @@ F: package/libass/ F: package/libbdplus/ F: package/libbluray/ F: package/libbroadvoice/ +F: package/libcap/ F: package/libcdio/ F: package/libcec/ F: package/libcodec2/ @@ -373,6 +377,7 @@ F: package/libdvdcss/ F: package/libdvdnav/ F: package/libdvdread/ F: package/libebur128/ +F: package/libfribidi/ F: package/libfreeglut/ F: package/libg7221/ F: package/libglew/ @@ -401,16 +406,23 @@ F: package/libudfread/ F: package/libunibreak/ F: package/liburiparser/ F: package/libutp/ +F: package/libuv/ F: package/libva/ F: package/libva-intel-driver/ F: package/libva-utils/ F: package/libvorbis/ F: package/libvpx/ F: package/libyuv/ +F: package/linux-firmware/ +F: package/mc/ F: package/mesa3d/ F: package/minidlna/ F: package/mjpg-streamer/ +F: package/mpg123/ +F: package/ntp/ F: package/nut/ +F: package/opus/ +F: package/pciutils/ F: package/perl-crypt-openssl-guess/ F: package/perl-crypt-openssl-random/ F: package/perl-crypt-openssl-rsa/ @@ -439,6 +451,8 @@ F: package/php/ F: package/pixman/ F: package/pngquant/ F: package/pound/ +F: package/pppd/ +F: package/privoxy/ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ @@ -453,8 +467,10 @@ F: package/python-pylru/ F: package/python-requests-oauthlib/ F: package/python-slob/ F: package/rsync/ +F: package/rrdtool/ F: package/rtmpdump/ F: package/samba4/ +F: package/sofia-sip/ F: package/softether/ F: package/spandsp/ F: package/sqlite/ @@ -471,6 +487,9 @@ F: package/vdr-plugin-vnsiserver/ F: package/vlc/ F: package/vnstat/ F: package/waylandpp/ +F: package/wget/ +F: package/wireless-regdb/ +F: package/wireless_tools/ F: package/x264/ F: package/x265/ F: package/xmrig/ From 32d30be53634c778b8750fa25531f2f55e21587a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 13:22:47 +0200 Subject: [PATCH 0308/1167] DEVELOPERS: remove Bernd Kuhls from various packages Remove packages which are no longer runtime-tested here. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 2b6ea18e47c88b899ac45d8e60d3a7bc2f983d66) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index a540317ae96..6da1be8b486 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -321,8 +321,6 @@ F: package/apr-util/ F: package/bcg729/ F: package/bento4/ F: package/bitcoin/ -F: package/bluez-tools/ -F: package/boinc/ F: package/clamav/ F: package/dav1d/ F: package/dht/ @@ -343,13 +341,10 @@ F: package/fstrcmp/ F: package/ghostscript/ F: package/giflib/ F: package/gkrellm/ -F: package/gli/ -F: package/glmark2/ F: package/gpsd/ F: package/gptfdisk/ F: package/hdparm/ F: package/hddtemp/ -F: package/inih/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ @@ -401,7 +396,6 @@ F: package/libsidplay2/ F: package/libsilk/ F: package/libsndfile/ F: package/libsoundtouch/ -F: package/libsquish/ F: package/libudfread/ F: package/libunibreak/ F: package/liburiparser/ @@ -450,7 +444,6 @@ F: package/perl-www-robotrules/ F: package/php/ F: package/pixman/ F: package/pngquant/ -F: package/pound/ F: package/pppd/ F: package/privoxy/ F: package/pure-ftpd/ @@ -471,7 +464,6 @@ F: package/rrdtool/ F: package/rtmpdump/ F: package/samba4/ F: package/sofia-sip/ -F: package/softether/ F: package/spandsp/ F: package/sqlite/ F: package/stellarium/ @@ -481,12 +473,8 @@ F: package/tor/ F: package/transmission/ F: package/tvheadend/ F: package/unixodbc/ -F: package/utf8proc/ -F: package/vdr/ -F: package/vdr-plugin-vnsiserver/ F: package/vlc/ F: package/vnstat/ -F: package/waylandpp/ F: package/wget/ F: package/wireless-regdb/ F: package/wireless_tools/ From 186732748c7dbf3623595ec66d60b32350ac053f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 18 Jun 2023 14:32:14 +0200 Subject: [PATCH 0309/1167] package/gkrellm: link with -latomic if needed Fixes: http://autobuild.buildroot.net/results/5df/5dffba341cfe5e4d41b3c88e58d92b0747318c07/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 36c29522ae6840eb8815a4e0c037f4cd17b1f126) Signed-off-by: Peter Korsgaard --- package/gkrellm/gkrellm.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/gkrellm/gkrellm.mk b/package/gkrellm/gkrellm.mk index 2a687226630..27a87be1905 100644 --- a/package/gkrellm/gkrellm.mk +++ b/package/gkrellm/gkrellm.mk @@ -12,7 +12,13 @@ GKRELLM_LICENSE_FILES = COPYING COPYRIGHT GKRELLM_DEPENDENCIES = host-pkgconf libglib2 $(TARGET_NLS_DEPENDENCIES) GKRELLM_BUILD_OPTS = \ STRIP="" \ - SYS_LIBS=$(TARGET_NLS_LIBS) + SYS_LIBS="$(GKRELLM_SYS_LIBS)" + +GKRELLM_SYS_LIBS = $(TARGET_NLS_LIBS) + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +GKRELLM_SYS_LIBS += -latomic +endif ifeq ($(BR2_PACKAGE_LM_SENSORS),y) GKRELLM_DEPENDENCIES += lm-sensors From 1c9af7406429d9eb1b7eaf99b7cf031c7b913d63 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Tue, 20 Jun 2023 10:09:22 -0700 Subject: [PATCH 0310/1167] package/freescale-imx/firmware-imx: ensure the linux firmware is installed first There was some imx SDMA firmware in the base linux-firmware package at one time, but the firmware-imx is updated with the latest versions from NXP releases. This just ensures a dependency is set so that the firmware-imx package will always come later in case an overlap occurs again. Signed-off-by: Charles Hardin Reviewed-by: Gary Bisson Signed-off-by: Thomas Petazzoni (cherry picked from commit 70ff5377f233ff936d31956b4c2747280d25d289) Signed-off-by: Peter Korsgaard --- package/freescale-imx/firmware-imx/firmware-imx.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index 99fe71a91c9..4cceb670193 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -14,6 +14,10 @@ FIRMWARE_IMX_REDISTRIBUTE = NO FIRMWARE_IMX_INSTALL_IMAGES = YES +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE),y) +FIRMWARE_IMX_DEPENDENCIES += linux-firmware +endif + define FIRMWARE_IMX_EXTRACT_CMDS $(call NXP_EXTRACT_HELPER,$(FIRMWARE_IMX_DL_DIR)/$(FIRMWARE_IMX_SOURCE)) endef From 7cc57e0b73ca7687ce3dfbe417d5207c7486ce60 Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Tue, 20 Jun 2023 10:23:05 -0700 Subject: [PATCH 0311/1167] package/unzip: configure with LARGE_FILE_SUPPORT by default Buildroot always enable largefile support in the toolchain, and thus the associated definitions are always on. This leads to a problem in unzip that on a 32-bit arch with these flags being passed in -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 but the LARGE_FILE_SUPPORT define not being set will cause a size mismatch on the comparison of the zipfiles: $ unzip test.zip Archive: test.zip error: invalid zip file with overlapped components (possible zip bomb) The simple solution is just enable LARGE_FILE_SUPPORT to enable large file support. In order to avoid redefinition warnings, we undefine _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE. Signed-off-by: Charles Hardin Tested-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni (cherry picked from commit 168e5848addda21067d3b8791e9b781847daa30f) Signed-off-by: Peter Korsgaard --- package/unzip/unzip.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk index 44cc2013fbc..14ccedd48fd 100644 --- a/package/unzip/unzip.mk +++ b/package/unzip/unzip.mk @@ -28,4 +28,18 @@ UNZIP_IGNORE_CVES = \ CVE-2022-0529 \ CVE-2022-0530 +# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when +# necessary, redefining it on the command line causes some warnings. +UNZIP_TARGET_CFLAGS = \ + $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) + +# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when +# necessary, redefining it on the command line causes some warnings. +UNZIP_TARGET_CXXFLAGS = \ + $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CXXFLAGS)) + +UNZIP_CONF_OPTS += \ + -DCMAKE_C_FLAGS="$(UNZIP_TARGET_CFLAGS) -DLARGE_FILE_SUPPORT" \ + -DCMAKE_CXX_FLAGS="$(UNZIP_TARGET_CXXFLAGS) -DLARGE_FILE_SUPPORT" + $(eval $(cmake-package)) From 12c76f9be582264aa60172a4c45ea32cce006492 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 10 Jul 2023 15:26:53 -0600 Subject: [PATCH 0312/1167] DEVELOPERS: Remove Michael Rommel Removal requested via email: could you somehow please remove me as maintainer from this package. I am since many years not using builtroot anymore and have no longer systems with which I could do patch requests. I am going into retirement. Signed-off-by: James Hilliard Signed-off-by: Yann E. MORIN (cherry picked from commit 10dbb664e50e75ce7df2732d3cb483817147ffbf) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 5 ----- 1 file changed, 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 6da1be8b486..adbf85ab175 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2057,11 +2057,6 @@ F: package/protobuf/ F: package/re2/ F: package/spdlog/ -N: Michael Rommel -F: package/knock/ -F: package/python-crc16/ -F: package/python-pyzmq/ - N: Michael Trimarchi F: board/bsh/ F: configs/imx8mn_bsh_smm_s2_defconfig From 63bea3d49f521cbbbd31b1a76853aae4f1d1dcdb Mon Sep 17 00:00:00 2001 From: Lothar Felten Date: Tue, 11 Jul 2023 11:44:48 +0200 Subject: [PATCH 0313/1167] configs/beaglebone_qt5_defconfig: build am335x-bonegreen-wireless Build the am335x-bonegreen-wireless.dtb device tree. The genimage script which is shared between beaglebone and beaglebone_qt5 was updated to support the bonegreen-wireless. Signed-off-by: Lothar Felten Signed-off-by: Yann E. MORIN (cherry picked from commit adc566856e95990ede1174faa0a2ff031b15d356) Signed-off-by: Peter Korsgaard --- configs/beaglebone_qt5_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index ff03a05a8eb..0038acfcfdb 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.7 BR2_LINUX_KERNEL_DEFCONFIG="omap2plus" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/beaglebone/linux-sgx.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless" +BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-evm am335x-bone am335x-boneblack am335x-bonegreen am335x-evmsk am335x-boneblue am335x-boneblack-wireless am335x-bonegreen-wireless" BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_PACKAGE_FBV=y BR2_PACKAGE_QT5=y From cf058768356597b655e9c118076078a17780665f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Mon, 10 Jul 2023 19:45:42 +0200 Subject: [PATCH 0314/1167] package/yavta: update _SITE URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It looks like the project moved to https://git.ideasonboard.org/yavta.git. Update YAVA_SITE URL accordingly. Signed-off-by: Sébastien Szymanski Signed-off-by: Yann E. MORIN (cherry picked from commit b17ed57763c4809f4541b4abe6a7a0e2349e6f90) Signed-off-by: Peter Korsgaard --- package/yavta/yavta.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yavta/yavta.mk b/package/yavta/yavta.mk index d16bee69b11..db481b77b95 100644 --- a/package/yavta/yavta.mk +++ b/package/yavta/yavta.mk @@ -5,7 +5,7 @@ ################################################################################ YAVTA_VERSION = 583bedefc2a247d2cfd32d1b4a0abbe3e2015c70 -YAVTA_SITE = https://git.ideasonboard.org/git/yavta.git +YAVTA_SITE = https://git.ideasonboard.org/yavta.git YAVTA_SITE_METHOD = git YAVTA_LICENSE = GPL-2.0+ YAVTA_LICENSE_FILES = COPYING.GPL From d77b2404c522cee86b5f137f45fc23be354186bf Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 5 Jul 2023 18:10:42 +0200 Subject: [PATCH 0315/1167] package/ffmpeg: mmal is not available on aarch64 Fixes: http://autobuild.buildroot.net/results/aa5/aa589b38e1591a0ec4d400891bf86f5138cf4542/ For details see: https://lists.buildroot.org/pipermail/buildroot/2023-July/669839.html https://github.com/raspberrypi/userland/issues/688 Reported-by: Guillermo G Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c2d37c58f274ae25b963fec53aa2d5a057527af5) Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 59e13b503e8..9d9209706a3 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -282,9 +282,14 @@ FFMPEG_CONF_OPTS += --disable-vdpau endif ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \ +FFMPEG_CONF_OPTS += --enable-omx --enable-omx-rpi \ --extra-cflags=-I$(STAGING_DIR)/usr/include/IL FFMPEG_DEPENDENCIES += rpi-userland +ifeq ($(BR2_arm),y) +FFMPEG_CONF_OPTS += --enable-mmal +else +FFMPEG_CONF_OPTS += --disable-mmal +endif else FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi endif From 00ab747055d0583aac073b8c2dac8625dabd348a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 5 Jul 2023 18:20:11 +0200 Subject: [PATCH 0316/1167] package/ffmpeg: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccw5V2Ti.s: Assembler messages: /tmp/ccw5V2Ti.s:2013: Error: selected processor does not support `itt gt' in Thumb mode /tmp/ccw5V2Ti.s:2014: Error: Thumb does not support conditional execution /tmp/ccw5V2Ti.s:2015: Error: Thumb does not support conditional execution /tmp/ccw5V2Ti.s:2017: Error: selected processor does not support `it le' in Thumb mode /tmp/ccw5V2Ti.s:2018: Error: Thumb does not support conditional execution /tmp/ccw5V2Ti.s:2020: Error: selected processor does not support `it gt' in Thumb mode /tmp/ccw5V2Ti.s:2021: Error: Thumb does not support conditional execution Fixes: http://autobuild.buildroot.net/results/3fc/3fc68f756cf1661673941c411c4a2477e901e361/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c8cc28b5ced34677a39de8e7bcc9a96d6e8df9fe) Signed-off-by: Peter Korsgaard --- package/ffmpeg/ffmpeg.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 9d9209706a3..ce285bcc60f 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -554,6 +554,10 @@ FFMPEG_CONF_OPTS += --disable-optimizations FFMPEG_CFLAGS += -O0 endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +FFMPEG_CFLAGS += -marm +endif + FFMPEG_CONF_ENV += CFLAGS="$(FFMPEG_CFLAGS)" FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF)) From 211ea14e6f63ef106ab4d9bd02512ba71e5e530f Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Tue, 11 Jul 2023 23:31:25 +0200 Subject: [PATCH 0317/1167] package/rtl8189fs: bump version to 2023-07-08 This version fixes a wrong patching for Linux 6.1 Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit ee2f9c920ab33d23e07e439f440d549eb1bb4e09) Signed-off-by: Peter Korsgaard --- package/rtl8189fs/rtl8189fs.hash | 2 +- package/rtl8189fs/rtl8189fs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rtl8189fs/rtl8189fs.hash b/package/rtl8189fs/rtl8189fs.hash index 95a031b6f29..377812fba81 100644 --- a/package/rtl8189fs/rtl8189fs.hash +++ b/package/rtl8189fs/rtl8189fs.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 5d8aad48b8d124a313e5b8182c5dba2b94ecdbac2a9f1861a50c081b9034a543 rtl8189fs-c223a25b1000d64432eca4201a8f012414dfc7ce.tar.gz +sha256 9ff7aa9ee8cd7a8f386531d3b009e7bcbce1ff71bb676c187c40e538755eb8b5 rtl8189fs-75a566a830037c7d1309c5a9fe411562772a1cf2.tar.gz diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index dd35a166e53..ca8ea15c035 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -4,7 +4,7 @@ # ################################################################################ -RTL8189FS_VERSION = c223a25b1000d64432eca4201a8f012414dfc7ce +RTL8189FS_VERSION = 75a566a830037c7d1309c5a9fe411562772a1cf2 RTL8189FS_SITE = $(call github,jwrdegoede,rtl8189ES_linux,$(RTL8189FS_VERSION)) RTL8189FS_LICENSE = GPL-2.0 From c31651c2f2350011ac6c038f20736ab417ac39d6 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 11 Jul 2023 15:14:56 -0700 Subject: [PATCH 0318/1167] package/go: security bump to version 1.19.11 go1.19.11 (released 2023-07-11) includes a security fix to the net/http package, as well as bug fixes to cgo, the cover tool, the go command, the runtime, and the go/printer package. CVE-2023-29406 and Go issue https://go.dev/issue/60374 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit fc957ece11e585f1980c51764aafc56fde5b0e15) Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 874737ea2d3..6d4c718a405 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 13755bcce529747d5f2930dee034730c86d02bd3e521ab3e2bbede548d3b953f go1.19.10.src.tar.gz +sha256 e25c9ab72d811142b7f41ff6da5165fec2d1be5feec3ef2c66bc0bdecb431489 go1.19.11.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 545d2117b7d..22b8161e052 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.10 +GO_VERSION = 1.19.11 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From d41d079735b82c9f5fdce8d26903e91ce952fbdd Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 9 Jun 2023 01:28:43 +0200 Subject: [PATCH 0319/1167] package/python-iptables: fix _find_library() While the commit [1] already fixed some runtime issue with uClibc toolchain, the same test TestPythonPy3Iptables fail with Glibc toolchain. xtables_version = 12 if xtables_version: _searchlib = "libxtables.so.%s" % (xtables_version,) else: _searchlib = "xtables" _lib_xtables, xtables_version = find_library(_searchlib) _lib_xtables and xtables_version are null with glibc The implementation of find_library() rely on the custom _find_library() that try to use the IPTABLES_LIBDIR environment variable (that does not exist in the context of Buildroot). Within the scope of buildroot we can determine what IPTABLES_LIBDIR should be at build time and replace the calls to os.environ.get('IPTABLES_LIBDIR', None) with the correct value. [1] d341ec035067120b456f669a826e26eb594c0237 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni (cherry picked from commit bbf3454f8f760e323ebcc0fffeafb6606692c5c3) Signed-off-by: Peter Korsgaard --- package/python-iptables/python-iptables.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-iptables/python-iptables.mk b/package/python-iptables/python-iptables.mk index 0ccf064217d..9cb4285ec34 100644 --- a/package/python-iptables/python-iptables.mk +++ b/package/python-iptables/python-iptables.mk @@ -15,6 +15,7 @@ define PYTHON_IPTABLES_SET_XTABLES_ENV_VARS XTABLES_VERSION=`awk '/XTABLES_VERSION_CODE/ {print $$NF}' $(STAGING_DIR)/usr/include/xtables-version.h`; \ sed -i "s%os.getenv(\"PYTHON_IPTABLES_XTABLES_VERSION\")%$$XTABLES_VERSION%" $(@D)/iptc/xtables.py sed -i "s%os.getenv(\"XTABLES_LIBDIR\")%\"/usr/lib/xtables\"%" $(@D)/iptc/xtables.py + sed -i "s%os.environ.get('IPTABLES_LIBDIR', None)%\"/usr/lib\"%" $(@D)/iptc/util.py endef PYTHON_IPTABLES_PRE_BUILD_HOOKS += PYTHON_IPTABLES_SET_XTABLES_ENV_VARS From afef2ea19031d541f74a4e5c06b85596a1a3e192 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 13 Jul 2023 22:20:24 +0200 Subject: [PATCH 0320/1167] package/ghostscript: security bump version to 10.01.2 Fixes CVE-2023-36664: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-36664 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit effe9f895e6642a2a92df1f283f5afc609d774fb) Signed-off-by: Peter Korsgaard --- package/ghostscript/ghostscript.hash | 4 ++-- package/ghostscript/ghostscript.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ghostscript/ghostscript.hash b/package/ghostscript/ghostscript.hash index 30c45a5a74a..2e4b6ac7504 100644 --- a/package/ghostscript/ghostscript.hash +++ b/package/ghostscript/ghostscript.hash @@ -1,5 +1,5 @@ -# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10011/SHA512SUMS -sha512 d944be9e8aef68d1176d64c40db6fa86d55d0c9e30047f2147c02806ab61cfe9ac2cb00d4e5b218ff3c51cc6ed47ceffe1bac4dd9d4cc1760b7974f30c6c2735 ghostscript-10.01.1.tar.xz +# From https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs10012/SHA512SUMS +sha512 ee20f0e12f553a3d04578e71a0d45defebc71117ce4dc2c14043985bfe7348ad7f8b2fe98fc9b4f5b935ecb32e50dc340be67d6ef58190542ec6d0f9da1de380 ghostscript-10.01.2.tar.xz # Hash for license file: sha256 8ce064f423b7c24a011b6ebf9431b8bf9861a5255e47c84bfb23fc526d030a8b LICENSE diff --git a/package/ghostscript/ghostscript.mk b/package/ghostscript/ghostscript.mk index 03fc9ef0162..bd3eec1e45c 100644 --- a/package/ghostscript/ghostscript.mk +++ b/package/ghostscript/ghostscript.mk @@ -4,7 +4,7 @@ # ################################################################################ -GHOSTSCRIPT_VERSION = 10.01.1 +GHOSTSCRIPT_VERSION = 10.01.2 GHOSTSCRIPT_SOURCE = ghostscript-$(GHOSTSCRIPT_VERSION).tar.xz GHOSTSCRIPT_SITE = https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs$(subst .,,$(GHOSTSCRIPT_VERSION)) GHOSTSCRIPT_LICENSE = AGPL-3.0 From 42a36db68e7bedd7d21987d0b87d971ee8c65c6c Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Fri, 14 Jul 2023 08:13:28 +0000 Subject: [PATCH 0321/1167] DEVELOPERS: update entry for Daniel Lang Signed-off-by: Daniel Lang Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni (cherry picked from commit a1a2bfa429ebeb061059a00fdb6c2f9def494c78) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index adbf85ab175..c4a2557aba0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -649,7 +649,7 @@ F: package/odroidc2-firmware/ N: Daniel J. Leach F: package/dacapo/ -N: Daniel Lang +N: Daniel Lang F: package/atkmm/ F: package/atkmm2_28/ F: package/cairomm/ @@ -663,6 +663,7 @@ F: package/libsigc2/ F: package/paho-mqtt-cpp/ F: package/pangomm/ F: package/pangomm2_46/ +F: package/sam-ba/ N: Damien Lanson F: package/libvdpau/ From ce3c56527e2176a2cdaf57793b30791c0783f389 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 11 Jun 2023 11:25:58 +0200 Subject: [PATCH 0322/1167] package/wireless-regdb: bump version to 2023.05.03 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit ecfa41b6f1b8c4cec9048acc0d241521811447db) Signed-off-by: Peter Korsgaard --- package/wireless-regdb/wireless-regdb.hash | 2 +- package/wireless-regdb/wireless-regdb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/wireless-regdb/wireless-regdb.hash b/package/wireless-regdb/wireless-regdb.hash index 36451f839d8..b4e8dcaf544 100644 --- a/package/wireless-regdb/wireless-regdb.hash +++ b/package/wireless-regdb/wireless-regdb.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73 wireless-regdb-2023.02.13.tar.xz +sha256 f254d08ab3765aeae2b856222e11a95d44aef519a6663877c71ef68fae4c8c12 wireless-regdb-2023.05.03.tar.xz # Locally computed sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 68fbe35b8be..db9c7f42d56 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRELESS_REGDB_VERSION = 2023.02.13 +WIRELESS_REGDB_VERSION = 2023.05.03 WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC From 851a7195a55bf88a6b3cc6c06e6190c9288cdd8e Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 14 Jul 2023 22:35:30 +0200 Subject: [PATCH 0323/1167] package/libssh: fix build with Thumb /home/buildroot/autobuild/instance-3/output-1/build/libssh-0.10.5/src/bignum.c: In function 'ssh_make_bignum_string': /home/buildroot/autobuild/instance-3/output-1/build/libssh-0.10.5/src/bignum.c:64:1: sorry, unimplemented: '-fstack-check=specific' for Thumb-1 Fixes: http://autobuild.buildroot.net/results/82c/82c8e3bb755bc8732a81f05a72f04a96ecc08b4e/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 0368cd816307ee961bbd17ce2d3827b955b0c204) Signed-off-by: Peter Korsgaard --- package/libssh/libssh.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/libssh/libssh.mk b/package/libssh/libssh.mk index 3be6c6adaf3..e770d2b9244 100644 --- a/package/libssh/libssh.mk +++ b/package/libssh/libssh.mk @@ -17,6 +17,10 @@ LIBSSH_CONF_OPTS = \ -DWITH_STACK_PROTECTOR=OFF \ -DWITH_EXAMPLES=OFF +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +LIBSSH_CONF_OPTS += -DWITH_STACK_CLASH_PROTECTION=OFF +endif + ifeq ($(BR2_PACKAGE_LIBSSH_SERVER),y) LIBSSH_CONF_OPTS += -DWITH_SERVER=ON else From ef926a0a44e49da84f619846f66028e7653e5c52 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 14 Jul 2023 20:24:00 +0200 Subject: [PATCH 0324/1167] utils/genrandconfig: increase default target ubifs image size The new value is calculated based on: ROOTFS_SIZE = 5G (see commit 3c98eb26db6501a373cc405c80505ba72fde9e96) BR2_TARGET_ROOTFS_UBIFS_LEBSIZE = 0x1f800 5G / 0x1f800 = 41610 Fixes: http://autobuild.buildroot.net/results/f72/f72918d63510b170e5da01bfa9c247cf9dcf507f/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 9b31b643825e5ffa0e5849b622de4925b5b73cb9) Signed-off-by: Peter Korsgaard --- utils/genrandconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/genrandconfig b/utils/genrandconfig index 0938260c1be..60922e871c1 100755 --- a/utils/genrandconfig +++ b/utils/genrandconfig @@ -525,6 +525,11 @@ def fixup_config(sysinfo, configfile): configlines.remove('BR2_TARGET_ROOTFS_F2FS_SIZE="100M"\n') configlines.append('BR2_TARGET_ROOTFS_F2FS_SIZE="%s"\n' % ROOTFS_SIZE) + if 'BR2_TARGET_ROOTFS_UBIFS=y\n' in configlines and \ + 'BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2048\n' in configlines: + configlines.remove('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=2048\n') + configlines.append('BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT=41610\n') + if 'BR2_TARGET_S500_BOOTLOADER=y\n' in configlines and \ 'BR2_TARGET_S500_BOOTLOADER_BOARD=""\n' in configlines: configlines.remove('BR2_TARGET_S500_BOOTLOADER=y\n') From ab72054281376ead3742ff9cbb8511562b0f7c53 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 16 Jul 2023 02:39:00 -0600 Subject: [PATCH 0325/1167] boot/uboot: set DTC path when BR2_TARGET_UBOOT_NEEDS_DTC In order for host-dtc to get picked up properly we need to set the DTC path passed to the build explicitly. See: https://github.com/u-boot/u-boot/blob/v2023.07.02/Makefile#L420 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 231d79c81e9a1f8c2ef14861374a40fcdc5e6b33) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 4eae8e95c37..1a6e70a792a 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -209,6 +209,7 @@ endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_DTC),y) UBOOT_DEPENDENCIES += host-dtc +UBOOT_MAKE_OPTS += DTC=$(HOST_DIR)/bin/dtc endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYTHON3),y) From a856114c6b1337fa81cf4390d4fbddccc1b9e0da Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Jul 2023 10:52:59 +0200 Subject: [PATCH 0326/1167] package/pipewire: remove optional dependency to vulkan Fixes: http://autobuild.buildroot.net/results/8b4/8b4d12de72a1407e74bd9b9b79f4e01ae86510ba/ vulkan.pc is provided by the package vulkan-loader which is not part of buildroot yet. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit ed20a4eccd7dd665cb7997537f170391b417c5e7) Signed-off-by: Peter Korsgaard --- package/pipewire/pipewire.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index ecf4a035ecb..d6bd2434bfb 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -30,6 +30,7 @@ PIPEWIRE_CONF_OPTS += \ -Dvideoconvert=enabled \ -Dvideotestsrc=enabled \ -Dvolume=enabled \ + -Dvulkan=disabled \ -Dsession-managers=[] \ -Dlegacy-rtkit=false \ -Davb=disabled \ @@ -180,12 +181,6 @@ else PIPEWIRE_CONF_OPTS += -Dlibusb=disabled endif -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),y) -PIPEWIRE_CONF_OPTS += -Dvulkan=enabled -PIPEWIRE_DEPENDENCIES += mesa3d -else -PIPEWIRE_CONF_OPTS += -Dvulkan=disabled -endif ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) PIPEWIRE_CONF_OPTS += -Dpw-cat=enabled -Dsndfile=enabled From b7c0e5fb01b198760dc989638fe18eb8e63f2e54 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Mon, 17 Jul 2023 11:17:27 +0200 Subject: [PATCH 0327/1167] package/python-pysmb: add the missing runtime dependency python-tqdm dependency was introduced in 1.2.9 (bump occured in Buildroot commit 1ffc7b4bb1241eb64272aa78448aac35d67ff4ba). Signed-off-by: Yegor Yefremov Signed-off-by: Thomas Petazzoni (cherry picked from commit 66d38cfcfdc1b09c7c1e80c71a9f8a7b7558a47b) Signed-off-by: Peter Korsgaard --- package/python-pysmb/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/python-pysmb/Config.in b/package/python-pysmb/Config.in index 61d7c2a03e4..bb935dddf17 100644 --- a/package/python-pysmb/Config.in +++ b/package/python-pysmb/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_PYSMB bool "python-pysmb" depends on BR2_INSTALL_LIBSTDCPP select BR2_PACKAGE_PYTHON_PYASN1 + select BR2_PACKAGE_PYTHON_TQDM help pysmb is an experimental SMB/CIFS library written in Python. It implements the client-side SMB/CIFS protocol (SMB1 and From b8d73a338e7c5eb078482732dd162301eac59b10 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 18 Jul 2023 23:30:14 +0200 Subject: [PATCH 0328/1167] package/pipewire: drop consecutive empty lines Fixes: package/pipewire/pipewire.mk:184: consecutive empty lines https://gitlab.com/buildroot.org/buildroot/-/jobs/4682253962/raw Signed-off-by: Thomas Petazzoni (cherry picked from commit 157089d34d06712b67f42b083bcfb16a9bdee1f0) Signed-off-by: Peter Korsgaard --- package/pipewire/pipewire.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/pipewire/pipewire.mk b/package/pipewire/pipewire.mk index d6bd2434bfb..f71979db22b 100644 --- a/package/pipewire/pipewire.mk +++ b/package/pipewire/pipewire.mk @@ -181,7 +181,6 @@ else PIPEWIRE_CONF_OPTS += -Dlibusb=disabled endif - ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) PIPEWIRE_CONF_OPTS += -Dpw-cat=enabled -Dsndfile=enabled PIPEWIRE_DEPENDENCIES += libsndfile From 5e3e9b91ea15578050d8de5a620cfcfef5427cde Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 20 Jul 2023 22:28:29 +0200 Subject: [PATCH 0329/1167] package/libuhttpd: fix comment Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit fbec4980061421c301d511ceeb57163079f07632) Signed-off-by: Peter Korsgaard --- package/libuhttpd/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libuhttpd/Config.in b/package/libuhttpd/Config.in index a552a88f0c2..d89f4541b6a 100644 --- a/package/libuhttpd/Config.in +++ b/package/libuhttpd/Config.in @@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBUHTTPD comment "libuhttpd needs a toolchain w/ gcc >= 4.9" depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 From d4c4fa9dfc3dae13d47faaba657544b1763414f7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:17:55 +0200 Subject: [PATCH 0330/1167] package/heimdal: bump version Samba-4.16 bumped its internal heimdal code[1] which made it incompatible with asn1_compile built with heimdal-7.7.1: /home/user/buildroot/output/build/samba4-4.18.2/third_party/heimdal/lib/asn1/rfc2459.asn1:260: Ignoring char(_) /home/user/buildroot/output/build/samba4-4.18.2/third_party/heimdal/lib/asn1/rfc2459.asn1:260: syntax error Bump this package to the same version LibreELEC is using https://github.com/LibreELEC/LibreELEC.tv/commit/1dc0b5bf3e50500658c8a61e89f57a98dfc0468d https://github.com/LibreELEC/LibreELEC.tv/commit/1112a1879523fdff7f6dec5a083d4f2bc82e7017 https://github.com/LibreELEC/LibreELEC.tv/commit/763eddbab10f89da42a380624192cc4039eed086 to fix the build error. Removed HOST_HEIMDAL_MAKE_SYMLINK as asn1_compile is now installed in $(HOST_DIR)/bin/. [1] https://www.samba.org/samba/history/samba-4.16.0.html Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 8e33cc012e53a3964ff7144df1492b3c61c14948) Signed-off-by: Peter Korsgaard --- package/heimdal/heimdal.hash | 4 +--- package/heimdal/heimdal.mk | 14 ++++---------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/package/heimdal/heimdal.hash b/package/heimdal/heimdal.hash index cf822340daf..250ddbbd4db 100644 --- a/package/heimdal/heimdal.hash +++ b/package/heimdal/heimdal.hash @@ -1,5 +1,3 @@ -# From https://github.com/heimdal/heimdal/releases -sha1 a33fdc957f84ab13f39f164b04fe1deeaab3179e heimdal-7.7.1.tar.gz -sha256 117cb1ede7848db24cf27311c46f7f735a99f9c836c22e80aec92b91efe56644 heimdal-7.7.1.tar.gz # Locally computed +sha256 2576c5e2d793db53c86e108fd117b278437bb02d6c6db2bec4d1b86958f1980a heimdal-f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17.tar.gz sha256 0c4b07bf5b98f7a1d01f8e60722d6c6747ef052c2aa6d2043daf690d4e1b0a7f LICENSE diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 21b6c0ccb3b..59b64c358b1 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -4,9 +4,10 @@ # ################################################################################ -HEIMDAL_VERSION = 7.7.1 -HEIMDAL_SITE = https://github.com/heimdal/heimdal/releases/download/heimdal-$(HEIMDAL_VERSION) +HEIMDAL_VERSION = f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17 +HEIMDAL_SITE = $(call github,heimdal,heimdal,$(HEIMDAL_VERSION)) HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf +HOST_HEIMDAL_AUTORECONF = YES HEIMDAL_INSTALL_STAGING = YES # static because of -fPIC issues with e2fsprogs on x86_64 host HOST_HEIMDAL_CONF_OPTS = \ @@ -39,14 +40,7 @@ define HOST_HEIMDAL_INSTALL_COMPILE_ET $(HOST_DIR)/bin/compile_et endef -# We need asn1_compile in the PATH for samba4 -define HOST_HEIMDAL_MAKE_SYMLINK - ln -sf $(HOST_DIR)/libexec/heimdal/asn1_compile \ - $(HOST_DIR)/bin/asn1_compile -endef - HOST_HEIMDAL_POST_INSTALL_HOOKS += \ - HOST_HEIMDAL_INSTALL_COMPILE_ET \ - HOST_HEIMDAL_MAKE_SYMLINK + HOST_HEIMDAL_INSTALL_COMPILE_ET $(eval $(host-autotools-package)) From 1e87afecbbe05e787be123ed379993e26b827ce7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 3 May 2023 18:17:56 +0200 Subject: [PATCH 0331/1167] package/samba4: bump version to 4.18.2 Removed patches which were applied upstream, rebased remaining patches. Added patch 0004 to avoid dependency to perl package JSON:PP. This bump depends on bumping heimdal, see previous patch of this series. Signed-off-by: Bernd Kuhls [yann.morin.1998@free.fr: - make new patch git-formatted - add upstream status to new patch - update .checkpackageignore wth removed patches ] Signed-off-by: Yann E. MORIN (cherry picked from commit 55ceaef8f65eeb0fd9ca7314b03668cf9dd325ca) Signed-off-by: Peter Korsgaard --- ...01-libreplace-disable-libbsd-support.patch | 2 +- ...uilt-heimdal-build-tools-in-case-of-.patch | 42 ++++--------------- ...-Use-perl-module-JSON-part-of-core-i.patch | 41 ++++++++++++++++++ .../0004-lib-util-Add-signal.h-include.patch | 37 ---------------- ...mba-4.16.2-fix-build-without-innetgr.patch | 34 --------------- package/samba4/samba4.hash | 4 +- package/samba4/samba4.mk | 4 +- 7 files changed, 54 insertions(+), 110 deletions(-) create mode 100644 package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch delete mode 100644 package/samba4/0004-lib-util-Add-signal.h-include.patch delete mode 100644 package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch diff --git a/package/samba4/0001-libreplace-disable-libbsd-support.patch b/package/samba4/0001-libreplace-disable-libbsd-support.patch index 79216860dd8..8259e91fc65 100644 --- a/package/samba4/0001-libreplace-disable-libbsd-support.patch +++ b/package/samba4/0001-libreplace-disable-libbsd-support.patch @@ -19,7 +19,7 @@ diff --git a/lib/replace/wscript b/lib/replace/wscript index 240d730cbee..c6d8df43c74 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript -@@ -406,21 +406,6 @@ def configure(conf): +@@ -436,21 +436,6 @@ def configure(conf): strlcpy_in_bsd = False diff --git a/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch b/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch index 484e6722ea2..1c4de6a02ef 100644 --- a/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch +++ b/package/samba4/0002-build-find-pre-built-heimdal-build-tools-in-case-of-.patch @@ -1,4 +1,4 @@ -From e002d2ef2688d5433d2bd03aa4d77a0ec5ac4e63 Mon Sep 17 00:00:00 2001 +From 2e53f331104b29db7caf1641a30d3e9316b57184 Mon Sep 17 00:00:00 2001 From: Uri Simchoni Date: Sun, 20 Oct 2019 00:03:14 +0300 Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded @@ -33,18 +33,20 @@ BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164 Signed-off-by: Uri Simchoni Signed-off-by: Bernd Kuhls -[Bernd: rebased for version 4.11.13] +[Bernd: rebased for version 4.11.13 & 4.17.7] --- wscript_configure_embedded_heimdal | 11 +++++++++++ wscript_configure_system_heimdal | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal -index 8c55ae2a938..4fdae8062c5 100644 +index 8c55ae2..4fdae80 100644 --- a/wscript_configure_embedded_heimdal +++ b/wscript_configure_embedded_heimdal -@@ -1 +1,12 @@ - conf.RECURSE('source4/heimdal_build') +@@ -6,3 +6,14 @@ + + conf.define('USING_EMBEDDED_HEIMDAL', 1) + conf.RECURSE('third_party/heimdal_build') + +def check_system_heimdal_binary(name): + if conf.LIB_MAY_BE_BUNDLED(name): @@ -56,34 +58,6 @@ index 8c55ae2a938..4fdae8062c5 100644 + +check_system_heimdal_binary("compile_et") +check_system_heimdal_binary("asn1_compile") -diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal -index 0ff6dad2f55..f77c177442f 100644 ---- a/wscript_configure_system_heimdal -+++ b/wscript_configure_system_heimdal -@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None): - conf.define('USING_SYSTEM_%s' % name.upper(), 1) - return True - --def check_system_heimdal_binary(name): -- if conf.LIB_MAY_BE_BUNDLED(name): -- return False -- if not conf.find_program(name, var=name.upper()): -- return False -- conf.define('USING_SYSTEM_%s' % name.upper(), 1) -- return True -- - check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h") - - if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"): -@@ -96,9 +88,6 @@ - #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'): - # conf.define('USING_SYSTEM_TOMMATH', 1) - --check_system_heimdal_binary("compile_et") --check_system_heimdal_binary("asn1_compile") -- - conf.env.KRB5_VENDOR = 'heimdal' - conf.define('USING_SYSTEM_KRB5', 1) - conf.define('USING_SYSTEM_HEIMDAL', 1) -- 2.20.1 + diff --git a/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch new file mode 100644 index 00000000000..7eb31e5d078 --- /dev/null +++ b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch @@ -0,0 +1,41 @@ +From bd8fc19c8383914b518a9d56f4c08fba3baeb967 Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" +Date: Sun, 7 May 2023 11:02:26 +0200 +Subject: [PATCH] 3rdparty/heindal: Use perl module JSON, part of core, instead + of JSON:PP package + +Downloaded from +https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch + +Signed-off-by: Bernd Kuhls +Signed-off-by: Yann E. MORIN +Upstream: unknown +--- + third_party/heimdal/cf/make-proto.pl | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/third_party/heimdal/cf/make-proto.pl b/third_party/heimdal/cf/make-proto.pl +index 36a040ce6c0..ad21dbad9e1 100644 +--- a/third_party/heimdal/cf/make-proto.pl ++++ b/third_party/heimdal/cf/make-proto.pl +@@ -4,7 +4,7 @@ + use Getopt::Std; + use File::Compare; + +-use JSON; ++use JSON::PP; + + my $comment = 0; + my $doxygen = 0; +@@ -70,7 +70,7 @@ if($opt_x) { + my $EXP; + local $/; + open(EXP, '<', $opt_x) || die "open ${opt_x}"; +- my $obj = JSON->new->utf8->decode(); ++ my $obj = JSON::PP->new->utf8->decode(); + close $EXP; + + foreach my $x (keys %$obj) { +-- +2.25.1 + diff --git a/package/samba4/0004-lib-util-Add-signal.h-include.patch b/package/samba4/0004-lib-util-Add-signal.h-include.patch deleted file mode 100644 index 838a8fa6d75..00000000000 --- a/package/samba4/0004-lib-util-Add-signal.h-include.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d1732a79dbf30c41802245909d0250ebe2b9d92e Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 12 Dec 2021 10:27:42 +0100 -Subject: [PATCH] lib/util: Add signal.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes build error with samba-4.15.3 and uClibc: - -../../source3/printing/samba-bgqd.c: In function ‘main’: -../../source3/printing/samba-bgqd.c:340:21: error: ‘SIGPIPE’ undeclared (first use in this function); did you mean ‘EPIPE’? -../../source3/printing/samba-bgqd.c:384:14: error: ‘SIGTERM’ undeclared (first use in this function) - -Patch sent upstream: -https://gitlab.com/samba-team/samba/-/merge_requests/2296 - -Signed-off-by: Bernd Kuhls ---- - lib/util/signal.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/util/signal.h b/lib/util/signal.h -index 0663af6ab94..f662ee110d6 100644 ---- a/lib/util/signal.h -+++ b/lib/util/signal.h -@@ -21,6 +21,7 @@ - #ifndef _SAMBA_UTIL_SIGNAL_H_ - #define _SAMBA_UTIL_SIGNAL_H_ - -+#include - #include - - /** --- -2.30.2 - diff --git a/package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch b/package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch deleted file mode 100644 index b338596d7aa..00000000000 --- a/package/samba4/0005-samba-4.16.2-fix-build-without-innetgr.patch +++ /dev/null @@ -1,34 +0,0 @@ -# Gentoo bug 855047 - -Fixes uClibc build when uClibc was build without netgroup support. -Upstream enables netgroup support based on getdomainname() being -present: -https://github.com/samba-team/samba/commit/f179184a2be2ddd38f463fcc12252f8d24e529f8#diff-b8d1bc25b89846e70ecb61cb296a8f5c50c9a0a1b62e46790fae81aa9d5bfaaeR632 - -Downloaded from -https://gitweb.gentoo.org/repo/gentoo.git/tree/net-fs/samba/files/samba-4.16.2-fix-musl-without-innetgr.patch - -Signed-off-by: Bernd Kuhls - ---- a/lib/util/access.c -+++ b/lib/util/access.c -@@ -115,7 +115,7 @@ static bool string_match(const char *tok,const char *s) - return true; - } - } else if (tok[0] == '@') { /* netgroup: look it up */ --#ifdef HAVE_NETGROUP -+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) - DATA_BLOB tmp; - char *mydomain = NULL; - char *hostname = NULL; ---- a/source3/auth/user_util.c -+++ b/source3/auth/user_util.c -@@ -135,7 +135,7 @@ static void store_map_in_gencache(TALLOC_CTX *ctx, const char *from, const char - - bool user_in_netgroup(TALLOC_CTX *ctx, const char *user, const char *ngname) - { --#ifdef HAVE_NETGROUP -+#if defined(HAVE_NETGROUP) && defined(HAVE_INNETGR) - char nis_domain_buf[256]; - const char *nis_domain = NULL; - char *lowercase_user = NULL; diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 18ec63e07a5..20390fb6b4b 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.15.13.tar.asc -sha256 c412e3536a5265d04e52983e643bae9e047bcc3eac08683a945b1057ecdf4968 samba-4.15.13.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.18.2.tar.asc +sha256 5bf87e179616cd12a52d85fb8b26eec709f13709a2b67fe42b1fb0213f7e8106 samba-4.18.2.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index b979aaf09f6..2799dbe2f71 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.15.13 +SAMBA4_VERSION = 4.18.2 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES @@ -120,7 +120,7 @@ define SAMBA4_CONFIGURE_CMDS PERL="$(HOST_DIR)/bin/perl" \ $(TARGET_CONFIGURE_OPTS) \ $(SAMBA4_CONF_ENV) \ - ./buildtools/bin/waf configure \ + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ From 96466e31910a1b1f59686d962e7714a706b18cbd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 24 Jun 2023 16:18:47 +0200 Subject: [PATCH 0332/1167] package/samba4: update patch 0004 Fix typo in title, add upstream URL Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 95b7465e746c9d51929e9dd6896ec9940188b3b5) Signed-off-by: Peter Korsgaard --- ...dparty-heindal-Use-perl-module-JSON-part-of-core-i.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch index 7eb31e5d078..aa55c098915 100644 --- a/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch +++ b/package/samba4/0004-3rdparty-heindal-Use-perl-module-JSON-part-of-core-i.patch @@ -1,15 +1,15 @@ From bd8fc19c8383914b518a9d56f4c08fba3baeb967 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 7 May 2023 11:02:26 +0200 -Subject: [PATCH] 3rdparty/heindal: Use perl module JSON, part of core, instead - of JSON:PP package +Subject: [PATCH] 3rdparty/heimdal: Use perl module JSON:PP, part of core, instead + of JSON package Downloaded from https://github.com/openwrt/packages/blob/master/net/samba4/patches/105-perl-json-pp.patch Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN -Upstream: unknown +Upstream: https://github.com/heimdal/heimdal/pull/1176 --- third_party/heimdal/cf/make-proto.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) From 54be53a189006f46aa627640d936df381ef6e00a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 28 Jun 2023 19:54:01 +0200 Subject: [PATCH 0333/1167] package/samba4: add optional dependency to libunwind Upstream added configure options for libunwind in commit https://github.com/samba-team/samba/commit/14feb93d481011765f62614ab49b304e17e4f6fd Fixes: http://autobuild.buildroot.net/results/63c/63c469106e9daa198f77d8da7a5bb123edcce0f7/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit bca9d7e58a23fc8c4a27be7971ace1fc84526d22) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 2799dbe2f71..4489c28d2bd 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -93,6 +93,13 @@ else SAMBA4_CONF_OPTS += --without-libarchive endif +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +SAMBA4_CONF_OPTS += --with-libunwind +SAMBA4_DEPENDENCIES += libunwind +else +SAMBA4_CONF_OPTS += --without-libunwind +endif + ifeq ($(BR2_PACKAGE_NCURSES),y) SAMBA4_CONF_ENV += NCURSES_CONFIG="$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)" SAMBA4_DEPENDENCIES += ncurses From 16fa9bc71faf385deb8fe87db8e10d77bac3e958 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 31 May 2023 20:13:44 +0200 Subject: [PATCH 0334/1167] package/samba4: bump version to 4.18.3 Release notes: https://www.samba.org/samba/history/samba-4.18.3.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit adfdeb1f82544466c5948f4c42e1eccd3ab0f72c) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 20390fb6b4b..05563d00cf2 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.18.2.tar.asc -sha256 5bf87e179616cd12a52d85fb8b26eec709f13709a2b67fe42b1fb0213f7e8106 samba-4.18.2.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.18.3.tar.asc +sha256 c67e1453165a3918ffffad600236ca3966b47bde4798e89ae600ae3903ccc32c samba-4.18.3.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 4489c28d2bd..75938e21a89 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.18.2 +SAMBA4_VERSION = 4.18.3 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 75af6b59d5fb7cf45a94535d7c8e3d0291477dca Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 5 Jul 2023 18:29:36 +0200 Subject: [PATCH 0335/1167] package/samba4: bump version to 4.18.4 Release notes: https://www.samba.org/samba/history/samba-4.18.4.html Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard (cherry picked from commit 006badd9b61ec281d656e23009ddc326a94ae39e) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index 05563d00cf2..cc7eee620f2 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.18.3.tar.asc -sha256 c67e1453165a3918ffffad600236ca3966b47bde4798e89ae600ae3903ccc32c samba-4.18.3.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.18.4.tar.asc +sha256 6ba7b3503cc59c9ff4f6fcb1b510c2c855fff93e0b366ab891a32a4732e88e53 samba-4.18.4.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 75938e21a89..a14cc63c010 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.18.3 +SAMBA4_VERSION = 4.18.4 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 543733c83083c493f225fdbf5670d6c89b728d5a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 19 Jul 2023 22:10:05 +0200 Subject: [PATCH 0336/1167] package/samba4: security bump version to 4.18.5 Release notes: https://www.samba.org/samba/history/samba-4.18.5.html Fixes the following CVEs: o CVE-2022-2127: When winbind is used for NTLM authentication, a maliciously crafted request can trigger an out-of-bounds read in winbind and possibly crash it. https://www.samba.org/samba/security/CVE-2022-2127.html o CVE-2023-3347: SMB2 packet signing is not enforced if an admin configured "server signing = required" or for SMB2 connections to Domain Controllers where SMB2 packet signing is mandatory. https://www.samba.org/samba/security/CVE-2023-3347.html o CVE-2023-34966: An infinite loop bug in Samba's mdssvc RPC service for Spotlight can be triggered by an unauthenticated attacker by issuing a malformed RPC request. https://www.samba.org/samba/security/CVE-2023-34966.html o CVE-2023-34967: Missing type validation in Samba's mdssvc RPC service for Spotlight can be used by an unauthenticated attacker to trigger a process crash in a shared RPC mdssvc worker process. https://www.samba.org/samba/security/CVE-2023-34967.html o CVE-2023-34968: As part of the Spotlight protocol Samba discloses the server- side absolute path of shares and files and directories in search results. https://www.samba.org/samba/security/CVE-2023-34968.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 83651e1833f3f1845132800ed286bf91321e54a9) Signed-off-by: Peter Korsgaard --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index cc7eee620f2..1901707f3b9 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.18.4.tar.asc -sha256 6ba7b3503cc59c9ff4f6fcb1b510c2c855fff93e0b366ab891a32a4732e88e53 samba-4.18.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.18.5.tar.asc +sha256 095256ac332e1d9fbf9b7ff7823f92a3233d3ed658ce7fc9b33905c2243f447f samba-4.18.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index a14cc63c010..edc0fee286f 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.18.4 +SAMBA4_VERSION = 4.18.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From b97e74be68bded4fc2515a86ef30b52dd5f71e23 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 20 Jul 2023 07:30:31 +0200 Subject: [PATCH 0337/1167] package/libcurl: security bump to version 8.2.0 Fixes CVE-2023-32001: https://curl.se/docs/CVE-2023-32001.html Changelog: https://curl.se/changes.html#8_2_0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 566e00adea17196dff8e041e36c9349ab6075e0f) 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 18b2dbfd862..f606735c0f3 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.1.2.tar.xz.asc +# https://curl.se/download/curl-8.2.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6 curl-8.1.2.tar.xz +sha256 2859ec79e2cd96e976a99493547359b8001af1d1e21f3a3a3b846544ef54500f curl-8.2.0.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 2be3415cb87..d0bf6cceade 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.1.2 +LIBCURL_VERSION = 8.2.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From e882411e4fb80fcd4844839492b9b1f94c6d909b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 20 Jul 2023 07:39:14 +0200 Subject: [PATCH 0338/1167] {linux, linux-headers}: bump 6.{1, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 5037426d2bd12b78f52270164158f423e20ccc85) [Peter: drop 6.4.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 2 +- package/linux-headers/Config.in.host | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 352fa76379e..2cad920d6f9 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.38" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.39" 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 04466406300..e561cb9a93c 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 f9a4f91b609f7d332a5f2be01ab86336fa00149fae6bdc19f16fa19f78802d43 linux-6.1.38.tar.xz +sha256 4cddee22fdf657138a06af653492f67cd3a4762c04a34725534bd200d99085b8 linux-6.1.39.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc sha256 6499089eae6b271063cb3e873ab7f4ba0543cfb21dcc9c54d9bcf5357db683f6 linux-5.15.120.tar.xz sha256 1e60296a135d272bb7ce645f6ae68fbd4ffd1972cb4b82c38c6faa1172481be3 linux-5.10.186.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 7b054a2e411..6a4c9594e41 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -389,7 +389,7 @@ config BR2_DEFAULT_KERNEL_HEADERS default "5.4.249" if BR2_KERNEL_HEADERS_5_4 default "5.10.186" if BR2_KERNEL_HEADERS_5_10 default "5.15.120" if BR2_KERNEL_HEADERS_5_15 - default "6.1.38" if BR2_KERNEL_HEADERS_6_1 + default "6.1.39" if BR2_KERNEL_HEADERS_6_1 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 9d7896b7406ca0c5973c15cf378ca98b35311374 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 21 Jul 2023 19:38:06 +0200 Subject: [PATCH 0339/1167] package/openssh: security bump version to 9.3p2 Fixes CVE-2023-38408: https://www.openssh.com/txt/release-9.3p2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 7ccdeeb213ec04551237414e9bc7cb9aa52b2851) Signed-off-by: Peter Korsgaard --- package/openssh/openssh.hash | 4 ++-- package/openssh/openssh.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/openssh/openssh.hash b/package/openssh/openssh.hash index 2be54431ec5..df472e087df 100644 --- a/package/openssh/openssh.hash +++ b/package/openssh/openssh.hash @@ -1,4 +1,4 @@ -# From https://www.openssh.com/txt/release-9.3 (base64 encoded) -sha256 e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8 openssh-9.3p1.tar.gz +# From https://www.openssh.com/txt/release-9.3p2 +sha256 200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8 openssh-9.3p2.tar.gz # Locally calculated sha256 05c30446ba738934b3f1efa965b454c122ca26cc4b268e5ae6843f58ccd1b16d LICENCE diff --git a/package/openssh/openssh.mk b/package/openssh/openssh.mk index 26d6bd504d8..e14d752290a 100644 --- a/package/openssh/openssh.mk +++ b/package/openssh/openssh.mk @@ -5,7 +5,7 @@ ################################################################################ OPENSSH_VERSION_MAJOR = 9.3 -OPENSSH_VERSION_MINOR = p1 +OPENSSH_VERSION_MINOR = p2 OPENSSH_VERSION = $(OPENSSH_VERSION_MAJOR)$(OPENSSH_VERSION_MINOR) OPENSSH_CPE_ID_VERSION = $(OPENSSH_VERSION_MAJOR) OPENSSH_CPE_ID_UPDATE = $(OPENSSH_VERSION_MINOR) From 35ffaa834987b3aa4881e68ab0464e0406bf837f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 18 Jul 2023 20:32:36 +0200 Subject: [PATCH 0340/1167] package/wpebackend-fdo: bump version to 1.14.2 Removed md5 hash. Release notes: https://lists.webkit.org/pipermail/webkit-wpe/2023-March/000590.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c9f59f49727058b26c33665d21d8e51a4fe769aa) Signed-off-by: Peter Korsgaard --- package/wpebackend-fdo/wpebackend-fdo.hash | 7 +++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index d1a344a664e..26ba1217271 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,6 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.1.tar.xz.sums -md5 2b49218cdd16075b028bbaf5a4f57890 wpebackend-fdo-1.14.1.tar.xz -sha1 a68db2480d29d53d7fa24c69888bacbab6efea11 wpebackend-fdo-1.14.1.tar.xz -sha256 01938dd93c62b3a47b18dd13c70d50490a8b8a6caec23c8550a3dbdbcc6bbb50 wpebackend-fdo-1.14.1.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.14.2.tar.xz.sums +sha1 f453f8d77e93f4ac6ac81c1874d4d6bdcb45c253 wpebackend-fdo-1.14.2.tar.xz +sha256 93c9766ae9864eeaeaee2b0a74f22cbca08df42c1a1bdb55b086f2528e380d38 wpebackend-fdo-1.14.2.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index c1e4e057967..7ef347b6221 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.14.1 +WPEBACKEND_FDO_VERSION = 1.14.2 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES From c8387e73ee3c78714e0a78df0ea216c0b0ac9db3 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 11 Jun 2023 15:34:01 +0200 Subject: [PATCH 0341/1167] package/dmidecode: security bump to version 3.5 Fixes CVE-2023-30630: Dmidecode before 3.5 allows -dump-bin to overwrite a local file: https://nvd.nist.gov/vuln/detail/CVE-2023-30630 For change log, see: https://git.savannah.gnu.org/cgit/dmidecode.git/tree/NEWS?h=dmidecode-3-5 Note: this patch also adds a comment about pgp signature verification in the hash file. Signed-off-by: Julien Olivain Signed-off-by: Peter Korsgaard (cherry picked from commit c97f27283b36ffc39dfb6223caee6055997b3234) [Peter: mark as security bump] Signed-off-by: Peter Korsgaard --- package/dmidecode/dmidecode.hash | 5 +++-- package/dmidecode/dmidecode.mk | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/dmidecode/dmidecode.hash b/package/dmidecode/dmidecode.hash index ec5484e6678..654c4cc537c 100644 --- a/package/dmidecode/dmidecode.hash +++ b/package/dmidecode/dmidecode.hash @@ -1,3 +1,4 @@ -# Locally computed -sha256 43cba851d8467c9979ccdbeab192eb6638c7d3a697eba5ddb779da8837542212 dmidecode-3.4.tar.xz +# Locally computed after checking pgp signature from: +# https://download.savannah.gnu.org/releases/dmidecode/dmidecode-3.5.tar.xz.sig +sha256 79d76735ee8e25196e2a722964cf9683f5a09581503537884b256b01389cc073 dmidecode-3.5.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk index 352cdb106c4..353978daa94 100644 --- a/package/dmidecode/dmidecode.mk +++ b/package/dmidecode/dmidecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -DMIDECODE_VERSION = 3.4 +DMIDECODE_VERSION = 3.5 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ From ff942e3f27bab0cbd08df1c4fcc532d11893559c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 18 Jul 2023 20:32:37 +0200 Subject: [PATCH 0342/1167] package/webkitgtk: bump version to 2.40.3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 4a03340176b457add38327bbd53aa6f06cf7a524) Signed-off-by: Peter Korsgaard --- package/webkitgtk/webkitgtk.hash | 7 +++---- package/webkitgtk/webkitgtk.mk | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/webkitgtk/webkitgtk.hash b/package/webkitgtk/webkitgtk.hash index 3bc521e4450..756ac13ec28 100644 --- a/package/webkitgtk/webkitgtk.hash +++ b/package/webkitgtk/webkitgtk.hash @@ -1,7 +1,6 @@ -# From https://webkitgtk.org/releases/webkitgtk-2.38.6.tar.xz.sums -md5 a50290fdc80842b1ae8be1e1147b5679 webkitgtk-2.38.6.tar.xz -sha1 4dfb3d96f621fc633ff347e083e429893551fb26 webkitgtk-2.38.6.tar.xz -sha256 1c614c9589389db1a79ea9ba4293bbe8ac3ab0a2234cac700935fae0724ad48b webkitgtk-2.38.6.tar.xz +# From https://www.webkitgtk.org/releases/webkitgtk-2.40.3.tar.xz.sums +sha1 74ee7241f2add46897019e22bd4f8e19e09027bb webkitgtk-2.40.3.tar.xz +sha256 cc0aa83f40dbc64c1c6ae42ec6b85af4be2a9dbf524cfcb95f89a367fb5098dd webkitgtk-2.40.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/webkitgtk/webkitgtk.mk b/package/webkitgtk/webkitgtk.mk index dd17b46e676..56277a0a0a0 100644 --- a/package/webkitgtk/webkitgtk.mk +++ b/package/webkitgtk/webkitgtk.mk @@ -4,7 +4,7 @@ # ################################################################################ -WEBKITGTK_VERSION = 2.38.6 +WEBKITGTK_VERSION = 2.40.3 WEBKITGTK_SITE = https://www.webkitgtk.org/releases WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz WEBKITGTK_INSTALL_STAGING = YES @@ -13,7 +13,7 @@ WEBKITGTK_LICENSE_FILES = \ Source/WebCore/LICENSE-APPLE \ Source/WebCore/LICENSE-LGPL-2.1 WEBKITGTK_CPE_ID_VENDOR = webkitgtk -WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf \ +WEBKITGTK_DEPENDENCIES = host-ruby host-python3 host-gperf host-unifdef \ enchant harfbuzz icu jpeg libgcrypt libgtk3 libsecret libsoup \ libtasn1 libxml2 libxslt openjpeg sqlite webp woff2 WEBKITGTK_CONF_OPTS = \ @@ -24,6 +24,7 @@ WEBKITGTK_CONF_OPTS = \ -DENABLE_SPELLCHECK=ON \ -DENABLE_WEB_RTC=OFF \ -DPORT=GTK \ + -DUSE_AVIF=OFF \ -DUSE_LIBHYPHEN=OFF \ -DUSE_OPENJPEG=ON \ -DUSE_SOUP2=ON \ From 38de1018253a2de85653659430d3dee509d68fa2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 18 Jul 2023 20:32:38 +0200 Subject: [PATCH 0343/1167] package/wpewebkit: security bump version to 2.40.3 Removed md5 hash. Switch _SITE to https and update URL. Added dependency to host-unifdef, needed since upstream commit https://github.com/WebKit/WebKit/commit/f76a7e30e5749af897b83cc75b2534b1afa32552 Release notes: 2.40.3 - https://lists.webkit.org/pipermail/webkit-wpe/2023-June/000603.html 2.40.2 - https://lists.webkit.org/pipermail/webkit-wpe/2023-May/000598.html Fixes CVE-2023-28204 & CVE-2023-32373: https://lists.webkit.org/pipermail/webkit-wpe/2023-May/000599.html 2.40.1 - https://lists.webkit.org/pipermail/webkit-wpe/2023-April/000591.html 2.40.0 - https://lists.webkit.org/pipermail/webkit-wpe/2023-March/000589.html 2.39.91 - https://lists.webkit.org/pipermail/webkit-wpe/2023-March/000581.html 2.39.90 - https://lists.webkit.org/pipermail/webkit-wpe/2023-February/000577.html 2.39.5 - https://lists.webkit.org/pipermail/webkit-wpe/2023-January/000571.html USE_AVIF was enabled by default upstream: https://github.com/WebKit/WebKit/commit/3d60d9f93c64aac55c890160d00d008367e11e91 Add -DUSE_AVIF=OFF to _CONF_OPTS due to missing libavif package Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 1c978d782d92d4623156ba7d88d375de43f7ba5b) Signed-off-by: Peter Korsgaard --- package/wpewebkit/wpewebkit.hash | 7 +++---- package/wpewebkit/wpewebkit.mk | 7 ++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index d5f628e1ee1..aaeea2bcda7 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,6 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.38.6.tar.xz.sums -md5 eb44d3132208218f3752170cae3220b8 wpewebkit-2.38.6.tar.xz -sha1 5c541a10e216d8d9ca48572b3dc0f82bfb2236c5 wpewebkit-2.38.6.tar.xz -sha256 dcb6591456393c5366ad9abc62a808137d4fea039cbc7ef4c8d64ead506d035b wpewebkit-2.38.6.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.40.3.tar.xz.sums +sha1 c840bd76b2c86cb8ca0d68b56598cb0abbafc727 wpewebkit-2.40.3.tar.xz +sha256 05b6a9cb1d7d03485e0dc41b2a8e6f99a36aea23d32ba3ecb38d0d6860747ada wpewebkit-2.40.3.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 7b8ac67d924..c13a7201e67 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,8 +4,8 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.38.6 -WPEWEBKIT_SITE = http://www.wpewebkit.org/releases +WPEWEBKIT_VERSION = 2.40.3 +WPEWEBKIT_SITE = https://wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES WPEWEBKIT_LICENSE = LGPL-2.1+, BSD-2-Clause @@ -14,7 +14,7 @@ WPEWEBKIT_LICENSE_FILES = \ Source/WebCore/LICENSE-LGPL-2.1 WPEWEBKIT_CPE_ID_VENDOR = wpewebkit WPEWEBKIT_CPE_ID_PRODUCT = wpe_webkit -WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby \ +WPEWEBKIT_DEPENDENCIES = host-gperf host-python3 host-ruby host-unifdef \ harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ libpng libxslt openjpeg wayland-protocols webp wpebackend-fdo @@ -26,6 +26,7 @@ WPEWEBKIT_CONF_OPTS = \ -DENABLE_INTROSPECTION=OFF \ -DENABLE_MINIBROWSER=OFF \ -DENABLE_WEB_RTC=OFF \ + -DUSE_AVIF=OFF \ -DUSE_SOUP2=ON ifeq ($(BR2_PACKAGE_WPEWEBKIT_SANDBOX),y) From 73adf9831be13a94d0fb14d9d9e9a9de86a17fde Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Jul 2023 18:37:07 +0200 Subject: [PATCH 0344/1167] package/yaml-cpp: fix library name In the current state this package install libyaml-cppd.so due to "d" being added because the variable CMAKE_DEBUG_POSTFIX is not set: https://github.com/jbeder/yaml-cpp/blob/master/CMakeLists.txt#L137 This breaks the build of mongodb which expects the library name libyaml-cpp.so: https://github.com/mongodb/mongo/blob/master/SConstruct#L5090 Fixes: http://autobuild.buildroot.net/results/304/3044d040dec090a2f528a96f201d4e554f6779b4/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 9613092610729177f060bea62708fe3d81c0536b) Signed-off-by: Peter Korsgaard --- package/yaml-cpp/yaml-cpp.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/yaml-cpp/yaml-cpp.mk b/package/yaml-cpp/yaml-cpp.mk index d65298ffb9c..367df27ff19 100644 --- a/package/yaml-cpp/yaml-cpp.mk +++ b/package/yaml-cpp/yaml-cpp.mk @@ -13,6 +13,7 @@ YAML_CPP_CPE_ID_VENDOR = yaml-cpp_project # Disable testing and parse tools YAML_CPP_CONF_OPTS += \ + -DCMAKE_DEBUG_POSTFIX="" \ -DYAML_CPP_BUILD_TESTS=OFF \ -DYAML_CPP_BUILD_TOOLS=OFF From f004f2b0ed8b9209f98265e8ca7df82c29930b20 Mon Sep 17 00:00:00 2001 From: Gwenhael Goavec-Merou Date: Wed, 19 Jul 2023 13:57:38 +0200 Subject: [PATCH 0345/1167] package/gnuradio: fix gnuradio python libraries for cross-compile By default, module libraries have a suffix based on cpython version + host architecture: this is fine for a native compile when these libraries are used on the same computer (or similar computers). But when target architecture is not the same python is unable to find libraries due to the wrong suffix and produces unclear errors messages: # python3 Python 3.11.3 (main, Jun 19 2023, 14:15:44) [GCC 11.4.0] on linux Type "help", "copyright", "credits" or "license" for more information. >>> from gnuradio import blocks Traceback (most recent call last): File "/home/xxx/buildroot/output/build/gnuradio-3.10.4.0/gr-blocks/python/blocks/__init__.py", line 18, in ModuleNotFoundError: No module named 'gnuradio.blocks.blocks_python' During handling of the above exception, another exception occurred: Traceback (most recent call last): File "", line 1, in File "/home/xxx/buildroot/output/build/gnuradio-3.10.4.0/gr-blocks/python/blocks/__init__.py", line 22, in ModuleNotFoundError: No module named 'gnuradio.blocks.blocks_python' >>> By adding _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" at configure time, sysconfig will return correct informations (target architecture) instead of host architecture. Signed-off-by: Gwenhael Goavec-Merou Signed-off-by: Thomas Petazzoni (cherry picked from commit e22b450692a6d02da43a453f24ec057bb5517422) Signed-off-by: Peter Korsgaard --- package/gnuradio/gnuradio.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 1453b784937..8eb7778d997 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -119,6 +119,10 @@ GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON # mandatory to avoid pybind11 to overwrite variables provided # by gnuradio and buildroot GNURADIO_CONF_OPTS += -DPYBIND11_PYTHONLIBS_OVERWRITE=OFF +# mandatory to avoid pybind11 to force libraries extensions +# with a name based on host architecture +GNURADIO_CONF_ENV += _PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \ + PYTHONPATH=$(PYTHON3_PATH) # mandatory to install python modules in site-packages and to use # correct path for python libraries GNURADIO_CONF_OPTS += -DGR_PYTHON_RELATIVE=ON \ From ff0521a70c32c263d0375d31570c6665c63ff261 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 22 Jul 2023 10:03:13 +0200 Subject: [PATCH 0346/1167] package/tpm2-tss: security bump version to 3.2.2 Fixes CVE-2023-22745. Changelog: https://github.com/tpm2-software/tpm2-tss/blob/3.2.x/CHANGELOG.md Changed the ac_cv_prog variables due to an upstream commit which changed the detection of groupadd/useradd: https://github.com/tpm2-software/tpm2-tss/commit/7fde604383c62fc764a1e060dff48fc06f79860b Buildroot commit a85f5f2a412db894fdf548e10d12e7c56eda9107 bumped tpm2-pkcs11 to 1.8.0 which includes a commit bumping the required version of tpm2-tss to >= 3.2 https://github.com/tpm2-software/tpm2-pkcs11/commit/940b661e330cac0ecc7d4db5d3626ef828ecdda8 Fixes: http://autobuild.buildroot.net/results/6fd/6fddfee6f852ce835c5d1178e6913b6ab1b3fe50/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 598bfea96d9114ede3d04926f56d24e7b57db8af) Signed-off-by: Peter Korsgaard --- package/tpm2-tss/tpm2-tss.hash | 2 +- package/tpm2-tss/tpm2-tss.mk | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/tpm2-tss/tpm2-tss.hash b/package/tpm2-tss/tpm2-tss.hash index b6eb3c1f976..c9fa4e6ae0f 100644 --- a/package/tpm2-tss/tpm2-tss.hash +++ b/package/tpm2-tss/tpm2-tss.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 8900a6603f74310b749b65f23c3461cde6e2a23a5f61058b21004c25f9cf19e8 tpm2-tss-3.1.0.tar.gz +sha256 ba9e52117f254f357ff502e7d60fce652b3bfb26327d236bbf5ab634235e40f1 tpm2-tss-3.2.2.tar.gz sha256 18c1bf4b1ba1fb2c4ffa7398c234d83c0d55475298e470ae1e5e3a8a8bd2e448 LICENSE diff --git a/package/tpm2-tss/tpm2-tss.mk b/package/tpm2-tss/tpm2-tss.mk index 060883c377e..10d605fc65c 100644 --- a/package/tpm2-tss/tpm2-tss.mk +++ b/package/tpm2-tss/tpm2-tss.mk @@ -4,7 +4,7 @@ # ################################################################################ -TPM2_TSS_VERSION = 3.1.0 +TPM2_TSS_VERSION = 3.2.2 TPM2_TSS_SITE = https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION) TPM2_TSS_LICENSE = BSD-2-Clause TPM2_TSS_LICENSE_FILES = LICENSE @@ -26,7 +26,8 @@ TPM2_TSS_CONF_OPTS = \ ac_cv_prog_result_setfacl=yes \ ac_cv_prog_systemd_sysusers=no \ ac_cv_prog_systemd_tmpfiles=no \ - ac_cv_prog_result_useradd=yes \ + ac_cv_prog_useradd=yes \ + ac_cv_prog_groupadd=yes \ --with-crypto=ossl \ --disable-doxygen-doc \ --disable-defaultflags From ae370839a3e613f24da781f27d3e235b23f8181a Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 21 Jul 2023 20:23:32 -0700 Subject: [PATCH 0347/1167] package/linux-tools: disable libtracevent detection Since upstream Linux commit 6898e60f709b0047206110d3ec9f4612210e3ff7 ("perf build: If libtraceevent isn't present error the build") present in Linux 6.4 and newer, Linux will fail to build if libtraceevent is not present. Since we do not currently have support for libtracevent in buildroot, pass NO_LIBTRACEVENT=1 to get perf to build again. Signed-off-by: Florian Fainelli Signed-off-by: Thomas Petazzoni (cherry picked from commit b4ab45a5c1db05f84efb5f3b6909982263afb1d4) Signed-off-by: Peter Korsgaard --- package/linux-tools/linux-tool-perf.mk.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/linux-tools/linux-tool-perf.mk.in b/package/linux-tools/linux-tool-perf.mk.in index 122c7cbbc42..ee308a85dfd 100644 --- a/package/linux-tools/linux-tool-perf.mk.in +++ b/package/linux-tools/linux-tool-perf.mk.in @@ -27,7 +27,8 @@ PERF_MAKE_FLAGS = \ NO_GTK2=1 \ NO_LIBPERL=1 \ NO_LIBPYTHON=1 \ - NO_LIBBIONIC=1 + NO_LIBBIONIC=1 \ + NO_LIBTRACEEVENT=1 # We need to pass an argument to ld for setting the emulation when # building for MIPS architecture, otherwise the default one will always From fc77f89211bfa3b0bbb121895acbbdbecd5d72f0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Jul 2023 15:55:57 +0200 Subject: [PATCH 0348/1167] package/supertuxkart: fix build with bluetooth enabled The wiiuse code force an out-of-tree build: https://github.com/supertuxkart/stk-code/blob/master/lib/wiiuse/cmake/cmake-4.0.0-modules/RequireOutOfSourceBuild.cmake#L41 Fixes a build error not yet caught by the autobuilders: -- Configuring WiiUse version 0.15.5 CMake Error at lib/wiiuse/cmake/cmake-4.0.0-modules/RequireOutOfSourceBuild.cmake:41 (message): You must set a binary directory that is different from your source directory. You might consider Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit d1e79b4c95b9ae0590f5a2155517934daaef59f1) Signed-off-by: Peter Korsgaard --- package/supertuxkart/supertuxkart.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/supertuxkart/supertuxkart.mk b/package/supertuxkart/supertuxkart.mk index 1f9ad4102bb..6bdd512eac0 100644 --- a/package/supertuxkart/supertuxkart.mk +++ b/package/supertuxkart/supertuxkart.mk @@ -44,6 +44,7 @@ SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF \ ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) SUPERTUXKART_DEPENDENCIES += bluez5_utils SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=ON -DUSE_SYSTEM_WIIUSE=ON +SUPERTUXKART_SUPPORTS_IN_SOURCE_BUILD = NO else # Wiimote support relies on bluez5. SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=OFF From a3cfb1f114806dc3d290996e1223a47ca0958363 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Thu, 6 Jul 2023 12:18:32 -0500 Subject: [PATCH 0349/1167] toolchain/toolchain-external/toolchain-external-bootlin: flag OpenMP support The fragments provided by toolchains.bootlin.com were incorrectly flagging toolchains as not having OpenMP support while they had it [0]. This has been fixed in toolchains.bootlin.com, so a run of gen-bootlin-toolchains has allowed to adjust the toolchain definitions in Buildroot, leading to this commit. OpenMP support needs to be flagged so the proper libraries get copied into the resultant filesystem to avoid missing dependencies [1]. [0]: https://github.com/bootlin/toolchains-builder/issues/60 [1]: https://bugs.busybox.net/show_bug.cgi?id=15634 Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni (cherry picked from commit 746ac56850664aa3e21902723f2e05570088ea26) Signed-off-by: Peter Korsgaard --- .../Config.in.options | 187 ++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 7ae56a9d790..d90137af091 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -65,6 +65,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -88,6 +89,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -111,6 +113,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -134,6 +137,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -157,6 +161,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -180,6 +185,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -202,6 +208,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -225,6 +232,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -249,6 +257,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -272,6 +281,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64BE_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -440,6 +450,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -465,6 +476,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -490,6 +502,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -515,6 +528,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -541,6 +555,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -566,6 +581,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV5_EABI_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -590,6 +606,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -615,6 +632,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -640,6 +658,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -665,6 +684,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -691,6 +711,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -716,6 +737,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV6_EABIHF_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -740,6 +762,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -765,6 +788,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -790,6 +814,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -815,6 +840,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -841,6 +867,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -866,6 +893,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -890,6 +918,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -915,6 +944,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -940,6 +970,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -965,6 +996,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -991,6 +1023,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1016,6 +1049,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMEBV7_EABIHF_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1040,6 +1074,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1062,6 +1097,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7M_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1083,6 +1119,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1106,6 +1143,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_68XXX_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1452,6 +1490,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1477,6 +1516,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1502,6 +1542,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1527,6 +1568,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1552,6 +1594,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1577,6 +1620,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1601,6 +1645,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1626,6 +1671,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1651,6 +1697,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1676,6 +1723,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1701,6 +1749,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1726,6 +1775,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32EL_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1750,6 +1800,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1775,6 +1826,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1800,6 +1852,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1825,6 +1878,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1851,6 +1905,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1876,6 +1931,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R5EL_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -1900,6 +1956,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1925,6 +1982,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1950,6 +2008,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -1975,6 +2034,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2001,6 +2061,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2026,6 +2087,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS32R6EL_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2051,6 +2113,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2077,6 +2140,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2103,6 +2167,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2129,6 +2194,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2156,6 +2222,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2182,6 +2249,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64_N32_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2207,6 +2275,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2233,6 +2302,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2259,6 +2329,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2285,6 +2356,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2312,6 +2384,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2338,6 +2411,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64EL_N32_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2363,6 +2437,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2389,6 +2464,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2415,6 +2491,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2441,6 +2518,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2468,6 +2546,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2494,6 +2573,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MIPS64R6EL_N32_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2516,6 +2596,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2539,6 +2620,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_NIOS2_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2563,6 +2645,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2587,6 +2670,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2611,6 +2695,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2635,6 +2720,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2659,6 +2745,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2683,6 +2770,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_OPENRISC_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2706,6 +2794,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2730,6 +2819,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2754,6 +2844,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2777,6 +2868,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2801,6 +2893,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2825,6 +2918,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_440FP_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2848,6 +2942,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2872,6 +2967,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -2896,6 +2992,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2919,6 +3016,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2943,6 +3041,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2967,6 +3066,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E300C3_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -2990,6 +3090,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3014,6 +3115,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3038,6 +3140,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3061,6 +3164,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3085,6 +3189,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3109,6 +3214,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC_E500MC_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3132,6 +3238,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3156,6 +3263,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E5500_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3180,6 +3288,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3204,6 +3313,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3228,6 +3338,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3252,6 +3363,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_E6500_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3276,6 +3388,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3300,6 +3413,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3324,6 +3438,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3348,6 +3463,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64_POWER8_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3372,6 +3488,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3396,6 +3513,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3420,6 +3538,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3444,6 +3563,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_POWERPC64LE_POWER8_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3470,6 +3590,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3496,6 +3617,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3522,6 +3644,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3548,6 +3671,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3574,6 +3698,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3602,6 +3727,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3629,6 +3755,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3652,6 +3779,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3676,6 +3804,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_S390X_Z13_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3700,6 +3829,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3724,6 +3854,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3748,6 +3879,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3772,6 +3904,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3796,6 +3929,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3820,6 +3954,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -3843,6 +3978,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3867,6 +4003,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3891,6 +4028,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3915,6 +4053,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SH_SH4AEB_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3938,6 +4077,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3962,6 +4102,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARC64_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -3987,6 +4128,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4011,6 +4153,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_SPARCV8_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4036,6 +4179,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4062,6 +4206,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4088,6 +4233,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4114,6 +4260,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4140,6 +4287,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4166,6 +4314,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4195,6 +4344,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4225,6 +4375,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4255,6 +4406,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4285,6 +4437,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4315,6 +4468,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4345,6 +4499,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V2_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4376,6 +4531,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4408,6 +4564,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4440,6 +4597,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4472,6 +4630,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4504,6 +4663,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4536,6 +4696,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V3_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4568,6 +4729,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4601,6 +4763,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4634,6 +4797,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4667,6 +4831,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4700,6 +4865,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4733,6 +4899,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_V4_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4762,6 +4929,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4792,6 +4960,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4822,6 +4991,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4852,6 +5022,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4883,6 +5054,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4913,6 +5085,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -4940,6 +5113,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4968,6 +5142,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -4996,6 +5171,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5023,6 +5199,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5050,6 +5227,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5078,6 +5256,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_CORE2_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5108,6 +5287,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -5139,6 +5319,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_SSP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG @@ -5170,6 +5351,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_BLEEDING_EDGE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5200,6 +5382,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_MUSL_STABLE select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_9 select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5230,6 +5413,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5261,6 +5445,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5286,6 +5471,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_BLEEDING_EDGE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS @@ -5311,6 +5497,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_XTENSA_LX60_UCLIBC_STABLE select BR2_ENABLE_LOCALE select BR2_INSTALL_LIBSTDCPP select BR2_TOOLCHAIN_HAS_FORTRAN + select BR2_TOOLCHAIN_HAS_OPENMP select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS From 914e8ed0afaf47c061572810f2fa16cf46107222 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Jul 2023 19:16:03 +0200 Subject: [PATCH 0350/1167] {linux, linux-headers}: bump 5.15.x / 6.{1, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 15aae1902a3d47caa29bfb997a82a72194c79396) [Peter: drop 6.4.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 2cad920d6f9..cef9c9eebeb 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.39" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.40" 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 e561cb9a93c..321629704ba 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 4cddee22fdf657138a06af653492f67cd3a4762c04a34725534bd200d99085b8 linux-6.1.39.tar.xz +sha256 43eafc2197a07dcdcff7a7ef79ac7502061f7c564744e51626bf5fa2e22587f0 linux-6.1.40.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 6499089eae6b271063cb3e873ab7f4ba0543cfb21dcc9c54d9bcf5357db683f6 linux-5.15.120.tar.xz +sha256 07e0cebdb00d25459683e9c330a0576349b8c5e5f2abf053b864f9909151c31d linux-5.15.121.tar.xz sha256 1e60296a135d272bb7ce645f6ae68fbd4ffd1972cb4b82c38c6faa1172481be3 linux-5.10.186.tar.xz sha256 dc5458462c6edbe3473fc6dee80fbe0841df7c177fe0546c2f131e5918f5351d linux-5.4.249.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 6a4c9594e41..83b8625c4cf 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -388,8 +388,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.288" if BR2_KERNEL_HEADERS_4_19 default "5.4.249" if BR2_KERNEL_HEADERS_5_4 default "5.10.186" if BR2_KERNEL_HEADERS_5_10 - default "5.15.120" if BR2_KERNEL_HEADERS_5_15 - default "6.1.39" if BR2_KERNEL_HEADERS_6_1 + default "5.15.121" if BR2_KERNEL_HEADERS_5_15 + default "6.1.40" if BR2_KERNEL_HEADERS_6_1 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 66f47a5c1b3d1a8c18d22edeed30fdf879a76810 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 23 Jul 2023 19:03:38 +0200 Subject: [PATCH 0351/1167] DEVELOPERS: remove Bernd Kuhls from pixman & vnstat Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit b65f510fb6ce315957e9aed427ad5bb3db85dda6) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index c4a2557aba0..98e34cf5bb0 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -442,7 +442,6 @@ F: package/perl-timedate/ F: package/perl-uri/ F: package/perl-www-robotrules/ F: package/php/ -F: package/pixman/ F: package/pngquant/ F: package/pppd/ F: package/privoxy/ @@ -474,7 +473,6 @@ F: package/transmission/ F: package/tvheadend/ F: package/unixodbc/ F: package/vlc/ -F: package/vnstat/ F: package/wget/ F: package/wireless-regdb/ F: package/wireless_tools/ From 69b34c93ecbd33e2dbb8a35512494007364c1a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= Date: Fri, 21 Jul 2023 15:09:59 +0200 Subject: [PATCH 0352/1167] boot/arm-trusted-firmware: add patch to fix fiptool link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When building a fip firmware (BR2_TARGET_ARM_TRUSTED_FIRMWARE_FIP=y), the TF-A build recipe starts by building the host program fiptool with the proper build environment variables. Then the main TF-A target firmware build step takes place, with the expectation that the fiptool program will be used under the hood if necessary. In TF-A, the build recipe for the host program fiptool has subtly changed after v2.7, in commit cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility"). This change has the effect to force re-linking fiptool each time. If we try to build with Buildroot a fip firmware with a TF-A version after v2.7 comprising the aforementioned change, the fiptool program is forcibly re-linked during the main firmware build step. This happens without the proper build environment variables and consequently, if openssl is not installed on the host, the libcrypto shared library will not be found by the linker and the link will fail with the following error: /usr/bin/ld: cannot find -lcrypto: No such file or directory A patch has been integrated into TF-A to avoid re-linking fiptool when not necessary, which should solve the problem starting with version v2.10. Add that patch in Buildroot for versions v2.8 and v2.9, to repair the build in the cases described above. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4664845767 Signed-off-by: Vincent Stehlé Cc: Dick Olsson Cc: Sergey Matyukevich [yann.morin.1998@free.fr: - don't use symlink in v2.9, just copy patch - fix numbering in v2.8 which now has two patches ] Signed-off-by: Yann E. MORIN (cherry picked from commit f3597910cfa47790047fe75d569a0755b4cdb73f) Signed-off-by: Peter Korsgaard --- ...2-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++ ...1-build-tools-avoid-unnecessary-link.patch | 77 +++++++++++++++++++ 2 files changed, 154 insertions(+) create mode 100644 boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch create mode 100644 boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch diff --git a/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 00000000000..9e0ea74248b --- /dev/null +++ b/boot/arm-trusted-firmware/v2.8/0002-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehlé +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + diff --git a/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch b/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch new file mode 100644 index 00000000000..9e0ea74248b --- /dev/null +++ b/boot/arm-trusted-firmware/v2.9/0001-build-tools-avoid-unnecessary-link.patch @@ -0,0 +1,77 @@ +From aa57ce632c629fe72ff417e261e0f5bfd8db6bab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= +Date: Tue, 4 Jul 2023 16:14:02 +0200 +Subject: [PATCH] build(tools): avoid unnecessary link +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In their respective makefiles, cert_create, encrypt_fw and fiptool +depend on the --openssl phony target as a prerequisite. This forces +those tools to be re-linked each time. + +Move the dependencies on the --openssl target from the tools to their +makefiles all targets, to avoid unnecessary linking while preserving the +OpenSSL version printing done in the --openssl targets when in debug. + +Fixes: cf2dd17ddda2 ("refactor(security): add OpenSSL 1.x compatibility") +Signed-off-by: Vincent Stehlé +Change-Id: I98a3ab30f36dffc253cecaaf3a57d2712522135d +Upstream: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=aa57ce632c629fe72ff417e261e0f5bfd8db6bab +--- + tools/cert_create/Makefile | 4 ++-- + tools/encrypt_fw/Makefile | 4 ++-- + tools/fiptool/Makefile | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/cert_create/Makefile b/tools/cert_create/Makefile +index 042e844626..b911d19d2b 100644 +--- a/tools/cert_create/Makefile ++++ b/tools/cert_create/Makefile +@@ -85,9 +85,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__; \ + const char platform_msg[] = "${PLAT_MSG}";' | \ +diff --git a/tools/encrypt_fw/Makefile b/tools/encrypt_fw/Makefile +index 2939b142be..924e5febab 100644 +--- a/tools/encrypt_fw/Makefile ++++ b/tools/encrypt_fw/Makefile +@@ -65,9 +65,9 @@ HOSTCC ?= gcc + + .PHONY: all clean realclean --openssl + +-all: ${BINARY} ++all: --openssl ${BINARY} + +-${BINARY}: --openssl ${OBJECTS} Makefile ++${BINARY}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + @echo 'const char build_msg[] = "Built : "__TIME__", "__DATE__;' | \ + ${HOSTCC} -c ${HOSTCCFLAGS} -xc - -o src/build_msg.o +diff --git a/tools/fiptool/Makefile b/tools/fiptool/Makefile +index 2ebee33931..4bdebd9235 100644 +--- a/tools/fiptool/Makefile ++++ b/tools/fiptool/Makefile +@@ -68,9 +68,9 @@ DEPS := $(patsubst %.o,%.d,$(OBJECTS)) + + .PHONY: all clean distclean --openssl + +-all: ${PROJECT} ++all: --openssl ${PROJECT} + +-${PROJECT}: --openssl ${OBJECTS} Makefile ++${PROJECT}: ${OBJECTS} Makefile + @echo " HOSTLD $@" + ${Q}${HOSTCC} ${OBJECTS} -o $@ ${LDLIBS} + @${ECHO_BLANK_LINE} +-- +2.25.1 + From ea6d79c5e36e4d283e9b4a6c5b3fc290f4c6583f Mon Sep 17 00:00:00 2001 From: Pieterjan Camerlynck Date: Tue, 25 Jul 2023 20:48:47 +0200 Subject: [PATCH 0353/1167] DEVELOPERS: update email address for Pieterjan Camerlynck Signed-off-by: Pieterjan Camerlynck Signed-off-by: Yann E. MORIN (cherry picked from commit abd0b56294e77098e233eff0c906bde6b7d7f2f8) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEVELOPERS b/DEVELOPERS index 98e34cf5bb0..1f30279d98b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2384,7 +2384,7 @@ F: package/tree/ N: Pieter De Gendt F: package/libvips/ -N: Pieterjan Camerlynck +N: Pieterjan Camerlynck F: package/libdvbpsi/ F: package/mraa/ F: package/synergy/ From ae1839e7d4afd4cec041bdc7c3f551737894cd4f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 24 Jul 2023 23:06:24 +0200 Subject: [PATCH 0354/1167] {linux, linux-headers}: security bump 4.19.x / 5.{4, 10, 15}.x / 6.{1, 4}.x series Fixes Zenbleed (CVE-2023-20593): https://lwn.net/Articles/939101/ Signed-off-by: Bernd Kuhls Signed-off-by: Yann E. MORIN (cherry picked from commit 8af2c5ab83bab001853b23acf0356bbbc1bcf164) [Peter: drop 6.4.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 10 +++++----- package/linux-headers/Config.in.host | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index cef9c9eebeb..57b38b79c51 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.40" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.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 321629704ba..49e7cc4dc11 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,11 +1,11 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 43eafc2197a07dcdcff7a7ef79ac7502061f7c564744e51626bf5fa2e22587f0 linux-6.1.40.tar.xz +sha256 312809a78eea052a08a6580f47b2ed8dd28e5633461d6731febaf3cb1e570bb7 linux-6.1.41.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 07e0cebdb00d25459683e9c330a0576349b8c5e5f2abf053b864f9909151c31d linux-5.15.121.tar.xz -sha256 1e60296a135d272bb7ce645f6ae68fbd4ffd1972cb4b82c38c6faa1172481be3 linux-5.10.186.tar.xz -sha256 dc5458462c6edbe3473fc6dee80fbe0841df7c177fe0546c2f131e5918f5351d linux-5.4.249.tar.xz +sha256 38755801cd1ce229a8c0a0536d29aa37acea8a8aa13fa438e19fbf9d6293342d linux-5.15.122.tar.xz +sha256 f69454210b3e9e00e8b8368aaa897d4ca59f8be3b85399a2fcaecbf17af98bbb linux-5.10.187.tar.xz +sha256 0f5b8876526062bf5e346f6b9dde88be873761ee33cf3b8a1586d7d109a091fb linux-5.4.250.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc -sha256 33ebd0c445b58c814428558496b65a192410f000096b0e2e6f5d813ecd95e3eb linux-4.19.288.tar.xz +sha256 118f7411793868db8dcb043cdc82e9ac6f722fbec8dcdde30b07889d941aa3b3 linux-4.19.289.tar.xz sha256 ed82679c0c6e600db80050d09e2294fb28b61cf27dc98657296c7eb5250a7625 linux-4.14.320.tar.xz # Locally computed sha256 fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae linux-cip-5.10.162-cip24.tar.gz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 83b8625c4cf..03e5db7895a 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -385,11 +385,11 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.320" if BR2_KERNEL_HEADERS_4_14 - default "4.19.288" if BR2_KERNEL_HEADERS_4_19 - default "5.4.249" if BR2_KERNEL_HEADERS_5_4 - default "5.10.186" if BR2_KERNEL_HEADERS_5_10 - default "5.15.121" if BR2_KERNEL_HEADERS_5_15 - default "6.1.40" if BR2_KERNEL_HEADERS_6_1 + default "4.19.289" if BR2_KERNEL_HEADERS_4_19 + default "5.4.250" if BR2_KERNEL_HEADERS_5_4 + default "5.10.187" if BR2_KERNEL_HEADERS_5_10 + default "5.15.122" if BR2_KERNEL_HEADERS_5_15 + default "6.1.41" if BR2_KERNEL_HEADERS_6_1 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 d0af5a6ecf7048119d287d8601ab4c101fb2089d Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Sun, 18 Jun 2023 14:14:33 +0300 Subject: [PATCH 0355/1167] package/python-iniparse: add host variant dependency from python-six Signed-off-by: Sergey Bobrenok Signed-off-by: Thomas Petazzoni (cherry picked from commit bef2298f5a9e465b39ef93308ab028d228c2b408) Signed-off-by: Peter Korsgaard --- package/python-iniparse/python-iniparse.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/python-iniparse/python-iniparse.mk b/package/python-iniparse/python-iniparse.mk index e76987d1e95..9f00cf73875 100644 --- a/package/python-iniparse/python-iniparse.mk +++ b/package/python-iniparse/python-iniparse.mk @@ -10,6 +10,9 @@ PYTHON_INIPARSE_SITE = https://pypi.python.org/packages/source/i/iniparse PYTHON_INIPARSE_LICENSE = Python-2.0, MIT PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE PYTHON_INIPARSE_SETUP_TYPE = setuptools +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_PYTHON_INIPARSE_DEPENDENCIES = host-python-six $(eval $(python-package)) $(eval $(host-python-package)) From 4d654340b69c165949472afe3819f8c972215709 Mon Sep 17 00:00:00 2001 From: Sergey Bobrenok Date: Sun, 18 Jun 2023 14:14:34 +0300 Subject: [PATCH 0356/1167] package/crudini: add host variant dependency from python-iniparse Signed-off-by: Sergey Bobrenok Signed-off-by: Thomas Petazzoni (cherry picked from commit dd194540a1b8e9f70a01c6bf9c574863168e6778) Signed-off-by: Peter Korsgaard --- package/crudini/crudini.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/crudini/crudini.mk b/package/crudini/crudini.mk index c376c5f777f..48e0ebde8ff 100644 --- a/package/crudini/crudini.mk +++ b/package/crudini/crudini.mk @@ -9,6 +9,9 @@ CRUDINI_SITE = $(call github,pixelb,crudini,$(CRUDINI_VERSION)) CRUDINI_SETUP_TYPE = setuptools CRUDINI_LICENSE = GPL-2.0 CRUDINI_LICENSE_FILES = COPYING +# This is a runtime dependency, but we don't have the concept of +# runtime dependencies for host packages. +HOST_CRUDINI_DEPENDENCIES = host-python-iniparse $(eval $(python-package)) $(eval $(host-python-package)) From 43e1e51997a152e9c1c084c89b5f01886a701f8e Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Mon, 12 Jun 2023 18:53:44 +0200 Subject: [PATCH 0357/1167] package/rtl8189fs: en/disable runtime debug according to BR2_ENABLE_RUNTIME_DEBUG Signed-off-by: Giulio Benetti Tested-by: Indrek Kruusa Signed-off-by: Thomas Petazzoni (cherry picked from commit e798bfb8ff48acd54540e1347ad09c6ebf4ac29e) Signed-off-by: Peter Korsgaard --- package/rtl8189fs/rtl8189fs.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/rtl8189fs/rtl8189fs.mk b/package/rtl8189fs/rtl8189fs.mk index ca8ea15c035..c3eef6e071c 100644 --- a/package/rtl8189fs/rtl8189fs.mk +++ b/package/rtl8189fs/rtl8189fs.mk @@ -13,6 +13,10 @@ RTL8189FS_MODULE_MAKE_OPTS = \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR) +ifeq ($(BR2_ENABLE_RUNTIME_DEBUG),) +RTL8189FS_MODULE_MAKE_OPTS += CONFIG_RTW_DEBUG=n +endif + define RTL8189FS_LINUX_CONFIG_FIXUPS $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) From 16c683a27df3634941637b76426c0793b5d019e8 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 26 Jul 2023 21:44:52 +0200 Subject: [PATCH 0358/1167] package/wolfssl: disable asm on armv4 Quoting https://developer.arm.com/documentation/dui0489/i/arm-and-thumb-instructions/clz "This ARM instruction is available in ARMv5T and above." Fixes: - armeb http://autobuild.buildroot.net/results/ea9/ea9b19e872b4b20b97fceec3f7e0a6a1109c4f12/ /tmp/ccdRCOaB.s:27: Error: selected processor does not support `clz r5,r2' in ARM mode - arm http://autobuild.buildroot.net/results/cb1/cb1c7ac68b3379d3f4b5efc897198bea0a904217/ /tmp/cc72ECAj.s:6764: Error: selected processor does not support `clz r5,r0' in ARM mode /tmp/cc72ECAj.s:7110: Error: selected processor does not support `clz r5,lr' in ARM mode /tmp/cc72ECAj.s:8934: Error: selected processor does not support `clz r5,fp' in ARM mode Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 4c663675646264e9bb1e72f014195081a1582d19) Signed-off-by: Peter Korsgaard --- package/wolfssl/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wolfssl/Config.in b/package/wolfssl/Config.in index c41bdb6888c..9d173412fed 100644 --- a/package/wolfssl/Config.in +++ b/package/wolfssl/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_WOLFSSL_ASM_SUPPORTS bool default y if BR2_aarch64 - default y if BR2_arm || BR2_armeb + default y if (BR2_arm || BR2_armeb) && !BR2_ARM_CPU_ARMV4 # clz default y if BR2_powerpc default y if BR2_powerpc64 || BR2_powerpc64le default y if BR2_mips64 && !BR2_MIPS_CPU_MIPS32R6 From f2cfe1d28c093d2abeef0d86d73022d6c6deea24 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Thu, 27 Jul 2023 15:36:52 -0500 Subject: [PATCH 0359/1167] arch/Config.in.x86: drop AVX512 from alderlake Alder Lake CPUs have AVX512 support disabled [0]. To prevent potential issues, remove the AVX512 support advertisement. This puts Buildroot inline with the GCC options [1]. [0]: https://www.intel.com/content/www/us/en/support/articles/000089918/processors.html [1]: https://gcc.gnu.org/onlinedocs/gcc/x86-Options.html Fixes: e7b94130 ("arch/Config.in.x86: add sapphirerapids, alderlake, rocketlake") Signed-off-by: Vincent Fazio Signed-off-by: Thomas Petazzoni (cherry picked from commit f82a65b15b1805b9cbde0220e68e0267d0dbdb2b) Signed-off-by: Peter Korsgaard --- arch/Config.in.x86 | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/Config.in.x86 b/arch/Config.in.x86 index c770ae3ffe3..56ce1eb0cc0 100644 --- a/arch/Config.in.x86 +++ b/arch/Config.in.x86 @@ -450,7 +450,6 @@ config BR2_x86_alderlake select BR2_X86_CPU_HAS_SSE42 select BR2_X86_CPU_HAS_AVX select BR2_X86_CPU_HAS_AVX2 - select BR2_X86_CPU_HAS_AVX512 select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_x86_rocketlake bool "rocketlake" From e9ca6ecae41162dfa73c1e618769371ed74f46bc Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 27 Jul 2023 11:51:30 -0600 Subject: [PATCH 0360/1167] package/seatd: fix seatd group name The seatd service was changed to use the "seat" group in version 0.6.0: https://git.sr.ht/~kennylevinsen/seatd/commit/5535c2c3b19b42ebfe4c451600059e9418e401a6 In buildroot we updated seatd past version 0.6.0 in commit: c54f85ca0d2ba7b73c899a27e62c67d3389617b8 However we forgot to fix the group name when doing so. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni (cherry picked from commit 50a8d8330bf5ac9a3f7a52e83a5316bd40fe0ec9) Signed-off-by: Peter Korsgaard --- package/seatd/seatd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 96caf63b303..dbe9ac31544 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -33,7 +33,7 @@ ifeq ($(BR2_PACKAGE_SEATD_DAEMON),y) SEATD_CONF_OPTS += -Dlibseat-seatd=enabled -Dserver=enabled define SEATD_USERS - - - video -1 - - - - - + - - seat -1 - - - - - endef define SEATD_INSTALL_INIT_SYSV From 5722d30644e42720201cf9d5f4cf52285c9d6b17 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jul 2023 16:42:28 +0200 Subject: [PATCH 0361/1167] package/cairo: mutex support depends on NPTL Fixes: http://autobuild.buildroot.net/results/041/041ac8f0809a0f9415c545b7585cd197db08b55f/ The last bump of cairo took place in 2019 with commit 8d2a9d089a969909ad2de8acb67ee14ced03de28, the first build error of this kind I could find dates back to Sep 2022: http://autobuild.buildroot.net/results/8c5/8c547ec2e148ce3c4f230bb4b0d5c5b360d74dd5/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 92f14307ba670058d0b3692fb8e82753d6ad6868) Signed-off-by: Peter Korsgaard --- package/cairo/cairo.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index e8a704c7da6..7bc8f92debe 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -26,7 +26,7 @@ ifeq ($(BR2_m68k_cf),y) CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" endif From 135585ba23df556cd814f3fe49c4cc0e311dc108 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jul 2023 18:23:40 +0200 Subject: [PATCH 0362/1167] package/tor: bump version to 0.4.7.14 Changelog: https://gitlab.torproject.org/tpo/core/tor/-/blob/release-0.4.7/ChangeLog Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 361ff14457d6438e8b32a3566d60edb27a422ce5) Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index 51892f15c3d..a6b5f27c402 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.7.13.tar.gz.sha256sum -sha256 2079172cce034556f110048e26083ce9bea751f3154b0ad2809751815b11ea9d tor-0.4.7.13.tar.gz +# From https://dist.torproject.org/tor-0.4.7.14.tar.gz.sha256sum +sha256 a5ac67f6466380fc05e8043d01c581e4e8a2b22fe09430013473e71065e65df8 tor-0.4.7.14.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 03bd9987085..b794296c6a3 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.7.13 +TOR_VERSION = 0.4.7.14 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 8c00b2b07e0b0ab234f16347735c9db63f08f477 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jul 2023 18:24:25 +0200 Subject: [PATCH 0363/1167] package/libcurl: bump version to 8.2.1 Changelog: https://curl.se/changes.html#8_2_1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 653076ab71a418eaa5a0af3528cbec31bfee3aa6) 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 f606735c0f3..42bf5967e16 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.2.0.tar.xz.asc +# https://curl.se/download/curl-8.2.1.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 2859ec79e2cd96e976a99493547359b8001af1d1e21f3a3a3b846544ef54500f curl-8.2.0.tar.xz +sha256 dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894 curl-8.2.1.tar.xz sha256 b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524 COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index d0bf6cceade..7a3d6460e92 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.2.0 +LIBCURL_VERSION = 8.2.1 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From 0e2d0c1f83a5b9202547588c7df9f703568995ac Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 27 Jul 2023 18:30:52 +0200 Subject: [PATCH 0364/1167] {linux, linux-headers}: bump 5.{4, 10, 15}.x / 6.{1, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 0a4a689e9688120787092286b202fdf5fe89d5bf) [Peter: drop 6.4.x bump] Signed-off-by: Peter Korsgaard --- linux/Config.in | 2 +- linux/linux.hash | 8 ++++---- package/linux-headers/Config.in.host | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index 57b38b79c51..8b4c867d981 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.41" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.42" 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 49e7cc4dc11..83d4c2ca5fe 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,9 +1,9 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 312809a78eea052a08a6580f47b2ed8dd28e5633461d6731febaf3cb1e570bb7 linux-6.1.41.tar.xz +sha256 aaf8261b551c8b76b81eab8780b446e88cea4d551ae517ac3a9b2dbdbd381ed3 linux-6.1.42.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 38755801cd1ce229a8c0a0536d29aa37acea8a8aa13fa438e19fbf9d6293342d linux-5.15.122.tar.xz -sha256 f69454210b3e9e00e8b8368aaa897d4ca59f8be3b85399a2fcaecbf17af98bbb linux-5.10.187.tar.xz -sha256 0f5b8876526062bf5e346f6b9dde88be873761ee33cf3b8a1586d7d109a091fb linux-5.4.250.tar.xz +sha256 2de69544a12e6a059163c58fc901c13bcf22e8cac39c66b56f8fbb633399bf93 linux-5.15.123.tar.xz +sha256 c9558bab35e23ae67661bfb3192c609c857f78582a035449ae63e33d04ab6112 linux-5.10.188.tar.xz +sha256 bcb4953ed68131ef17f9f1ba52cac8b9d70007f5ab600bf3dee1fbf8beb218ca linux-5.4.251.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc sha256 118f7411793868db8dcb043cdc82e9ac6f722fbec8dcdde30b07889d941aa3b3 linux-4.19.289.tar.xz sha256 ed82679c0c6e600db80050d09e2294fb28b61cf27dc98657296c7eb5250a7625 linux-4.14.320.tar.xz diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 03e5db7895a..dbcc09a46db 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -386,10 +386,10 @@ config BR2_DEFAULT_KERNEL_HEADERS string default "4.14.320" if BR2_KERNEL_HEADERS_4_14 default "4.19.289" if BR2_KERNEL_HEADERS_4_19 - default "5.4.250" if BR2_KERNEL_HEADERS_5_4 - default "5.10.187" if BR2_KERNEL_HEADERS_5_10 - default "5.15.122" if BR2_KERNEL_HEADERS_5_15 - default "6.1.41" if BR2_KERNEL_HEADERS_6_1 + default "5.4.251" if BR2_KERNEL_HEADERS_5_4 + default "5.10.188" if BR2_KERNEL_HEADERS_5_10 + default "5.15.123" if BR2_KERNEL_HEADERS_5_15 + default "6.1.42" if BR2_KERNEL_HEADERS_6_1 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 1f7e47ab07f8634f2de0c22934f2fb7030d010f3 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 27 Jul 2023 16:22:35 -0700 Subject: [PATCH 0365/1167] package/containerd: bump version to v1.6.22 Bugfixes and updates. https://github.com/containerd/containerd/releases/tag/v1.6.22 Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 718c4972c6f58fd8ac401fa4a982a9d8514f9dcd) Signed-off-by: Peter Korsgaard --- package/containerd/containerd.hash | 2 +- package/containerd/containerd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/containerd/containerd.hash b/package/containerd/containerd.hash index 345a7b16ffa..8404675e306 100644 --- a/package/containerd/containerd.hash +++ b/package/containerd/containerd.hash @@ -1,3 +1,3 @@ # Computed locally -sha256 9452e95455d03a00d78ae0587595d0c18555bae7912068269efa25a724efe713 containerd-1.6.21.tar.gz +sha256 b109aceacc814d7a637ed94ba5ade829cd2642841d03e06971ef124fa3b86899 containerd-1.6.22.tar.gz sha256 4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4 LICENSE diff --git a/package/containerd/containerd.mk b/package/containerd/containerd.mk index 83489a3abfa..c4a6d854c31 100644 --- a/package/containerd/containerd.mk +++ b/package/containerd/containerd.mk @@ -4,7 +4,7 @@ # ################################################################################ -CONTAINERD_VERSION = 1.6.21 +CONTAINERD_VERSION = 1.6.22 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION)) CONTAINERD_LICENSE = Apache-2.0 CONTAINERD_LICENSE_FILES = LICENSE From 9aeda9cc621b8b1ede0aa58103d3ed710538cdad Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jul 2023 19:06:48 +0200 Subject: [PATCH 0366/1167] package/ntp: needs either mmu or threads Fixes: http://autobuild.buildroot.net/results/f2b466853ed296fdc8b4629f36e5a6447658f82d/ Quoting the first error message: ntp_io.c:3793:9: error: unknown type name 'blocking_child' ntp needs either fork or threads: https://bk.ntp.org/ntp-dev/include/ntp_workimpl.h?PAGE=anno&REV=4d6178063mDeaH-s7PteNqw1DDK-Rw #if defined(WORK_FORK) || defined(WORK_THREAD) # define WORKER #endif to enable the blocking_child code based on the WORKER define: https://bk.ntp.org/ntp-dev/include/intreswork.h?PAGE=anno&REV=4d617805zzdW7YeB56-WZ4GbGCcXxw The build error first occured on April 3rd, 2022: http://autobuild.buildroot.net/results/31b/31bfdac8411ebf043a39e3277f6d7b008fe337b0/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit f2d9118423612818c897bf075bc055fc7252cfc6) Signed-off-by: Peter Korsgaard --- package/ntp/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/ntp/Config.in b/package/ntp/Config.in index 97d933b5a85..78f008a4b81 100644 --- a/package/ntp/Config.in +++ b/package/ntp/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NTP bool "ntp" + depends on BR2_USE_MMU || BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBEVENT help Network Time Protocol suite/programs. From 75f705159037d9f9863fd30b13cecd8052d19fc7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jul 2023 16:38:40 +0200 Subject: [PATCH 0367/1167] package/gcc: or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS Backport upstream patch to fix build error seens with alsa-lib: error.c:(.text+0x12c): undefined reference to `__tls_get_addr' Fixes: http://autobuild.buildroot.net/results/525ca7fe78015168c186ffda5fa52c0edb2071c9/ The fix is included in gcc 13.x. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 4ce0dacb60b7fdccf3daabe58e09358da3f09fa2) Signed-off-by: Peter Korsgaard --- ...ine-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 +++++++++++++++++++ ...ine-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 49 +++++++++++++++++++ ...ine-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch | 48 ++++++++++++++++++ 3 files changed, 146 insertions(+) create mode 100644 package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch create mode 100644 package/gcc/11.4.0/0006-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch create mode 100644 package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch diff --git a/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch new file mode 100644 index 00000000000..7e9714e9cbe --- /dev/null +++ b/package/gcc/10.4.0/0007-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch @@ -0,0 +1,49 @@ +From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Thu, 29 Sep 2022 15:32:39 +0100 +Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS + +This was found when testing buildroot with linuxthreads enabled. In +this case, the build passes --disable-tls to the toolchain during +configuration. After building the OpenRISC toolchain it was still +generating TLS code sequences and causing linker failures such as: + + ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl + ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' + +This patch fixes this by disabling tls for the OpenRISC target when requested +via --disable-tls. + +gcc/ChangeLog: + + * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if + HAVE_AS_TLS is defined. + +Tested-by: Yann E. MORIN + +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 + +[Bernd: backported to 10.4.0] +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/or1k.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c +index da2f59062ba..0ce7b234417 100644 +--- a/gcc/config/or1k/or1k.c ++++ b/gcc/config/or1k/or1k.c +@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, + #undef TARGET_LEGITIMATE_ADDRESS_P + #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p + ++#ifdef HAVE_AS_TLS + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true ++#endif + + #undef TARGET_HAVE_SPECULATION_SAFE_VALUE + #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed +-- +2.39.3 + diff --git a/package/gcc/11.4.0/0006-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/11.4.0/0006-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch new file mode 100644 index 00000000000..025e6cfe32a --- /dev/null +++ b/package/gcc/11.4.0/0006-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch @@ -0,0 +1,49 @@ +From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Thu, 29 Sep 2022 15:32:39 +0100 +Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS + +This was found when testing buildroot with linuxthreads enabled. In +this case, the build passes --disable-tls to the toolchain during +configuration. After building the OpenRISC toolchain it was still +generating TLS code sequences and causing linker failures such as: + + ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl + ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' + +This patch fixes this by disabling tls for the OpenRISC target when requested +via --disable-tls. + +gcc/ChangeLog: + + * config/or1k/or1k.c (TARGET_HAVE_TLS): Only define if + HAVE_AS_TLS is defined. + +Tested-by: Yann E. MORIN + +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 + +[Bernd: backported to 11.4.0] +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/or1k.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c +index da2f59062ba..0ce7b234417 100644 +--- a/gcc/config/or1k/or1k.c ++++ b/gcc/config/or1k/or1k.c +@@ -2175,8 +2175,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, + #undef TARGET_LEGITIMATE_ADDRESS_P + #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p + ++#ifdef HAVE_AS_TLS + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true ++#endif + + #undef TARGET_HAVE_SPECULATION_SAFE_VALUE + #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed +-- +2.39.3 + diff --git a/package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch b/package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch new file mode 100644 index 00000000000..4bac5972332 --- /dev/null +++ b/package/gcc/12.3.0/0002-or1k-Only-define-TARGET_HAVE_TLS-when-HAVE_AS_TLS.patch @@ -0,0 +1,48 @@ +From ca01d2526917ec6e54b30472d3aedfd46d4ca585 Mon Sep 17 00:00:00 2001 +From: Stafford Horne +Date: Thu, 29 Sep 2022 15:32:39 +0100 +Subject: [PATCH] or1k: Only define TARGET_HAVE_TLS when HAVE_AS_TLS + +This was found when testing buildroot with linuxthreads enabled. In +this case, the build passes --disable-tls to the toolchain during +configuration. After building the OpenRISC toolchain it was still +generating TLS code sequences and causing linker failures such as: + + ..../or1k-buildroot-linux-uclibc-gcc -o gpsd-3.24/gpsctl .... -lusb-1.0 -lm -lrt -lnsl + ..../ld: ..../sysroot/usr/lib/libusb-1.0.so: undefined reference to `__tls_get_addr' + +This patch fixes this by disabling tls for the OpenRISC target when requested +via --disable-tls. + +gcc/ChangeLog: + + * config/or1k/or1k.cc (TARGET_HAVE_TLS): Only define if + HAVE_AS_TLS is defined. + +Tested-by: Yann E. MORIN + +Upstream: https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=ca01d2526917ec6e54b30472d3aedfd46d4ca585 + +Signed-off-by: Bernd Kuhls +--- + gcc/config/or1k/or1k.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gcc/config/or1k/or1k.cc b/gcc/config/or1k/or1k.cc +index da2f59062ba..0ce7b234417 100644 +--- a/gcc/config/or1k/or1k.cc ++++ b/gcc/config/or1k/or1k.cc +@@ -2206,8 +2206,10 @@ or1k_output_mi_thunk (FILE *file, tree thunk_fndecl, + #undef TARGET_LEGITIMATE_ADDRESS_P + #define TARGET_LEGITIMATE_ADDRESS_P or1k_legitimate_address_p + ++#ifdef HAVE_AS_TLS + #undef TARGET_HAVE_TLS + #define TARGET_HAVE_TLS true ++#endif + + #undef TARGET_HAVE_SPECULATION_SAFE_VALUE + #define TARGET_HAVE_SPECULATION_SAFE_VALUE speculation_safe_value_not_needed +-- +2.39.3 + From dc0a90c96cb6267c6cb84452720076d600d20091 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sat, 4 Mar 2023 17:31:00 +0100 Subject: [PATCH 0368/1167] package/iperf3: bump to version 3.13 LICENSE file hash changed, due to year update. For change log, see: https://github.com/esnet/iperf/blob/3.13/RELNOTES.md#iperf-313-2023-02-16 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 06fa870d7e8ba385de00e64116df74c1e3b9b31a) Signed-off-by: Peter Korsgaard --- package/iperf3/iperf3.hash | 6 +++--- package/iperf3/iperf3.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash index 15c75b6dac2..b2c89df98ab 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.12.tar.gz.sha256 -sha256 72034ecfb6a7d6d67e384e19fb6efff3236ca4f7ed4c518d7db649c447e1ffd6 iperf-3.12.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.13.tar.gz.sha256 +sha256 bee427aeb13d6a2ee22073f23261f63712d82befaa83ac8cb4db5da4c2bdc865 iperf-3.13.tar.gz # Locally computed -sha256 a5c2e3d799f2835156e565a3de4fad33d32ed289cdc9e414dfaf75719fd12ef9 LICENSE +sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 9041c865759..129319d78a9 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.12 +IPERF3_VERSION = 3.13 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 34dde405262f7570422f9e8a84d0b103ffd2032c Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 24 Jul 2023 19:01:09 +0200 Subject: [PATCH 0369/1167] package/iperf3: security bump to version 3.14 For change log, see: https://github.com/esnet/iperf/blob/3.14/RELNOTES.md#iperf-314-2023-07-07 Fixes CVE-2023-38403: https://www.cve.org/CVERecord?id=CVE-2023-38403 Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit 3c4f02e76ea6df25456e4cccedd04d47c44add18) 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 b2c89df98ab..02ada0dcc64 100644 --- a/package/iperf3/iperf3.hash +++ b/package/iperf3/iperf3.hash @@ -1,4 +1,4 @@ -# From https://downloads.es.net/pub/iperf/iperf-3.13.tar.gz.sha256 -sha256 bee427aeb13d6a2ee22073f23261f63712d82befaa83ac8cb4db5da4c2bdc865 iperf-3.13.tar.gz +# From https://downloads.es.net/pub/iperf/iperf-3.14.tar.gz.sha256 +sha256 723fcc430a027bc6952628fa2a3ac77584a1d0bd328275e573fc9b206c155004 iperf-3.14.tar.gz # Locally computed sha256 35aa7c4618b9884d6faa9b43a4e70291b35ea9f89329d5d33becd852e85221b0 LICENSE diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk index 129319d78a9..c00b16ce613 100644 --- a/package/iperf3/iperf3.mk +++ b/package/iperf3/iperf3.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPERF3_VERSION = 3.13 +IPERF3_VERSION = 3.14 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 7812ee6b6cc08a94fbde10f15a41925efa18be25 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 28 Jul 2023 19:20:26 +0200 Subject: [PATCH 0370/1167] package/php: force arm mode instead of Thumb mode Fix the following build failure: /tmp/ccqcLrVb.s:4053: Error: selected processor does not support `umlal r2,r1,r0,r3' in Thumb mode /tmp/ccqcLrVb.s:4076: Error: selected processor does not support `umlal r0,r3,r1,r2' in Thumb mode /tmp/ccqcLrVb.s:8644: Error: selected processor does not support `umlal r0,r3,r2,r4' in Thumb mode Fixes: http://autobuild.buildroot.net/results/1d09a0a58cbc1712416de746d57d4532df580673/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 73ddf7bf509813a1a9008fa61c8706e200340fe9) Signed-off-by: Peter Korsgaard --- package/php/php.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/php/php.mk b/package/php/php.mk index 6a2a6ae71b1..68aeceb33e5 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -84,6 +84,13 @@ else PHP_CONF_ENV += ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=no endif +# php has some assembly function that is not present in Thumb mode: +# Error: selected processor does not support `umlal r2,r1,r0,r3' in Thumb mode +# so, we desactivate Thumb mode +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +PHP_CFLAGS += -marm +endif + PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CLI),--enable-cli,--disable-cli) PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CGI),--enable-cgi,--disable-cgi) PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_FPM),--enable-fpm,--disable-fpm) From 71bece0f26a030e89ef9304d77ddca6dc04abd19 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 28 Jul 2023 21:29:52 +0000 Subject: [PATCH 0371/1167] package/libubootenv: backport fix for NOR flashes Fixes a bug present since v0.3.3 that causes extremely slow writes to NOR flashes. Signed-off-by: Brandon Maier Signed-off-by: Thomas Petazzoni (cherry picked from commit be57403d04c20e5c870b9fff0e650587de493739) Signed-off-by: Peter Korsgaard --- ...-fix-bug-when-SPI-flash-write-size-s.patch | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch diff --git a/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch b/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch new file mode 100644 index 00000000000..414cb3d2056 --- /dev/null +++ b/package/libubootenv/0002-Revert-fw_setenv-fix-bug-when-SPI-flash-write-size-s.patch @@ -0,0 +1,71 @@ +From 35bbc4d8155ed86ca7200e060dad98bdfbce684d Mon Sep 17 00:00:00 2001 +From: Stefano Babic +Date: Thu, 15 Jun 2023 16:54:46 +0200 +Subject: [PATCH] Revert "fw_setenv: fix bug when SPI flash write size != + sector size" + +This reverts commit 44ecc1c216007272a6f99a104a71c9d410969d9e. + +mtd writesize was errouneously interpreted as maximum allowed size, but +it is the minimum size. The patch raises performance issues because on +NOR flashes single bytes are written. + +Signed-off-by: Stefano Babic +Upstream: https://github.com/sbabic/libubootenv/commit/9f17a00ee56dc5cfb1d9b51e6639d67b64cb3309 +Signed-off-by: Brandon Maier +--- + src/uboot_env.c | 29 +++++++++-------------------- + 1 file changed, 9 insertions(+), 20 deletions(-) + +diff --git a/src/uboot_env.c b/src/uboot_env.c +index c5eefe7..76e2619 100644 +--- a/src/uboot_env.c ++++ b/src/uboot_env.c +@@ -712,8 +712,6 @@ static int mtdwrite(struct uboot_flash_env *dev, void *data) + sectors = dev->envsectors ? dev->envsectors : 1; + buf = data; + while (count > 0) { +- int blockcount; +- + erase.start = start; + + skip = is_nand_badblock(dev, start); +@@ -744,26 +742,17 @@ static int mtdwrite(struct uboot_flash_env *dev, void *data) + ret =-EIO; + goto devwrite_out; + } +- +- blockcount = blocksize; +- +- /* writesize can be different than the sector size. */ +- +- while (blockcount > 0) { +- if (lseek(dev->fd, start, SEEK_SET) < 0) { +- ret =-EIO; +- goto devwrite_out; +- } +- if (write(dev->fd, buf, dev->mtdinfo.writesize) != dev->mtdinfo.writesize) { +- ret =-EIO; +- goto devwrite_out; +- } +- +- blockcount -= dev->mtdinfo.writesize; +- start += dev->mtdinfo.writesize; +- buf += dev->mtdinfo.writesize; ++ if (lseek(dev->fd, start, SEEK_SET) < 0) { ++ ret =-EIO; ++ goto devwrite_out; ++ } ++ if (write(dev->fd, buf, blocksize) != blocksize) { ++ ret =-EIO; ++ goto devwrite_out; + } + MTDLOCK(dev, &erase); ++ start += dev->sectorsize; ++ buf += blocksize; + count -= blocksize; + ret += blocksize; + } +-- +2.41.0 + From 93fb7cccca622cc15d2f33f3c567a6a26b25f4b0 Mon Sep 17 00:00:00 2001 From: Brandon Maier Date: Fri, 28 Jul 2023 21:32:18 +0000 Subject: [PATCH 0372/1167] utils/docker-run: fix support for git-worktrees The docker-run script attempts to support git-new-workdirs and git-worktrees by resolving the symlink at '$GIT_DIR/config' to get the true $GIT_DIR. However this does not work for git-worktrees as they do not use symlinks, instead they change the $GIT_DIR into a regular file that contains the path to the real $GIT_DIR. To complicate things further, we actually want the $GIT_COMMON_DIR which is the superset of a worktree's $GIT_DIR. git-rev-parse supports the '--git-common-dir' which will resolve the $GIT_COMMON_DIR for us. However it does not work for git-new-workdirs, so we still need to detect and handle them. '--git-common-dir' also appeared only with git 2.10.0, released in 2016, so it will not be available in older "enterprise-grade" distributions. In that case, 'git rev-parse --git-common-dir' would return the option flag '--git-common-dir' as-is, which is incorrect. So, we instruct it to never return flags. '--git-common-dir' also returns just '.git' for the main working copy, but 'docker run' want an absolute path, so we canonicalise it. Signed-off-by: Brandon Maier [yann.morin.1998@free.fr: - support git versions before --git-common-dir was introduced - don't mount GIT_DIR if unknown (i.e. not needed) - fix expanding MAIN_DIR ] Signed-off-by: Yann E. MORIN (cherry picked from commit 90790790925c5d456ce7585afdf6e42aa25fd9ea) Signed-off-by: Peter Korsgaard --- utils/docker-run | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/utils/docker-run b/utils/docker-run index 17c587a484b..b201d28289a 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -2,8 +2,13 @@ set -o errexit -o pipefail DIR=$(dirname "${0}") MAIN_DIR=$(readlink -f "${DIR}/..") -# GIT_DIR to support workdirs/worktrees -GIT_DIR="$(dirname "$(realpath "${MAIN_DIR}/.git/config")")" +if [ -L "${MAIN_DIR}/.git/config" ]; then + # Support git-new-workdir + GIT_DIR="$(dirname "$(realpath "${MAIN_DIR}/.git/config")")" +else + # Support git-worktree + GIT_DIR="$(cd "${MAIN_DIR}" && git rev-parse --no-flags --git-common-dir)" +fi # shellcheck disable=SC2016 IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \ sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g') @@ -13,9 +18,21 @@ declare -a docker_opts=( --rm --user "$(id -u):$(id -g)" --mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" - --mount "type=bind,src=${GIT_DIR},dst=${GIT_DIR}" --workdir "${MAIN_DIR}" ) + +# Empty GIT_DIR means that we are not in a workdir, *and* git is too old +# to know about worktrees, so we're not in a worktree either. So it means +# we're in the main git working copy, and thus we don't need to mount the +# .git directory. +if [ "${GIT_DIR}" ]; then + # GIT_DIR in the main working copy (when git supports worktrees) will + # be just '.git', but 'docker run' needs an absolute path. If it's an + # absolute path already (in a wordir), then that's a noop. + GIT_DIR="$(readlink -e "${GIT_DIR}")" + docker_opts+=( --mount "type=bind,src=${GIT_DIR},dst=${GIT_DIR}" ) +fi + if tty -s; then docker_opts+=( -t ) fi From e3290059712ea592ce2c609c737aeef699dca237 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Sat, 25 Mar 2023 21:38:08 +0100 Subject: [PATCH 0373/1167] package/bind: fix build failure due to gcc bug 101737 The bind package exhibits gcc bug 101737 when built for the SH4 architecture with optimization enabled, which causes a build failure. As done for other packages in Buildroot work around this gcc bug by setting optimization to -O0 if BR2_TOOLCHAIN_HAS_GCC_BUG_101737=y. To achieve this we need to correct the override of CFLAGS by using: BIND_CONF_OPTS += CFLAGS="$(BIND_CFLAGS)" instead of: BIND_CONF_ENV = BUILD_CFLAGS"$(BIND_CFLAGS)" since the latter doesn't work as expected and doesn't override CFLAGS. Fixes: http://autobuild.buildroot.net/results/e7b/e7b9a4cbee8bb16431609182b96d1ac1ccec10e7/ Signed-off-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit 105e3b34be2e51e03721710fb3e91aa93083b1ce) Signed-off-by: Peter Korsgaard --- package/bind/bind.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/bind/bind.mk b/package/bind/bind.mk index f46d1a8a544..b934ab31908 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -28,7 +28,6 @@ BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone tsig-keygen BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate BIND_CONF_ENV = \ BUILD_CC="$(TARGET_CC)" \ - BUILD_CFLAGS="$(TARGET_CFLAGS)" \ LIBS=`$(PKG_CONFIG_HOST_BINARY) --libs openssl` BIND_CONF_OPTS = \ --without-cmocka \ @@ -39,6 +38,14 @@ BIND_CONF_OPTS = \ BIND_DEPENDENCIES = host-pkgconf libuv openssl +BIND_CFLAGS = $(TARGET_CFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101737),y) +BIND_CFLAGS += -O0 +endif + +BIND_CONF_OPTS += CFLAGS="$(BIND_CFLAGS)" + ifeq ($(BR2_PACKAGE_ZLIB),y) BIND_CONF_OPTS += --with-zlib BIND_DEPENDENCIES += zlib From 75f235013e047527668520320cc5b1923fb6061b Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Thu, 6 Jul 2023 12:53:47 +0200 Subject: [PATCH 0374/1167] board/bsh/imx8mn-bsh-smm-s2/readme.txt: fix typo It was a leftover from the copy-and-paste of the readme.txt file of its almost twin sister BSH SMM S2 PRO. Signed-off-by: Dario Binacchi Reviewed-by: Michael Trimarchi Signed-off-by: Thomas Petazzoni (cherry picked from commit d4f23da67eedc56f285e093b7432b33ba303a71c) Signed-off-by: Peter Korsgaard --- board/bsh/imx8mn-bsh-smm-s2/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/bsh/imx8mn-bsh-smm-s2/readme.txt b/board/bsh/imx8mn-bsh-smm-s2/readme.txt index 37081091e84..6b8cd031990 100644 --- a/board/bsh/imx8mn-bsh-smm-s2/readme.txt +++ b/board/bsh/imx8mn-bsh-smm-s2/readme.txt @@ -2,7 +2,7 @@ i.MX8MN BSH SMM S2 ================== This tutorial describes how to use the predefined Buildroot -configuration for the i.MX8MN BSH SMM S2 PRO board. +configuration for the i.MX8MN BSH SMM S2 board. Building -------- From 99c68c06b8a4067c65a8d72a6a11929dabbdcad7 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 30 Jul 2023 13:04:32 +0200 Subject: [PATCH 0375/1167] DEVELOPERS: sort entries of Bernd Kuhls Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 210306b4fa1f1a018393c69334eb48bf247a91c7) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index 1f30279d98b..b407537c71a 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -343,8 +343,8 @@ F: package/giflib/ F: package/gkrellm/ F: package/gpsd/ F: package/gptfdisk/ -F: package/hdparm/ F: package/hddtemp/ +F: package/hdparm/ F: package/intel-gmmlib/ F: package/intel-mediadriver/ F: package/intel-mediasdk/ @@ -372,8 +372,8 @@ F: package/libdvdcss/ F: package/libdvdnav/ F: package/libdvdread/ F: package/libebur128/ -F: package/libfribidi/ F: package/libfreeglut/ +F: package/libfribidi/ F: package/libg7221/ F: package/libglew/ F: package/libglfw/ @@ -435,9 +435,9 @@ F: package/perl-io-html/ F: package/perl-lwp-mediatypes/ F: package/perl-mail-dkim/ F: package/perl-mailtools/ +F: package/perl-netaddr-ip/ F: package/perl-net-dns/ F: package/perl-net-http/ -F: package/perl-netaddr-ip/ F: package/perl-timedate/ F: package/perl-uri/ F: package/perl-www-robotrules/ @@ -449,17 +449,17 @@ F: package/pure-ftpd/ F: package/python-couchdb/ F: package/python-cssutils/ F: package/python-glslang/ +F: package/python-mako/ F: package/python-mwclient/ F: package/python-mwscrape/ F: package/python-mwscrape2slob/ -F: package/python-mako/ F: package/python-oauthlib/ F: package/python-pyicu/ F: package/python-pylru/ F: package/python-requests-oauthlib/ F: package/python-slob/ -F: package/rsync/ F: package/rrdtool/ +F: package/rsync/ F: package/rtmpdump/ F: package/samba4/ F: package/sofia-sip/ From 4d292bc080f42c0b74cb4363e25d024743675793 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Mon, 12 Jun 2023 18:02:04 +0200 Subject: [PATCH 0376/1167] package/speex: force arm mode instead of Thumb mode Fix the following build failure: /tmp/cclxE0xY.s: Assembler messages: /tmp/cclxE0xY.s:118: Error: cannot honor width suffix -- `smlabb r2,r0,r4,r6' /tmp/cclxE0xY.s:134: Error: cannot honor width suffix -- `smlabb r9,r2,r2,r3' /tmp/cclxE0xY.s:812: Error: cannot honor width suffix -- `smlabb r1,r2,r2,r6' /tmp/cclxE0xY.s:1202: Error: cannot honor width suffix -- `smulbb r3,r0,r6' /tmp/cclxE0xY.s:2298: Error: cannot honor width suffix -- `smulbb r3,r0,r4' /tmp/cclxE0xY.s:3133: Error: cannot honor width suffix -- `smulbb r3,r2,r5' Fixes: http://autobuild.buildroot.net/results/c55/c557ca72832c942f201b4a21f913f74534857cc6/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 17cdf58f1cb85a786cdd884872486828fe416112) Signed-off-by: Peter Korsgaard --- package/speex/speex.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/speex/speex.mk b/package/speex/speex.mk index 6d61e93833d..0bbcb2bde2f 100644 --- a/package/speex/speex.mk +++ b/package/speex/speex.mk @@ -26,6 +26,10 @@ ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y) SPEEX_CONF_OPTS += --enable-arm5e-asm endif +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +SPEEX_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" +endif + define SPEEX_LIBTOOL_FIXUP $(SED) 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $(@D)/libtool $(SED) 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $(@D)/libtool From 7df514e36734fe05fc725a07eacaf129a58512da Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Wed, 15 Mar 2023 16:21:11 +0000 Subject: [PATCH 0377/1167] package/sam-ba: drop 32bit host lib requirement Current versions of sam-ba are 64bit only. objdump -p $(HOST_DIR)/bin/sam-ba $(HOST_DIR)/bin/sam-ba: file format elf64-x86-64 Signed-off-by: Daniel Lang Signed-off-by: Thomas Petazzoni (cherry picked from commit 71b5ea4030a25f84375a5e23d0eae6cf49ffe5a8) Signed-off-by: Peter Korsgaard --- Config.in | 2 +- package/sam-ba/Config.in.host | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Config.in b/Config.in index 0d7641633c3..670e199c0b0 100644 --- a/Config.in +++ b/Config.in @@ -65,7 +65,7 @@ config BR2_NEEDS_HOST_JAVA # Hidden boolean selected by pre-built packages for x86, when they # need to run on x86-64 machines (example: pre-built external -# toolchains, binary tools like SAM-BA, etc.). +# toolchains, binary tools, etc.). config BR2_HOSTARCH_NEEDS_IA32_LIBS bool diff --git a/package/sam-ba/Config.in.host b/package/sam-ba/Config.in.host index 1967f33ab31..cd11e8633e5 100644 --- a/package/sam-ba/Config.in.host +++ b/package/sam-ba/Config.in.host @@ -1,7 +1,6 @@ config BR2_PACKAGE_HOST_SAM_BA bool "host sam-ba" depends on BR2_HOSTARCH = "x86_64" - select BR2_HOSTARCH_NEEDS_IA32_LIBS help Atmel SAM-BA software provides an open set of tools for programming the Atmel SAM3, SAM7 and SAM9 ARM-based From 08c379dca090b32c0f39fab02123aa911e17c020 Mon Sep 17 00:00:00 2001 From: Joel Carlson Date: Mon, 2 Jan 2023 00:15:22 -0700 Subject: [PATCH 0378/1167] package/cmocka: fix build on Thumb classic configurations The cmocka package checks if a toolchain supports the -fstack-clash-protection compiler flag, and if it does automatically uses it. That flag is not supported by GCC for Thumb1 builds (at least as of both GCC 11 and GCC 12). Let's tell cmocka about this by passing -DWITH_STACK_CLASH_PROTECTION=OFF in this configuration, as suggested by Arnout Vandecappelle. Fixes: http://autobuild.buildroot.net/results/4044b3a71d3130d934c7a7c0c5badfabb2a97030/ Signed-off-by: Joel Carlson [Thomas: change the initial patch from Joel to use the suggestion from Arnout] Signed-off-by: Thomas Petazzoni (cherry picked from commit 5622c76bf42fd29f8dfc231d0fccb623960b3542) Signed-off-by: Peter Korsgaard --- package/cmocka/cmocka.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/cmocka/cmocka.mk b/package/cmocka/cmocka.mk index eafb4898e1e..297f95f4650 100644 --- a/package/cmocka/cmocka.mk +++ b/package/cmocka/cmocka.mk @@ -21,4 +21,9 @@ ifeq ($(BR2_SHARED_STATIC_LIBS),y) CMOCKA_CONF_OPTS += -DWITH_STATIC_LIB=ON endif +# gcc for ARM Thumb1 doesn't implement -fstack-clash-protection +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +CMOCKA_CONF_OPTS += -DWITH_STACK_CLASH_PROTECTION=OFF +endif + $(eval $(cmake-package)) From d97346f1ceb2f86d0b26fb72cf18647a074bb639 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 31 Jul 2023 20:56:57 +0200 Subject: [PATCH 0379/1167] utils/docker-run: fix running when CWD is not MAIN_DIR Commit 90790790925c (utils/docker-run: fix support for git-worktrees) got last-minute changes when it was applied, and the case when the current working directory is not the top of the current working copy got broken. Fix that by duplicating (and thus reinstating) the 'cd MAIN_DIR' to match what is done when retrieving the git-common-dir. Fixes: 90790790925c Reported-by: Brandon Maier Signed-off-by: Yann E. MORIN (cherry picked from commit 5b559109eeeec19e6e33c82712690aec89dcb562) Signed-off-by: Peter Korsgaard --- utils/docker-run | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/docker-run b/utils/docker-run index b201d28289a..ab95e61e846 100755 --- a/utils/docker-run +++ b/utils/docker-run @@ -27,9 +27,10 @@ declare -a docker_opts=( # .git directory. if [ "${GIT_DIR}" ]; then # GIT_DIR in the main working copy (when git supports worktrees) will - # be just '.git', but 'docker run' needs an absolute path. If it's an - # absolute path already (in a wordir), then that's a noop. - GIT_DIR="$(readlink -e "${GIT_DIR}")" + # be just '.git', but 'docker run' needs an absolute path. If it is + # not absolute, GIT_DIR is relative to MAIN_DIR. If it's an absolute + # path already (in a wordir), then that's a noop. + GIT_DIR="$(cd "${MAIN_DIR}"; readlink -e "${GIT_DIR}")" docker_opts+=( --mount "type=bind,src=${GIT_DIR},dst=${GIT_DIR}" ) fi From 9e6b20bae9ba6cb547d3d7ca8def4a30d23f51f4 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 31 Jul 2023 22:10:52 +0200 Subject: [PATCH 0380/1167] package/sysdig: remove patch that doesn't apply Patch 0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohmann.patch should have been deleted as part of Buildroot commit 08792a60df80a1147ee78bb108f8186996bf0c77 ("package/sysdig: bump to version 0.29.3"). Indeed, this patch was merged upstream as commit 114436c1a45142ef73acfc2607fbc6572782160f between 0.29.2 and 0.29.3. This fixes the following build failure: Applying 0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohmann.patch using patch: patching file cmake/modules/nlohmann-json.cmake Reversed (or previously applied) patch detected! Skipping patch. 1 out of 1 hunk ignored -- saving rejects to file cmake/modules/nlohmann-json.cmake.rej There are no autobuilder failures, probably because getting to build sysdig requires so many special conditions that it never triggered. Signed-off-by: Thomas Petazzoni (cherry picked from commit e434d8a29fd566c43c1051eb84694b6ac032597d) Signed-off-by: Peter Korsgaard --- ...BUNDLED_DEPS-before-getting-nlohmann.patch | 52 ------------------- 1 file changed, 52 deletions(-) delete mode 100644 package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohmann.patch diff --git a/package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohmann.patch b/package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohmann.patch deleted file mode 100644 index 3521bd3f8df..00000000000 --- a/package/sysdig/0001-cmake-Check-USE_BUNDLED_DEPS-before-getting-nlohmann.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0dbebd008c04d266dc41c4bec8280a0744fd5130 Mon Sep 17 00:00:00 2001 -From: Francis Laniel -Date: Wed, 13 Apr 2022 18:01:11 +0100 -Subject: [PATCH] cmake: Check USE_BUNDLED_DEPS before getting - nlohmann-json. - -Upstream: https://github.com/draios/sysdig/pull/1869 -Signed-off-by: Francis Laniel ---- - cmake/modules/nlohmann-json.cmake | 29 +++++++++++++++++++---------- - 1 file changed, 19 insertions(+), 10 deletions(-) - -diff --git a/cmake/modules/nlohmann-json.cmake b/cmake/modules/nlohmann-json.cmake -index bb1279d7..feb0f071 100644 ---- a/cmake/modules/nlohmann-json.cmake -+++ b/cmake/modules/nlohmann-json.cmake -@@ -16,13 +16,22 @@ - # limitations under the License. - # - --set(NJSON_SRC "${PROJECT_BINARY_DIR}/njson-prefix/src/njson") --message(STATUS "Using bundled nlohmann-json in '${NJSON_SRC}'") --set(NJSON_INCLUDE_DIR "${NJSON_SRC}/single_include") --ExternalProject_Add( -- njson -- URL "https://github.com/nlohmann/json/archive/v3.3.0.tar.gz" -- URL_HASH "SHA256=2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa801" -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "") -+if(NOT USE_BUNDLED_DEPS) -+ find_path(NJSON_INCLUDE_DIR NAMES nlohmann/json.hpp) -+ if(NJSON_INCLUDE_DIR) -+ message(STATUS "Found njson: include: ${NJSON_INCLUDE_DIR}") -+ else() -+ message(FATAL_ERROR "Couldn't find system njson") -+ endif() -+else() -+ set(NJSON_SRC "${PROJECT_BINARY_DIR}/njson-prefix/src/njson") -+ message(STATUS "Using bundled nlohmann-json in '${NJSON_SRC}'") -+ set(NJSON_INCLUDE_DIR "${NJSON_SRC}/single_include") -+ ExternalProject_Add( -+ njson -+ URL "https://github.com/nlohmann/json/archive/v3.3.0.tar.gz" -+ URL_HASH "SHA256=2fd1d207b4669a7843296c41d3b6ac5b23d00dec48dba507ba051d14564aa801" -+ CONFIGURE_COMMAND "" -+ BUILD_COMMAND "" -+ INSTALL_COMMAND "") -+endif() --- -2.25.1 - From 7ed51e5c2f30102bde6cdef8a6bd3d60e152da28 Mon Sep 17 00:00:00 2001 From: Pierre Ficheux Date: Wed, 15 Mar 2023 18:05:18 +0100 Subject: [PATCH 0381/1167] package/xenomai: fix testsuite install Since commit [1], the testsuite build is unconditionally disabled although we have the option BR2_PACKAGE_XENOMAI_TESTSUITE to install Xenomai testsuite on the target. Handle --disable-testsuite option with BR2_PACKAGE_XENOMAI_TESTSUITE. [1] 74196b7d059684e555a87e5409c21c56c727066b Signed-off-by: Pierre Ficheux Signed-off-by: Romain Naour Cc: Fabrice Fontaine Signed-off-by: Thomas Petazzoni (cherry picked from commit bc9a8ef111b5bbc325a8490d2ce04cc02ffd0416) Signed-off-by: Peter Korsgaard --- package/xenomai/xenomai.mk | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index c1ad0c5df62..9356919259b 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -41,7 +41,6 @@ XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user XENOMAI_CONF_OPTS += \ --disable-demo \ - --disable-testsuite \ --includedir=/usr/include/xenomai/ ifeq ($(BR2_PACKAGE_XENOMAI_MERCURY),y) @@ -87,17 +86,10 @@ endef XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_UNNEEDED_FILES -ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),) -define XENOMAI_REMOVE_TESTSUITE - rm -rf $(TARGET_DIR)/usr/share/xenomai/ - for i in clocktest gpiotest latency smokey spitest switchtest \ - xeno-test-run-wrapper dohell xeno-test-run xeno-test ; do \ - rm -f $(TARGET_DIR)/usr/bin/$$i ; \ - done - rm -rf $(TARGET_DIR)/usr/demo/ -endef - -XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_TESTSUITE +ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),y) +XENOMAI_CONF_OPTS += --enable-testsuite +else +XENOMAI_CONF_OPTS += --disable-testsuite endif ifeq ($(BR2_PACKAGE_XENOMAI_RTCAN),) From a938b2e5cbf0b5ebe87445ef14cdebd89f6f3f7a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 31 Aug 2023 13:02:35 +0200 Subject: [PATCH 0382/1167] package/go: security bump to v1.19.12 go1.19.12 (released 2023-08-01) includes a security fix to the crypto/tls package, as well as bug fixes to the assembler and the compiler. Fixes CVE-2023-29409: restrict RSA keys in certificates to <= 8192 bits Extremely large RSA keys in certificate chains can cause a client/server to expend significant CPU time verifying signatures. Limit this by restricting the size of RSA keys transmitted during handshakes to <= 8192 bits. Based on a survey of publicly trusted RSA keys, there are currently only three certificates in circulation with keys larger than this, and all three appear to be test certificates that are not actively deployed. It is possible there are larger keys in use in private PKIs, but we target the web PKI, so causing breakage here in the interests of increasing the default safety of users of crypto/tls seems reasonable. Signed-off-by: Peter Korsgaard --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 6d4c718a405..ac8499e7dc7 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://go.dev/dl -sha256 e25c9ab72d811142b7f41ff6da5165fec2d1be5feec3ef2c66bc0bdecb431489 go1.19.11.src.tar.gz +sha256 ee5d50e0a7fd74ba1b137cb879609aaaef9880bf72b5d1742100e38ae72bb557 go1.19.12.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 22b8161e052..9189032ba8c 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.19.11 +GO_VERSION = 1.19.12 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 7b172fd00e32fc9057054c675f2d26eb419627ef Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 2 Aug 2023 20:33:14 +0200 Subject: [PATCH 0383/1167] package/gdb: fix build error for version arc-2020.09 Fixes: http://autobuild.buildroot.net/results/e60/e60c9bba5395970f99e9f889bba4675ac6f004c4/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit ea1816008818acc7a339cf1b009b9453bc59e95a) Signed-off-by: Peter Korsgaard --- ...t-define-basic_string_view-to_string.patch | 114 ++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch diff --git a/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch b/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch new file mode 100644 index 00000000000..210ba6d6096 --- /dev/null +++ b/package/gdb/arc-2020.09-release-gdb/0001-Do-not-define-basic_string_view-to_string.patch @@ -0,0 +1,114 @@ +From 5ac588997c3c2d032d5d5145d9245eb37354c23b Mon Sep 17 00:00:00 2001 +From: Tom Tromey +Date: Tue, 30 Jun 2020 07:53:03 -0600 +Subject: [PATCH] Do not define basic_string_view::to_string + +gdb's copy of basic_string_view includes a to_string method. However, +according to cppreference, this is not a method on the real +std::basic_string_view: + +https://en.cppreference.com/w/cpp/string/basic_string_view + +This difference matters because gdb_string_view.h will use the +standard implementation when built with a C++17 or later. This caused +PR build/26183. + +This patch fixes the problem by changing the method to be a standalone +helper function, and then rewriting the uses. Tested by rebuilding +with a version of GCC that defaults to C++17. + +(Note that the build still is not clean; and also I noticed that the +libstdc++ string_view forbids the use of nullptr ... I wonder if gdb +violates that.) + +gdb/ChangeLog +2020-06-30 Tom Tromey + + PR build/26183: + * ada-lang.c (ada_lookup_name_info::ada_lookup_name_info): Use + gdb::to_string. + +gdbsupport/ChangeLog +2020-06-30 Tom Tromey + + PR build/26183: + * gdb_string_view.h (basic_string_view::to_string): Remove. + (gdb::to_string): New function. + +Upstream: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=5ac588997c3c2d032d5d5145d9245eb37354c23b +Bug report: https://sourceware.org/bugzilla/show_bug.cgi?id=26183 + +Signed-off-by: Bernd Kuhls +--- + gdb/ChangeLog | 6 ++++++ + gdb/ada-lang.c | 8 ++++---- + gdbsupport/ChangeLog | 6 ++++++ + gdbsupport/gdb_string_view.h | 17 ++++++++++------- + 4 files changed, 26 insertions(+), 11 deletions(-) + +diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c +index 9b0c2efbfe2..98508c168bc 100644 +--- a/gdb/ada-lang.c ++++ b/gdb/ada-lang.c +@@ -13553,10 +13553,10 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) + { + if (user_name.back () == '>') + m_encoded_name +- = user_name.substr (1, user_name.size () - 2).to_string (); ++ = gdb::to_string (user_name.substr (1, user_name.size () - 2)); + else + m_encoded_name +- = user_name.substr (1, user_name.size () - 1).to_string (); ++ = gdb::to_string (user_name.substr (1, user_name.size () - 1)); + m_encoded_p = true; + m_verbatim_p = true; + m_wild_match_p = false; +@@ -13575,10 +13575,10 @@ ada_lookup_name_info::ada_lookup_name_info (const lookup_name_info &lookup_name) + if (encoded != NULL) + m_encoded_name = encoded; + else +- m_encoded_name = user_name.to_string (); ++ m_encoded_name = gdb::to_string (user_name); + } + else +- m_encoded_name = user_name.to_string (); ++ m_encoded_name = gdb::to_string (user_name); + + /* Handle the 'package Standard' special case. See description + of m_standard_p. */ +diff --git a/gdbsupport/gdb_string_view.h b/gdbsupport/gdb_string_view.h +index c0ae7a8a2d9..65124e67e54 100644 +--- a/gdbsupport/gdb_string_view.h ++++ b/gdbsupport/gdb_string_view.h +@@ -245,13 +245,6 @@ namespace gdb { + return { this->_M_str, this->_M_len }; + } + +- template> +- std::basic_string<_CharT, _Traits, _Allocator> +- to_string(const _Allocator& __alloc = _Allocator()) const +- { +- return { this->_M_str, this->_M_len, __alloc }; +- } +- + size_type + copy(_CharT* __str, size_type __n, size_type __pos = 0) const + { +@@ -560,4 +553,14 @@ namespace gdb { + + #endif // __cplusplus < 201703L + ++namespace gdb { ++ ++static inline std::string ++to_string(const gdb::string_view &view) ++{ ++ return { view.data (), view.size () }; ++} ++ ++} ++ + #endif /* COMMON_GDB_STRING_VIEW_H */ +-- +2.39.3 + From fee82326b2e50f527f0b5cc85f0e2dce5f5b7bb9 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Thu, 3 Aug 2023 09:37:03 +0200 Subject: [PATCH 0384/1167] package/systemd: fix typos in comments Signed-off-by: Luca Ceresoli Signed-off-by: Yann E. MORIN (cherry picked from commit d3e71819f7eaccbd974ff0e4f52ed080f24856b0) Signed-off-by: Peter Korsgaard --- package/systemd/systemd.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 63467171ed8..7f89c7cd1e0 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -670,9 +670,9 @@ SYSTEMD_TARGET_FINALIZE_HOOKS += \ SYSTEMD_INSTALL_RESOLVCONF_HOOK ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) -# systemd provides multiple units to autospawn getty as neede +# systemd provides multiple units to autospawn getty as needed # * getty@.service to start a getty on normal TTY -# * sertial-getty@.service to start a getty on serial lines +# * serial-getty@.service to start a getty on serial lines # * console-getty.service for generic /dev/console # * container-getty@.service for a getty on /dev/pts/* # @@ -680,7 +680,7 @@ ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # * read the console= kernel command line parameter # * enable one of the above units depending on what it finds # -# Systemd defaults to enablinb getty@tty1.service +# Systemd defaults to enabling getty@tty1.service # # What we want to do # * Enable a getty on $BR2_TARGET_GENERIC_TTY_PATH From 88822fb8ca89aa2d1a1d0e34d1461c1b34417d68 Mon Sep 17 00:00:00 2001 From: Luca Ceresoli Date: Thu, 3 Aug 2023 09:37:04 +0200 Subject: [PATCH 0385/1167] package/systemd: fix wrong variable name in comment There is no such thing as a BR2_TARGET_GENERIC_TTY_PATH variable. The comment here should mention BR2_TARGET_GENERIC_GETTY_PORT instead. Signed-off-by: Luca Ceresoli Signed-off-by: Yann E. MORIN (cherry picked from commit e0ff6ad7ff6fb5c4643314b9e029f81cc3b07762) Signed-off-by: Peter Korsgaard --- package/systemd/systemd.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 7f89c7cd1e0..d2352568679 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -683,15 +683,15 @@ ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) # Systemd defaults to enabling getty@tty1.service # # What we want to do -# * Enable a getty on $BR2_TARGET_GENERIC_TTY_PATH +# * Enable a getty on $BR2_TARGET_GENERIC_GETTY_PORT # * Set the baudrate for all units according to BR2_TARGET_GENERIC_GETTY_BAUDRATE # * Always enable a getty on the console using systemd-getty-generator # (backward compatibility with previous releases of buildroot) # # What we do # * disable getty@tty1 (enabled by upstream systemd) -# * enable getty@xxx if $BR2_TARGET_GENERIC_TTY_PATH is a tty -# * enable serial-getty@xxx for other $BR2_TARGET_GENERIC_TTY_PATH +# * enable getty@xxx if $BR2_TARGET_GENERIC_GETTY_PORT is a tty +# * enable serial-getty@xxx for other $BR2_TARGET_GENERIC_GETTY_PORT # * rewrite baudrates if a baudrate is provided define SYSTEMD_INSTALL_SERVICE_TTY mkdir -p $(TARGET_DIR)/usr/lib/systemd/system/getty@.service.d; \ From 92793cbe05faf7cd157eb448e94d60b56c5effa9 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Thu, 3 Aug 2023 06:03:39 +0100 Subject: [PATCH 0386/1167] DEVELOPERS: sort entries of Neal Frager Signed-off-by: Neal Frager [yann.morin.1998@free.fr: sort with LC_ALL=C] Signed-off-by: Yann E. MORIN (cherry picked from commit 2672fb08730dc378079672b02aa4c1f713b186ab) Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DEVELOPERS b/DEVELOPERS index b407537c71a..974fc8b2848 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2115,12 +2115,11 @@ N: Neal Frager F: board/versal/ F: board/zynq/ F: board/zynqmp/ -F: board/zynqmp/kria/ F: configs/versal_vck190_defconfig F: configs/zynq_zc706_defconfig +F: configs/zynqmp_kria_kv260_defconfig F: configs/zynqmp_zcu102_defconfig F: configs/zynqmp_zcu106_defconfig -F: configs/zynqmp_kria_kv260_defconfig F: package/bootgen/ F: package/versal-firmware/ From 63dc6f6d4ef7fa5dc0c724f08e1af414ae368f76 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 31 Aug 2023 13:30:09 +0200 Subject: [PATCH 0387/1167] package/libopenssl: security bump version to 1.1.1v Fixes: CVE-2023-3446: https://www.openssl.org/news/secadv/20230719.txt CVE-2023-3817: https://www.openssl.org/news/secadv/20230731.txt Signed-off-by: Peter Korsgaard --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index 708926de803..4541087c07a 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://www.openssl.org/source/openssl-1.1.1u.tar.gz.sha256 -sha256 e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6 openssl-1.1.1u.tar.gz +# From https://www.openssl.org/source/openssl-1.1.1v.tar.gz.sha256 +sha256 d6697e2871e77238460402e9362d47d18382b15ef9f246aba6c7bd780d38a6b0 openssl-1.1.1v.tar.gz # License files sha256 c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c LICENSE diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 178979f43b1..fe68a20ed1e 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 1.1.1u +LIBOPENSSL_VERSION = 1.1.1v LIBOPENSSL_SITE = https://www.openssl.org/source LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = OpenSSL or SSLeay From f6f9b0938b41371d49207f99f86e50d9984dc05a Mon Sep 17 00:00:00 2001 From: Frank Vanbever Date: Fri, 28 Apr 2023 21:23:51 +0200 Subject: [PATCH 0388/1167] package/libmodsecurity: security bump to version 3.0.9 Fixes the following security issue: - CVE-2023-28882: Trustwave ModSecurity 3.0.5 through 3.0.8 before 3.0.9 allows a denial of service (worker crash and unresponsiveness) because some inputs cause a segfault in the Transaction class for some configurations. https://security-tracker.debian.org/tracker/CVE-2023-28882 - Drop 0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch, handling of libmaxminddb was fixed upstream in d2b700d - Drop 0004-build-pcre.m4-fix-build-without-pcre.patch, handling of PCRE was fixed upstream in 791964a Signed-off-by: Frank Vanbever Signed-off-by: Peter Korsgaard (cherry picked from commit a1e0e7276ca246385d7f31d2db8331f52ce34228) Signed-off-by: Peter Korsgaard --- ...Revert-Fix-maxminddb-link-on-FreeBSD.patch | 28 ------------------ ...build-pcre.m4-fix-build-without-pcre.patch | 29 ------------------- package/libmodsecurity/libmodsecurity.hash | 4 +-- package/libmodsecurity/libmodsecurity.mk | 4 +-- 4 files changed, 4 insertions(+), 61 deletions(-) delete mode 100644 package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch delete mode 100644 package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch diff --git a/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch b/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch deleted file mode 100644 index 9608e3d9350..00000000000 --- a/package/libmodsecurity/0003-Revert-Fix-maxminddb-link-on-FreeBSD.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6737dc133cb4811a000c02b4e0a92b72f0b220ee Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 16 Jul 2021 19:12:51 +0200 -Subject: [PATCH] Revert "Fix maxminddb link on FreeBSD" - -This reverts commit 785958f9b5089b918c7d054cbcc2fe4a3c7b3788. - -Signed-off-by: Fabrice Fontaine ---- - build/libmaxmind.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/libmaxmind.m4 b/build/libmaxmind.m4 -index 656fc250..02820b5a 100644 ---- a/build/libmaxmind.m4 -+++ b/build/libmaxmind.m4 -@@ -10,7 +10,7 @@ dnl MAXMIND_VERSION - AC_DEFUN([PROG_MAXMIND], [ - - # Possible names for the maxmind library/package (pkg-config) --MAXMIND_POSSIBLE_LIB_NAMES="maxminddb maxmind" -+MAXMIND_POSSIBLE_LIB_NAMES="libmaxminddb maxminddb maxmind" - - # Possible extensions for the library - MAXMIND_POSSIBLE_EXTENSIONS="so la sl dll dylib" --- -2.30.2 - diff --git a/package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch b/package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch deleted file mode 100644 index 5a5baeacee9..00000000000 --- a/package/libmodsecurity/0004-build-pcre.m4-fix-build-without-pcre.patch +++ /dev/null @@ -1,29 +0,0 @@ -From af96f4fe916adc7dc6d649a07c10b45c978d31a1 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 27 Jul 2022 14:17:20 +0200 -Subject: [PATCH] build/pcre.m4: fix build without pcre - -Don't raise an error if pcre is disabled now that pcre2 is supported - -Signed-off-by: Fabrice Fontaine -[Upstream status: not sent (no feedback on -https://github.com/SpiderLabs/ModSecurity/pull/2596)] ---- - build/pcre.m4 | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/build/pcre.m4 b/build/pcre.m4 -index f6c9ae18..3e40f5c9 100644 ---- a/build/pcre.m4 -+++ b/build/pcre.m4 -@@ -99,7 +99,6 @@ AC_SUBST(PCRE_LD_PATH) - - if test -z "${PCRE_VERSION}"; then - AC_MSG_NOTICE([*** pcre library not found.]) -- ifelse([$2], , AC_MSG_ERROR([pcre library is required]), $2) - else - AC_MSG_NOTICE([using pcre v${PCRE_VERSION}]) - ifelse([$1], , , $1) --- -2.35.1 - diff --git a/package/libmodsecurity/libmodsecurity.hash b/package/libmodsecurity/libmodsecurity.hash index 7ba0ef7f181..c79ae1cf45d 100644 --- a/package/libmodsecurity/libmodsecurity.hash +++ b/package/libmodsecurity/libmodsecurity.hash @@ -1,4 +1,4 @@ -# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.8/modsecurity-v3.0.8.tar.gz.sha256 -sha256 e241c89b3cd7e58a863d0d0d6b9b8ba4d33ffb0f51171044c258c62e3e7956c7 modsecurity-v3.0.8.tar.gz +# From https://github.com/SpiderLabs/ModSecurity/releases/download/v3.0.9/modsecurity-v3.0.9.tar.gz.sha256 +sha256 a5111ecd23e332a1d7c9652dbdb18517a96b21573315cb887a8e86761b95d3d8 modsecurity-v3.0.9.tar.gz # Localy calculated sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 LICENSE diff --git a/package/libmodsecurity/libmodsecurity.mk b/package/libmodsecurity/libmodsecurity.mk index e83fda895f1..335f3a41e54 100644 --- a/package/libmodsecurity/libmodsecurity.mk +++ b/package/libmodsecurity/libmodsecurity.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBMODSECURITY_VERSION = 3.0.8 +LIBMODSECURITY_VERSION = 3.0.9 LIBMODSECURITY_SOURCE = modsecurity-v$(LIBMODSECURITY_VERSION).tar.gz LIBMODSECURITY_SITE = https://github.com/SpiderLabs/ModSecurity/releases/download/v$(LIBMODSECURITY_VERSION) LIBMODSECURITY_INSTALL_STAGING = YES @@ -12,7 +12,7 @@ LIBMODSECURITY_LICENSE = Apache-2.0 LIBMODSECURITY_LICENSE_FILES = LICENSE LIBMODSECURITY_CPE_ID_VENDOR = trustwave LIBMODSECURITY_CPE_ID_PRODUCT = modsecurity -# We're patching build/libmaxmind.m4 and build/pcre.m4 +# We're patching configure.ac LIBMODSECURITY_AUTORECONF = YES LIBMODSECURITY_DEPENDENCIES = pcre2 From 3b8e5b19ad9117c0ebcace9cde2e075108462c98 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 31 Aug 2023 20:49:03 +0200 Subject: [PATCH 0389/1167] Update for 2023.02.4 Signed-off-by: Peter Korsgaard --- CHANGES | 29 +++++++++++++++++++++++++++++ Makefile | 4 ++-- support/misc/Vagrantfile | 2 +- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index b5cb5e76651..abf5b4bd7c8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,32 @@ +2023.02.4, released August 31th, 2023 + + Important / security related fixes. + + Toolchains: Correctly mark Bootlin external toolchains as + having OpenMP support. + + Arch: Mark Alderlake x86 variants as having no AVX512 support. + + Utils: Ensure utils/docker-run correctly supports git + worktrees. + + Defconfigs: Beaglebone qt5: Enable support for green wireless + variant. + + Updated/fixed packages: arm-trusted-firmware, bind, cairo, + cmocka, containerd, crudini, dmidecode, ffmpeg, freescale-imx, + gcc, gdb, ghostscript, gkrellm, gnuradio, go, heimdall, + iperf3, libcurl, libmodsecurity, libopenssl, libssh, + libubootenv, libuhttpd, linux-tools, ntp, openssh, php, + pipewire, python-iniparse, python-iptables, python-pysmb, + rtl8189fs, sam-ba, samba4, seatd, speex, supertuxkart, sysdig, + tor, tpm2-tss, uboot, unzip, webkitgtk, wireless-regdb, + wolfssl, wpebackend-fdo wpewebkit, xenomai, yaml-cpp, yavta + + Issues resolved (http://bugs.uclibc.org): + + #15634: fluidsynths refers to missing libgomp.so.1 + 2023.02.3, released July 17th, 2023 Important / security related fixes. diff --git a/Makefile b/Makefile index 7309fd99761..42bb7a7b1f4 100644 --- a/Makefile +++ b/Makefile @@ -90,9 +90,9 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2023.02.3 +export BR2_VERSION := 2023.02.4 # Actual time the release is cut (for reproducible builds) -BR2_VERSION_EPOCH = 1689628000 +BR2_VERSION_EPOCH = 1693507700 # 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 250766fb1d5..29f1e8223d2 100644 --- a/support/misc/Vagrantfile +++ b/support/misc/Vagrantfile @@ -5,7 +5,7 @@ ################################################################################ # Buildroot version to use -RELEASE='2023.02.3' +RELEASE='2023.02.4' ### Change here for more memory/cores ### VM_MEMORY=2048 From ff72ac444311f45028381207df65d6538a7b12c8 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 16 Jul 2023 21:10:46 -0700 Subject: [PATCH 0390/1167] package/docker-engine: backport fix for host header check Go 1.20.6 and 1.19.11 include a security check of the http Host header: https://github.com/golang/go/issues/60374 docker-cli does not satisfy this check: $ docker exec -it ctr bash http: invalid Host header This is a backported patch to fix this issue: Issue: https://github.com/moby/moby/issues/45935 Upstream PR: https://github.com/moby/moby/pull/45942 The upstream PR has been merged and will be included in v24.0.5. Signed-off-by: Christian Stewart Tested-by: TIAN Yuanhao Signed-off-by: Peter Korsgaard --- ...dummy-hostname-to-use-for-local-conn.patch | 174 ++++++++++++++++++ ...a-dummy-hostname-for-local-connectio.patch | 69 +++++++ 2 files changed, 243 insertions(+) create mode 100644 package/docker-engine/0001-client-define-a-dummy-hostname-to-use-for-local-conn.patch create mode 100644 package/docker-engine/0002-pkg-plugins-use-a-dummy-hostname-for-local-connectio.patch diff --git a/package/docker-engine/0001-client-define-a-dummy-hostname-to-use-for-local-conn.patch b/package/docker-engine/0001-client-define-a-dummy-hostname-to-use-for-local-conn.patch new file mode 100644 index 00000000000..c5f8d1eb718 --- /dev/null +++ b/package/docker-engine/0001-client-define-a-dummy-hostname-to-use-for-local-conn.patch @@ -0,0 +1,174 @@ +From 8ced4331e5e3a6760465a8ce2bd42c66d3232c96 Mon Sep 17 00:00:00 2001 +From: Sebastiaan van Stijn +Date: Wed, 12 Jul 2023 14:15:38 +0200 +Subject: [PATCH] client: define a "dummy" hostname to use for local + connections + +Go 1.20.6 and 1.19.11 include a security check of the http Host header: + + https://github.com/golang/go/issues/60374 + +This is a backported patch to fix this issue. + +Issue: https://github.com/moby/moby/issues/45935 +Upstream PR: https://github.com/moby/moby/pull/45942 + +The upstream PR has been merged and will be included in v24.0.5. + +Signed-off-by: Christian Stewart + +--- + +For local communications (npipe://, unix://), the hostname is not used, +but we need valid and meaningful hostname. + +The current code used the client's `addr` as hostname in some cases, which +could contain the path for the unix-socket (`/var/run/docker.sock`), which +gets rejected by go1.20.6 and go1.19.11 because of a security fix for +[CVE-2023-29406 ][1], which was implemented in https://go.dev/issue/60374. + +Prior versions go Go would clean the host header, and strip slashes in the +process, but go1.20.6 and go1.19.11 no longer do, and reject the host +header. + +This patch introduces a `DummyHost` const, and uses this dummy host for +cases where we don't need an actual hostname. + +Before this patch (using go1.20.6): + + make GO_VERSION=1.20.6 TEST_FILTER=TestAttach test-integration + === RUN TestAttachWithTTY + attach_test.go:46: assertion failed: error is not nil: http: invalid Host header + --- FAIL: TestAttachWithTTY (0.11s) + === RUN TestAttachWithoutTTy + attach_test.go:46: assertion failed: error is not nil: http: invalid Host header + --- FAIL: TestAttachWithoutTTy (0.02s) + FAIL + +With this patch applied: + + make GO_VERSION=1.20.6 TEST_FILTER=TestAttach test-integration + INFO: Testing against a local daemon + === RUN TestAttachWithTTY + --- PASS: TestAttachWithTTY (0.12s) + === RUN TestAttachWithoutTTy + --- PASS: TestAttachWithoutTTy (0.02s) + PASS + +[1]: https://github.com/advisories/GHSA-f8f7-69v5-w4vx + +Signed-off-by: Sebastiaan van Stijn +(cherry picked from commit 92975f0c11f0566cc3c36659f5e3bb9faf5cb176) +Signed-off-by: Sebastiaan van Stijn +--- + client/client.go | 30 ++++++++++++++++++++++++++++++ + client/hijack.go | 6 +++++- + client/request.go | 10 ++++------ + client/request_test.go | 4 ++-- + 4 files changed, 41 insertions(+), 9 deletions(-) + +diff --git a/client/client.go b/client/client.go +index 1c081a51ae..54fa36cca8 100644 +--- a/client/client.go ++++ b/client/client.go +@@ -56,6 +56,36 @@ import ( + "github.com/pkg/errors" + ) + ++// DummyHost is a hostname used for local communication. ++// ++// It acts as a valid formatted hostname for local connections (such as "unix://" ++// or "npipe://") which do not require a hostname. It should never be resolved, ++// but uses the special-purpose ".localhost" TLD (as defined in [RFC 2606, Section 2] ++// and [RFC 6761, Section 6.3]). ++// ++// [RFC 7230, Section 5.4] defines that an empty header must be used for such ++// cases: ++// ++// If the authority component is missing or undefined for the target URI, ++// then a client MUST send a Host header field with an empty field-value. ++// ++// However, [Go stdlib] enforces the semantics of HTTP(S) over TCP, does not ++// allow an empty header to be used, and requires req.URL.Scheme to be either ++// "http" or "https". ++// ++// For further details, refer to: ++// ++// - https://github.com/docker/engine-api/issues/189 ++// - https://github.com/golang/go/issues/13624 ++// - https://github.com/golang/go/issues/61076 ++// - https://github.com/moby/moby/issues/45935 ++// ++// [RFC 2606, Section 2]: https://www.rfc-editor.org/rfc/rfc2606.html#section-2 ++// [RFC 6761, Section 6.3]: https://www.rfc-editor.org/rfc/rfc6761#section-6.3 ++// [RFC 7230, Section 5.4]: https://datatracker.ietf.org/doc/html/rfc7230#section-5.4 ++// [Go stdlib]: https://github.com/golang/go/blob/6244b1946bc2101b01955468f1be502dbadd6807/src/net/http/transport.go#L558-L569 ++const DummyHost = "api.moby.localhost" ++ + // ErrRedirect is the error returned by checkRedirect when the request is non-GET. + var ErrRedirect = errors.New("unexpected redirect in response") + +diff --git a/client/hijack.go b/client/hijack.go +index 6bdacab10a..4dcaaca4c5 100644 +--- a/client/hijack.go ++++ b/client/hijack.go +@@ -64,7 +64,11 @@ func fallbackDial(proto, addr string, tlsConfig *tls.Config) (net.Conn, error) { + } + + func (cli *Client) setupHijackConn(ctx context.Context, req *http.Request, proto string) (net.Conn, string, error) { +- req.Host = cli.addr ++ req.URL.Host = cli.addr ++ if cli.proto == "unix" || cli.proto == "npipe" { ++ // Override host header for non-tcp connections. ++ req.Host = DummyHost ++ } + req.Header.Set("Connection", "Upgrade") + req.Header.Set("Upgrade", proto) + +diff --git a/client/request.go b/client/request.go +index c799095c12..bcedcf3bd9 100644 +--- a/client/request.go ++++ b/client/request.go +@@ -96,16 +96,14 @@ func (cli *Client) buildRequest(method, path string, body io.Reader, headers hea + return nil, err + } + req = cli.addHeaders(req, headers) ++ req.URL.Scheme = cli.scheme ++ req.URL.Host = cli.addr + + if cli.proto == "unix" || cli.proto == "npipe" { +- // For local communications, it doesn't matter what the host is. We just +- // need a valid and meaningful host name. (See #189) +- req.Host = "docker" ++ // Override host header for non-tcp connections. ++ req.Host = DummyHost + } + +- req.URL.Host = cli.addr +- req.URL.Scheme = cli.scheme +- + if expectedPayload && req.Header.Get("Content-Type") == "" { + req.Header.Set("Content-Type", "text/plain") + } +diff --git a/client/request_test.go b/client/request_test.go +index 6e5a6e81f2..50b09d954c 100644 +--- a/client/request_test.go ++++ b/client/request_test.go +@@ -29,12 +29,12 @@ func TestSetHostHeader(t *testing.T) { + }{ + { + "unix:///var/run/docker.sock", +- "docker", ++ DummyHost, + "/var/run/docker.sock", + }, + { + "npipe:////./pipe/docker_engine", +- "docker", ++ DummyHost, + "//./pipe/docker_engine", + }, + { +-- +2.41.0 + diff --git a/package/docker-engine/0002-pkg-plugins-use-a-dummy-hostname-for-local-connectio.patch b/package/docker-engine/0002-pkg-plugins-use-a-dummy-hostname-for-local-connectio.patch new file mode 100644 index 00000000000..5bd8682927e --- /dev/null +++ b/package/docker-engine/0002-pkg-plugins-use-a-dummy-hostname-for-local-connectio.patch @@ -0,0 +1,69 @@ +From 09306e7eb3c26ade69ef1e4c99d5b1fd9c0b7364 Mon Sep 17 00:00:00 2001 +From: Sebastiaan van Stijn +Date: Wed, 12 Jul 2023 15:07:59 +0200 +Subject: [PATCH] pkg/plugins: use a dummy hostname for local connections + +For local communications (npipe://, unix://), the hostname is not used, +but we need valid and meaningful hostname. + +The current code used the socket path as hostname, which gets rejected by +go1.20.6 and go1.19.11 because of a security fix for [CVE-2023-29406 ][1], +which was implemented in https://go.dev/issue/60374. + +Prior versions go Go would clean the host header, and strip slashes in the +process, but go1.20.6 and go1.19.11 no longer do, and reject the host +header. + +Before this patch, tests would fail on go1.20.6: + + === FAIL: pkg/authorization TestAuthZRequestPlugin (15.01s) + time="2023-07-12T12:53:45Z" level=warning msg="Unable to connect to plugin: //tmp/authz2422457390/authz-test-plugin.sock/AuthZPlugin.AuthZReq: Post \"http://%2F%2Ftmp%2Fauthz2422457390%2Fauthz-test-plugin.sock/AuthZPlugin.AuthZReq\": http: invalid Host header, retrying in 1s" + time="2023-07-12T12:53:46Z" level=warning msg="Unable to connect to plugin: //tmp/authz2422457390/authz-test-plugin.sock/AuthZPlugin.AuthZReq: Post \"http://%2F%2Ftmp%2Fauthz2422457390%2Fauthz-test-plugin.sock/AuthZPlugin.AuthZReq\": http: invalid Host header, retrying in 2s" + time="2023-07-12T12:53:48Z" level=warning msg="Unable to connect to plugin: //tmp/authz2422457390/authz-test-plugin.sock/AuthZPlugin.AuthZReq: Post \"http://%2F%2Ftmp%2Fauthz2422457390%2Fauthz-test-plugin.sock/AuthZPlugin.AuthZReq\": http: invalid Host header, retrying in 4s" + time="2023-07-12T12:53:52Z" level=warning msg="Unable to connect to plugin: //tmp/authz2422457390/authz-test-plugin.sock/AuthZPlugin.AuthZReq: Post \"http://%2F%2Ftmp%2Fauthz2422457390%2Fauthz-test-plugin.sock/AuthZPlugin.AuthZReq\": http: invalid Host header, retrying in 8s" + authz_unix_test.go:82: Failed to authorize request Post "http://%2F%2Ftmp%2Fauthz2422457390%2Fauthz-test-plugin.sock/AuthZPlugin.AuthZReq": http: invalid Host header + +[1]: https://github.com/advisories/GHSA-f8f7-69v5-w4vx + +Signed-off-by: Sebastiaan van Stijn +(cherry picked from commit 6b7705d5b29e226a24902a8dcc488836faaee33c) +Signed-off-by: Sebastiaan van Stijn +--- + pkg/plugins/client.go | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/pkg/plugins/client.go b/pkg/plugins/client.go +index 752fecd0ae..e683eb777d 100644 +--- a/pkg/plugins/client.go ++++ b/pkg/plugins/client.go +@@ -18,6 +18,12 @@ import ( + + const ( + defaultTimeOut = 30 ++ ++ // dummyHost is a hostname used for local communication. ++ // ++ // For local communications (npipe://, unix://), the hostname is not used, ++ // but we need valid and meaningful hostname. ++ dummyHost = "plugin.moby.localhost" + ) + + func newTransport(addr string, tlsConfig *tlsconfig.Options) (transport.Transport, error) { +@@ -44,8 +50,12 @@ func newTransport(addr string, tlsConfig *tlsconfig.Options) (transport.Transpor + return nil, err + } + scheme := httpScheme(u) +- +- return transport.NewHTTPTransport(tr, scheme, socket), nil ++ hostName := u.Host ++ if hostName == "" || u.Scheme == "unix" || u.Scheme == "npipe" { ++ // Override host header for non-tcp connections. ++ hostName = dummyHost ++ } ++ return transport.NewHTTPTransport(tr, scheme, hostName), nil + } + + // NewClient creates a new plugin client (http). +-- +2.41.0 + From d0ab8a869dbc5724a758f9777cafc1e12a343786 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 16 Jul 2023 21:10:47 -0700 Subject: [PATCH 0391/1167] package/docker-cli: backport fix for host header check Go 1.20.6 and 1.19.11 include a security check of the http Host header: https://github.com/golang/go/issues/60374 docker-cli does not satisfy this check: $ docker exec -it ctr bash http: invalid Host header This is a backported patch to fix this issue: Issue: https://github.com/moby/moby/issues/45935 Upstream PR: https://github.com/moby/moby/pull/45942 The upstream PR has been merged and will be included in v24.0.5. Signed-off-by: Christian Stewart Tested-by: TIAN Yuanhao Signed-off-by: Peter Korsgaard --- ...ackport-fix-for-go-Host-header-check.patch | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 package/docker-cli/0001-backport-fix-for-go-Host-header-check.patch diff --git a/package/docker-cli/0001-backport-fix-for-go-Host-header-check.patch b/package/docker-cli/0001-backport-fix-for-go-Host-header-check.patch new file mode 100644 index 00000000000..2b585825389 --- /dev/null +++ b/package/docker-cli/0001-backport-fix-for-go-Host-header-check.patch @@ -0,0 +1,127 @@ +From 4dc783e2bdf414761ef7c209b435d0a30f17c858 Mon Sep 17 00:00:00 2001 +From: Sebastiaan van Stijn +Date: Sat, 15 Jul 2023 02:22:10 +0200 +Subject: [PATCH] backport fix for go Host header check + +Go 1.20.6 and 1.19.11 include a security check of the http Host header: + + https://github.com/golang/go/issues/60374 + +docker-cli fails this check: + + $ docker exec -it ctr bash + http: invalid Host header + +This is a backported patch to fix this issue. + +Issue: https://github.com/moby/moby/issues/45935 +Upstream PR: https://github.com/moby/moby/pull/45942 + +The upstream PR has been merged and will be included in v24.0.5. + +Signed-off-by: Christian Stewart +[Peter: drop vendor.mod/vendor.sum changes] +--- + +For local communications (npipe://, unix://), the hostname is not used, +but we need valid and meaningful hostname. + +The current code used the socket path as hostname, which gets rejected by +go1.20.6 and go1.19.11 because of a security fix for [CVE-2023-29406 ][1], +which was implemented in https://go.dev/issue/60374. + +Prior versions go Go would clean the host header, and strip slashes in the +process, but go1.20.6 and go1.19.11 no longer do, and reject the host +header. +--- + .../github.com/docker/docker/client/client.go | 30 +++++++++++++++++ + .../github.com/docker/docker/client/hijack.go | 6 +++- + .../docker/docker/client/request.go | 10 +++--- + 4 files changed, 72 insertions(+), 40 deletions(-) + +diff --git a/vendor/github.com/docker/docker/client/client.go b/vendor/github.com/docker/docker/client/client.go +index 1c081a51ae..54fa36cca8 100644 +--- a/vendor/github.com/docker/docker/client/client.go ++++ b/vendor/github.com/docker/docker/client/client.go +@@ -56,6 +56,36 @@ import ( + "github.com/pkg/errors" + ) + ++// DummyHost is a hostname used for local communication. ++// ++// It acts as a valid formatted hostname for local connections (such as "unix://" ++// or "npipe://") which do not require a hostname. It should never be resolved, ++// but uses the special-purpose ".localhost" TLD (as defined in [RFC 2606, Section 2] ++// and [RFC 6761, Section 6.3]). ++// ++// [RFC 7230, Section 5.4] defines that an empty header must be used for such ++// cases: ++// ++// If the authority component is missing or undefined for the target URI, ++// then a client MUST send a Host header field with an empty field-value. ++// ++// However, [Go stdlib] enforces the semantics of HTTP(S) over TCP, does not ++// allow an empty header to be used, and requires req.URL.Scheme to be either ++// "http" or "https". ++// ++// For further details, refer to: ++// ++// - https://github.com/docker/engine-api/issues/189 ++// - https://github.com/golang/go/issues/13624 ++// - https://github.com/golang/go/issues/61076 ++// - https://github.com/moby/moby/issues/45935 ++// ++// [RFC 2606, Section 2]: https://www.rfc-editor.org/rfc/rfc2606.html#section-2 ++// [RFC 6761, Section 6.3]: https://www.rfc-editor.org/rfc/rfc6761#section-6.3 ++// [RFC 7230, Section 5.4]: https://datatracker.ietf.org/doc/html/rfc7230#section-5.4 ++// [Go stdlib]: https://github.com/golang/go/blob/6244b1946bc2101b01955468f1be502dbadd6807/src/net/http/transport.go#L558-L569 ++const DummyHost = "api.moby.localhost" ++ + // ErrRedirect is the error returned by checkRedirect when the request is non-GET. + var ErrRedirect = errors.New("unexpected redirect in response") + +diff --git a/vendor/github.com/docker/docker/client/hijack.go b/vendor/github.com/docker/docker/client/hijack.go +index 6bdacab10a..4dcaaca4c5 100644 +--- a/vendor/github.com/docker/docker/client/hijack.go ++++ b/vendor/github.com/docker/docker/client/hijack.go +@@ -64,7 +64,11 @@ func fallbackDial(proto, addr string, tlsConfig *tls.Config) (net.Conn, error) { + } + + func (cli *Client) setupHijackConn(ctx context.Context, req *http.Request, proto string) (net.Conn, string, error) { +- req.Host = cli.addr ++ req.URL.Host = cli.addr ++ if cli.proto == "unix" || cli.proto == "npipe" { ++ // Override host header for non-tcp connections. ++ req.Host = DummyHost ++ } + req.Header.Set("Connection", "Upgrade") + req.Header.Set("Upgrade", proto) + +diff --git a/vendor/github.com/docker/docker/client/request.go b/vendor/github.com/docker/docker/client/request.go +index c799095c12..bcedcf3bd9 100644 +--- a/vendor/github.com/docker/docker/client/request.go ++++ b/vendor/github.com/docker/docker/client/request.go +@@ -96,16 +96,14 @@ func (cli *Client) buildRequest(method, path string, body io.Reader, headers hea + return nil, err + } + req = cli.addHeaders(req, headers) ++ req.URL.Scheme = cli.scheme ++ req.URL.Host = cli.addr + + if cli.proto == "unix" || cli.proto == "npipe" { +- // For local communications, it doesn't matter what the host is. We just +- // need a valid and meaningful host name. (See #189) +- req.Host = "docker" ++ // Override host header for non-tcp connections. ++ req.Host = DummyHost + } + +- req.URL.Host = cli.addr +- req.URL.Scheme = cli.scheme +- + if expectedPayload && req.Header.Get("Content-Type") == "" { + req.Header.Set("Content-Type", "text/plain") + } +-- +2.41.0 + From eef7d67a4ff0f0f4f774eaaf110fb2db41af8d3e Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 26 Jul 2023 13:28:37 -0700 Subject: [PATCH 0392/1167] package/python-pylibfdt: add host python package Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni (cherry picked from commit 05a0adea8355ba0901d5af02548a57657a2af89d) Signed-off-by: Peter Korsgaard --- package/python-pylibfdt/python-pylibfdt.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/python-pylibfdt/python-pylibfdt.mk b/package/python-pylibfdt/python-pylibfdt.mk index dc68de83b3e..077c60c0932 100644 --- a/package/python-pylibfdt/python-pylibfdt.mk +++ b/package/python-pylibfdt/python-pylibfdt.mk @@ -11,5 +11,7 @@ PYTHON_PYLIBFDT_SETUP_TYPE = setuptools PYTHON_PYLIBFDT_LICENSE = BSD-2-Clause or GPL-2.0+ PYTHON_PYLIBFDT_LICENSE_FILES = BSD-2-Clause GPL PYTHON_PYLIBFDT_DEPENDENCIES = host-python-setuptools-scm host-swig +HOST_PYTHON_PYLIBFDT_DEPENDENCIES = host-python-setuptools-scm host-swig $(eval $(python-package)) +$(eval $(host-python-package)) From 2eb849ac1663f2dd0322dc2a117f504e9a935d36 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 26 Jul 2023 13:28:38 -0700 Subject: [PATCH 0393/1167] boot/uboot: add host-python-pylibfdt dependency if needed Until now, BR2_TARGET_UBOOT_NEEDS_PYLIBFDT was only bringing host-swig as a dependency, because U-Boot was building its own pylibfdt, which requires host-swig. However, since commit 231d79c81e9a1f8c2ef14861374a40fcdc5e6b33 ("boot/uboot: set DTC path when BR2_TARGET_UBOOT_NEEDS_DTC"), in which we tell U-Boot to use the Buildroot built DTC, a consequence is that U-Boot no longer builds its own pylibfdt: it expects the system to provided it. So now, BR2_TARGET_UBOOT_NEEDS_PYLIBFDT really needs to bring host-python-pylibfdt. The dependency on host-swig is no longer needed, as what we need is host-python-pylibfdt, and it is an internal detail of pylibfdt that it needs host-swig to build. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/4749556137 https://gitlab.com/buildroot.org/buildroot/-/jobs/4749556224 https://gitlab.com/buildroot.org/buildroot/-/jobs/4749556227 https://gitlab.com/buildroot.org/buildroot/-/jobs/4749556229 https://gitlab.com/buildroot.org/buildroot/-/jobs/4749556230 Signed-off-by: Christian Stewart Tested-by: Giulio Benetti Signed-off-by: Thomas Petazzoni (cherry picked from commit f788a8f527c038112671ff6fdc968823a54cf3aa) Signed-off-by: Peter Korsgaard --- boot/uboot/uboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk index 1a6e70a792a..c3e3829362d 100644 --- a/boot/uboot/uboot.mk +++ b/boot/uboot/uboot.mk @@ -217,7 +217,7 @@ UBOOT_DEPENDENCIES += host-python3 host-python-setuptools endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYLIBFDT),y) -UBOOT_DEPENDENCIES += host-swig +UBOOT_DEPENDENCIES += host-python-pylibfdt endif ifeq ($(BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS),y) From f27fd5f2f358629dd140e123c9569403bfd41e8a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 4 Aug 2023 20:33:19 +0200 Subject: [PATCH 0394/1167] package/stellarium: disable telescopecontrol plugin Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped stellarium which included this commit https://github.com/Stellarium/stellarium/commit/186b06fa215bd28ea03cc291dc861b552af8d99a It removed the previously bundled libindi source and lets stellarium download the sourcecode of the indiclient package (not present in buildroot) during the build: $ find output/build/stellarium-23.2/ -iname *.zip output/build/stellarium-23.2/_deps/indiclient-subbuild/indiclient-populate-prefix/src/v1.8.5.zip which breaks offline builds. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit c2a450ddd6ab8235009149a9fc14ff77199a9d57) Signed-off-by: Peter Korsgaard --- package/stellarium/stellarium.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index a62488907f8..09f1177afd4 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -20,6 +20,7 @@ STELLARIUM_CONF_OPTS = \ -DENABLE_NLS=OFF \ -DENABLE_QTWEBENGINE=OFF \ -DENABLE_QT6=OFF \ + -DUSE_PLUGIN_TELESCOPECONTROL=OFF \ -DUSE_SYSTEM_ZLIB=ON ifeq ($(BR2_PACKAGE_QT5SCRIPT),y) @@ -34,13 +35,9 @@ STELLARIUM_DEPENDENCIES += qt5serialport ifeq ($(BR2_PACKAGE_GPSD),y) STELLARIUM_DEPENDENCIES += gpsd endif -STELLARIUM_CONF_OPTS += \ - -DENABLE_GPS=ON \ - -DUSE_PLUGIN_TELESCOPECONTROL=ON +STELLARIUM_CONF_OPTS += -DENABLE_GPS=ON else -STELLARIUM_CONF_OPTS += \ - -DENABLE_GPS=OFF \ - -DUSE_PLUGIN_TELESCOPECONTROL=OFF +STELLARIUM_CONF_OPTS += -DENABLE_GPS=OFF endif $(eval $(cmake-package)) From 635da4557f94f5776581539c556affc1195cb297 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 4 Aug 2023 20:33:20 +0200 Subject: [PATCH 0395/1167] package/stellarium: disable xlsx support Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped stellarium which included this commit https://github.com/Stellarium/stellarium/commit/186b06fa215bd28ea03cc291dc861b552af8d99a It removed the previously bundled QXlsx source and lets stellarium git-clone the sourcecode of the QXlsx package (not present in buildroot) during the build: $ find output/build/stellarium-23.2/ -iname .gitignore | grep qxl output/build/stellarium-23.2/_deps/qxlsxqt5-src/.gitignore which breaks offline builds. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit b032b3b1df645eaaf79f53005945bac7dad45e74) Signed-off-by: Peter Korsgaard --- package/stellarium/stellarium.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index 09f1177afd4..7b481319127 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -20,6 +20,7 @@ STELLARIUM_CONF_OPTS = \ -DENABLE_NLS=OFF \ -DENABLE_QTWEBENGINE=OFF \ -DENABLE_QT6=OFF \ + -DENABLE_XLSX=OFF \ -DUSE_PLUGIN_TELESCOPECONTROL=OFF \ -DUSE_SYSTEM_ZLIB=ON From f2a10a4f0d6831136ddfd812545533eebf2225e3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 4 Aug 2023 20:33:21 +0200 Subject: [PATCH 0396/1167] package/stellarium: disable ShowMySky atmosphere model Buildroot commit 319c56dfe3309dbf24be01fed3afff6259a2c5dd bumped stellarium which included these commits https://github.com/Stellarium/stellarium/commit/b3f02beaec2a285251db1e1707abe2e423803834 https://github.com/Stellarium/stellarium/commit/5d5edd0e5f5630872628a1525685b77854b6e4b4 It downloads external packages during the build: $ find output/build/stellarium-23.2/ -iname *.tar.* output/build/stellarium-23.2/_deps/eigen3-subbuild/eigen3-populate-prefix/src/eigen-3.4.0.tar.bz2 output/build/stellarium-23.2/_deps/showmysky-qt5-subbuild/showmysky-qt5-populate-prefix/src/v0.3.1.tar.gz which breaks offline builds. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 2616272339073834c262bc46fdf995fdaa91acf7) Signed-off-by: Peter Korsgaard --- package/stellarium/stellarium.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/stellarium/stellarium.mk b/package/stellarium/stellarium.mk index 7b481319127..fe7aaf6ac96 100644 --- a/package/stellarium/stellarium.mk +++ b/package/stellarium/stellarium.mk @@ -18,6 +18,7 @@ STELLARIUM_DEPENDENCIES = \ STELLARIUM_CONF_OPTS = \ -DENABLE_MEDIA=ON \ -DENABLE_NLS=OFF \ + -DENABLE_SHOWMYSKY=OFF \ -DENABLE_QTWEBENGINE=OFF \ -DENABLE_QT6=OFF \ -DENABLE_XLSX=OFF \ From 5a7695bf97555e104d7722225487ff1c2bc16bad Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 6 Aug 2023 12:57:03 +0200 Subject: [PATCH 0397/1167] package/lsof: add LSOF_CPE_ID_VENDOR cpe:2.3:a:lsof_project:lsof is a valid CPE identifier for this package: https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alsof_project%3Alsof Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni (cherry picked from commit e4f053c7b0582251c8441def72619bbe18bb78ea) Signed-off-by: Peter Korsgaard --- package/lsof/lsof.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index fd5887141b1..f318950ded0 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -10,6 +10,7 @@ LSOF_LICENSE = lsof license # License is repeated in each file, this is a relatively small one. # It is also defined in 00README, but that contains a lot of other cruft. LSOF_LICENSE_FILES = dialects/linux/dproto.h +LSOF_CPE_ID_VENDOR = lsof_project ifeq ($(BR2_PACKAGE_LIBTIRPC),y) LSOF_DEPENDENCIES += libtirpc From 0f0cd8003166cdfe05a8520ab97a7edcdf5d080c Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 2 Aug 2023 22:31:46 +0200 Subject: [PATCH 0398/1167] boot/at91dataflashboot: force arm mode instead of Thumb mode The at91dataflashboot code contains some hand-written ARM assembly that uses ARM classic instructions, and will not build in Thumb-1 mode. This issue has always existed in Buildroot, but it's only since we started testing random configurations, including Thumb-1 configurations, that this issue popped up. Fixes: http://autobuild.buildroot.net/results/68bf2291201ef1882d8e8d3eca2b1a5ad731e4b0/ Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 07acc00add7ac09114f3c01b85d794a31c68229c) Signed-off-by: Peter Korsgaard --- boot/at91dataflashboot/at91dataflashboot.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/boot/at91dataflashboot/at91dataflashboot.mk b/boot/at91dataflashboot/at91dataflashboot.mk index c66f27e3431..cb329a90dff 100644 --- a/boot/at91dataflashboot/at91dataflashboot.mk +++ b/boot/at91dataflashboot/at91dataflashboot.mk @@ -11,9 +11,14 @@ AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot AT91DATAFLASHBOOT_INSTALL_TARGET = NO AT91DATAFLASHBOOT_INSTALL_IMAGES = YES +AT91DATAFLASHBOOT_CFLAGS = $(TARGET_CFLAGS) -fno-stack-protector +ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) +AT91DATAFLASHBOOT_CFLAGS += -marm +endif + define AT91DATAFLASHBOOT_BUILD_CMDS make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector" + CFLAGS="$(AT91DATAFLASHBOOT_CFLAGS)" endef define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS From 3bf2318584f46f9951e95ce07d4f3cc6b7b56ae7 Mon Sep 17 00:00:00 2001 From: Neal Frager Date: Fri, 4 Aug 2023 07:20:06 +0100 Subject: [PATCH 0399/1167] board/versal: clean shellcheck issues This patch cleans up the shellcheck issues in the versal post scripts. Signed-off-by: Neal Frager Signed-off-by: Thomas Petazzoni (cherry picked from commit 2b738044edbed64e313a2b4f275a70e02e5bc143) Signed-off-by: Peter Korsgaard --- board/versal/post-build.sh | 5 ++--- board/versal/post-image.sh | 14 +++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/board/versal/post-build.sh b/board/versal/post-build.sh index ff8f8a60719..ed08ea2d497 100755 --- a/board/versal/post-build.sh +++ b/board/versal/post-build.sh @@ -3,9 +3,8 @@ # genimage will need to find the extlinux.conf # in the binaries directory -BOARD_DIR="$(dirname $0)" -CONSOLE=$2 -ROOT=$3 +CONSOLE="$2" +ROOT="$3" mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/extlinux.conf" diff --git a/board/versal/post-image.sh b/board/versal/post-image.sh index 92e65ed3b73..1d9802c34d2 100755 --- a/board/versal/post-image.sh +++ b/board/versal/post-image.sh @@ -6,12 +6,12 @@ FIRST_DT=$(sed -nr \ -e 's|^BR2_LINUX_KERNEL_INTREE_DTS_NAME="(xilinx/)?([-_/[:alnum:]\\.]*).*"$|\2|p' \ - ${BR2_CONFIG}) + "${BR2_CONFIG}") -[ -z "${FIRST_DT}" ] || ln -fs ${FIRST_DT}.dtb ${BINARIES_DIR}/system.dtb +[ -z "${FIRST_DT}" ] || ln -fs "${FIRST_DT}.dtb" "${BINARIES_DIR}/system.dtb" -BOARD_DIR="$(dirname $0)" -BOARD_NAME=$4 +BOARD_DIR="$(dirname "$0")" +BOARD_NAME="$4" mkdir -p "${BINARIES_DIR}" cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" @@ -23,7 +23,7 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" { core=psm, file=${BINARIES_DIR}/${BOARD_NAME}_psmfw.elf } } image { - id = 0x1c000000, name=apu_subsystem + id = 0x1c000000, name=apu_subsystem { type=raw, load=0x00001000, file=${BINARIES_DIR}/u-boot.dtb } { core=a72-0, exception_level=el-3, trustzone, file=${BINARIES_DIR}/bl31.elf } { core=a72-0, exception_level=el-2, file=${BINARIES_DIR}/u-boot.elf } @@ -31,5 +31,5 @@ cat <<-__HEADER_EOF > "${BINARIES_DIR}/bootgen.bif" } __HEADER_EOF -${HOST_DIR}/bin/bootgen -arch versal -image ${BINARIES_DIR}/bootgen.bif -o ${BINARIES_DIR}/boot.bin -w on -support/scripts/genimage.sh -c ${BOARD_DIR}/genimage.cfg +"${HOST_DIR}/bin/bootgen" -arch versal -image "${BINARIES_DIR}/bootgen.bif" -o "${BINARIES_DIR}/boot.bin" -w on +support/scripts/genimage.sh -c "${BOARD_DIR}/genimage.cfg" From bf06180dc8718b755dc2347d30cdd76508d2acc2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 3 Aug 2023 20:15:44 +0200 Subject: [PATCH 0400/1167] {linux, linux-headers}: bump 5.15.x / 6.{1, 4}.x series Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni (cherry picked from commit 95116bc65e53f58b1dfbd35e5156b46f9e6b9a51) [Peter: Drop 6.4.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 8b4c867d981..c975c5caea6 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -128,7 +128,7 @@ endif config BR2_LINUX_KERNEL_VERSION string - default "6.1.42" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.1.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 83d4c2ca5fe..6daafb73ef7 100644 --- a/linux/linux.hash +++ b/linux/linux.hash @@ -1,7 +1,7 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 aaf8261b551c8b76b81eab8780b446e88cea4d551ae517ac3a9b2dbdbd381ed3 linux-6.1.42.tar.xz +sha256 245248470a62d4e94b46f753afc01e19e45b9e6f3a0fa06e7f5da21fe845a808 linux-6.1.43.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 2de69544a12e6a059163c58fc901c13bcf22e8cac39c66b56f8fbb633399bf93 linux-5.15.123.tar.xz +sha256 00036a0260ad012aa832a8698a4afcf23b2410091527738ce48ce3fcc23f22ed linux-5.15.124.tar.xz sha256 c9558bab35e23ae67661bfb3192c609c857f78582a035449ae63e33d04ab6112 linux-5.10.188.tar.xz sha256 bcb4953ed68131ef17f9f1ba52cac8b9d70007f5ab600bf3dee1fbf8beb218ca linux-5.4.251.tar.xz # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index dbcc09a46db..4f7934ff5e5 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -388,8 +388,8 @@ config BR2_DEFAULT_KERNEL_HEADERS default "4.19.289" if BR2_KERNEL_HEADERS_4_19 default "5.4.251" if BR2_KERNEL_HEADERS_5_4 default "5.10.188" if BR2_KERNEL_HEADERS_5_10 - default "5.15.123" if BR2_KERNEL_HEADERS_5_15 - default "6.1.42" if BR2_KERNEL_HEADERS_6_1 + default "5.15.124" if BR2_KERNEL_HEADERS_5_15 + default "6.1.43" if BR2_KERNEL_HEADERS_6_1 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 f16afb8d9f2b410fcb190874b59971fef16dfeca Mon Sep 17 00:00:00 2001 From: Nicolas Carrier Date: Wed, 2 Aug 2023 08:22:39 +0200 Subject: [PATCH 0401/1167] less: use default "make install" behavior The less package currently installs only the "less" binary, rather than running the default "make install" behavior from the autotools build system. However, at least another binary, "lessecho" is needed for the "s" command in less to work properly: so in that sense this commit is fixing a broken behavior. Since the less installation only installs 3 programs, "less", "lessopen" and "lesskey", there is no good reason to not use the default installation command, which we do in this commit. Signed-off-by: Nicolas Carrier [Thomas: rework commit message] Signed-off-by: Thomas Petazzoni (cherry picked from commit 8b1bc64d924e386466d715637a4a09228322beef) Signed-off-by: Peter Korsgaard --- package/less/less.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package/less/less.mk b/package/less/less.mk index f01f94d6c85..2c68ac5a119 100644 --- a/package/less/less.mk +++ b/package/less/less.mk @@ -14,8 +14,4 @@ LESS_DEPENDENCIES = ncurses # 0001-End-OSC8-hyperlink-on-invalid-embedded-escape-sequence.patch LESS_IGNORE_CVES += CVE-2022-46663 -define LESS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less -endef - $(eval $(autotools-package)) From 20ed5635f14bfcc2b14b9498001d848919c06c5c Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Wed, 5 Oct 2022 11:10:29 +0200 Subject: [PATCH 0402/1167] package/mpd: fix reversed logic in tcp disable In commit 54b9008d482923131191da75f09966483f4ecac1 ("package/mpd: bump to version 0.21.11"), mpd was migrated from using the autotools build system to the meson build system. As part of this, the BR2_PACKAGE_MPD_TCP was incorrectly modified, leading BR2_PACKAGE_MPD_TCP disabled to actually enable TCP, and BR2_PACKAGE_MPD_TCP enabled to not explicitly enable TCP support. This commit fixes that by handling this option in the common way. Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni (cherry picked from commit be08ba35698991ca0f42c7c11c70690caab3e378) Signed-off-by: Peter Korsgaard --- package/mpd/mpd.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index d73072a439b..b599e320e0f 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -285,8 +285,10 @@ else MPD_CONF_OPTS += -Dsqlite=disabled endif -ifneq ($(BR2_PACKAGE_MPD_TCP),y) +ifeq ($(BR2_PACKAGE_MPD_TCP),y) MPD_CONF_OPTS += -Dtcp=true +else +MPD_CONF_OPTS += -Dtcp=false endif ifeq ($(BR2_PACKAGE_MPD_TREMOR),y) From 99d5bacae619c68f2f9270a5943a5b0cd2a69aaa Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Wed, 5 Oct 2022 11:10:31 +0200 Subject: [PATCH 0403/1167] package/mpd: introduce id3tag feature dependency id3tag is a sub-feature that is needed to extract information from mp3 files. It selects the corresponding library and handles config settings. Two other features need this sub-feature, but handle all library selections themselves and omit enabling the id3tag feature. In consequence, users have to remember to select both mp3 library and id3tag, otherwise the mpd executable will not process mp3 files. Reflect feature dependency in mpd Config.in to make id3tag selection automatic. Signed-off-by: Andreas Ziegler Signed-off-by: Thomas Petazzoni (cherry picked from commit 876a365ea2a1c48477eabfe3ae600a9d48f1b4ab) Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 4 ++-- package/mpd/mpd.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 8f0af7b2d36..f350b7e72a5 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -127,7 +127,7 @@ config BR2_PACKAGE_MPD_LIBSNDFILE config BR2_PACKAGE_MPD_MAD bool "mad" default y - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_LIBMAD help Enable mad input support. @@ -141,7 +141,7 @@ config BR2_PACKAGE_MPD_MODPLUG config BR2_PACKAGE_MPD_MPG123 bool "mpg123" - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_MPG123 help Enable mpg123 input support. diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index b599e320e0f..0205208946d 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -190,7 +190,7 @@ MPD_CONF_OPTS += -Dsoxr=disabled endif ifeq ($(BR2_PACKAGE_MPD_MAD),y) -MPD_DEPENDENCIES += libid3tag libmad +MPD_DEPENDENCIES += libmad MPD_CONF_OPTS += -Dmad=enabled else MPD_CONF_OPTS += -Dmad=disabled @@ -204,7 +204,7 @@ MPD_CONF_OPTS += -Dmodplug=disabled endif ifeq ($(BR2_PACKAGE_MPD_MPG123),y) -MPD_DEPENDENCIES += libid3tag mpg123 +MPD_DEPENDENCIES += mpg123 MPD_CONF_OPTS += -Dmpg123=enabled else MPD_CONF_OPTS += -Dmpg123=disabled From bdc97b988cfb1c12efce3488bd8aab05a8800674 Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Sun, 6 Aug 2023 22:08:29 +0200 Subject: [PATCH 0404/1167] package/mpd: ensure expat is enabled when BR2_PACKAGE_MPD_UPNP_NPUPNP=y Just like BR2_PACKAGE_MPD_UPNP_PUPNP needs expat and curl support, BR2_PACKAGE_MPD_UPNP_NPUPNP also needs expat and curl. curl was already selected, but not expat. It didn't cause any visible issue, as BR2_PACKAGE_MPD_UPNP_NPUPNP selects BR2_PACKAGE_LIBNPUPNP, which itself select BR2_PACKAGE_EXPAT. But as mpd directly checks for the availability of expat, it makes sense to also select it directly. Signed-off-by: Andreas Ziegler [Thomas: extracted from a larger patch at https://patchwork.ozlabs.org/project/buildroot/patch/20221005091032.3014-5-br015@umbiko.net/] Signed-off-by: Thomas Petazzoni (cherry picked from commit 6cdb48a0482a093dcdf73d0d748f5435262515ab) Signed-off-by: Peter Korsgaard --- package/mpd/Config.in | 1 + package/mpd/mpd.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index f350b7e72a5..902a3da7795 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -407,6 +407,7 @@ config BR2_PACKAGE_MPD_UPNP_PUPNP config BR2_PACKAGE_MPD_UPNP_NPUPNP bool "npupnp" + select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBNPUPNP select BR2_PACKAGE_MPD_CURL help diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 0205208946d..4b737c715c6 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -312,6 +312,7 @@ MPD_DEPENDENCIES += \ MPD_CONF_OPTS += -Dupnp=pupnp else ifeq ($(BR2_PACKAGE_MPD_UPNP_NPUPNP),y) MPD_DEPENDENCIES += \ + expat \ libnpupnp MPD_CONF_OPTS += -Dupnp=npupnp else ifeq ($(BR2_PACKAGE_MPD_UPNP_DISABLED),y) From cd3b0fa07d7e0431923cdcee06b10d45f9d5a5fb Mon Sep 17 00:00:00 2001 From: Andreas Ziegler Date: Sun, 6 Aug 2023 22:11:45 +0200 Subject: [PATCH 0405/1167] package/mpd: handle expat and yajl explicitly mpd's Config.in selects expat and/or yajl depending on which sub-options is enabled, and adds build dependencies, but does not pass -D