Patch review
cover Patch review
Please review this set of changes for scarthgap and have comments back by end of day Monday, September 29
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/valkyrie/#/builders/29/builds/2436
The following changes since commit 4cf131ebd157b79226533b5a5074691dd0e1a4ab:
buildtools-tarball: fix unbound variable issues under 'set -u' (2025-09-17 09:32:52 -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
Adrian Freihofer (2):
llvm: update from 18.1.6 to 18.1.8
llvm: fix build with gcc-15
AshishKumar Mishra (2):
systemd: backport fix for handle USE_NLS from master
p11-kit: backport fix for handle USE_NLS from master
Chris Laplante (1):
util-linux: use ${B} instead of ${WORKDIR}/build, to fix building
under devtool
Martin Jansa (2):
sanity.conf: Update minimum bitbake version to 2.8.1 lib/oe/utils: use multiprocessing from bb
Nitin Wankhade (1):
examples: genl: fix wrong attribute size
Philip Lorenz (1):
shared-mime-info: Handle USE_NLS
Ross Burton (1):
libxslt: apply patch for CVE-2025-7424
Yogita Urade (1):
curl: fix CVE-2025-9086
meta/conf/sanity.conf | 2 +-
meta/lib/oe/utils.py | 3 +-
meta/recipes-core/systemd/systemd_255.21.bb | 1 +
.../util-linux/util-linux_2.39.3.bb | 2 +-
...36-Add-cstdint-to-SmallVector-101761.patch | 28 +++++
...cstdint-in-AMDGPUMCTargetDesc-101766.patch | 23 ++++
...-include-to-X86MCTargetDesc.h-123320.patch | 32 ++++++
.../llvm/{llvm_18.1.6.bb => llvm_18.1.8.bb} | 5 +-
...amples-genl-fix-wrong-attribute-size.patch | 44 ++++++++
meta/recipes-extended/libmnl/libmnl_1.0.5.bb | 5 +-
.../curl/curl/CVE-2025-9086.patch | 55 ++++++++++
meta/recipes-support/curl/curl_8.7.1.bb | 1 +
.../gnome-libxslt-bug-139-apple-fix.diff | 103 ++++++++++++++++++
.../recipes-support/libxslt/libxslt_1.1.43.bb | 3 +-
.../recipes-support/p11-kit/p11-kit_0.25.3.bb | 1 +
.../shared-mime-info/shared-mime-info_2.4.bb | 5 +-
16 files changed, 306 insertions(+), 7 deletions(-)
create mode 100644 meta/recipes-devtools/llvm/llvm/0036-Add-cstdint-to-SmallVector-101761.patch
create mode 100644 meta/recipes-devtools/llvm/llvm/0037-Include-cstdint-in-AMDGPUMCTargetDesc-101766.patch
create mode 100644 meta/recipes-devtools/llvm/llvm/0038-Add-missing-include-to-X86MCTargetDesc.h-123320.patch
rename meta/recipes-devtools/llvm/{llvm_18.1.6.bb => llvm_18.1.8.bb} (94%)
create mode 100644 meta/recipes-extended/libmnl/files/0001-examples-genl-fix-wrong-attribute-size.patch
create mode 100644 meta/recipes-support/curl/curl/CVE-2025-9086.patch
create mode 100644 meta/recipes-support/libxslt/files/gnome-libxslt-bug-139-apple-fix.diffSignature · 1 line
2.43.0
PATCH 1/11 libxslt: apply patch for CVE-2025-7424
From: Ross Burton <[email protected]>
This patch is taken from the upstream bug, and is used by Apple in their build of WebKit.
--- .../gnome-libxslt-bug-139-apple-fix.diff | 103 ++++++++++++++++++ .../recipes-support/libxslt/libxslt_1.1.43.bb | 3 +- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libxslt/files/gnome-libxslt-bug-139-apple-fix.diff
meta/recipes-support/libxslt/files/gnome-libxslt-bug-139-apple-fix.diff new file +103 -0
@@ -0,0 +1,103 @@ +From 345d6826d0eae6f0a962456b8ed6f6a1bad0877d Mon Sep 17 00:00:00 2001 +From: David Kilzer <[email protected]> +Date: Sat, 24 May 2025 15:06:42 -0700 +Subject: [PATCH] libxslt: Type confusion in xmlNode.psvi between stylesheet + and source nodes + +* libxslt/functions.c: +(xsltDocumentFunctionLoadDocument): +- Implement fix suggested by Ivan Fratric. This copies the xmlDoc, + calls xsltCleanupSourceDoc() to remove pvsi fields, then adds the + xmlDoc to tctxt->docList. +- Add error handling for functions that may return NULL. +* libxslt/transform.c: +- Remove static keyword so this can be called from + xsltDocumentFunctionLoadDocument(). +* libxslt/transformInternals.h: Add. +(xsltCleanupSourceDoc): Add declaration. + +Fixes #139. + +CVE: CVE-2025-7424 +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libxslt/-/issues/139] +Signed-off-by: Ross Burton <[email protected]> +--- + libxslt/functions.c | 16 +++++++++++++++- + libxslt/transform.c | 3 ++- + libxslt/transformInternals.h | 9 +++++++++ + 3 files changed, 26 insertions(+), 2 deletions(-) + create mode 100644 libxslt/transformInternals.h + +diff --git a/libxslt/functions.c b/libxslt/functions.c +index 72a58dc4..11ec039f 100644 +--- a/libxslt/functions.c ++++ b/libxslt/functions.c +@@ -34,6 +34,7 @@ + #include "numbersInternals.h" + #include "keys.h" + #include "documents.h" ++#include "transformInternals.h" + + #ifdef WITH_XSLT_DEBUG + #define WITH_XSLT_DEBUG_FUNCTION +@@ -125,7 +126,20 @@ xsltDocumentFunctionLoadDocument(xmlXPathParserContextPtr ctxt, + /* + * This selects the stylesheet's doc itself. + */ +- doc = tctxt->style->doc; ++ doc = xmlCopyDoc(tctxt->style->doc, 1); ++ if (doc == NULL) { ++ xsltTransformError(tctxt, NULL, NULL, ++ "document() : failed to copy style doc\n"); ++ goto out_fragment; ++ } ++ xsltCleanupSourceDoc(doc); /* Remove psvi fields. */ ++ idoc = xsltNewDocument(tctxt, doc); ++ if (idoc == NULL) { ++ xsltTransformError(tctxt, NULL, NULL, ++ "document() : failed to create xsltDocument\n"); ++ xmlFreeDoc(doc); ++ goto out_fragment; ++ } + } else { + goto out_fragment; + } +diff --git a/libxslt/transform.c b/libxslt/transform.c +index 54ef821b..38c2dce6 100644 +--- a/libxslt/transform.c ++++ b/libxslt/transform.c +@@ -43,6 +43,7 @@ + #include "xsltlocale.h" + #include "pattern.h" + #include "transform.h" ++#include "transformInternals.h" + #include "variables.h" + #include "numbersInternals.h" + #include "namespaces.h" +@@ -5757,7 +5758,7 @@ xsltCountKeys(xsltTransformContextPtr ctxt) + * + * Resets source node flags and ids stored in 'psvi' member. + */ +-static void ++void + xsltCleanupSourceDoc(xmlDocPtr doc) { + xmlNodePtr cur = (xmlNodePtr) doc; + void **psviPtr; +diff --git a/libxslt/transformInternals.h b/libxslt/transformInternals.h +new file mode 100644 +index 00000000..d0f42823 +--- /dev/null ++++ b/libxslt/transformInternals.h +@@ -0,0 +1,9 @@ ++/* ++ * Summary: set of internal interfaces for the XSLT engine transformation part. ++ * ++ * Copy: See Copyright for the status of this software. ++ * ++ * Author: David Kilzer <[email protected]> ++ */ ++ ++void xsltCleanupSourceDoc(xmlDocPtr doc); +-- +2.39.5 (Apple Git-154) +
meta/recipes-support/libxslt/libxslt_1.1.43.bb +2 -1
@@ -13,7 +13,8 @@ LIC_FILES_CHKSUM = "file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458" SECTION = "libs" DEPENDS = "libxml2" -SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz" +SRC_URI = "https://download.gnome.org/sources/libxslt/1.1/libxslt-${PV}.tar.xz \ + file://gnome-libxslt-bug-139-apple-fix.diff" SRC_URI[sha256sum] = "5a3d6b383ca5afc235b171118e90f5ff6aa27e9fea3303065231a6d403f0183a"
Signature · 1 line
2.43.0
PATCH 2/11 curl: fix CVE-2025-9086
In reply to Steve SakomanFrom: Yogita Urade <[email protected]>
1, A cookie is set using the secure keyword for https://target
2, curl is redirected to or otherwise made to speak with http://target
(same hostname, but using clear text HTTP) using the same cookie set 3, The same cookie name is set - but with just a slash as path (path="/"). Since this site is not secure, the cookie should just be ignored.
4, A bug in the path comparison logic makes curl read outside a heap buffer boundary
The bug either causes a crash or it potentially makes the comparison come to the wrong conclusion and lets the clear-text site override the contents of the secure cookie, contrary to expectations and depending on the memory contents immediately following the single-byte allocation that holds the path.
The presumed and correct behavior would be to plainly ignore the second set of the cookie since it was already set as secure on a secure host so overriding it on an insecure host should not be okay.
Reference:
https://nvd.nist.gov/vuln/detail/CVE-2025-9086
Upstream patch:
https://github.com/curl/curl/commit/c6ae07c6a541e0e96d0040afb6
--- .../curl/curl/CVE-2025-9086.patch | 55 +++++++++++++++++++ meta/recipes-support/curl/curl_8.7.1.bb | 1 + 2 files changed, 56 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2025-9086.patch
meta/recipes-support/curl/curl/CVE-2025-9086.patch new file +55 -0
@@ -0,0 +1,55 @@ +From c6ae07c6a541e0e96d0040afb62b45dd37711300 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg <[email protected]> +Date: Mon, 11 Aug 2025 20:23:05 +0200 +Subject: [PATCH] cookie: don't treat the leading slash as trailing + +If there is only a leading slash in the path, keep that. Also add an +assert to make sure the path is never blank. + +Reported-by: Google Big Sleep +Closes #18266 + +CVE: CVE-2025-9086 +Upstream-Status: Backport [https://github.com/curl/curl/commit/c6ae07c6a541e0e96d0040afb6] + +Signed-off-by: Yogita Urade <[email protected]> +--- + lib/cookie.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/lib/cookie.c b/lib/cookie.c +index c1ed291..67494d2 100644 +--- a/lib/cookie.c ++++ b/lib/cookie.c +@@ -316,7 +316,7 @@ static char *sanitize_cookie_path(const char *cookie_path) + } + + /* convert /hoge/ to /hoge */ +- if(len && new_path[len - 1] == '/') { ++ if(len > 1 && new_path[len - 1] == '/') { + new_path[len - 1] = 0x0; + } + +@@ -1074,7 +1074,7 @@ Curl_cookie_add(struct Curl_easy *data, + clist->spath && co->spath && /* both have paths */ + clist->secure && !co->secure && !secure) { + size_t cllen; +- const char *sep; ++ const char *sep = NULL; + + /* + * A non-secure cookie may not overlay an existing secure cookie. +@@ -1083,8 +1083,9 @@ Curl_cookie_add(struct Curl_easy *data, + * "/loginhelper" is ok. + */ + +- sep = strchr(clist->spath + 1, '/'); +- ++ DEBUGASSERT(clist->spath[0]); ++ if(clist->spath[0]) ++ sep = strchr(clist->spath + 1, '/'); + if(sep) + cllen = sep - clist->spath; + else +-- +2.40.0
meta/recipes-support/curl/curl_8.7.1.bb +1 -0
@@ -24,6 +24,7 @@ SRC_URI = " \ file://CVE-2024-11053-0002.patch \ file://CVE-2024-11053-0003.patch \ file://CVE-2025-0167.patch \ + file://CVE-2025-9086.patch \ " SRC_URI:append:class-nativesdk = " \
Signature · 1 line
2.43.0
PATCH 3/11 llvm: update from 18.1.6 to 18.1.8
In reply to Steve SakomanFrom: Adrian Freihofer <[email protected]>
---
meta/recipes-devtools/llvm/{llvm_18.1.6.bb => llvm_18.1.8.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/llvm/{llvm_18.1.6.bb => llvm_18.1.8.bb} (98%)meta/recipes-devtools/llvm/llvm_18.1.8.bb renamed from meta/recipes-devtools/llvm/llvm_18.1.6.bb +1 -1
@@ -28,7 +28,7 @@ SRC_URI = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/ file://0002-llvm-Fix-CVE-2024-0151.patch;striplevel=2 \ file://llvm-config \ " -SRC_URI[sha256sum] = "bd4b4cb6374bcd5fc5a3ba60cb80425d29da34f316b8821abc12c0db225cf6b4" +SRC_URI[sha256sum] = "0b58557a6d32ceee97c8d533a59b9212d87e0fc4d2833924eb6c611247db2f2a" UPSTREAM_CHECK_URI = "https://github.com/llvm/llvm-project" UPSTREAM_CHECK_REGEX = "llvmorg-(?P<pver>\d+(\.\d+)+)"
Signature · 1 line
2.43.0
PATCH 4/11 llvm: fix build with gcc-15
In reply to Steve SakomanFrom: Adrian Freihofer <[email protected]>
Pick 3 patches from meta-clang's scartsgap branch to fix build with gcc-15. These patches are already in upstream llvm but not in 18.1.8 release.
Note: the patch 0039-Fix-build-with-GCC-15.patch from meta-clang is not needed as it targets lldb which we do not build.
--- ...36-Add-cstdint-to-SmallVector-101761.patch | 28 ++++++++++++++++ ...cstdint-in-AMDGPUMCTargetDesc-101766.patch | 23 +++++++++++++ ...-include-to-X86MCTargetDesc.h-123320.patch | 32 +++++++++++++++++++ meta/recipes-devtools/llvm/llvm_18.1.8.bb | 3 ++ 4 files changed, 86 insertions(+) create mode 100644 meta/recipes-devtools/llvm/llvm/0036-Add-cstdint-to-SmallVector-101761.patch create mode 100644 meta/recipes-devtools/llvm/llvm/0037-Include-cstdint-in-AMDGPUMCTargetDesc-101766.patch create mode 100644 meta/recipes-devtools/llvm/llvm/0038-Add-missing-include-to-X86MCTargetDesc.h-123320.patch
meta/recipes-devtools/llvm/llvm/0036-Add-cstdint-to-SmallVector-101761.patch new file +28 -0
@@ -0,0 +1,28 @@ +From 9c9071480edd4093b28a9e9a9980c2426d27344c Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] Add `<cstdint>` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `<cstdint>` +which fails to build w/ GCC 15 after a change in libstdc++ [0] + +[0] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3a817a4a5a6d94da9127af3be9f84a74e3076ee2 + +Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/7e44305041d96b064c197216b931ae3917a34ac1] +Signed-off-by: Martin Jansa <[email protected]> +--- + llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h +index 09676d792..17444147b 100644 +--- a/llvm/include/llvm/ADT/SmallVector.h ++++ b/llvm/include/llvm/ADT/SmallVector.h +@@ -19,6 +19,7 @@ + #include <algorithm> + #include <cassert> + #include <cstddef> ++#include <cstdint> + #include <cstdlib> + #include <cstring> + #include <functional>
meta/recipes-devtools/llvm/llvm/0037-Include-cstdint-in-AMDGPUMCTargetDesc-101766.patch new file +23 -0
@@ -0,0 +1,23 @@ +From 422390b31680305ce6babcfbf65579b7dbe090a5 Mon Sep 17 00:00:00 2001 +From: Sam James <[email protected]> +Date: Sat, 3 Aug 2024 06:36:43 +0100 +Subject: [PATCH] Include `<cstdint>` in AMDGPUMCTargetDesc (#101766) + +Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/8f39502b85d34998752193e85f36c408d3c99248] +Signed-off-by: Martin Jansa <[email protected]> +--- + llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f757..879dbe1b2 100644 +--- a/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h ++++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +@@ -15,6 +15,7 @@ + #ifndef LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H + #define LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H + ++#include <cstdint> + #include <memory> + + namespace llvm {
meta/recipes-devtools/llvm/llvm/0038-Add-missing-include-to-X86MCTargetDesc.h-123320.patch new file +32 -0
@@ -0,0 +1,32 @@ +From 72dc74c42eb9d9940b36c6804a4e4ac757370324 Mon Sep 17 00:00:00 2001 +From: Stephan Hageboeck <[email protected]> +Date: Mon, 20 Jan 2025 17:52:47 +0100 +Subject: [PATCH] Add missing include to X86MCTargetDesc.h (#123320) + +In gcc-15, explicit includes of `<cstdint>` are required when fixed-size +integers are used. In this file, this include only happened as a side +effect of including SmallVector.h + +Although llvm compiles fine, the root-project would benefit from +explicitly including it here, so we can backport the patch. + +Maybe interesting for @hahnjo and @vgvassilev + +Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/7abf44069aec61eee147ca67a6333fc34583b524] +Signed-off-by: Martin Jansa <[email protected]> +--- + llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h +index 437a7bd6f..fd7d79484 100644 +--- a/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h ++++ b/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h +@@ -13,6 +13,7 @@ + #ifndef LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H + #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H + ++#include <cstdint> + #include <memory> + #include <string> +
meta/recipes-devtools/llvm/llvm_18.1.8.bb +3 -0
@@ -26,6 +26,9 @@ SRC_URI = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/ file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \ file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \ file://0002-llvm-Fix-CVE-2024-0151.patch;striplevel=2 \ + file://0036-Add-cstdint-to-SmallVector-101761.patch;striplevel=2 \ + file://0037-Include-cstdint-in-AMDGPUMCTargetDesc-101766.patch;striplevel=2 \ + file://0038-Add-missing-include-to-X86MCTargetDesc.h-123320.patch;striplevel=2 \ file://llvm-config \ " SRC_URI[sha256sum] = "0b58557a6d32ceee97c8d533a59b9212d87e0fc4d2833924eb6c611247db2f2a"
Signature · 1 line
2.43.0
PATCH 5/11 sanity.conf: Update minimum bitbake version to 2.8.1
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
Needed for multiprocessing module in bb used in the next commit.
It was added to bitbake in 62be9113d98fccb347c6aa0a10d5c4ee2857f8b6 which was backported to 2.8 branch and tagged as 2.8.1
--- meta/conf/sanity.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/sanity.conf +1 -1
@@ -3,7 +3,7 @@ # See sanity.bbclass # # Expert users can confirm their sanity with "touch conf/sanity.conf" -BB_MIN_VERSION = "2.7.3" +BB_MIN_VERSION = "2.8.1" SANITY_ABIFILE = "${TMPDIR}/abi_version"
Signature · 1 line
2.43.0
PATCH 6/11 lib/oe/utils: use multiprocessing from bb
In reply to Steve SakomanFrom: Martin Jansa <[email protected]>
Fixes build with python-3.14
It was added to bitbake in 62be9113d98fccb347c6aa0a10d5c4ee2857f8b6 and oe-core now requires latest bitbake already, so we can use this.
[YOCTO #15858]
--- meta/lib/oe/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/lib/oe/utils.py +2 -1
@@ -5,10 +5,11 @@ # import subprocess -import multiprocessing import traceback import errno +from bb import multiprocessing + def read_file(filename): try: f = open( filename, "r" )
Signature · 1 line
2.43.0
PATCH 7/11 systemd: backport fix for handle USE_NLS from master
In reply to Steve SakomanFrom: AshishKumar Mishra <[email protected]>
Do not build translations when NLS is disabled. (From OE-Core rev: 83795ef6c3fa12a863cd20b7ec1a2607606987b6)
This change corresponds to upstream d848b454e64ffbd642590b4bbc378619e1547ad3 from master .
Since the systemd version are different between master & scarthgap applied the patch manually
--- meta/recipes-core/systemd/systemd_255.21.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-core/systemd/systemd_255.21.bb +1 -0
@@ -247,6 +247,7 @@ EXTRA_OEMESON += "-Dnobody-user=nobody \ -Dmode=release \ -Dsystem-alloc-uid-min=101 \ -Dsystem-uid-max=999 \ + -Dtranslations=${@'false' if d.getVar('USE_NLS') == 'no' else 'true'} \ -Dsystem-alloc-gid-min=101 \ -Dsystem-gid-max=999 \ ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', '-Ddefault-mdns=no -Ddefault-llmnr=no', '', d)} \
Signature · 1 line
2.43.0
PATCH 8/11 shared-mime-info: Handle USE_NLS
In reply to Steve SakomanFrom: Philip Lorenz <[email protected]>
Skip building of translations when NLS is disabled.
(From OE-Core rev: b58a3f4e9c78522423a94821b7ba7a35eb18f75a)
--- .../recipes-support/shared-mime-info/shared-mime-info_2.4.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-support/shared-mime-info/shared-mime-info_2.4.bb +4 -1
@@ -17,7 +17,10 @@ S = "${WORKDIR}/git" inherit meson pkgconfig gettext python3native mime -EXTRA_OEMESON = "-Dupdate-mimedb=true" +EXTRA_OEMESON = " \ + -Dupdate-mimedb=true \ + -Dbuild-translations=${@'false' if d.getVar('USE_NLS') == 'no' else 'true'} \ + " FILES:${PN} += "${datadir}/mime" FILES:${PN}-dev += "${datadir}/pkgconfig/shared-mime-info.pc ${datadir}/gettext/its"
Signature · 1 line
2.43.0
PATCH 9/11 p11-kit: backport fix for handle USE_NLS from master
In reply to Steve SakomanFrom: AshishKumar Mishra <[email protected]>
Disable NLS in the build when USE_NLS is off.
(From OE-Core rev: b94798ecd535956ef4565663710ea9a701ff21ed)
This change corresponds to upstream eeb3974472429a99a724f324dc8a63e435741f68 from master .
Since the p11-kit version are different between master & scarthgap applied the patch manually
--- meta/recipes-support/p11-kit/p11-kit_0.25.3.bb | 1 + 1 file changed, 1 insertion(+)
meta/recipes-support/p11-kit/p11-kit_0.25.3.bb +1 -0
@@ -20,6 +20,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native" PACKAGECONFIG[trust-paths] = "-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt,,,ca-certificates" +EXTRA_OEMESON:append = " -Dnls=${@'false' if d.getVar('USE_NLS') == 'no' else 'true'}" GTKDOC_MESON_OPTION = 'gtk_doc' FILES:${PN} += " \
Signature · 1 line
2.43.0
PATCH 10/11 examples: genl: fix wrong attribute size
In reply to Steve SakomanFrom: Nitin Wankhade <[email protected]>
This example no longer works on more recent kernels:
genl-family-get
error: Invalid argument
dmesg says:
netlink: 'genl-family-get': attribute type 1 has an invalid length.
Fix this and also zero out the reserved field in the genl header, while not validated yet for dumps this could change.
Upstream-Status: Backport [https://git.netfilter.org/libmnl/patch/?id=54dea548d796653534645c6e3c8577eaf7d77411]
--- ...amples-genl-fix-wrong-attribute-size.patch | 44 +++++++++++++++++++ meta/recipes-extended/libmnl/libmnl_1.0.5.bb | 5 ++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/libmnl/files/0001-examples-genl-fix-wrong-attribute-size.patch
meta/recipes-extended/libmnl/files/0001-examples-genl-fix-wrong-attribute-size.patch new file +44 -0
@@ -0,0 +1,44 @@ +From 67ad7abf1fe888c650f9e8ed326a499e1456285c Mon Sep 17 00:00:00 2001 +From: Florian Westphal <[email protected]> +Date: Mon, 15 Sep 2025 14:40:30 +0200 +Subject: [PATCH] examples: genl: fix wrong attribute size + +This example no longer works on more recent kernels: + +genl-family-get +error: Invalid argument + +dmesg says: +netlink: 'genl-family-get': attribute type 1 has an invalid length. + +Fix this and also zero out the reserved field in the genl header, +while not validated yet for dumps this could change. + +Upstream-Status: Backport [https://git.netfilter.org/libmnl/patch/?id=54dea548d796653534645c6e3c8577eaf7d77411] + +Reported-by: Divyanshu Rathore <[email protected]> +Signed-off-by: Florian Westphal <[email protected]> +(cherry picked from commit 54dea548d796653534645c6e3c8577eaf7d77411) +Signed-off-by: Divyanshu Rathore <[email protected]> +--- + examples/genl/genl-family-get.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/examples/genl/genl-family-get.c b/examples/genl/genl-family-get.c +index ba8de12..0c20067 100644 +--- a/examples/genl/genl-family-get.c ++++ b/examples/genl/genl-family-get.c +@@ -199,8 +199,9 @@ int main(int argc, char *argv[]) + genl = mnl_nlmsg_put_extra_header(nlh, sizeof(struct genlmsghdr)); + genl->cmd = CTRL_CMD_GETFAMILY; + genl->version = 1; ++ genl->reserved = 0; + +- mnl_attr_put_u32(nlh, CTRL_ATTR_FAMILY_ID, GENL_ID_CTRL); ++ mnl_attr_put_u16(nlh, CTRL_ATTR_FAMILY_ID, GENL_ID_CTRL); + if (argc >= 2) + mnl_attr_put_strz(nlh, CTRL_ATTR_FAMILY_NAME, argv[1]); + else +-- +2.34.1 +
meta/recipes-extended/libmnl/libmnl_1.0.5.bb +4 -1
@@ -6,7 +6,10 @@ SECTION = "libs" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "https://netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2" +SRC_URI = "https://netfilter.org/projects/libmnl/files/libmnl-${PV}.tar.bz2 \ + file://0001-examples-genl-fix-wrong-attribute-size.patch \ +" + SRC_URI[sha256sum] = "274b9b919ef3152bfb3da3a13c950dd60d6e2bcd54230ffeca298d03b40d0525" inherit autotools pkgconfig
Signature · 1 line
2.43.0
PATCH 11/11 util-linux: use ${B} instead of ${WORKDIR}/build, to fix building under devtool
In reply to Steve SakomanFrom: Chris Laplante <[email protected]>
This change already exists on master, but it was made as part of the larger migration to ${UNPACKDIR} and is not cherry-pickable.
See: d73595df696 (recipes: Update WORKDIR references to UNPACKDIR)
--- meta/recipes-core/util-linux/util-linux_2.39.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/util-linux/util-linux_2.39.3.bb +1 -1
@@ -329,7 +329,7 @@ do_install_ptest() { cp ${S}/tests/*.sh ${D}${PTEST_PATH}/tests/ cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ - cp ${WORKDIR}/build/config.h ${D}${PTEST_PATH} + cp ${B}/config.h ${D}${PTEST_PATH} sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest
Signature · 1 line
2.43.0