Patch review
cover Patch review
Please review this set of changes for kirkstone and have comments back by end of day Friday, October 11
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/7379
The following changes since commit 3b646f322b4ffd5ed520f3815ce0726cf225ced2:
populate_sdk_base: inherit nopackages (2024-10-01 15:29:08 -0700)
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
Martin Jansa (2):
meta-world-pkgdata: Inherit nopackages
cdrtools-native: fix build with gcc-14
Massimiliano Minella (1):
zstd: fix LICENSE statement
Peter Marko (1):
rust: ignore CVE-2024-43402
Vijay Anusuri (1):
cups: Backport fix for CVE-2024-47175
meta/recipes-core/meta/meta-world-pkgdata.bb | 1 + .../cdrtools/cdrtools-native_3.01.bb | 6 +- meta/recipes-devtools/rust/rust-source.inc | 4 +- meta/recipes-extended/cups/cups.inc | 5 + .../cups/cups/CVE-2024-47175-1.patch | 73 +++++ .../cups/cups/CVE-2024-47175-2.patch | 148 +++++++++++ .../cups/cups/CVE-2024-47175-3.patch | 116 ++++++++ .../cups/cups/CVE-2024-47175-4.patch | 249 ++++++++++++++++++ .../cups/cups/CVE-2024-47175-5.patch | 37 +++ meta/recipes-extended/zstd/zstd_1.5.2.bb | 2 +- 10 files changed, 637 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-1.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-2.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-3.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-4.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-5.patch
Signature · 1 line
2.34.1
PATCH 1/5 cups: Backport fix for CVE-2024-47175
From: Vijay Anusuri <[email protected]>
Upstream-Status: Backport from
https://github.com/OpenPrinting/cups/commit/9939a70b750edd9d05270060cc5cf62ca98cfbe5
&
https://github.com/OpenPrinting/cups/commit/04bb2af4521b56c1699a2c2431c56c05a7102e69
&
https://github.com/OpenPrinting/cups/commit/e0630cd18f76340d302000f2bf6516e99602b844
&
https://github.com/OpenPrinting/cups/commit/1e6ca5913eceee906038bc04cc7ccfbe2923bdfd
& https://github.com/OpenPrinting/cups/commit/2abe1ba8a66864aa82cd9836b37e57103b8e1a3b
Reference: https://security-tracker.debian.org/tracker/CVE-2024-47175
--- meta/recipes-extended/cups/cups.inc | 5 + .../cups/cups/CVE-2024-47175-1.patch | 73 +++++ .../cups/cups/CVE-2024-47175-2.patch | 148 +++++++++++ .../cups/cups/CVE-2024-47175-3.patch | 116 ++++++++ .../cups/cups/CVE-2024-47175-4.patch | 249 ++++++++++++++++++ .../cups/cups/CVE-2024-47175-5.patch | 37 +++ 6 files changed, 628 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-1.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-2.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-3.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-4.patch create mode 100644 meta/recipes-extended/cups/cups/CVE-2024-47175-5.patch
meta/recipes-extended/cups/cups.inc +5 -0
@@ -20,6 +20,11 @@ SRC_URI = "https://github.com/OpenPrinting/cups/releases/download/v${PV}/cups-${ file://CVE-2023-32360.patch \ file://CVE-2023-4504.patch \ file://CVE-2024-35235.patch \ + file://CVE-2024-47175-1.patch \ + file://CVE-2024-47175-2.patch \ + file://CVE-2024-47175-3.patch \ + file://CVE-2024-47175-4.patch \ + file://CVE-2024-47175-5.patch \ " UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups/releases"
meta/recipes-extended/cups/cups/CVE-2024-47175-1.patch new file +73 -0
73 lines not on this page · raw message
meta/recipes-extended/cups/cups/CVE-2024-47175-2.patch new file +148 -0
148 lines not on this page · raw message
meta/recipes-extended/cups/cups/CVE-2024-47175-3.patch new file +116 -0
116 lines not on this page · raw message
meta/recipes-extended/cups/cups/CVE-2024-47175-4.patch new file +249 -0
249 lines not on this page · raw message
meta/recipes-extended/cups/cups/CVE-2024-47175-5.patch new file +37 -0
@@ -0,0 +1,37 @@ +From 2abe1ba8a66864aa82cd9836b37e57103b8e1a3b Mon Sep 17 00:00:00 2001 +From: Michael R Sweet <[email protected]> +Date: Mon, 23 Sep 2024 10:11:31 -0400 +Subject: [PATCH] Fix warnings for unused vars. + +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/2abe1ba8a66864aa82cd9836b37e57103b8e1a3b] +CVE: CVE-2024-47175 +Signed-off-by: Vijay Anusuri <[email protected]> +--- + cups/ppd-cache.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/cups/ppd-cache.c b/cups/ppd-cache.c +index 85ede0f18..a6163a0e1 100644 +--- a/cups/ppd-cache.c ++++ b/cups/ppd-cache.c +@@ -3222,8 +3222,7 @@ _ppdCreateFromIPP2( + int have_qdraft = 0,/* Have draft quality? */ + have_qhigh = 0; /* Have high quality? */ + char msgid[256]; /* Message identifier (attr.value) */ +- const char *keyword, /* Keyword value */ +- *msgstr; /* Localized string */ ++ const char *keyword; /* Keyword value */ + cups_array_t *strings = NULL;/* Printer strings file */ + struct lconv *loc = localeconv(); + /* Locale data */ +@@ -5009,9 +5008,8 @@ _ppdCreateFromIPP2( + { + ipp_t *preset = ippGetCollection(attr, i); + /* Preset collection */ +- const char *preset_name = ippGetString(ippFindAttribute(preset, "preset-name", IPP_TAG_ZERO), 0, NULL), ++ const char *preset_name = ippGetString(ippFindAttribute(preset, "preset-name", IPP_TAG_ZERO), 0, NULL); + /* Preset name */ +- *localized_name; /* Localized preset name */ + ipp_attribute_t *member; /* Member attribute in preset */ + const char *member_name; /* Member attribute name */ + char member_value[256]; /* Member attribute value */
Signature · 1 line
2.34.1
PATCH 2/5 rust: ignore CVE-2024-43402
In reply to Steve SakomanFrom: Peter Marko <[email protected]>
This CVE iwas created because fix for CVE-2024-24576 was incomplete. Ignore the new CVE in the same way as the old one.
See https://nvd.nist.gov/vuln/detail/CVE-2024-43402
--- meta/recipes-devtools/rust/rust-source.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/rust/rust-source.inc +2 -2
@@ -6,5 +6,5 @@ RUSTSRC = "${WORKDIR}/rustc-${PV}-src" UPSTREAM_CHECK_URI = "https://forge.rust-lang.org/infra/other-installation-methods.html" UPSTREAM_CHECK_REGEX = "rustc-(?P<pver>\d+(\.\d+)+)-src" -#CVE-2024-24576 is specific to Microsoft Windows -CVE_CHECK_IGNORE += "CVE-2024-24576" +# These CVEs are specific to Microsoft Windows +CVE_CHECK_IGNORE += "CVE-2024-24576 CVE-2024-43402"
Signature · 1 line
2.34.1
PATCH 3/5 meta-world-pkgdata: Inherit nopackages
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
Since this is a recipe with PACKAGES = "", inherit the nopackages class to skip the various packaging functions which wouldn't do anything anyway.
This fixes errors from buildhistory changes where packages-split would be empty.
--- meta/recipes-core/meta/meta-world-pkgdata.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-core/meta/meta-world-pkgdata.bb +1 -0
@@ -27,6 +27,7 @@ python do_collect_packagedata() { oe.copy_buildsystem.generate_locked_sigs(sigfile, d) } +inherit nopackages deltask do_fetch deltask do_unpack deltask do_patch
Signature · 1 line
2.34.1
PATCH 4/5 cdrtools-native: fix build with gcc-14
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
Fixes:
http://errors.yoctoproject.org/Errors/Details/770525/
| checking whether the C compiler (gcc -isystem/OE/build/oe-core/tmp-glibc/work/x86_64-linux/cdrtools-native/3.01/recipe-sysroot-native/usr/include -O2 -pipe ) works... no | configure: error: installation or configuration problem: C compiler cannot create executables. | RULES/rules.cnf:70: incs/amd-ryzen-threadripper-3970x-32-core-processor-linux-cc/rules.cnf: No such file or directory | make: *** [RULES/rules.cnf:59: incs/amd-ryzen-threadripper-3970x-32-core-processor-linux-cc/rules.cnf] Error 1 | make: *** Waiting for unfinished jobs....
where config.log show it's caused by gcc-14:
configure:1189: checking whether the C compiler (gcc -isystem/OE/build/oe-core/tmp-glibc/work/x86_64-linux/cdrtools-native/3.01/recipe-sysroot-native/usr/include -O2 -pipe ) works
configure:1211: gcc -o conftest -isystem/OE/build/oe-core/tmp-glibc/work/x86_64-linux/cdrtools-native/3.01/recipe-sysroot-native/usr/include -O2 -pipe -D_GNU_SOURCE conftest.c 1>&5
configure:1208:1: error: return type defaults to 'int' [-Wimplicit-int]
configure: failed program was:
main(){return(0);}
--- meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
meta/recipes-devtools/cdrtools/cdrtools-native_3.01.bb +5 -1
@@ -16,13 +16,17 @@ SRC_URI = " \ SRC_URI[md5sum] = "7d45c5b7e1f78d85d1583b361aee6e8b" SRC_URI[sha256sum] = "ed282eb6276c4154ce6a0b5dee0bdb81940d0cbbfc7d03f769c4735ef5f5860f" -EXTRA_OEMAKE = "-e MAKEFLAGS=" +EXTRA_OEMAKE = "-e MAKEFLAGS= CPPOPTX='${CPPFLAGS}' COPTX='${CFLAGS}' C++OPTX='${CXXFLAGS}' LDOPTX='${LDFLAGS}' GMAKE_NOWARN='true'" # Stop failures when 'cc' can't be found export ac_cv_prog_CC = "${CC}" inherit native +# Use -std=gnu89 to build with gcc-14 (https://bugs.gentoo.org/903876) +# this needs to be after native inherit (which sets CFLAGS to BUILD_CFLAGS) +CFLAGS += "-std=gnu89" + do_install() { make install GMAKE_NOWARN=true INS_BASE=${prefix} DESTDIR=${D} }
Signature · 1 line
2.34.1
PATCH 5/5 zstd: fix LICENSE statement
In reply to Steve SakomanFrom: Massimiliano Minella <[email protected]>
[Backport from OE-Core: 40f85de590c188c9c3985e64a83efaf06b0b4fbc]
zstd is dual-licensed under BSD _OR_ GPLv2 which was updated in the README for v1.5.6. License wording in the README for v1.5.2 is misleading, but license headers in the code clearly state that there is a choice between the two licenses.
--- meta/recipes-extended/zstd/zstd_1.5.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/zstd/zstd_1.5.2.bb +1 -1
@@ -5,7 +5,7 @@ It's backed by a very fast entropy stage, provided by Huff0 and FSE library." HOMEPAGE = "http://www.zstd.net/" SECTION = "console/utils" -LICENSE = "BSD-3-Clause & GPL-2.0-only" +LICENSE = "BSD-3-Clause | GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=c7f0b161edbe52f5f345a3d1311d0b32 \ file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0"
Signature · 1 line
2.34.1