Patch review
cover Patch review
Please review this set of changes for scarthgap and have comments back by end of day Tuesday, September 24
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/7346
The following changes since commit 343f40b0bc8ef65cc1e2abd6c9c33bb2e08bad3d:
libedit: Make docs generation deterministic (2024-09-12 14:34:56 -0700)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/scarthgap-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/scarthgap-nut
Alban Bedel (1):
bind: Fix build with the httpstats package config enabled
Chen Qi (1):
qemu: back port patches to fix riscv64 build failure
Colin McAllister (2):
udev-extraconf: Add collect flag to mount
busybox: Fix cut with "-s" flag
Guðni Már Gilbert (1):
bluez5: remove redundant patch for MAX_INPUT
Khem Raj (1):
gcc: Fix spurious '/' in GLIBC_DYNAMIC_LINKER on microblaze
Mark Hatle (1):
create-sdpx-2.2.bbclass: Switch from exists to isfile checking
debugsrc
Pedro Ferreira (2):
buildhistory: Fix intermittent package file list creation
buildhistory: Restoring files from preserve list
Peter Marko (1):
python3: Upgrade 3.12.5 -> 3.12.6
Richard Purdie (1):
buildhistory: Simplify intercept call sites and drop
SSTATEPOSTINSTFUNC usage
Siddharth Doshi (1):
openssl: Upgrade 3.2.2 -> 3.2.3
Steve Sakoman (1):
Revert "wpa-supplicant: Upgrade 2.10 -> 2.11"
Trevor Gamblin (2):
python3: upgrade 3.12.4 -> 3.12.5
python3: skip readline limited history tests
Vijay Anusuri (1):
libpcap: Security fix for CVE-2023-7256 & CVE-2024-8006
meta/classes-global/sstate.bbclass | 5 +-
meta/classes/buildhistory.bbclass | 71 +-
meta/classes/create-spdx-2.2.bbclass | 3 +-
.../recipes-connectivity/bind/bind_9.18.28.bb | 2 +-
meta/recipes-connectivity/bluez5/bluez5.inc | 1 -
...shared-util.c-include-linux-limits.h.patch | 27 -
.../libpcap/libpcap/CVE-2023-7256-pre1.patch | 37 +
.../libpcap/libpcap/CVE-2023-7256.patch | 365 +++++
.../libpcap/libpcap/CVE-2024-8006.patch | 42 +
.../libpcap/libpcap_1.10.4.bb | 7 +-
...ke-history-reporting-when-test-fails.patch | 8 +-
.../openssl/openssl/CVE-2024-5535_1.patch | 113 --
.../openssl/openssl/CVE-2024-5535_10.patch | 203 ---
.../openssl/openssl/CVE-2024-5535_2.patch | 43 -
.../openssl/openssl/CVE-2024-5535_3.patch | 38 -
.../openssl/openssl/CVE-2024-5535_4.patch | 82 --
.../openssl/openssl/CVE-2024-5535_5.patch | 176 ---
.../openssl/openssl/CVE-2024-5535_6.patch | 1173 -----------------
.../openssl/openssl/CVE-2024-5535_7.patch | 43 -
.../openssl/openssl/CVE-2024-5535_8.patch | 66 -
.../openssl/openssl/CVE-2024-5535_9.patch | 271 ----
.../{openssl_3.2.2.bb => openssl_3.2.3.bb} | 14 +-
...all-wpa_passphrase-when-not-disabled.patch | 33 +
...te-Phase-2-authentication-requiremen.patch | 213 +++
...options-for-libwpa_client.so-and-wpa.patch | 73 +
...oval-of-wpa_passphrase-on-make-clean.patch | 26 +
...plicant_2.11.bb => wpa-supplicant_2.10.bb} | 10 +-
...1-cut-Fix-s-flag-to-omit-blank-lines.patch | 66 +
meta/recipes-core/busybox/busybox_1.36.1.bb | 1 +
.../recipes-core/udev/udev-extraconf/mount.sh | 2 +-
...AMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 6 +-
...t_readline-skip-limited-history-test.patch | 38 +
.../python/python3/CVE-2024-7592.patch | 143 --
.../python/python3/CVE-2024-8088.patch | 128 --
.../{python3_3.12.4.bb => python3_3.12.6.bb} | 5 +-
meta/recipes-devtools/qemu/qemu.inc | 3 +
...kvm-change-KVM_REG_RISCV_FP_F-to-u32.patch | 75 ++
...kvm-change-KVM_REG_RISCV_FP_D-to-u64.patch | 73 +
...cv-kvm-change-timer-regs-size-to-u64.patch | 107 ++
39 files changed, 1226 insertions(+), 2566 deletions(-)
delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch
create mode 100644 meta/recipes-connectivity/libpcap/libpcap/CVE-2023-7256-pre1.patch
create mode 100644 meta/recipes-connectivity/libpcap/libpcap/CVE-2023-7256.patch
create mode 100644 meta/recipes-connectivity/libpcap/libpcap/CVE-2024-8006.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_1.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_10.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_2.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_3.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_4.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_5.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_6.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_7.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_8.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_9.patch
rename meta/recipes-connectivity/openssl/{openssl_3.2.2.bb => openssl_3.2.3.bb} (94%)
create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-Install-wpa_passphrase-when-not-disabled.patch
create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-PEAP-client-Update-Phase-2-authentication-requiremen.patch
create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch
create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch
rename meta/recipes-connectivity/wpa-supplicant/{wpa-supplicant_2.11.bb => wpa-supplicant_2.10.bb} (90%)
create mode 100644 meta/recipes-core/busybox/busybox/0001-cut-Fix-s-flag-to-omit-blank-lines.patch
create mode 100644 meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch
delete mode 100644 meta/recipes-devtools/python/python3/CVE-2024-7592.patch
delete mode 100644 meta/recipes-devtools/python/python3/CVE-2024-8088.patch
rename meta/recipes-devtools/python/{python3_3.12.4.bb => python3_3.12.6.bb} (99%)
create mode 100644 meta/recipes-devtools/qemu/qemu/0001-target-riscv-kvm-change-KVM_REG_RISCV_FP_F-to-u32.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0002-target-riscv-kvm-change-KVM_REG_RISCV_FP_D-to-u64.patch
create mode 100644 meta/recipes-devtools/qemu/qemu/0003-target-riscv-kvm-change-timer-regs-size-to-u64.patchSignature · 1 line
2.34.1
PATCH 1/16 Revert "wpa-supplicant: Upgrade 2.10 -> 2.11"
This version bump adds new features and should not have been taken.
This reverts commit 35c2b5f56bca789b9723a144fda0a130a67a860c.
---
...all-wpa_passphrase-when-not-disabled.patch | 33 +++
...te-Phase-2-authentication-requiremen.patch | 213 ++++++++++++++++++
...options-for-libwpa_client.so-and-wpa.patch | 73 ++++++
...oval-of-wpa_passphrase-on-make-clean.patch | 26 +++
...plicant_2.11.bb => wpa-supplicant_2.10.bb} | 10 +-
5 files changed, 352 insertions(+), 3 deletions(-)
create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-Install-wpa_passphrase-when-not-disabled.patch
create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-PEAP-client-Update-Phase-2-authentication-requiremen.patch
create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch
create mode 100644 meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch
rename meta/recipes-connectivity/wpa-supplicant/{wpa-supplicant_2.11.bb => wpa-supplicant_2.10.bb} (90%)meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-Install-wpa_passphrase-when-not-disabled.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 57b12a1e43605f71239a21488cb9b541f0751dda Mon Sep 17 00:00:00 2001 +From: Alex Kiernan <[email protected]> +Date: Thu, 21 Apr 2022 10:15:29 +0100 +Subject: [PATCH] Install wpa_passphrase when not disabled + +As part of fixing CONFIG_NO_WPA_PASSPHRASE, whilst wpa_passphrase gets +built, its not installed during `make install`. + +Fixes: cb41c214b78d ("build: Re-enable options for libwpa_client.so and wpa_passphrase") +Signed-off-by: Alex Kiernan <[email protected]> +Signed-off-by: Alex Kiernan <[email protected]> +Upstream-Status: Submitted [http://lists.infradead.org/pipermail/hostap/2022-April/040448.html] +--- + wpa_supplicant/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index 0bab313f2355..12787c0c7d0f 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -73,6 +73,9 @@ $(DESTDIR)$(BINDIR)/%: % + + install: $(addprefix $(DESTDIR)$(BINDIR)/,$(BINALL)) + $(MAKE) -C ../src install ++ifndef CONFIG_NO_WPA_PASSPHRASE ++ install -D wpa_passphrase $(DESTDIR)/$(BINDIR)/wpa_passphrase ++endif + ifdef CONFIG_BUILD_WPA_CLIENT_SO + install -m 0644 -D libwpa_client.so $(DESTDIR)/$(LIBDIR)/libwpa_client.so + install -m 0644 -D ../src/common/wpa_ctrl.h $(DESTDIR)/$(INCDIR)/wpa_ctrl.h +-- +2.35.1 +
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-PEAP-client-Update-Phase-2-authentication-requiremen.patch new file +213 -0
213 lines not on this page · raw message
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch new file +73 -0
73 lines not on this page · raw message
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch new file +26 -0
@@ -0,0 +1,26 @@ +From d001b301ba7987f4b39453a211631b85c48f2ff8 Mon Sep 17 00:00:00 2001 +From: Jouni Malinen <[email protected]> +Date: Thu, 3 Mar 2022 13:26:42 +0200 +Subject: [PATCH 2/2] Fix removal of wpa_passphrase on 'make clean' + +Fixes: 0430bc8267b4 ("build: Add a common-clean target") +Signed-off-by: Jouni Malinen <[email protected]> +Upstream-Status: Backport +Signed-off-by: Alex Kiernan <[email protected]> +Signed-off-by: Alex Kiernan <[email protected]> +--- + wpa_supplicant/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile +index c456825ae75f..4b4688931b1d 100644 +--- a/wpa_supplicant/Makefile ++++ b/wpa_supplicant/Makefile +@@ -2077,3 +2077,4 @@ clean: common-clean + rm -f libwpa_client.a + rm -f libwpa_client.so + rm -f libwpa_test1 libwpa_test2 ++ rm -f wpa_passphrase +-- +2.35.1 +
meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.10.bb renamed from meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.11.bb +7 -3
@@ -5,8 +5,8 @@ BUGTRACKER = "http://w1.fi/security/" SECTION = "network" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=5ebcb90236d1ad640558c3d3cd3035df \ - file://README;beginline=1;endline=56;md5=6e4b25e7d74bfc44a32ba37bdf5210a6 \ - file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=f5ccd57ea91e04800edb88267bf8eae4" + file://README;beginline=1;endline=56;md5=e3d2f6c2948991e37c1ca4960de84747 \ + file://wpa_supplicant/wpa_supplicant.c;beginline=1;endline=12;md5=76306a95306fee9a976b0ac1be70f705" DEPENDS = "dbus libnl"
@@ -15,8 +15,12 @@ SRC_URI = "http://w1.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://wpa_supplicant.conf \ file://wpa_supplicant.conf-sane \ file://99_wpa_supplicant \ + file://0001-build-Re-enable-options-for-libwpa_client.so-and-wpa.patch \ + file://0002-Fix-removal-of-wpa_passphrase-on-make-clean.patch \ + file://0001-Install-wpa_passphrase-when-not-disabled.patch \ + file://0001-PEAP-client-Update-Phase-2-authentication-requiremen.patch \ " -SRC_URI[sha256sum] = "912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a" +SRC_URI[sha256sum] = "20df7ae5154b3830355f8ab4269123a87affdea59fe74fe9292a91d0d7e17b2f" S = "${WORKDIR}/wpa_supplicant-${PV}"
Signature · 1 line
2.34.1
PATCH 2/16 libpcap: Security fix for CVE-2023-7256 & CVE-2024-8006
In reply to Steve SakomanFrom: Vijay Anusuri <[email protected]>
Reference:
https://security-tracker.debian.org/tracker/CVE-2023-7256
https://security-tracker.debian.org/tracker/CVE-2024-8006
Upstream commits:
https://github.com/the-tcpdump-group/libpcap/commit/73da0d4d65ef0925772b7b7f82a5fbb3ff2c5e4f
https://github.com/the-tcpdump-group/libpcap/commit/2aa69b04d8173b18a0e3492e0c8f2f7fabdf642d
https://github.com/the-tcpdump-group/libpcap/commit/8a633ee5b9ecd9d38a587ac9b204e2380713b0d6
--- .../libpcap/libpcap/CVE-2023-7256-pre1.patch | 37 ++ .../libpcap/libpcap/CVE-2023-7256.patch | 365 ++++++++++++++++++ .../libpcap/libpcap/CVE-2024-8006.patch | 42 ++ .../libpcap/libpcap_1.10.4.bb | 7 +- 4 files changed, 450 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-connectivity/libpcap/libpcap/CVE-2023-7256-pre1.patch create mode 100644 meta/recipes-connectivity/libpcap/libpcap/CVE-2023-7256.patch create mode 100644 meta/recipes-connectivity/libpcap/libpcap/CVE-2024-8006.patch
meta/recipes-connectivity/libpcap/libpcap/CVE-2023-7256-pre1.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 73da0d4d65ef0925772b7b7f82a5fbb3ff2c5e4f Mon Sep 17 00:00:00 2001 +From: Rose <[email protected]> +Date: Tue, 16 May 2023 12:37:11 -0400 +Subject: [PATCH] Remove unused variable retval in sock_present2network + +This quiets the compiler since it is not even returned anyway, and is a misleading variable name. + +(cherry picked from commit c7b90298984c46d820d3cee79a96d24870b5f200) + +Upstream-Status: Backport [https://github.com/the-tcpdump-group/libpcap/commit/73da0d4d65ef0925772b7b7f82a5fbb3ff2c5e4f] +CVE: CVE-2023-7256 #Dependency Patch +Signed-off-by: Vijay Anusuri <[email protected]> +--- + sockutils.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/sockutils.c b/sockutils.c +index 1c07f76fd1..6752f296af 100644 +--- a/sockutils.c ++++ b/sockutils.c +@@ -2082,7 +2082,6 @@ int sock_getascii_addrport(const struct sockaddr_storage *sockaddr, char *addres + */ + int sock_present2network(const char *address, struct sockaddr_storage *sockaddr, int addr_family, char *errbuf, int errbuflen) + { +- int retval; + struct addrinfo *addrinfo; + struct addrinfo hints; + +@@ -2090,7 +2089,7 @@ int sock_present2network(const char *address, struct sockaddr_storage *sockaddr, + + hints.ai_family = addr_family; + +- if ((retval = sock_initaddress(address, "22222" /* fake port */, &hints, &addrinfo, errbuf, errbuflen)) == -1) ++ if (sock_initaddress(address, "22222" /* fake port */, &hints, &addrinfo, errbuf, errbuflen) == -1) + return 0; + + if (addrinfo->ai_family == PF_INET)
meta/recipes-connectivity/libpcap/libpcap/CVE-2023-7256.patch new file +365 -0
365 lines not on this page · raw message
meta/recipes-connectivity/libpcap/libpcap/CVE-2024-8006.patch new file +42 -0
42 lines not on this page · raw message
meta/recipes-connectivity/libpcap/libpcap_1.10.4.bb +6 -1
@@ -10,7 +10,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5eb289217c160e2920d2e35bddc36453 \ file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2" DEPENDS = "flex-native bison-native" -SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz" +SRC_URI = "https://www.tcpdump.org/release/${BP}.tar.gz \ + file://CVE-2023-7256-pre1.patch \ + file://CVE-2023-7256.patch \ + file://CVE-2024-8006.patch \ + " + SRC_URI[sha256sum] = "ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f" inherit autotools binconfig-disabled pkgconfig
Signature · 1 line
2.34.1
PATCH 3/16 openssl: Upgrade 3.2.2 -> 3.2.3
In reply to Steve SakomanFrom: Siddharth Doshi <[email protected]>
Updated SRC_URI link and format due to change in openssl website.
CVE's Fixed by upgrade:
CVE-2024-5535: Fixed possible buffer overread in SSL_select_next_proto().
CVE-2024-6119: Fixed possible denial of service in X.509 name checks
- Removed backports of CVE-2024-5535 as it is already fixed.
- Removed first hunk of 0001-Added-handshake-history-reporting-when-test-fails.patch as the copyright years are already updated in test/helpers/handshake.c file
Detailed Information:
https://github.com/openssl/openssl/blob/openssl-3.2/CHANGES.md#changes-between-322-and-323-3-sep-2024
---
...ke-history-reporting-when-test-fails.patch | 8 +-
.../openssl/openssl/CVE-2024-5535_1.patch | 113 --
.../openssl/openssl/CVE-2024-5535_10.patch | 203 ---
.../openssl/openssl/CVE-2024-5535_2.patch | 43 -
.../openssl/openssl/CVE-2024-5535_3.patch | 38 -
.../openssl/openssl/CVE-2024-5535_4.patch | 82 --
.../openssl/openssl/CVE-2024-5535_5.patch | 176 ---
.../openssl/openssl/CVE-2024-5535_6.patch | 1173 -----------------
.../openssl/openssl/CVE-2024-5535_7.patch | 43 -
.../openssl/openssl/CVE-2024-5535_8.patch | 66 -
.../openssl/openssl/CVE-2024-5535_9.patch | 271 ----
.../{openssl_3.2.2.bb => openssl_3.2.3.bb} | 14 +-
12 files changed, 3 insertions(+), 2227 deletions(-)
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_1.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_10.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_2.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_3.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_4.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_5.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_6.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_7.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_8.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_9.patch
rename meta/recipes-connectivity/openssl/{openssl_3.2.2.bb => openssl_3.2.3.bb} (94%)meta/recipes-connectivity/openssl/openssl/0001-Added-handshake-history-reporting-when-test-fails.patch +1 -7
@@ -6,6 +6,7 @@ Subject: [PATCH] Added handshake history reporting when test fails Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/22481] Signed-off-by: William Lyu <[email protected]> +Signed-off-by: Siddharth Doshi <[email protected]> --- test/helpers/handshake.c | 139 +++++++++++++++++++++++++++++---------- test/helpers/handshake.h | 70 +++++++++++++++++++-
@@ -16,13 +17,6 @@ diff --git a/test/helpers/handshake.c b/test/helpers/handshake.c index e0422469e4..ae2ad59dd4 100644 --- a/test/helpers/handshake.c +++ b/test/helpers/handshake.c -@@ -1,5 +1,5 @@ - /* -- * Copyright 2016-2022 The OpenSSL Project Authors. All Rights Reserved. -+ * Copyright 2016-2023 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy @@ -24,6 +24,102 @@ #include <netinet/sctp.h> #endif
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_1.patch deleted +0 -113
113 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_10.patch deleted +0 -203
203 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_2.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_3.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 4f9334a33da89949f97927c8fe7df1003c42cda4 Mon Sep 17 00:00:00 2001 -From: Matt Caswell <[email protected]> -Date: Fri, 31 May 2024 11:22:13 +0100 -Subject: [PATCH 03/10] Use correctly formatted ALPN data in tserver - -The QUIC test server was using incorrectly formatted ALPN data. With the -previous implementation of SSL_select_next_proto this went unnoticed. With -the new stricter implemenation it was failing. - -Follow on from CVE-2024-5535 - -Reviewed-by: Neil Horman <[email protected]> -Reviewed-by: Tomas Mraz <[email protected]> -(Merged from https://github.com/openssl/openssl/pull/24717) - -Upstream-Status: Backport from [https://github.com/openssl/openssl/commit/6cc511826f09e513b4ec066d9b95acaf4f86d991] -CVE: CVE-2024-5535 -Signed-off-by: Siddharth Doshi <[email protected]> ---- - ssl/quic/quic_tserver.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ssl/quic/quic_tserver.c b/ssl/quic/quic_tserver.c -index 86187d0..15694e7 100644 ---- a/ssl/quic/quic_tserver.c -+++ b/ssl/quic/quic_tserver.c -@@ -58,7 +58,7 @@ static int alpn_select_cb(SSL *ssl, const unsigned char **out, - - if (srv->args.alpn == NULL) { - alpn = alpndeflt; -- alpnlen = sizeof(alpn); -+ alpnlen = sizeof(alpndeflt); - } else { - alpn = srv->args.alpn; - alpnlen = srv->args.alpnlen; --- -2.44.0 -
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_4.patch deleted +0 -82
82 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_5.patch deleted +0 -176
176 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_6.patch deleted +0 -1173
1,173 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_7.patch deleted +0 -43
43 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_8.patch deleted +0 -66
66 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl/CVE-2024-5535_9.patch deleted +0 -271
271 lines not on this page · raw message
meta/recipes-connectivity/openssl/openssl_3.2.3.bb renamed from meta/recipes-connectivity/openssl/openssl_3.2.2.bb +2 -12
@@ -7,28 +7,18 @@ SECTION = "libs/network" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c75985e733726beaba57bc5253e96d04" -SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ +SRC_URI = "https://github.com/openssl/openssl/releases/download/openssl-${PV}/openssl-${PV}.tar.gz \ file://run-ptest \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://0001-Configure-do-not-tweak-mips-cflags.patch \ file://0001-Added-handshake-history-reporting-when-test-fails.patch \ - file://CVE-2024-5535_1.patch \ - file://CVE-2024-5535_2.patch \ - file://CVE-2024-5535_3.patch \ - file://CVE-2024-5535_4.patch \ - file://CVE-2024-5535_5.patch \ - file://CVE-2024-5535_6.patch \ - file://CVE-2024-5535_7.patch \ - file://CVE-2024-5535_8.patch \ - file://CVE-2024-5535_9.patch \ - file://CVE-2024-5535_10.patch \ " SRC_URI:append:class-nativesdk = " \ file://environment.d-openssl.sh \ " -SRC_URI[sha256sum] = "197149c18d9e9f292c43f0400acaba12e5f52cacfe050f3d199277ea738ec2e7" +SRC_URI[sha256sum] = "52b5f1c6b8022bc5868c308c54fb77705e702d6c6f4594f99a0df216acf46239" inherit lib_package multilib_header multilib_script ptest perlnative manpages MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
Signature · 1 line
2.34.1
PATCH 4/16 python3: upgrade 3.12.4 -> 3.12.5
In reply to Steve SakomanFrom: Trevor Gamblin <[email protected]>
Changelog: https://docs.python.org/release/3.12.5/whatsnew/changelog.html
(From OE-Core rev: d9e2ebd6b24b802d1d4cd38b3b910e068c308809)
---
.../python/{python3_3.12.4.bb => python3_3.12.5.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3_3.12.4.bb => python3_3.12.5.bb} (99%)meta/recipes-devtools/python/python3_3.12.5.bb renamed from meta/recipes-devtools/python/python3_3.12.4.bb +1 -1
@@ -42,7 +42,7 @@ SRC_URI:append:class-native = " \ file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ " -SRC_URI[sha256sum] = "f6d419a6d8743ab26700801b4908d26d97e8b986e14f95de31b32de2b0e79554" +SRC_URI[sha256sum] = "fa8a2e12c5e620b09f53e65bcd87550d2e5a1e2e04bf8ba991dcc55113876397" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
Signature · 1 line
2.34.1
PATCH 5/16 python3: skip readline limited history tests
In reply to Steve SakomanFrom: Trevor Gamblin <[email protected]>
Python 3.12.5 is failing a newer ptest for reading/writing limited history when editline (default) is set in PACKAGECONFIG. Skip it for now until a proper fix (if any) is determined.
A bug has been opened upstream: https://github.com/python/cpython/issues/123018
(From OE-Core rev: de569ddffd5ea36b70c56df21dec9c892e5dee7d)
--- ...t_readline-skip-limited-history-test.patch | 41 +++++++++++++++++++ .../recipes-devtools/python/python3_3.12.5.bb | 1 + 2 files changed, 42 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch
meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch new file +41 -0
@@ -0,0 +1,41 @@ +From d9d916d5ea946c945323679d1709de1b87029b96 Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <[email protected]> +Date: Tue, 13 Aug 2024 11:07:05 -0400 +Subject: [PATCH] test_readline: skip limited history test + +This test was added recently and is failing on the ptest image when +using the default PACKAGECONFIG settings (i.e. with editline instead of +readline).. Disable it until the proper fix is determined. + +A bug has been opened upstream: https://github.com/python/cpython/issues/123018 + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Trevor Gamblin <[email protected]> +--- + Lib/test/test_readline.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py +index 91fd7dd13f9..d81f9bf8eed 100644 +--- a/Lib/test/test_readline.py ++++ b/Lib/test/test_readline.py +@@ -132,6 +132,7 @@ def test_nonascii_history(self): + self.assertEqual(readline.get_history_item(1), "entrée 1") + self.assertEqual(readline.get_history_item(2), "entrée 22") + ++ @unittest.skip("Skipping problematic test") + def test_write_read_limited_history(self): + previous_length = readline.get_history_length() + self.addCleanup(readline.set_history_length, previous_length) +@@ -349,6 +350,7 @@ def test_history_size(self): + self.assertEqual(len(lines), history_size) + self.assertEqual(lines[-1].strip(), b"last input") + ++ @unittest.skip("Skipping problematic test") + def test_write_read_limited_history(self): + previous_length = readline.get_history_length() + self.addCleanup(readline.set_history_length, previous_length) +-- +2.39.2 +
meta/recipes-devtools/python/python3_3.12.5.bb +1 -0
@@ -34,6 +34,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ file://0001-test_deadlock-skip-problematic-test.patch \ file://0001-test_active_children-skip-problematic-test.patch \ + file://0001-test_readline-skip-limited-history-test.patch \ file://CVE-2024-7592.patch \ file://CVE-2024-8088.patch \ "
Signature · 1 line
2.34.1
PATCH 6/16 python3: Upgrade 3.12.5 -> 3.12.6
In reply to Steve SakomanFrom: Peter Marko <[email protected]>
Includes security fixes for CVE-2024-7592, CVE-2024-8088, CVE-2024-6232, CVE-2023-27043 and other bug fixes.
Removed below patches, as the fix is included in 3.12.6 upgrade:
1. CVE-2024-7592.patch
2. CVE-2024-8088.patch
Release Notes:
https://www.python.org/downloads/release/python-3126/
(From OE-Core rev: aa492b1fd5973c37b8fa2cd17d28199eba46afcc)
---
...t_readline-skip-limited-history-test.patch | 19 +--
.../python/python3/CVE-2024-7592.patch | 143 ------------------
.../python/python3/CVE-2024-8088.patch | 128 ----------------
.../{python3_3.12.5.bb => python3_3.12.6.bb} | 4 +-
4 files changed, 9 insertions(+), 285 deletions(-)
delete mode 100644 meta/recipes-devtools/python/python3/CVE-2024-7592.patch
delete mode 100644 meta/recipes-devtools/python/python3/CVE-2024-8088.patch
rename meta/recipes-devtools/python/{python3_3.12.5.bb => python3_3.12.6.bb} (99%)meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch +8 -11
@@ -16,11 +16,11 @@ Signed-off-by: Trevor Gamblin <[email protected]> Lib/test/test_readline.py | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py -index 91fd7dd13f9..d81f9bf8eed 100644 ---- a/Lib/test/test_readline.py -+++ b/Lib/test/test_readline.py -@@ -132,6 +132,7 @@ def test_nonascii_history(self): +Index: Python-3.12.6/Lib/test/test_readline.py +=================================================================== +--- Python-3.12.6.orig/Lib/test/test_readline.py ++++ Python-3.12.6/Lib/test/test_readline.py +@@ -133,6 +133,7 @@ class TestHistoryManipulation (unittest. self.assertEqual(readline.get_history_item(1), "entrée 1") self.assertEqual(readline.get_history_item(2), "entrée 22")
@@ -28,14 +28,11 @@ index 91fd7dd13f9..d81f9bf8eed 100644 def test_write_read_limited_history(self): previous_length = readline.get_history_length() self.addCleanup(readline.set_history_length, previous_length) -@@ -349,6 +350,7 @@ def test_history_size(self): - self.assertEqual(len(lines), history_size) - self.assertEqual(lines[-1].strip(), b"last input") +@@ -371,6 +372,7 @@ readline.write_history_file(history_file + self.assertIn(b"done", output) + + @unittest.skip("Skipping problematic test") def test_write_read_limited_history(self): previous_length = readline.get_history_length() self.addCleanup(readline.set_history_length, previous_length) --- -2.39.2 -
meta/recipes-devtools/python/python3/CVE-2024-7592.patch deleted +0 -143
143 lines not on this page · raw message
meta/recipes-devtools/python/python3/CVE-2024-8088.patch deleted +0 -128
128 lines not on this page · raw message
meta/recipes-devtools/python/python3_3.12.6.bb renamed from meta/recipes-devtools/python/python3_3.12.5.bb +1 -3
@@ -35,15 +35,13 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-test_deadlock-skip-problematic-test.patch \ file://0001-test_active_children-skip-problematic-test.patch \ file://0001-test_readline-skip-limited-history-test.patch \ - file://CVE-2024-7592.patch \ - file://CVE-2024-8088.patch \ " SRC_URI:append:class-native = " \ file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ " -SRC_URI[sha256sum] = "fa8a2e12c5e620b09f53e65bcd87550d2e5a1e2e04bf8ba991dcc55113876397" +SRC_URI[sha256sum] = "1999658298cf2fb837dffed8ff3c033ef0c98ef20cf73c5d5f66bed5ab89697c" # exclude pre-releases for both python 2.x and 3.x UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
Signature · 1 line
2.34.1
PATCH 7/16 buildhistory: Fix intermittent package file list creation
In reply to Steve SakomanFrom: Pedro Ferreira <[email protected]>
The directory that buildhistory_list_pkg_files writes to during do_package is created by do_packagedata so a clean buildhistory doesn't have files-in-package written during the first build since packagedata happens after do_package.
Ensure the output package folder is created to avoid missing files-in-package.txt files.
Also it ensures that in case of find fails we leave with a hard error instead of hiding the error on the for loop.
--- meta/classes/buildhistory.bbclass | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
meta/classes/buildhistory.bbclass +3 -6
@@ -599,15 +599,12 @@ buildhistory_list_files_no_owners() { buildhistory_list_pkg_files() { # Create individual files-in-package for each recipe's package - for pkgdir in $(find ${PKGDEST}/* -maxdepth 0 -type d); do + pkgdirlist=$(find ${PKGDEST}/* -maxdepth 0 -type d) + for pkgdir in $pkgdirlist; do pkgname=$(basename $pkgdir) outfolder="${BUILDHISTORY_DIR_PACKAGE}/$pkgname" outfile="$outfolder/files-in-package.txt" - # Make sure the output folder exists so we can create the file - if [ ! -d $outfolder ] ; then - bbdebug 2 "Folder $outfolder does not exist, file $outfile not created" - continue - fi + mkdir -p $outfolder buildhistory_list_files $pkgdir $outfile fakeroot done }
Signature · 1 line
2.34.1
PATCH 8/16 buildhistory: Restoring files from preserve list
In reply to Steve SakomanFrom: Pedro Ferreira <[email protected]>
This fix will ensure that, when we activate feature BUILDHISTORY_RESET, files marked to keep on feature BUILDHISTORY_PRESERVE will indeed exist is buildhistory final path since they are moved to buildhistory/old but not restored at any point.
--- meta/classes/buildhistory.bbclass | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
meta/classes/buildhistory.bbclass +23 -0
@@ -110,6 +110,7 @@ python buildhistory_emit_pkghistory() { import json import shlex import errno + import shutil pkghistdir = d.getVar('BUILDHISTORY_DIR_PACKAGE') oldpkghistdir = d.getVar('BUILDHISTORY_OLD_DIR_PACKAGE')
@@ -223,6 +224,20 @@ python buildhistory_emit_pkghistory() { items.sort() return ' '.join(items) + def preservebuildhistoryfiles(pkg, preserve): + if os.path.exists(os.path.join(oldpkghistdir, pkg)): + listofobjs = os.listdir(os.path.join(oldpkghistdir, pkg)) + for obj in listofobjs: + if obj not in preserve: + continue + try: + bb.utils.mkdirhier(os.path.join(pkghistdir, pkg)) + shutil.copyfile(os.path.join(oldpkghistdir, pkg, obj), os.path.join(pkghistdir, pkg, obj)) + except IOError as e: + bb.note("Unable to copy file. %s" % e) + except EnvironmentError as e: + bb.note("Unable to copy file. %s" % e) + pn = d.getVar('PN') pe = d.getVar('PE') or "0" pv = d.getVar('PV')
@@ -250,6 +265,14 @@ python buildhistory_emit_pkghistory() { if not os.path.exists(pkghistdir): bb.utils.mkdirhier(pkghistdir) else: + # We need to make sure that all files kept in + # buildhistory/old are restored successfully + # otherwise next block of code wont have files to + # check and purge + if d.getVar("BUILDHISTORY_RESET"): + for pkg in packagelist: + preservebuildhistoryfiles(pkg, preserve) + # Remove files for packages that no longer exist for item in os.listdir(pkghistdir): if item not in preserve:
Signature · 1 line
2.34.1
PATCH 9/16 buildhistory: Simplify intercept call sites and drop SSTATEPOSTINSTFUNC usage
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
We planned to drop SSTATEPOSTINSTFUNC some time ago with the introduction of postfuncs. Finally get around to doing that which should make the buildhistory code a little more readable.
Unfortunately ordering the buildhistory function calls after the sstate ones is difficult without coding that into the sstate class. This patch does that to ensure everything functions as expected until we can find a better way. This is still likely preferable than the generic sstate postfuncs support since the function flow is much more readable.
--- meta/classes-global/sstate.bbclass | 5 +++- meta/classes/buildhistory.bbclass | 39 +++++++++++++++--------------- 2 files changed, 23 insertions(+), 21 deletions(-)
meta/classes-global/sstate.bbclass +4 -1
@@ -161,7 +161,10 @@ python () { d.setVar('SSTATETASKS', " ".join(unique_tasks)) for task in unique_tasks: d.prependVarFlag(task, 'prefuncs', "sstate_task_prefunc ") - d.appendVarFlag(task, 'postfuncs', " sstate_task_postfunc") + # Generally sstate should be last, execpt for buildhistory functions + postfuncs = (d.getVarFlag(task, 'postfuncs') or "").split() + newpostfuncs = [p for p in postfuncs if "buildhistory" not in p] + ["sstate_task_postfunc"] + [p for p in postfuncs if "buildhistory" in p] + d.setVarFlag(task, 'postfuncs', " ".join(newpostfuncs)) d.setVarFlag(task, 'network', '1') d.setVarFlag(task + "_setscene", 'network', '1') }
meta/classes/buildhistory.bbclass +19 -20
@@ -47,11 +47,18 @@ BUILDHISTORY_PUSH_REPO ?= "" BUILDHISTORY_TAG ?= "build" BUILDHISTORY_PATH_PREFIX_STRIP ?= "" -SSTATEPOSTINSTFUNCS:append = " buildhistory_emit_pkghistory" -# We want to avoid influencing the signatures of sstate tasks - first the function itself: -sstate_install[vardepsexclude] += "buildhistory_emit_pkghistory" -# then the value added to SSTATEPOSTINSTFUNCS: -SSTATEPOSTINSTFUNCS[vardepvalueexclude] .= "| buildhistory_emit_pkghistory" +# We want to avoid influencing the signatures of the task so use vardepsexclude +do_populate_sysroot[postfuncs] += "buildhistory_emit_sysroot" +do_populate_sysroot_setscene[postfuncs] += "buildhistory_emit_sysroot" +do_populate_sysroot[vardepsexclude] += "buildhistory_emit_sysroot" + +do_package[postfuncs] += "buildhistory_list_pkg_files" +do_package_setscene[postfuncs] += "buildhistory_list_pkg_files" +do_package[vardepsexclude] += "buildhistory_list_pkg_files" + +do_packagedata[postfuncs] += "buildhistory_emit_pkghistory" +do_packagedata_setscene[postfuncs] += "buildhistory_emit_pkghistory" +do_packagedata[vardepsexclude] += "buildhistory_emit_pkghistory" # Similarly for our function that gets the output signatures SSTATEPOSTUNPACKFUNCS:append = " buildhistory_emit_outputsigs"
@@ -91,27 +98,15 @@ buildhistory_emit_sysroot() { # Write out metadata about this package for comparison when writing future packages # python buildhistory_emit_pkghistory() { - if d.getVar('BB_CURRENTTASK') in ['populate_sysroot', 'populate_sysroot_setscene']: - bb.build.exec_func("buildhistory_emit_sysroot", d) - return 0 - - if not "package" in (d.getVar('BUILDHISTORY_FEATURES') or "").split(): - return 0 - - if d.getVar('BB_CURRENTTASK') in ['package', 'package_setscene']: - # Create files-in-<package-name>.txt files containing a list of files of each recipe's package - bb.build.exec_func("buildhistory_list_pkg_files", d) - return 0 - - if not d.getVar('BB_CURRENTTASK') in ['packagedata', 'packagedata_setscene']: - return 0 - import re import json import shlex import errno import shutil + if not "package" in (d.getVar('BUILDHISTORY_FEATURES') or "").split(): + return 0 + pkghistdir = d.getVar('BUILDHISTORY_DIR_PACKAGE') oldpkghistdir = d.getVar('BUILDHISTORY_OLD_DIR_PACKAGE')
@@ -621,6 +616,10 @@ buildhistory_list_files_no_owners() { } buildhistory_list_pkg_files() { + if [ "${@bb.utils.contains('BUILDHISTORY_FEATURES', 'package', '1', '0', d)}" = "0" ] ; then + return + fi + # Create individual files-in-package for each recipe's package pkgdirlist=$(find ${PKGDEST}/* -maxdepth 0 -type d) for pkgdir in $pkgdirlist; do
Signature · 1 line
2.34.1
PATCH 10/16 qemu: back port patches to fix riscv64 build failure
In reply to Steve SakomanFrom: Chen Qi <[email protected]>
Backport patches to fix riscv64 build failure.
--- meta/recipes-devtools/qemu/qemu.inc | 3 + ...kvm-change-KVM_REG_RISCV_FP_F-to-u32.patch | 75 ++++++++++++ ...kvm-change-KVM_REG_RISCV_FP_D-to-u64.patch | 73 ++++++++++++ ...cv-kvm-change-timer-regs-size-to-u64.patch | 107 ++++++++++++++++++ 4 files changed, 258 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-target-riscv-kvm-change-KVM_REG_RISCV_FP_F-to-u32.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0002-target-riscv-kvm-change-KVM_REG_RISCV_FP_D-to-u64.patch create mode 100644 meta/recipes-devtools/qemu/qemu/0003-target-riscv-kvm-change-timer-regs-size-to-u64.patch
meta/recipes-devtools/qemu/qemu.inc +3 -0
@@ -49,6 +49,9 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2024-7409-0002.patch \ file://CVE-2024-7409-0003.patch \ file://CVE-2024-7409-0004.patch \ + file://0001-target-riscv-kvm-change-KVM_REG_RISCV_FP_F-to-u32.patch \ + file://0002-target-riscv-kvm-change-KVM_REG_RISCV_FP_D-to-u64.patch \ + file://0003-target-riscv-kvm-change-timer-regs-size-to-u64.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
meta/recipes-devtools/qemu/qemu/0001-target-riscv-kvm-change-KVM_REG_RISCV_FP_F-to-u32.patch new file +75 -0
75 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0002-target-riscv-kvm-change-KVM_REG_RISCV_FP_D-to-u64.patch new file +73 -0
73 lines not on this page · raw message
meta/recipes-devtools/qemu/qemu/0003-target-riscv-kvm-change-timer-regs-size-to-u64.patch new file +107 -0
107 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 11/16 gcc: Fix spurious '/' in GLIBC_DYNAMIC_LINKER on microblaze
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
Backport from master OE-Core rev: f0eac82b9a1e4549b7d918df768c369ed7ab5183
--- ...fine-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/gcc/gcc/0007-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch +3 -3
@@ -1,4 +1,4 @@ -From aacfd6e14dd583b1fdc65691def61c5e1bc89708 Mon Sep 17 00:00:00 2001 +From 4067ae345f0ff1fbf37c0348f2af09257513b817 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 29 Mar 2013 09:24:50 +0400 Subject: [PATCH] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER
@@ -185,7 +185,7 @@ index aecaa02a199..62f88f7f9a2 100644 #undef GNU_USER_TARGET_LINK_SPEC #define GNU_USER_TARGET_LINK_SPEC \ diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h -index e2e2c421c52..6f26480e3b5 100644 +index 5ed8ee518be..299d1a62c81 100644 --- a/gcc/config/microblaze/linux.h +++ b/gcc/config/microblaze/linux.h @@ -28,7 +28,7 @@
@@ -193,7 +193,7 @@ index e2e2c421c52..6f26480e3b5 100644 #define TLS_NEEDS_GOT 1 -#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "/ld.so.1" ++#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld.so.1" #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" #if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */
Signature · 1 line
2.34.1
PATCH 12/16 udev-extraconf: Add collect flag to mount
In reply to Steve SakomanFrom: Colin McAllister <[email protected]>
Adds extra "--collect" flag to the mount command within automount_systemd. This is intended to fix an observed deadlock after rapidly inserting and removing external media. This is because if the mount command fails, the transient mount will enter a failed state. The next time the media is inserted, automount_systemd bails because the first consition finds that the file path for the failed transient mount still exists. This leaves the external media unmounted and cannot be mounted until the mount is fixed via systemctl or the device is rebooted.
Adding "--collect" ensures that the transient mount is cleaned up after entering a failed state, which ensures that the media can still be mounted when it's re-inserted.
(From OE-Core rev: f0cda74d73eb8c14cd6f695f514108f1e94984a6)
--- meta/recipes-core/udev/udev-extraconf/mount.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/udev/udev-extraconf/mount.sh +1 -1
@@ -98,7 +98,7 @@ automount_systemd() { ;; esac - if ! $MOUNT --no-block -t auto $DEVNAME "$MOUNT_BASE/$name" + if ! $MOUNT --collect --no-block -t auto $DEVNAME "$MOUNT_BASE/$name" then #logger "mount.sh/automount" "$MOUNT -t auto $DEVNAME \"$MOUNT_BASE/$name\" failed!" rm_dir "$MOUNT_BASE/$name"
Signature · 1 line
2.34.1
PATCH 13/16 busybox: Fix cut with "-s" flag
In reply to Steve SakomanFrom: Colin McAllister <[email protected]>
This fixes and issue that allows blank lines to be incorrectly output when the "-s" flag is included. This issue propogates into the populate-volatile.sh script in initscripts. If a volatiles drop file contains blank lines, a blank line will be included in combined users, which will incorrectly result in a difference in the number of combined users versus defined users. If this happens, the volatiles file will not be executed.
(From OE-Core rev: dfbcf0581ab3dd47037726a7b8aa06f777792473)
--- ...1-cut-Fix-s-flag-to-omit-blank-lines.patch | 66 +++++++++++++++++++ meta/recipes-core/busybox/busybox_1.36.1.bb | 1 + 2 files changed, 67 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/0001-cut-Fix-s-flag-to-omit-blank-lines.patch
meta/recipes-core/busybox/busybox/0001-cut-Fix-s-flag-to-omit-blank-lines.patch new file +66 -0
@@ -0,0 +1,66 @@ +From 199606e960942c29fd8085be812edd3d3697825c Mon Sep 17 00:00:00 2001 +From: Colin McAllister <[email protected]> +Date: Wed, 17 Jul 2024 07:58:52 -0500 +Subject: [PATCH 1/1] cut: Fix "-s" flag to omit blank lines + +Using cut with the delimiter flag ("-d") with the "-s" flag to only +output lines containing the delimiter will print blank lines. This is +deviant behavior from cut provided by GNU Coreutils. Blank lines should +be omitted if "-s" is used with "-d". + +This change introduces a somewhat naiive, yet efficient solution, where +line length is checked before looping though bytes. If line length is +zero and the "-s" flag is used, the code will jump to parsing the next +line to avoid printing a newline character. + +In addition, a test to cut.tests has been added to ensure that this +regression is fixed and will not happen again in the future. + +Upstream-Status: Submitted [http://lists.busybox.net/pipermail/busybox/2024-July/090834.html] + +Signed-off-by: Colin McAllister <[email protected]> +--- + coreutils/cut.c | 6 ++++++ + testsuite/cut.tests | 9 +++++++++ + 2 files changed, 15 insertions(+) + +diff --git a/coreutils/cut.c b/coreutils/cut.c +index 55bdd9386..b7f986f26 100644 +--- a/coreutils/cut.c ++++ b/coreutils/cut.c +@@ -152,6 +152,12 @@ static void cut_file(FILE *file, const char *delim, const char *odelim, + unsigned uu = 0, start = 0, end = 0, out = 0; + int dcount = 0; + ++ /* Blank line? */ ++ if (!linelen) { ++ if (option_mask32 & CUT_OPT_SUPPRESS_FLGS) ++ goto next_line; ++ } ++ + /* Loop through bytes, finding next delimiter */ + for (;;) { + /* End of current range? */ +diff --git a/testsuite/cut.tests b/testsuite/cut.tests +index 2458c019c..0b401bc00 100755 +--- a/testsuite/cut.tests ++++ b/testsuite/cut.tests +@@ -65,6 +65,15 @@ testing "cut with -d -f( ) -s" "cut -d' ' -f3 -s input && echo yes" "yes\n" "$in + testing "cut with -d -f(a) -s" "cut -da -f3 -s input" "n\nsium:Jim\n\ncion:Ed\n" "$input" "" + testing "cut with -d -f(a) -s -n" "cut -da -f3 -s -n input" "n\nsium:Jim\n\ncion:Ed\n" "$input" "" + ++input="\ ++ ++foo bar baz ++ ++bing bong boop ++ ++" ++testing "cut with -d -s omits blank lines" "cut -d' ' -f2 -s input" "bar\nbong\n" "$input" "" ++ + # substitute for awk + optional FEATURE_CUT_REGEX + testing "cut -DF" "cut -DF 2,7,5" \ +-- +2.43.0 +
meta/recipes-core/busybox/busybox_1.36.1.bb +1 -0
@@ -56,6 +56,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://0001-awk-fix-precedence-of-relative-to.patch \ file://0002-awk-fix-ternary-operator-and-precedence-of.patch \ file://0001-awk.c-fix-CVE-2023-42366-bug-15874.patch \ + file://0001-cut-Fix-s-flag-to-omit-blank-lines.patch \ " SRC_URI:append:libc-musl = " file://musl.cfg " # TODO http://lists.busybox.net/pipermail/busybox/2023-January/090078.html
Signature · 1 line
2.34.1
PATCH 14/16 bluez5: remove redundant patch for MAX_INPUT
In reply to Steve SakomanFrom: Guðni Már Gilbert <[email protected]>
The solution to the problem upstream was fixed by the following commit:
https://github.com/bluez/bluez/commit/ca6546fe521360fcf905bc115b893f322e706cb2
Now MAX_INPUT is defined for non-glibc systems such as musl. This fix was added in BlueZ 5.67.
--- meta/recipes-connectivity/bluez5/bluez5.inc | 1 - ...shared-util.c-include-linux-limits.h.patch | 27 ------------------- 2 files changed, 28 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch
meta/recipes-connectivity/bluez5/bluez5.inc +0 -1
@@ -54,7 +54,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ - file://0004-src-shared-util.c-include-linux-limits.h.patch \ " S = "${WORKDIR}/bluez-${PV}"
meta/recipes-connectivity/bluez5/bluez5/0004-src-shared-util.c-include-linux-limits.h.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From b53df61b41088b68c127ac76cc71683ac3453b9d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 12 Dec 2022 13:10:19 +0100 -Subject: [PATCH] src/shared/util.c: include linux/limits.h - -MAX_INPUT is defined in that file. This matters on non-glibc -systems such as those using musl. - -Upstream-Status: Submitted [to [email protected],[email protected],[email protected]] -Signed-off-by: Alexander Kanavin <[email protected]> - ---- - src/shared/util.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/shared/util.c b/src/shared/util.c -index c0c2c4a..036dc0d 100644 ---- a/src/shared/util.c -+++ b/src/shared/util.c -@@ -23,6 +23,7 @@ - #include <unistd.h> - #include <dirent.h> - #include <limits.h> -+#include <linux/limits.h> - #include <string.h> - - #ifdef HAVE_SYS_RANDOM_H
Signature · 1 line
2.34.1
PATCH 15/16 create-sdpx-2.2.bbclass: Switch from exists to isfile checking debugsrc
In reply to Steve SakomanFrom: Mark Hatle <[email protected]>
While debugsrc is almost always a file (or link), there are apparently cases where a directory could be returned from the dwarfsrcfiles processing. When this happens, the hashing fails and an error results when building the SPDX documents.
--- meta/classes/create-spdx-2.2.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/classes/create-spdx-2.2.bbclass +2 -1
@@ -315,7 +315,8 @@ def add_package_sources_from_debug(d, package_doc, spdx_package, package, packag debugsrc_path = search / debugsrc.replace('/usr/src/kernel/', '') else: debugsrc_path = search / debugsrc.lstrip("/") - if not debugsrc_path.exists(): + # We can only hash files below, skip directories, links, etc. + if not os.path.isfile(debugsrc_path): continue file_sha256 = bb.utils.sha256_file(debugsrc_path)
Signature · 1 line
2.34.1
PATCH 16/16 bind: Fix build with the `httpstats` package config enabled
In reply to Steve SakomanFrom: Alban Bedel <[email protected]>
------C65ED3E1A5DE826CA595746785F6AF6F
To: [email protected]
CC: Alban Bedel <[email protected]>
Subject: [PATCH] bind: Fix build with the httpstats package config enabled
Date: Wed, 11 Sep 2024 08:26:47 +0200
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain
MIME-Version: 1.0
When the httpstats package config is enabled configure fails with the error:
Quoted 2 lines
configure: error: Specifying libxml2 installation path is not supported, adjust
PKG_CONFIG_PATHinstead
Drop the explicit path from --with-libxml2 to solve this issue.
--- meta/recipes-connectivity/bind/bind_9.18.28.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-connectivity/bind/bind_9.18.28.bb +1 -1
@@ -34,7 +34,7 @@ inherit autotools update-rc.d systemd useradd pkgconfig multilib_header update-a # PACKAGECONFIGs readline and libedit should NOT be set at same time PACKAGECONFIG ?= "readline" -PACKAGECONFIG[httpstats] = "--with-libxml2=${STAGING_DIR_HOST}${prefix},--without-libxml2,libxml2" +PACKAGECONFIG[httpstats] = "--with-libxml2,--without-libxml2,libxml2" PACKAGECONFIG[readline] = "--with-readline=readline,,readline" PACKAGECONFIG[libedit] = "--with-readline=libedit,,libedit" PACKAGECONFIG[dns-over-http] = "--enable-doh,--disable-doh,nghttp2"
Signature · 1 line
2.34.1