Patch review
cover Patch review
Please review this set of changes for kirkstone and have comments back by end of day Friday, September 22.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/5927
The following changes since commit 26309ba6ef5b776d6bc45b984261b91e6c8c5a94:
yocto-uninative: Update to 4.3 (2023-09-12 12:47:53 -1000)
are available in the Git repository at:
https://git.openembedded.org/openembedded-core-contrib stable/kirkstone-nut
https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/kirkstone-nut
Alexander Kanavin (1):
cargo.bbclass: set up cargo environment in common do_compile
Alexis Lothoré (1):
oeqa/utils/gitarchive: fix tag computation when creating archive
Archana Polampalli (1):
vim: upgrade 9.0.1592 -> 9.0.1664
Etienne Cordonnier (1):
vim: update obsolete comment
Khem Raj (1):
build-sysroots: Add SUMMARY field
Markus Niebel (1):
wic: fix wrong attempt to create file system in upartitioned regions
Martin Jansa (1):
tcl: prevent installing another copy of tzdata
Michael Opdenacker (1):
scripts/create-pull-request: update URLs to git repositories
Pavel Zhukov (1):
dbus: Specify runstatedir configure option
Peter Suti (1):
externalsrc: fix dependency chain issues
Richard Purdie (3):
vim: Upgrade 9.0.1664 -> 9.0.1894
pseudo: Fix to work with glibc 2.38
resulttool/report: Avoid divide by zero
Ross Burton (1):
gcc: Fix -fstack-protector issue on aarch64
Sanjana (3):
binutils: Fix CVE-2022-48065
glibc: stable 2.35 branch updates
binutils: stable 2.38 branch updates
Soumya Sambu (1):
go: Fix CVE-2023-39319
Wang Mingyu (1):
tar: upgrade 1.34 -> 1.35
Yogita Urade (1):
cups: fix CVE-2023-32360
meta/classes/cargo.bbclass | 1 -
meta/classes/cargo_common.bbclass | 4 +
meta/classes/externalsrc.bbclass | 7 +-
meta/lib/oeqa/utils/gitarchive.py | 6 +-
meta/recipes-core/dbus/dbus_1.14.8.bb | 3 +-
meta/recipes-core/glibc/glibc-version.inc | 2 +-
meta/recipes-core/meta/build-sysroots.bb | 3 +-
.../binutils/binutils-2.38.inc | 5 +-
.../binutils/0029-CVE-2022-48065-1.patch | 31 +
.../binutils/0029-CVE-2022-48065-2.patch | 115 +
.../binutils/0029-CVE-2022-48065-3.patch | 122 +
meta/recipes-devtools/gcc/gcc-11.4.inc | 1 +
.../gcc/gcc/CVE-2023-4039.patch | 2893 +++++++++++++++++
meta/recipes-devtools/go/go-1.17.13.inc | 3 +-
.../go/go-1.20/CVE-2023-39319.patch | 254 ++
.../pseudo/files/glibc238.patch | 72 +
meta/recipes-devtools/pseudo/pseudo_git.bb | 1 +
meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 6 +
meta/recipes-extended/cups/cups.inc | 1 +
.../cups/cups/CVE-2023-32360.patch | 35 +
.../tar/tar/CVE-2022-48303.patch | 43 -
.../tar/{tar_1.34.bb => tar_1.35.bb} | 8 +-
meta/recipes-support/vim/vim.inc | 11 +-
scripts/create-pull-request | 7 +-
scripts/lib/resulttool/report.py | 5 +-
scripts/lib/wic/partition.py | 2 +-
26 files changed, 3568 insertions(+), 73 deletions(-)
create mode 100644 meta/recipes-devtools/binutils/binutils/0029-CVE-2022-48065-1.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/0029-CVE-2022-48065-2.patch
create mode 100644 meta/recipes-devtools/binutils/binutils/0029-CVE-2022-48065-3.patch
create mode 100644 meta/recipes-devtools/gcc/gcc/CVE-2023-4039.patch
create mode 100644 meta/recipes-devtools/go/go-1.20/CVE-2023-39319.patch
create mode 100644 meta/recipes-devtools/pseudo/files/glibc238.patch
create mode 100644 meta/recipes-extended/cups/cups/CVE-2023-32360.patch
delete mode 100644 meta/recipes-extended/tar/tar/CVE-2022-48303.patch
rename meta/recipes-extended/tar/{tar_1.34.bb => tar_1.35.bb} (87%)Signature · 1 line
2.34.1
PATCH 1/20 go: Fix CVE-2023-39319
From: Soumya Sambu <[email protected]>
The html/template package does not apply the proper rules for handling occurrences of "<script", "<!--", and "</script" within JS literals in <script> contexts. This may cause the template parser to improperly consider script contexts to be terminated early, causing actions to be improperly escaped. This could be leveraged to perform an XSS attack.
References:
https://nvd.nist.gov/vuln/detail/CVE-2023-39319
--- meta/recipes-devtools/go/go-1.17.13.inc | 3 +- .../go/go-1.20/CVE-2023-39319.patch | 254 ++++++++++++++++++ 2 files changed, 256 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/go/go-1.20/CVE-2023-39319.patch
meta/recipes-devtools/go/go-1.17.13.inc +2 -1
@@ -1,6 +1,6 @@ require go-common.inc -FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go-1.21:${FILE_DIRNAME}/go-1.19:${FILE_DIRNAME}/go-1.18:" +FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/go-1.21:${FILE_DIRNAME}/go-1.20:${FILE_DIRNAME}/go-1.19:${FILE_DIRNAME}/go-1.18:" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707"
@@ -43,6 +43,7 @@ SRC_URI += "\ file://CVE-2023-24531_1.patch \ file://CVE-2023-24531_2.patch \ file://CVE-2023-29409.patch \ + file://CVE-2023-39319.patch \ " SRC_URI[main.sha256sum] = "a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd"
meta/recipes-devtools/go/go-1.20/CVE-2023-39319.patch new file +254 -0
254 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 2/20 cups: fix CVE-2023-32360
In reply to Steve SakomanFrom: Yogita Urade <[email protected]>
An authentication issue was addressed with improved state management. This issue is fixed in macOS Big Sur 11.7.7, macOS Monterey 12.6.6, macOS Ventura 13.4. An unauthenticated user may be able to access recently printed documents.
References:
https://ubuntu.com/security/CVE-2023-32360
https://security-tracker.debian.org/tracker/CVE-2023-32360
--- meta/recipes-extended/cups/cups.inc | 1 + .../cups/cups/CVE-2023-32360.patch | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/CVE-2023-32360.patch
meta/recipes-extended/cups/cups.inc +1 -0
@@ -17,6 +17,7 @@ SRC_URI = "https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${ file://cups-volatiles.conf \ file://CVE-2023-32324.patch \ file://CVE-2023-34241.patch \ + file://CVE-2023-32360.patch \ " UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups/releases"
meta/recipes-extended/cups/cups/CVE-2023-32360.patch new file +35 -0
@@ -0,0 +1,35 @@ +From a0c8b9c9556882f00c68b9727a95a1b6d1452913 Mon Sep 17 00:00:00 2001 +From: Michael R Sweet <[email protected]> +Date: Thu, 14 Sep 2023 09:16:45 +0000 +Subject: [PATCH] Require authentication for CUPS-Get-Document. + +CVE: CVE-2023-32360 + +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/a0c8b9c9556882f00c68b9727a95a1b6d1452913] + +Signed-off-by: Yogita Urade <[email protected]> +--- + conf/cupsd.conf.in | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/conf/cupsd.conf.in b/conf/cupsd.conf.in +index b258849..08f5070 100644 +--- a/conf/cupsd.conf.in ++++ b/conf/cupsd.conf.in +@@ -68,7 +68,13 @@ IdleExitTimeout @EXIT_TIMEOUT@ + Order deny,allow + </Limit> + +- <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document> ++ <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job> ++ Require user @OWNER @SYSTEM ++ Order deny,allow ++ </Limit> ++ ++ <Limit CUPS-Get-Document> ++ AuthType Defaul + Require user @OWNER @SYSTEM + Order deny,allow + </Limit> +-- +2.35.5
Signature · 1 line
2.34.1
PATCH 3/20 binutils: Fix CVE-2022-48065
In reply to Steve SakomanFrom: Sanjana <[email protected]>
--- .../binutils/binutils-2.38.inc | 3 + .../binutils/0029-CVE-2022-48065-1.patch | 31 +++++ .../binutils/0029-CVE-2022-48065-2.patch | 115 +++++++++++++++++ .../binutils/0029-CVE-2022-48065-3.patch | 122 ++++++++++++++++++ 4 files changed, 271 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/0029-CVE-2022-48065-1.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0029-CVE-2022-48065-2.patch create mode 100644 meta/recipes-devtools/binutils/binutils/0029-CVE-2022-48065-3.patch
meta/recipes-devtools/binutils/binutils-2.38.inc +3 -0
@@ -56,5 +56,8 @@ SRC_URI = "\ file://0023-CVE-2023-25585.patch \ file://0026-CVE-2023-1972.patch \ file://0025-CVE-2023-25588.patch \ + file://0029-CVE-2022-48065-1.patch \ + file://0029-CVE-2022-48065-2.patch \ + file://0029-CVE-2022-48065-3.patch \ " S = "${WORKDIR}/git"
meta/recipes-devtools/binutils/binutils/0029-CVE-2022-48065-1.patch new file +31 -0
@@ -0,0 +1,31 @@ +From: Jan Beulich <[email protected]> +Date: Tue, 29 Mar 2022 06:19:14 +0000 (+0200) +Subject: bfd/Dwarf2: gas doesn't mangle names +X-Git-Tag: binutils-2_39~1287 +X-Git-Url: https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=ddfc2f56d5782af79c696d7fef7c73bba11e8b09 + +bfd/Dwarf2: gas doesn't mangle names + +Include the language identifier emitted by gas in the set of ones where +no mangled names are expected. Even if there could be "hand-mangled" +names, gas doesn't emit DW_AT_linkage_name in the first place. +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff_plain;h=ddfc2f56d5782af79c696d7fef7c73bba11e8b09] + +CVE: CVE-2022-48065 + +Signed-off-by: Sanjana Venkatesh <[email protected]> + +--- + +diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c +index 8cd0ce9d425..9aa4e955a5e 100644 +--- a/bfd/dwarf2.c ++++ b/bfd/dwarf2.c +@@ -1441,6 +1441,7 @@ non_mangled (int lang) + case DW_LANG_PLI: + case DW_LANG_UPC: + case DW_LANG_C11: ++ case DW_LANG_Mips_Assembler: + return true; + } + }
meta/recipes-devtools/binutils/binutils/0029-CVE-2022-48065-2.patch new file +115 -0
115 lines not on this page · raw message
meta/recipes-devtools/binutils/binutils/0029-CVE-2022-48065-3.patch new file +122 -0
122 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 4/20 gcc: Fix -fstack-protector issue on aarch64
In reply to Steve SakomanFrom: Ross Burton <[email protected]>
This series of patches fixes deficiencies in GCC's -fstack-protector implementation for AArch64 when using dynamically allocated stack space. This is CVE-2023-4039. See:
https://developer.arm.com/Arm%20Security%20Center/GCC%20Stack%20Protector%20Vulnerability%20AArch64
https://github.com/metaredteam/external-disclosures/security/advisories/GHSA-x7ch-h5rf-w2mf
for more details.
--- meta/recipes-devtools/gcc/gcc-11.4.inc | 1 + .../gcc/gcc/CVE-2023-4039.patch | 2893 +++++++++++++++++ 2 files changed, 2894 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc/CVE-2023-4039.patch
meta/recipes-devtools/gcc/gcc-11.4.inc +1 -0
@@ -68,6 +68,7 @@ SRC_URI = "\ file://0002-aarch64-add-armv9-a-to-march.patch \ file://0003-aarch64-Enable-FP16-feature-by-default-for-Armv9.patch \ file://0004-arm-add-armv9-a-architecture-to-march.patch \ + file://CVE-2023-4039.patch \ " SRC_URI[sha256sum] = "3f2db222b007e8a4a23cd5ba56726ef08e8b1f1eb2055ee72c1402cea73a8dd9"
meta/recipes-devtools/gcc/gcc/CVE-2023-4039.patch new file +2893 -0
2,893 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 5/20 glibc: stable 2.35 branch updates
In reply to Steve SakomanFrom: Sanjana <[email protected]>
Below commits on glibc-2.35 stable branch are updated.
561e9dadc0 x86: Fix incorrect scope of setting shared_per_thread 1c3ecf5858 x86: Use 3/4*sizeof(per-thread-L3) as low bound for NT threshold. 47c7d2eb03 x86: Fix slight bug in shared_per_thread cache size calculation. d1b1da26ea x86: Increase non_temporal_threshold to roughly sizeof_L3 / 4 e19af583b4 elf: _dl_find_object may return 1 during early startup.
--- meta/recipes-core/glibc/glibc-version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/glibc/glibc-version.inc +1 -1
@@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.35/master" PV = "2.35" -SRCREV_glibc ?= "cbceb903c4d770acc7e4ba5641036516830ed69b" +SRCREV_glibc ?= "561e9dadc02f46a7ba2190c0a04259583479f6c9" SRCREV_localedef ?= "794da69788cbf9bf57b59a852f9f11307663fa87" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git"
Signature · 1 line
2.34.1
PATCH 6/20 binutils: stable 2.38 branch updates
In reply to Steve SakomanFrom: Sanjana <[email protected]>
Below commits on binutils-2.38 stable branch are updated.
ea5fe5d01e5 PR30697, ppc32 mix of local-dynamic and global-dynamic TLS
--- meta/recipes-devtools/binutils/binutils-2.38.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/binutils/binutils-2.38.inc +1 -1
@@ -18,7 +18,7 @@ SRCBRANCH ?= "binutils-2_38-branch" UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)" -SRCREV ?= "dc2474e7d204c124ab5a21b4490aa46eb7e1d4c3" +SRCREV ?= "ea5fe5d01e5a182ee7a0eddb54a702109a9f5931" BINUTILS_GIT_URI ?= "git://sourceware.org/git/binutils-gdb.git;branch=${SRCBRANCH};protocol=git" SRC_URI = "\ ${BINUTILS_GIT_URI} \
Signature · 1 line
2.34.1
PATCH 7/20 tar: upgrade 1.34 -> 1.35
In reply to Steve SakomanFrom: Wang Mingyu <[email protected]>
CVE-2022-48303.patch
removed since it's included in 1.35
License-Update: http changed to https
Changelog:
===========
* Fail when building GNU tar, if the platform supports 64-bit time_t but the build uses only 32-bit time_t.
* Leave the devmajor and devminor fields empty (rather than zero) for non-special files, as this is more compatible with traditional tar.
* Bug fixes
** Fix interaction of --update with --wildcards.
** When extracting archives into an empty directory, do not create
hard links to files outside that directory.
** Handle partial reads from regular files.
** Warn "file changed as we read it" less often.
** Fix --ignore-failed-read to ignore file-changed read errors ** Fix --remove-files to not remove a file that changed while we read it. ** Fix --atime-preserve=replace to not fail if there was no need to replace,
either because we did not read the file, or the atime did not change.
** Fix race when creating a parent directory while another process is
also doing so.
** Fix handling of prefix keywords not followed by "." in pax headers. ** Fix handling of out-of-range sparse entries in pax headers. ** Fix handling of --transform='s/s/@/2'.
** Fix treatment of options ending in / in files-from list.
** Fix crash on 'tar --checkpoint-action exec=\"'.
** Fix low-memory crash when reading incremental dumps.
** Fix --exclude-vcs-ignores memory allocation misuse.
---
.../tar/tar/CVE-2022-48303.patch | 43 -------------------
.../tar/{tar_1.34.bb => tar_1.35.bb} | 8 ++--
2 files changed, 3 insertions(+), 48 deletions(-)
delete mode 100644 meta/recipes-extended/tar/tar/CVE-2022-48303.patch
rename meta/recipes-extended/tar/{tar_1.34.bb => tar_1.35.bb} (87%)meta/recipes-extended/tar/tar/CVE-2022-48303.patch deleted +0 -43
@@ -1,43 +0,0 @@ -From 3da78400eafcccb97e2f2fd4b227ea40d794ede8 Mon Sep 17 00:00:00 2001 -From: Sergey Poznyakoff <[email protected]> -Date: Sat, 11 Feb 2023 11:57:39 +0200 -Subject: Fix boundary checking in base-256 decoder - -* src/list.c (from_header): Base-256 encoding is at least 2 bytes -long. - -Upstream-Status: Backport [see reference below] -CVE: CVE-2022-48303 - -Reference to upstream patch: -https://savannah.gnu.org/bugs/?62387 -https://git.savannah.gnu.org/cgit/tar.git/patch/src/list.c?id=3da78400eafcccb97e2f2fd4b227ea40d794ede8 - -Signed-off-by: Rodolfo Quesada Zumbado <[email protected]> -Signed-off-by: Joe Slater <[email protected]> ---- - src/list.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-)Signed-off-by: Rodolfo Quesada Zumbado <[email protected]> - - -(limited to 'src/list.c') - -diff --git a/src/list.c b/src/list.c -index 9fafc42..86bcfdd 100644 ---- a/src/list.c -+++ b/src/list.c -@@ -881,8 +881,9 @@ from_header (char const *where0, size_t digs, char const *type, - where++; - } - } -- else if (*where == '\200' /* positive base-256 */ -- || *where == '\377' /* negative base-256 */) -+ else if (where <= lim - 2 -+ && (*where == '\200' /* positive base-256 */ -+ || *where == '\377' /* negative base-256 */)) - { - /* Parse base-256 output. A nonnegative number N is - represented as (256**DIGS)/2 + N; a negative number -N is --- -cgit v1.1 -
meta/recipes-extended/tar/tar_1.35.bb renamed from meta/recipes-extended/tar/tar_1.34.bb +3 -5
@@ -4,13 +4,11 @@ or disk archive, and can restore individual files from the archive." HOMEPAGE = "http://www.gnu.org/software/tar/" SECTION = "base" LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" -SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ - file://CVE-2022-48303.patch \ -" +SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2" -SRC_URI[sha256sum] = "b44cc67f8a1f6b0250b7c860e952b37e8ed932a90bd9b1862a511079255646ff" +SRC_URI[sha256sum] = "7edb8886a3dc69420a1446e1e2d061922b642f1cf632d2cd0f9ee7e690775985" inherit autotools gettext texinfo
Signature · 1 line
2.34.1
PATCH 8/20 vim: update obsolete comment
In reply to Steve SakomanFrom: Etienne Cordonnier <[email protected]>
vim 8.3 has been out for a long time, so this comment is obsolete. However we still need UPSTREAM_VERSION_UNKNOWN, since we ignore the last digit of the upstream version number.
Test result:
$ devtool check-upgrade-status vim ... INFO: vim 9.0.1592 UNKNOWN Tom Rini <[email protected]> c0370529c027abc5b1698d53fcfb8c02a0c515da
(From OE-Core rev: 65f5de85c3f488136d1ec2b1f7fe8d8426d6c5b3)
--- meta/recipes-support/vim/vim.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
meta/recipes-support/vim/vim.inc +2 -3
@@ -22,11 +22,10 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ PV .= ".1592" SRCREV = "29b4c513b11deb37f0e0538df53d195f602fa42c" -# Remove when 8.3 is out -UPSTREAM_VERSION_UNKNOWN = "1" - # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0" +# Ignore that the upstream version .z in x.y.z is always newer +UPSTREAM_VERSION_UNKNOWN = "1" S = "${WORKDIR}/git"
Signature · 1 line
2.34.1
PATCH 9/20 vim: upgrade 9.0.1592 -> 9.0.1664
In reply to Steve SakomanFrom: Archana Polampalli <[email protected]>
Fixes:
https://nvd.nist.gov/vuln/detail/CVE-2023-38968154e642a (tag: v9.0.1664) patch 9.0.1664: divide by zero when scrolling with 'smoothscroll' set
--- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/vim/vim.inc +2 -2
@@ -19,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1592" -SRCREV = "29b4c513b11deb37f0e0538df53d195f602fa42c" +PV .= ".1664" +SRCREV = "8154e642aa476e1a5d3de66c34e8289845b2b797" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0"
Signature · 1 line
2.34.1
PATCH 10/20 vim: Upgrade 9.0.1664 -> 9.0.1894
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
This includes multiple CVE fixes.
The license change is due to changes in maintainership, the license itself is unchanged.
--- meta/recipes-support/vim/vim.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-support/vim/vim.inc +3 -3
@@ -10,7 +10,7 @@ DEPENDS = "ncurses gettext-native" RSUGGESTS:${PN} = "diffutils" LICENSE = "Vim" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d1a651ab770b45d41c0f8cb5a8ca930e" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \
@@ -19,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".1664" -SRCREV = "8154e642aa476e1a5d3de66c34e8289845b2b797" +PV .= ".1894" +SRCREV = "e5f7cd0a60d0eeab84f7aeb35c13d3af7e50072e" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+)\.0"
Signature · 1 line
2.34.1
PATCH 11/20 pseudo: Fix to work with glibc 2.38
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
This adds a horrible hack to get pseudo working with glibc 2.38. We can't drop _GNU_SOURCE to something like _DEFAULT_SOURCE since we need the defines the gnu options bring in. That leaves using internal glibc defines to disable the c23 versions of strtol/fscanf and friends. Which would break pseudo build with 2.38 from running on hosts with older glibc.
We'll probably need to come up with something better but this gets glibc 2.38 and working and avoids autobuilder failures.
--- .../pseudo/files/glibc238.patch | 72 +++++++++++++++++++ meta/recipes-devtools/pseudo/pseudo_git.bb | 1 + 2 files changed, 73 insertions(+) create mode 100644 meta/recipes-devtools/pseudo/files/glibc238.patch
meta/recipes-devtools/pseudo/files/glibc238.patch new file +72 -0
@@ -0,0 +1,72 @@ +glibc 2.38 would include __isoc23_strtol and similar symbols. This is trggerd by +_GNU_SOURCE but we have to set that for other definitions. Therefore play with defines +to turn this off within pseudo_wrappers.c. Elsewhere we can switch to _DEFAULT_SOURCE +rather than _GNU_SOURCE. + +Upstream-Status: Pending + +Index: git/pseudo_wrappers.c +=================================================================== +--- git.orig/pseudo_wrappers.c ++++ git/pseudo_wrappers.c +@@ -6,6 +6,15 @@ + * SPDX-License-Identifier: LGPL-2.1-only + * + */ ++/* glibc 2.38 would include __isoc23_strtol and similar symbols. This is trggerd by ++ * _GNU_SOURCE but we have to set that for other definitions. Therefore play with defines ++ * to turn this off. ++ */ ++#include <features.h> ++#undef __GLIBC_USE_ISOC2X ++#undef __GLIBC_USE_C2X_STRTOL ++#define __GLIBC_USE_C2X_STRTOL 0 ++ + #include <assert.h> + #include <stdlib.h> + #include <limits.h> +Index: git/pseudo_util.c +=================================================================== +--- git.orig/pseudo_util.c ++++ git/pseudo_util.c +@@ -8,6 +8,14 @@ + */ + /* we need access to RTLD_NEXT for a horrible workaround */ + #define _GNU_SOURCE ++/* glibc 2.38 would include __isoc23_strtol and similar symbols. This is trggerd by ++ * _GNU_SOURCE but we have to set that for other definitions. Therefore play with defines ++ * to turn this off. ++ */ ++#include <features.h> ++#undef __GLIBC_USE_ISOC2X ++#undef __GLIBC_USE_C2X_STRTOL ++#define __GLIBC_USE_C2X_STRTOL 0 + + #include <ctype.h> + #include <errno.h> +Index: git/pseudolog.c +=================================================================== +--- git.orig/pseudolog.c ++++ git/pseudolog.c +@@ -8,7 +8,7 @@ + */ + /* We need _XOPEN_SOURCE for strptime(), but if we define that, + * we then don't get S_IFSOCK... _GNU_SOURCE turns on everything. */ +-#define _GNU_SOURCE ++#define _DEFAULT_SOURCE + + #include <ctype.h> + #include <limits.h> +Index: git/pseudo_client.c +=================================================================== +--- git.orig/pseudo_client.c ++++ git/pseudo_client.c +@@ -6,7 +6,7 @@ + * SPDX-License-Identifier: LGPL-2.1-only + * + */ +-#define _GNU_SOURCE ++#define _DEFAULT_SOURCE + + #include <stdio.h> + #include <signal.h>
meta/recipes-devtools/pseudo/pseudo_git.bb +1 -0
@@ -2,6 +2,7 @@ require pseudo.inc SRC_URI = "git://git.yoctoproject.org/pseudo;branch=oe-core \ file://0001-configure-Prune-PIE-flags.patch \ + file://glibc238.patch \ file://fallback-passwd \ file://fallback-group \ "
Signature · 1 line
2.34.1
PATCH 12/20 externalsrc: fix dependency chain issues
In reply to Steve SakomanFrom: Peter Suti <[email protected]>
Instead of deleting setscene tasks, now SSTATE_SKIP_CREATION is set instead.
This seems to fix the compile issues where the populate_sysroot task was not run when an externalsrc recipe was built as a dependency.
[YOCTO #15164]
[RP addition: The deltask was added by me in 2012 when the class was created. The trouble is bitbake assumes 'sstate' tasks have a setscene task and by deleting the setscene task, bitbake stops thinking the task can be accelerated. There is other code in the sysroot code which assumes some tasks are always sstate tasks.
We cannot delete the task without changes to the way bitbake learns about 'setscene' tasks so the patch is correct, avoiding creating files is the better approach given the way the world works now.
There would be concerns about exisitng sstate reuse however this shouldn't occur since SRC_URI changes and that will change the underlying hashes. Hash equivalency could potentially cause issues by joining hashes together again however if the output matches, that shouldn't in theory cause any issue.]
--- meta/classes/externalsrc.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
meta/classes/externalsrc.bbclass +3 -4
@@ -76,6 +76,8 @@ python () { # Dummy value because the default function can't be called with blank SRC_URI d.setVar('SRCPV', '999') + # sstate is never going to work for external source trees, disable it + d.setVar('SSTATE_SKIP_CREATION', '1') if d.getVar('CONFIGUREOPT_DEPTRACK') == '--disable-dependency-tracking': d.setVar('CONFIGUREOPT_DEPTRACK', '')
@@ -83,10 +85,7 @@ python () { tasks = filter(lambda k: d.getVarFlag(k, "task"), d.keys()) for task in tasks: - if task.endswith("_setscene"): - # sstate is never going to work for external source trees, disable it - bb.build.deltask(task, d) - elif os.path.realpath(d.getVar('S')) == os.path.realpath(d.getVar('B')): + if os.path.realpath(d.getVar('S')) == os.path.realpath(d.getVar('B')): # Since configure will likely touch ${S}, ensure only we lock so one task has access at a time d.appendVarFlag(task, "lockfiles", " ${S}/singletask.lock")
Signature · 1 line
2.34.1
PATCH 13/20 scripts/create-pull-request: update URLs to git repositories
In reply to Steve SakomanFrom: Michael Opdenacker <[email protected]>
Also remove the git.pokylinux.org URL, no longer used.
--- scripts/create-pull-request | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
scripts/create-pull-request +2 -5
@@ -149,13 +149,10 @@ fi WEB_URL="" case "$REMOTE_URL" in *git.yoctoproject.org*) - WEB_URL="http://git.yoctoproject.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH" - ;; - *git.pokylinux.org*) - WEB_URL="http://git.pokylinux.org/cgit.cgi/$REMOTE_REPO/log/?h=$BRANCH" + WEB_URL="https://git.yoctoproject.org/$REMOTE_REPO/log/?h=$BRANCH" ;; *git.openembedded.org*) - WEB_URL="http://cgit.openembedded.org/$REMOTE_REPO/log/?h=$BRANCH" + WEB_URL="https://git.openembedded.org/$REMOTE_REPO/log/?h=$BRANCH" ;; *github.com*) WEB_URL="https://github.com/$REMOTE_REPO/tree/$BRANCH"
Signature · 1 line
2.34.1
PATCH 14/20 oeqa/utils/gitarchive: fix tag computation when creating archive
In reply to Steve SakomanFrom: Alexis Lothoré <[email protected]>
Sporadic errors have been observed in autobuilder when trying to store new tests results:
error: failed to push some refs to 'push.yoctoproject.org:yocto-testresults'
hint: Updates were rejected because the tag already exists in the remote.
The new tag name is generated by gitarchive based on known tags from the repository (learnt with git tag). In autobuilder case, this repository is a shallow clone, so git tag only returns most recent tags, which mean we could miss some older tags which exist in remote but not locally. In this case, gitarchive will likely create a tag which already exists in remote, and so will fail to push
Fix this tag duplication by using git ls-remote to learn about existing tags instead of git tag. Two places which wrongly read only local tags has been identified in gitarchive: expand_tag_strings and get_test_runs
Fixes [YOCTO #15140]
--- meta/lib/oeqa/utils/gitarchive.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
meta/lib/oeqa/utils/gitarchive.py +4 -2
@@ -116,7 +116,8 @@ def expand_tag_strings(repo, name_pattern, msg_subj_pattern, msg_body_pattern, tag_re = tag_re.format(tag_number='(?P<tag_number>[0-9]{1,5})') keyws['tag_number'] = 0 - for existing_tag in repo.run_cmd('tag').splitlines(): + tags_refs = repo.run_cmd(['ls-remote', '--refs', '--tags', '-q']) + for existing_tag in ["".join(d.split()[1].split('/', 2)[2:]) for d in tags_refs.splitlines()]: match = re.match(tag_re, existing_tag) if match and int(match.group('tag_number')) >= keyws['tag_number']:
@@ -181,7 +182,8 @@ def get_test_runs(log, repo, tag_name, **kwargs): # Get a list of all matching tags tag_pattern = tag_name.format(**str_fields) - tags = repo.run_cmd(['tag', '-l', tag_pattern]).splitlines() + revs = repo.run_cmd(['ls-remote', '--refs', '--tags', 'origin', '-q', tag_pattern]).splitlines() + tags = ["".join(d.split()[1].split('/', 2)[2:]) for d in revs] log.debug("Found %d tags matching pattern '%s'", len(tags), tag_pattern) # Parse undefined fields from tag names
Signature · 1 line
2.34.1
PATCH 15/20 resulttool/report: Avoid divide by zero
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
Avoid a divide by zero traceback if unfortunate test counts are encountered.
--- scripts/lib/resulttool/report.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
scripts/lib/resulttool/report.py +4 -1
@@ -176,7 +176,10 @@ class ResultsTextReport(object): vals['sort'] = line['testseries'] + "_" + line['result_id'] vals['failed_testcases'] = line['failed_testcases'] for k in cols: - vals[k] = "%d (%s%%)" % (line[k], format(line[k] / total_tested * 100, '.0f')) + if total_tested: + vals[k] = "%d (%s%%)" % (line[k], format(line[k] / total_tested * 100, '.0f')) + else: + vals[k] = "0 (0%)" for k in maxlen: if k in vals and len(vals[k]) > maxlen[k]: maxlen[k] = len(vals[k])
Signature · 1 line
2.34.1
PATCH 16/20 build-sysroots: Add SUMMARY field
In reply to Steve SakomanFrom: Khem Raj <[email protected]>
Fixes build QA warning about [missing-metadata]
--- meta/recipes-core/meta/build-sysroots.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/meta/build-sysroots.bb +2 -1
@@ -1,5 +1,6 @@ -INHIBIT_DEFAULT_DEPS = "1" LICENSE = "MIT" +SUMMARY = "Build old style sysroot based on everything in the components directory that matches the current MACHINE" +INHIBIT_DEFAULT_DEPS = "1" STANDALONE_SYSROOT = "${STAGING_DIR}/${MACHINE}" STANDALONE_SYSROOT_NATIVE = "${STAGING_DIR}/${BUILD_ARCH}"
Signature · 1 line
2.34.1
PATCH 17/20 wic: fix wrong attempt to create file system in upartitioned regions
In reply to Steve SakomanFrom: Markus Niebel <[email protected]>
The kickstart parser defaults fstype to "vfat". This leads to an attempt to create an empty file system even for regions configured with "--no-table" if used without fstype when no --sourceparams given.
The fix tests for fstype "none" or no_table in Partition prepare method. This will omit the file system creation an the potential error for small region with --no-table option.
--- scripts/lib/wic/partition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/lib/wic/partition.py +1 -1
@@ -132,7 +132,7 @@ class Partition(): self.update_fstab_in_rootfs = True if not self.source: - if self.fstype == "none": + if self.fstype == "none" or self.no_table: return if not self.size and not self.fixed_size: raise WicError("The %s partition has a size of zero. Please "
Signature · 1 line
2.34.1
PATCH 18/20 tcl: prevent installing another copy of tzdata
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
It checks build host filesystem and if it doesn't find UTC or GMT files it installs another copy of tzdata files in:/usr/lib/tcl8.6/tzdata
Buildhistory shows the difference:
-PKGSIZE = 2227075
+PKGSIZE = 3433088
See the autodetection in configure.in:
#------------------------------------------------------------------------
# Check whether the timezone data is supplied by the OS or has # to be installed by Tcl. The default is autodetection, but can # be overridden on the configure command line either way.
#------------------------------------------------------------------------
AC_MSG_CHECKING([for timezone data])
AC_ARG_WITH(tzdata,
AC_HELP_STRING([--with-tzdata],
[install timezone data (default: autodetect)]),
[tcl_ok=$withval], [tcl_ok=auto]) #
# Any directories that get added here must also be added to the
# search path in ::tcl::clock::Initialize (library/clock.tcl).
#
case $tcl_ok in
no)
AC_MSG_RESULT([supplied by OS vendor])
;;
yes)
# nothing to do here
;;
auto*)
AC_CACHE_VAL([tcl_cv_dir_zoneinfo], [
for dir in /usr/share/zoneinfo \
/usr/share/lib/zoneinfo \
/usr/lib/zoneinfo
do
if test -f $dir/UTC -o -f $dir/GMT
then
tcl_cv_dir_zoneinfo="$dir"
break
fi
done])
if test -n "$tcl_cv_dir_zoneinfo"; then
tcl_ok=no
AC_MSG_RESULT([$dir])
else
tcl_ok=yes
fi
;;
*)
AC_MSG_ERROR([invalid argument: $tcl_ok])
;;
esac
if test $tcl_ok = yes
then
AC_MSG_RESULT([supplied by Tcl])
INSTALL_TZDATA=install-tzdata
fi--- meta/recipes-devtools/tcltk/tcl_8.6.11.bb | 6 ++++++ 1 file changed, 6 insertions(+)
meta/recipes-devtools/tcltk/tcl_8.6.11.bb +6 -0
@@ -44,6 +44,12 @@ inherit autotools ptest binconfig AUTOTOOLS_SCRIPT_PATH = "${S}/unix" EXTRA_OECONF = "--enable-threads --disable-rpath --enable-man-suffix" +# Prevent installing copy of tzdata based on tzdata installation on the build host +# It doesn't install tzdata if one of the following files exist on the host: +# /usr/share/zoneinfo/UTC /usr/share/zoneinfo/GMT /usr/share/lib/zoneinfo/UTC /usr/share/lib/zoneinfo/GMT /usr/lib/zoneinfo/UTC /usr/lib/zoneinfo/GMT +# otherwise "/usr/lib/tcl8.6/tzdata" is included in tcl package +EXTRA_OECONF += "--with-tzdata=no" + do_install() { autotools_do_install oe_runmake 'DESTDIR=${D}' install-private-headers
Signature · 1 line
2.34.1
PATCH 19/20 dbus: Specify runstatedir configure option
In reply to Steve SakomanFrom: Pavel Zhukov <[email protected]>
Without specifing runstatedir tmpfiles.d is configured to use /var/run for dbus and this causes deprecation warnings in system logs.
--- meta/recipes-core/dbus/dbus_1.14.8.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/dbus/dbus_1.14.8.bb +2 -1
@@ -25,6 +25,7 @@ EXTRA_OECONF = "--disable-xml-docs \ --enable-tests \ --enable-checks \ --enable-asserts \ + --runstatedir=/run \ " EXTRA_OECONF:append:class-target = " SYSTEMCTL=${base_bindir}/systemctl"
@@ -132,7 +133,7 @@ do_install() { sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 install -d ${D}${sysconfdir}/default/volatiles - echo "d messagebus messagebus 0755 ${localstatedir}/run/dbus none" \ + echo "d messagebus messagebus 0755 /run/dbus none" \ > ${D}${sysconfdir}/default/volatiles/99_dbus fi
Signature · 1 line
2.34.1
PATCH 20/20 cargo.bbclass: set up cargo environment in common do_compile
In reply to Steve SakomanFrom: Alexander Kanavin <[email protected]>
cargo_do_compile runs only if the recipe is built using cargo as the top level tool. Some recipes hide usage of cargo inside setuptools (or autoconf) and use do_compile definitions specific to those, and so the environment isn't properly set up.
This was exposed by latest versions of python3-cryptography.
--- meta/classes/cargo.bbclass | 1 - meta/classes/cargo_common.bbclass | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-)
meta/classes/cargo.bbclass +0 -1
@@ -49,7 +49,6 @@ oe_cargo_build () { do_compile[progress] = "outof:\s+(\d+)/(\d+)" cargo_do_compile () { - oe_cargo_fix_env oe_cargo_build }
meta/classes/cargo_common.bbclass +4 -0
@@ -101,6 +101,10 @@ cargo_common_do_configure () { EOF } +do_compile:prepend () { + oe_cargo_fix_env +} + oe_cargo_fix_env () { export CC="${RUST_TARGET_CC}" export CXX="${RUST_TARGET_CXX}"
Signature · 1 line
2.34.1
Re: [kirkstone 02/20] cups: fix CVE-2023-32360
In reply to Steve SakomanHi Steve and oe-core
Just noticed issues with cups, and can see the problem in this patch.
++ AuthType Defaul
should have been
++ AuthType Default
We are missing a "t" in the end.
Will send a patch - but I might first have time later this week, and it don't know if it is needed for 4.0.13
Regards
Claus