* [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
@ 2025-05-21 8:09 Hongxu Jia
2025-05-21 8:09 ` [PATCH v2 2/5] patch: upgrade 2.7.6 -> 2.8 Hongxu Jia
` (4 more replies)
0 siblings, 5 replies; 14+ messages in thread
From: Hongxu Jia @ 2025-05-21 8:09 UTC (permalink / raw)
To: Peter.Marko, mathieu.dubois-briand, alex.kanavin,
openembedded-core
- Rebase install-tests.patch
- Remove --enable-ipv6, due to upstream [build: Remove check for IPv6 ][2]
License-Update: Mention contributors in Copyright [1]
[1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/4bd66d4549b2e8925a752e0daac3a189d2fec8f7
[2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/dc6f55cf6e03ae63a40e3af9ad6879821558d6a7
Release notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.3
Regressions
reader: Fix reading compressed data
parser: Make undeclared entities in XML content fatal
save: Fix XML escape table
save: Fix xmlSave with NULL encoding
Revert "valid: Remove duplicate error messages when streaming"
Bug fixes
save: Fix serialization of attribute defaults containing <
io: Fix linkage of __xml*BufferCreateFilename functions
Build systems
cmake: Fix installation directories in libxml2-config.cmake
meson: Install libxml2.py
Improvements
parser: Make xmlCtxtGetValidCtxt depend on VALID_ENABLED
html: Avoid HTML_PARSE_HTML5 clashing with XML_PARSE_NOENT
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../libxml/libxml2/install-tests.patch | 16 +++++++++++-----
.../{libxml2_2.13.8.bb => libxml2_2.14.3.bb} | 6 ++----
2 files changed, 13 insertions(+), 9 deletions(-)
rename meta/recipes-core/libxml/{libxml2_2.13.8.bb => libxml2_2.14.3.bb} (93%)
diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch
index 1c8c13ab5cc..2570efcdf50 100644
--- a/meta/recipes-core/libxml/libxml2/install-tests.patch
+++ b/meta/recipes-core/libxml/libxml2/install-tests.patch
@@ -1,21 +1,24 @@
-From 8c1054eacb430472068f21e4840749c384e8e866 Mon Sep 17 00:00:00 2001
+From 5bebe007b3efd1a723bd45bb9b3303f8645e9810 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
-Date: Mon, 5 Dec 2022 17:02:32 +0000
+Date: Mon, 19 May 2025 09:45:18 +0800
Subject: [PATCH] add yocto-specific install-ptest target
Add a target to install the test suite.
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@arm.com>
+
+Rebase to v2.14.3
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
Makefile.am | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/Makefile.am b/Makefile.am
-index 4cb9a5c..8adcd7e 100644
+index 6f98144..ecb3b54 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -27,6 +27,16 @@ check_PROGRAMS = \
+@@ -26,6 +26,16 @@ check_PROGRAMS = \
testparser \
testrecurse
@@ -29,6 +32,9 @@ index 4cb9a5c..8adcd7e 100644
+ cp -r $(srcdir)/result $(DESTDIR)$(ptestdir)
+ cp -r $(srcdir)/python/tests $(DESTDIR)$(ptestdir)/python
+
- bin_PROGRAMS = xmllint xmlcatalog
+ bin_PROGRAMS = xmllint
bin_SCRIPTS = xml2-config
+--
+2.34.1
+
diff --git a/meta/recipes-core/libxml/libxml2_2.13.8.bb b/meta/recipes-core/libxml/libxml2_2.14.3.bb
similarity index 93%
rename from meta/recipes-core/libxml/libxml2_2.13.8.bb
rename to meta/recipes-core/libxml/libxml2_2.14.3.bb
index e82e0e8ec36..1cdc80cbb76 100644
--- a/meta/recipes-core/libxml/libxml2_2.13.8.bb
+++ b/meta/recipes-core/libxml/libxml2_2.14.3.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "https://gitlab.gnome.org/GNOME/libxml2"
BUGTRACKER = "http://bugzilla.gnome.org/buglist.cgi?product=libxml2"
SECTION = "libs"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://Copyright;md5=f437ed9058e8e5135e47c01e973376ba \
+LIC_FILES_CHKSUM = "file://Copyright;md5=5873615e8a9ecbf5c8857c4312ee05d6 \
file://dict.c;beginline=6;endline=15;md5=2b4b7b827d2d8b080372433c4c9c85b6 \
file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \
"
@@ -19,7 +19,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt
file://install-tests.patch \
"
-SRC_URI[archive.sha256sum] = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a"
+SRC_URI[archive.sha256sum] = "6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833"
SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273"
# Disputed as a security issue, but fixed in d39f780
@@ -28,10 +28,8 @@ CVE_STATUS[CVE-2023-45322] = "disputed: issue requires memory allocation to fail
BINCONFIG = "${bindir}/xml2-config"
PACKAGECONFIG ??= "python \
- ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
"
PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3"
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
inherit autotools pkgconfig binconfig-disabled ptest
--
2.34.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/5] patch: upgrade 2.7.6 -> 2.8
2025-05-21 8:09 [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3 Hongxu Jia
@ 2025-05-21 8:09 ` Hongxu Jia
2025-05-21 8:09 ` [PATCH v2 3/5] man-pages: upgrade 6.13 -> 6.14 Hongxu Jia
` (3 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Hongxu Jia @ 2025-05-21 8:09 UTC (permalink / raw)
To: Peter.Marko, mathieu.dubois-briand, alex.kanavin,
openembedded-core
Drop obsolete patch, the lib/gnulib.mk has been removed by upstream
- 0001-Unset-need_charset_alias-when-building-for-musl.patch
Drop backport patches:
- 0002-Fix-segfault-with-mangled-rename-patch.patch
- 0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch
- 0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
- 0001-Fix-swapping-fake-lines-in-pch_swap.patch
- CVE-2019-13636.patch
- 0001-Invoke-ed-directly-instead-of-using-the-shell.patch
- 0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch
- 0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch
- CVE-2019-20633.patch
GNU patch 2.8 released: http://savannah.gnu.org/news/?id=10741
NEWS since v2.7.6 (2018-02-03):
The --follow-symlinks option now applies to output files as well as input.
'patch' now supports file timestamps after 2038 even on traditional
GNU/Linux platforms where time_t defaults to 32 bits.
'patch' no longer creates files with names containing newlines,
as encouraged by POSIX.1-2024.
Patches can no longer contain NUL ('\0') bytes in diff directive lines.
These bytes would otherwise cause unpredictable behavior.
Patches can now contain sequences of spaces and tabs around line numbers
and in other places where POSIX requires support for these sequences.
--enable-gcc-warnings no longer uses expensive static checking.
Use --enable-gcc-warnings=expensive if you still want it.
Fix undefined or ill-defined behavior in unusual cases, such as very
large sizes, possible stack overflow, I/O errors, memory exhaustion,
races with other processes, and signals arriving at inopportune moments.
Remove old "Plan B" code, designed for machines with 16-bit pointers.
Assume C99 or later; previously it assumed C89 or later.
Port to current GCC, Autoconf, Gnulib, etc.
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
...porary-file-on-failed-ed-style-patch.patch | 94 --------
...mporary-file-on-failed-multi-file-ed.patch | 81 -------
...-Fix-swapping-fake-lines-in-pch_swap.patch | 36 ---
...-directly-instead-of-using-the-shell.patch | 44 ----
...charset_alias-when-building-for-musl.patch | 33 ---
...x-segfault-with-mangled-rename-patch.patch | 35 ---
...s-to-be-missing-for-ed-style-patches.patch | 38 ----
...mmand-execution-in-ed-style-patches-.patch | 215 ------------------
.../patch/patch/CVE-2019-13636.patch | 113 ---------
.../patch/patch/CVE-2019-20633.patch | 31 ---
meta/recipes-devtools/patch/patch_2.7.6.bb | 25 --
meta/recipes-devtools/patch/patch_2.8.bb | 13 ++
12 files changed, 13 insertions(+), 745 deletions(-)
delete mode 100644 meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch
delete mode 100644 meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch
delete mode 100644 meta/recipes-devtools/patch/patch/0001-Fix-swapping-fake-lines-in-pch_swap.patch
delete mode 100644 meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch
delete mode 100644 meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch
delete mode 100644 meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch
delete mode 100644 meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch
delete mode 100644 meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
delete mode 100644 meta/recipes-devtools/patch/patch/CVE-2019-13636.patch
delete mode 100644 meta/recipes-devtools/patch/patch/CVE-2019-20633.patch
delete mode 100644 meta/recipes-devtools/patch/patch_2.7.6.bb
create mode 100644 meta/recipes-devtools/patch/patch_2.8.bb
diff --git a/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch b/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch
deleted file mode 100644
index 78345e925e4..00000000000
--- a/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 7f770b9c20da1a192dad8cb572a6391f2773285a Mon Sep 17 00:00:00 2001
-From: Jean Delvare <jdelvare@suse.de>
-Date: Thu, 3 May 2018 14:31:55 +0200
-Subject: [PATCH 1/2] Don't leak temporary file on failed ed-style patch
-
-Now that we write ed-style patches to a temporary file before we
-apply them, we need to ensure that the temporary file is removed
-before we leave, even on fatal error.
-
-* src/pch.c (do_ed_script): Use global TMPEDNAME instead of local
- tmpname. Don't unlink the file directly, instead tag it for removal
- at exit time.
-* src/patch.c (cleanup): Unlink TMPEDNAME at exit.
-
-This closes bug #53820:
-https://savannah.gnu.org/bugs/index.php?53820
-
-Fixes: 123eaff0d5d1 ("Fix arbitrary command execution in ed-style patches (CVE-2018-1000156)")
-
-CVE: CVE-2018-1000156
-Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=19599883ffb6a450d2884f081f8ecf68edbed7ee]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- src/common.h | 2 ++
- src/pch.c | 12 +++++-------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/common.h b/src/common.h
-index ec50b40..22238b5 100644
---- a/src/common.h
-+++ b/src/common.h
-@@ -94,10 +94,12 @@ XTERN char const *origsuff;
- XTERN char const * TMPINNAME;
- XTERN char const * TMPOUTNAME;
- XTERN char const * TMPPATNAME;
-+XTERN char const * TMPEDNAME;
-
- XTERN bool TMPINNAME_needs_removal;
- XTERN bool TMPOUTNAME_needs_removal;
- XTERN bool TMPPATNAME_needs_removal;
-+XTERN bool TMPEDNAME_needs_removal;
-
- #ifdef DEBUGGING
- XTERN int debug;
-diff --git a/src/pch.c b/src/pch.c
-index 16e001a..c1a62cf 100644
---- a/src/pch.c
-+++ b/src/pch.c
-@@ -2392,7 +2392,6 @@ do_ed_script (char const *inname, char const *outname,
- file_offset beginning_of_this_line;
- size_t chars_read;
- FILE *tmpfp = 0;
-- char const *tmpname;
- int tmpfd;
- pid_t pid;
-
-@@ -2404,12 +2403,13 @@ do_ed_script (char const *inname, char const *outname,
- invalid commands and treats the next line as a new command, which
- can lead to arbitrary command execution. */
-
-- tmpfd = make_tempfile (&tmpname, 'e', NULL, O_RDWR | O_BINARY, 0);
-+ tmpfd = make_tempfile (&TMPEDNAME, 'e', NULL, O_RDWR | O_BINARY, 0);
- if (tmpfd == -1)
-- pfatal ("Can't create temporary file %s", quotearg (tmpname));
-+ pfatal ("Can't create temporary file %s", quotearg (TMPEDNAME));
-+ TMPEDNAME_needs_removal = true;
- tmpfp = fdopen (tmpfd, "w+b");
- if (! tmpfp)
-- pfatal ("Can't open stream for file %s", quotearg (tmpname));
-+ pfatal ("Can't open stream for file %s", quotearg (TMPEDNAME));
- }
-
- for (;;) {
-@@ -2449,8 +2449,7 @@ do_ed_script (char const *inname, char const *outname,
- write_fatal ();
-
- if (lseek (tmpfd, 0, SEEK_SET) == -1)
-- pfatal ("Can't rewind to the beginning of file %s", quotearg (tmpname));
--
-+ pfatal ("Can't rewind to the beginning of file %s", quotearg (TMPEDNAME));
- if (! dry_run && ! skip_rest_of_patch) {
- int exclusive = *outname_needs_removal ? 0 : O_EXCL;
- *outname_needs_removal = true;
-@@ -2482,7 +2481,6 @@ do_ed_script (char const *inname, char const *outname,
- }
-
- fclose (tmpfp);
-- safe_unlink (tmpname);
-
- if (ofp)
- {
---
-2.17.0
-
diff --git a/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch b/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch
deleted file mode 100644
index 8ffffef47ef..00000000000
--- a/meta/recipes-devtools/patch/patch/0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 369dcccdfa6336e5a873d6d63705cfbe04c55727 Mon Sep 17 00:00:00 2001
-From: Jean Delvare <jdelvare@suse.de>
-Date: Mon, 7 May 2018 15:14:45 +0200
-Subject: Don't leak temporary file on failed multi-file ed-style patch
-
-The previous fix worked fine with single-file ed-style patches, but
-would still leak temporary files in the case of multi-file ed-style
-patch. Fix that case as well, and extend the test case to check for
-it.
-
-* src/patch.c (main): Unlink TMPEDNAME if needed before moving to
- the next file in a patch.
-
-This closes bug #53820:
-https://savannah.gnu.org/bugs/index.php?53820
-
-Fixes: 123eaff0d5d1 ("Fix arbitrary command execution in ed-style patches (CVE-2018-1000156)")
-Fixes: 19599883ffb6 ("Don't leak temporary file on failed ed-style patch")
-
-CVE: CVE-2018-1000156
-Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=369dcccdfa6336e5a873d6d63705cfbe04c55727]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
----
- src/patch.c | 1 +
- tests/ed-style | 31 +++++++++++++++++++++++++++++++
- 2 files changed, 32 insertions(+)
-
-diff --git a/src/patch.c b/src/patch.c
-index 9146597..81c7a02 100644
---- a/src/patch.c
-+++ b/src/patch.c
-@@ -236,6 +236,7 @@ main (int argc, char **argv)
- }
- remove_if_needed (TMPOUTNAME, &TMPOUTNAME_needs_removal);
- }
-+ remove_if_needed (TMPEDNAME, &TMPEDNAME_needs_removal);
-
- if (! skip_rest_of_patch && ! file_type)
- {
-diff --git a/tests/ed-style b/tests/ed-style
-index 6b6ef9d..504e6e5 100644
---- a/tests/ed-style
-+++ b/tests/ed-style
-@@ -38,3 +38,34 @@ EOF
- check 'cat foo' <<EOF
- foo
- EOF
-+
-+# Test the case where one ed-style patch modifies several files
-+
-+cat > ed3.diff <<EOF
-+--- foo
-++++ foo
-+1c
-+bar
-+.
-+--- baz
-++++ baz
-+0a
-+baz
-+.
-+EOF
-+
-+# Apparently we can't create a file with such a patch, while it works fine
-+# when the file name is provided on the command line
-+cat > baz <<EOF
-+EOF
-+
-+check 'patch -e -i ed3.diff' <<EOF
-+EOF
-+
-+check 'cat foo' <<EOF
-+bar
-+EOF
-+
-+check 'cat baz' <<EOF
-+baz
-+EOF
---
-cgit v1.0-41-gc330
-
diff --git a/meta/recipes-devtools/patch/patch/0001-Fix-swapping-fake-lines-in-pch_swap.patch b/meta/recipes-devtools/patch/patch/0001-Fix-swapping-fake-lines-in-pch_swap.patch
deleted file mode 100644
index 049149eb9e5..00000000000
--- a/meta/recipes-devtools/patch/patch/0001-Fix-swapping-fake-lines-in-pch_swap.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9c986353e420ead6e706262bf204d6e03322c300 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@gnu.org>
-Date: Fri, 17 Aug 2018 13:35:40 +0200
-Subject: [PATCH] Fix swapping fake lines in pch_swap
-
-* src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a
-blank line in the middle of a context-diff hunk: that empty line stays
-in the middle of the hunk and isn't swapped.
-
-Fixes: https://savannah.gnu.org/bugs/index.php?53133
-Signed-off-by: Andreas Gruenbacher <agruen@gnu.org>
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/git/patch.git]
-CVE: CVE-2018-6952
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
----
- src/pch.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/pch.c b/src/pch.c
-index e92bc64..a500ad9 100644
---- a/src/pch.c
-+++ b/src/pch.c
-@@ -2122,7 +2122,7 @@ pch_swap (void)
- }
- if (p_efake >= 0) { /* fix non-freeable ptr range */
- if (p_efake <= i)
-- n = p_end - i + 1;
-+ n = p_end - p_ptrn_lines;
- else
- n = -i;
- p_efake += n;
---
-2.10.2
-
diff --git a/meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch b/meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch
deleted file mode 100644
index d13d419f51c..00000000000
--- a/meta/recipes-devtools/patch/patch/0001-Invoke-ed-directly-instead-of-using-the-shell.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3fcd042d26d70856e826a42b5f93dc4854d80bf0 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@gnu.org>
-Date: Fri, 6 Apr 2018 19:36:15 +0200
-Subject: [PATCH] Invoke ed directly instead of using the shell
-
-* src/pch.c (do_ed_script): Invoke ed directly instead of using a shell
-command to avoid quoting vulnerabilities.
-
-CVE: CVE-2019-13638 CVE-2018-20969
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/patch.git/patch/?id=3fcd042d26d70856e826a42b5f93dc4854d80bf0]
-Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
-
----
- src/pch.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-
-diff --git a/src/pch.c b/src/pch.c
-index 4fd5a05..16e001a 100644
---- a/src/pch.c
-+++ b/src/pch.c
-@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const *outname,
- *outname_needs_removal = true;
- copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
- }
-- sprintf (buf, "%s %s%s", editor_program,
-- verbosity == VERBOSE ? "" : "- ",
-- outname);
- fflush (stdout);
-
- pid = fork();
-@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const *outname,
- else if (pid == 0)
- {
- dup2 (tmpfd, 0);
-- execl ("/bin/sh", "sh", "-c", buf, (char *) 0);
-+ assert (outname[0] != '!' && outname[0] != '-');
-+ execlp (editor_program, editor_program, "-", outname, (char *) NULL);
- _exit (2);
- }
- else
---
-2.7.4
-
diff --git a/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch b/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch
deleted file mode 100644
index ba1a4bab4c1..00000000000
--- a/meta/recipes-devtools/patch/patch/0001-Unset-need_charset_alias-when-building-for-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b9565dc2fe0c4f7daaec91b7e83bc7313dee2f4a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 13 Apr 2015 17:02:13 -0700
-Subject: [PATCH] Unset need_charset_alias when building for musl
-
-localcharset uses ac_cv_gnu_library_2_1 from glibc21.m4
-which actually shoudl be fixed in gnulib and then all downstream
-projects will get it eventually. For now we apply the fix to
-coreutils
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/gnulib.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/gnulib.mk b/lib/gnulib.mk
-index e1d74db..c0e92dd 100644
---- a/lib/gnulib.mk
-+++ b/lib/gnulib.mk
-@@ -1882,7 +1882,7 @@ install-exec-localcharset: all-local
- case '$(host_os)' in \
- darwin[56]*) \
- need_charset_alias=true ;; \
-- darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+ darwin* | cygwin* | mingw* | pw32* | cegcc* | linux-musl*) \
- need_charset_alias=false ;; \
- *) \
- need_charset_alias=true ;; \
---
-2.1.4
-
diff --git a/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch b/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch
deleted file mode 100644
index b0bd6fa83ad..00000000000
--- a/meta/recipes-devtools/patch/patch/0002-Fix-segfault-with-mangled-rename-patch.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f290f48a621867084884bfff87f8093c15195e6a Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@gnu.org>
-Date: Mon, 12 Feb 2018 16:48:24 +0100
-Subject: [PATCH] Fix segfault with mangled rename patch
-
-http://savannah.gnu.org/bugs/?53132
-* src/pch.c (intuit_diff_type): Ensure that two filenames are specified
-for renames and copies (fix the existing check).
-
-Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f290f48a621867084884bfff87f8093c15195e6a]
-CVE: CVE-2018-6951
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-
----
- src/pch.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/pch.c b/src/pch.c
-index ff9ed2c..bc6278c 100644
---- a/src/pch.c
-+++ b/src/pch.c
-@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type)
- if ((pch_rename () || pch_copy ())
- && ! inname
- && ! ((i == OLD || i == NEW) &&
-- p_name[! reverse] &&
-+ p_name[reverse] && p_name[! reverse] &&
-+ name_is_valid (p_name[reverse]) &&
- name_is_valid (p_name[! reverse])))
- {
- say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
---
-2.7.4
-
diff --git a/meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch b/meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch
deleted file mode 100644
index 2a09d0c03b5..00000000000
--- a/meta/recipes-devtools/patch/patch/0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b5a91a01e5d0897facdd0f49d64b76b0f02b43e1 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@gnu.org>
-Date: Fri, 6 Apr 2018 11:34:51 +0200
-Subject: [PATCH] Allow input files to be missing for ed-style patches
-
-* src/pch.c (do_ed_script): Allow input files to be missing so that new
-files will be created as with non-ed-style patches.
-
-Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1]
-CVE: CVE-2018-1000156
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- src/pch.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/pch.c b/src/pch.c
-index bc6278c..0c5cc26 100644
---- a/src/pch.c
-+++ b/src/pch.c
-@@ -2394,9 +2394,11 @@ do_ed_script (char const *inname, char const *outname,
-
- if (! dry_run && ! skip_rest_of_patch) {
- int exclusive = *outname_needs_removal ? 0 : O_EXCL;
-- assert (! inerrno);
-- *outname_needs_removal = true;
-- copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
-+ if (inerrno != ENOENT)
-+ {
-+ *outname_needs_removal = true;
-+ copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
-+ }
- sprintf (buf, "%s %s%s", editor_program,
- verbosity == VERBOSE ? "" : "- ",
- outname);
---
-2.7.4
-
diff --git a/meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch b/meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
deleted file mode 100644
index d74c2f182e5..00000000000
--- a/meta/recipes-devtools/patch/patch/0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From 123eaff0d5d1aebe128295959435b9ca5909c26d Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@gnu.org>
-Date: Fri, 6 Apr 2018 12:14:49 +0200
-Subject: [PATCH] Fix arbitrary command execution in ed-style patches (CVE-2018-1000156)
-
-* src/pch.c (do_ed_script): Write ed script to a temporary file instead
-of piping it to ed: this will cause ed to abort on invalid commands
-instead of rejecting them and carrying on.
-* tests/ed-style: New test case.
-* tests/Makefile.am (TESTS): Add test case.
-
-Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/patch.git/commit/?id=123eaff0d5d1aebe128295959435b9ca5909c26d]
-CVE: CVE-2018-1000156
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- src/pch.c | 91 ++++++++++++++++++++++++++++++++++++++++---------------
- tests/Makefile.am | 1 +
- tests/ed-style | 41 +++++++++++++++++++++++++
- 3 files changed, 108 insertions(+), 25 deletions(-)
- create mode 100644 tests/ed-style
-
-diff --git a/src/pch.c b/src/pch.c
-index 0c5cc26..4fd5a05 100644
---- a/src/pch.c
-+++ b/src/pch.c
-@@ -33,6 +33,7 @@
- # include <io.h>
- #endif
- #include <safe.h>
-+#include <sys/wait.h>
-
- #define INITHUNKMAX 125 /* initial dynamic allocation size */
-
-@@ -2389,24 +2390,28 @@ do_ed_script (char const *inname, char const *outname,
- static char const editor_program[] = EDITOR_PROGRAM;
-
- file_offset beginning_of_this_line;
-- FILE *pipefp = 0;
- size_t chars_read;
-+ FILE *tmpfp = 0;
-+ char const *tmpname;
-+ int tmpfd;
-+ pid_t pid;
-+
-+ if (! dry_run && ! skip_rest_of_patch)
-+ {
-+ /* Write ed script to a temporary file. This causes ed to abort on
-+ invalid commands such as when line numbers or ranges exceed the
-+ number of available lines. When ed reads from a pipe, it rejects
-+ invalid commands and treats the next line as a new command, which
-+ can lead to arbitrary command execution. */
-+
-+ tmpfd = make_tempfile (&tmpname, 'e', NULL, O_RDWR | O_BINARY, 0);
-+ if (tmpfd == -1)
-+ pfatal ("Can't create temporary file %s", quotearg (tmpname));
-+ tmpfp = fdopen (tmpfd, "w+b");
-+ if (! tmpfp)
-+ pfatal ("Can't open stream for file %s", quotearg (tmpname));
-+ }
-
-- if (! dry_run && ! skip_rest_of_patch) {
-- int exclusive = *outname_needs_removal ? 0 : O_EXCL;
-- if (inerrno != ENOENT)
-- {
-- *outname_needs_removal = true;
-- copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
-- }
-- sprintf (buf, "%s %s%s", editor_program,
-- verbosity == VERBOSE ? "" : "- ",
-- outname);
-- fflush (stdout);
-- pipefp = popen(buf, binary_transput ? "wb" : "w");
-- if (!pipefp)
-- pfatal ("Can't open pipe to %s", quotearg (buf));
-- }
- for (;;) {
- char ed_command_letter;
- beginning_of_this_line = file_tell (pfp);
-@@ -2417,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname,
- }
- ed_command_letter = get_ed_command_letter (buf);
- if (ed_command_letter) {
-- if (pipefp)
-- if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
-+ if (tmpfp)
-+ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp))
- write_fatal ();
- if (ed_command_letter != 'd' && ed_command_letter != 's') {
- p_pass_comments_through = true;
- while ((chars_read = get_line ()) != 0) {
-- if (pipefp)
-- if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
-+ if (tmpfp)
-+ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp))
- write_fatal ();
- if (chars_read == 2 && strEQ (buf, ".\n"))
- break;
-@@ -2437,13 +2442,49 @@ do_ed_script (char const *inname, char const *outname,
- break;
- }
- }
-- if (!pipefp)
-+ if (!tmpfp)
- return;
-- if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, pipefp) == 0
-- || fflush (pipefp) != 0)
-+ if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, tmpfp) == 0
-+ || fflush (tmpfp) != 0)
- write_fatal ();
-- if (pclose (pipefp) != 0)
-- fatal ("%s FAILED", editor_program);
-+
-+ if (lseek (tmpfd, 0, SEEK_SET) == -1)
-+ pfatal ("Can't rewind to the beginning of file %s", quotearg (tmpname));
-+
-+ if (! dry_run && ! skip_rest_of_patch) {
-+ int exclusive = *outname_needs_removal ? 0 : O_EXCL;
-+ *outname_needs_removal = true;
-+ if (inerrno != ENOENT)
-+ {
-+ *outname_needs_removal = true;
-+ copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
-+ }
-+ sprintf (buf, "%s %s%s", editor_program,
-+ verbosity == VERBOSE ? "" : "- ",
-+ outname);
-+ fflush (stdout);
-+
-+ pid = fork();
-+ if (pid == -1)
-+ pfatal ("Can't fork");
-+ else if (pid == 0)
-+ {
-+ dup2 (tmpfd, 0);
-+ execl ("/bin/sh", "sh", "-c", buf, (char *) 0);
-+ _exit (2);
-+ }
-+ else
-+ {
-+ int wstatus;
-+ if (waitpid (pid, &wstatus, 0) == -1
-+ || ! WIFEXITED (wstatus)
-+ || WEXITSTATUS (wstatus) != 0)
-+ fatal ("%s FAILED", editor_program);
-+ }
-+ }
-+
-+ fclose (tmpfp);
-+ safe_unlink (tmpname);
-
- if (ofp)
- {
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 6b6df63..16f8693 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -32,6 +32,7 @@ TESTS = \
- crlf-handling \
- dash-o-append \
- deep-directories \
-+ ed-style \
- empty-files \
- false-match \
- fifo \
-diff --git a/tests/ed-style b/tests/ed-style
-new file mode 100644
-index 0000000..d8c0689
---- /dev/null
-+++ b/tests/ed-style
-@@ -0,0 +1,41 @@
-+# Copyright (C) 2018 Free Software Foundation, Inc.
-+#
-+# Copying and distribution of this file, with or without modification,
-+# in any medium, are permitted without royalty provided the copyright
-+# notice and this notice are preserved.
-+
-+. $srcdir/test-lib.sh
-+
-+require cat
-+use_local_patch
-+use_tmpdir
-+
-+# ==============================================================
-+
-+cat > ed1.diff <<EOF
-+0a
-+foo
-+.
-+EOF
-+
-+check 'patch -e foo -i ed1.diff' <<EOF
-+EOF
-+
-+check 'cat foo' <<EOF
-+foo
-+EOF
-+
-+cat > ed2.diff <<EOF
-+1337a
-+r !echo bar
-+,p
-+EOF
-+
-+check 'patch -e foo -i ed2.diff 2> /dev/null || echo "Status: $?"' <<EOF
-+?
-+Status: 2
-+EOF
-+
-+check 'cat foo' <<EOF
-+foo
-+EOF
---
-2.7.4
-
diff --git a/meta/recipes-devtools/patch/patch/CVE-2019-13636.patch b/meta/recipes-devtools/patch/patch/CVE-2019-13636.patch
deleted file mode 100644
index 8059d9fe198..00000000000
--- a/meta/recipes-devtools/patch/patch/CVE-2019-13636.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From dce4683cbbe107a95f1f0d45fabc304acfb5d71a Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@gnu.org>
-Date: Mon, 15 Jul 2019 16:21:48 +0200
-Subject: Don't follow symlinks unless --follow-symlinks is given
-
-* src/inp.c (plan_a, plan_b), src/util.c (copy_to_fd, copy_file,
-append_to_file): Unless the --follow-symlinks option is given, open files with
-the O_NOFOLLOW flag to avoid following symlinks. So far, we were only doing
-that consistently for input files.
-* src/util.c (create_backup): When creating empty backup files, (re)create them
-with O_CREAT | O_EXCL to avoid following symlinks in that case as well.
-
-CVE: CVE-2019-13636
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/patch.git/patch/?id=dce4683cbbe107a95f1f0d45fabc304acfb5d71a]
-Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-
----
- src/inp.c | 12 ++++++++++--
- src/util.c | 14 +++++++++++---
- 2 files changed, 21 insertions(+), 5 deletions(-)
-
-diff --git a/src/inp.c b/src/inp.c
-index 32d0919..22d7473 100644
---- a/src/inp.c
-+++ b/src/inp.c
-@@ -238,8 +238,13 @@ plan_a (char const *filename)
- {
- if (S_ISREG (instat.st_mode))
- {
-- int ifd = safe_open (filename, O_RDONLY|binary_transput, 0);
-+ int flags = O_RDONLY | binary_transput;
- size_t buffered = 0, n;
-+ int ifd;
-+
-+ if (! follow_symlinks)
-+ flags |= O_NOFOLLOW;
-+ ifd = safe_open (filename, flags, 0);
- if (ifd < 0)
- pfatal ("can't open file %s", quotearg (filename));
-
-@@ -340,6 +345,7 @@ plan_a (char const *filename)
- static void
- plan_b (char const *filename)
- {
-+ int flags = O_RDONLY | binary_transput;
- int ifd;
- FILE *ifp;
- int c;
-@@ -353,7 +359,9 @@ plan_b (char const *filename)
-
- if (instat.st_size == 0)
- filename = NULL_DEVICE;
-- if ((ifd = safe_open (filename, O_RDONLY | binary_transput, 0)) < 0
-+ if (! follow_symlinks)
-+ flags |= O_NOFOLLOW;
-+ if ((ifd = safe_open (filename, flags, 0)) < 0
- || ! (ifp = fdopen (ifd, binary_transput ? "rb" : "r")))
- pfatal ("Can't open file %s", quotearg (filename));
- if (TMPINNAME_needs_removal)
-diff --git a/src/util.c b/src/util.c
-index 1cc08ba..fb38307 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -388,7 +388,7 @@ create_backup (char const *to, const struct stat *to_st, bool leave_original)
-
- try_makedirs_errno = ENOENT;
- safe_unlink (bakname);
-- while ((fd = safe_open (bakname, O_CREAT | O_WRONLY | O_TRUNC, 0666)) < 0)
-+ while ((fd = safe_open (bakname, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, 0666)) < 0)
- {
- if (errno != try_makedirs_errno)
- pfatal ("Can't create file %s", quotearg (bakname));
-@@ -579,10 +579,13 @@ create_file (char const *file, int open_flags, mode_t mode,
- static void
- copy_to_fd (const char *from, int tofd)
- {
-+ int from_flags = O_RDONLY | O_BINARY;
- int fromfd;
- ssize_t i;
-
-- if ((fromfd = safe_open (from, O_RDONLY | O_BINARY, 0)) < 0)
-+ if (! follow_symlinks)
-+ from_flags |= O_NOFOLLOW;
-+ if ((fromfd = safe_open (from, from_flags, 0)) < 0)
- pfatal ("Can't reopen file %s", quotearg (from));
- while ((i = read (fromfd, buf, bufsize)) != 0)
- {
-@@ -625,6 +628,8 @@ copy_file (char const *from, char const *to, struct stat *tost,
- else
- {
- assert (S_ISREG (mode));
-+ if (! follow_symlinks)
-+ to_flags |= O_NOFOLLOW;
- tofd = create_file (to, O_WRONLY | O_BINARY | to_flags, mode,
- to_dir_known_to_exist);
- copy_to_fd (from, tofd);
-@@ -640,9 +645,12 @@ copy_file (char const *from, char const *to, struct stat *tost,
- void
- append_to_file (char const *from, char const *to)
- {
-+ int to_flags = O_WRONLY | O_APPEND | O_BINARY;
- int tofd;
-
-- if ((tofd = safe_open (to, O_WRONLY | O_BINARY | O_APPEND, 0)) < 0)
-+ if (! follow_symlinks)
-+ to_flags |= O_NOFOLLOW;
-+ if ((tofd = safe_open (to, to_flags, 0)) < 0)
- pfatal ("Can't reopen file %s", quotearg (to));
- copy_to_fd (from, tofd);
- if (close (tofd) != 0)
---
-cgit v1.0-41-gc330
-
diff --git a/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch b/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch
deleted file mode 100644
index 9b2c07cf1e5..00000000000
--- a/meta/recipes-devtools/patch/patch/CVE-2019-20633.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 15b158db3ae11cb835f2eb8d2eb48e09d1a4af48 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruen@gnu.org>
-Date: Mon, 15 Jul 2019 19:10:02 +0200
-Subject: Avoid invalid memory access in context format diffs
-
-* src/pch.c (another_hunk): Avoid invalid memory access in context format
-diffs.
-
-CVE: CVE-2019-20633
-Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/patch.git/patch/?id=15b158db3ae11cb835f2eb8d2eb48e09d1a4af48]
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
----
- src/pch.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/pch.c b/src/pch.c
-index a500ad9..cb54e03 100644
---- a/src/pch.c
-+++ b/src/pch.c
-@@ -1328,6 +1328,7 @@ another_hunk (enum diff difftype, bool rev)
- ptrn_prefix_context = context;
- ptrn_suffix_context = context;
- if (repl_beginning
-+ || p_end <= 0
- || (p_end
- != p_ptrn_lines + 1 + (p_Char[p_end - 1] == '\n')))
- {
---
-cgit v1.2.1
-
diff --git a/meta/recipes-devtools/patch/patch_2.7.6.bb b/meta/recipes-devtools/patch/patch_2.7.6.bb
deleted file mode 100644
index 3dc3b5863c4..00000000000
--- a/meta/recipes-devtools/patch/patch_2.7.6.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require patch.inc
-LICENSE = "GPL-3.0-only"
-
-SRC_URI += "file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
- file://0002-Fix-segfault-with-mangled-rename-patch.patch \
- file://0003-Allow-input-files-to-be-missing-for-ed-style-patches.patch \
- file://0004-Fix-arbitrary-command-execution-in-ed-style-patches-.patch \
- file://0001-Fix-swapping-fake-lines-in-pch_swap.patch \
- file://CVE-2019-13636.patch \
- file://0001-Invoke-ed-directly-instead-of-using-the-shell.patch \
- file://0001-Don-t-leak-temporary-file-on-failed-ed-style-patch.patch \
- file://0001-Don-t-leak-temporary-file-on-failed-multi-file-ed.patch \
- file://CVE-2019-20633.patch \
-"
-
-SRC_URI[sha256sum] = "8cf86e00ad3aaa6d26aca30640e86b0e3e1f395ed99f189b06d4c9f74bc58a4e"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}"
-PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
-
-PROVIDES:append:class-native = " patch-replacement-native"
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/patch/patch_2.8.bb b/meta/recipes-devtools/patch/patch_2.8.bb
new file mode 100644
index 00000000000..6317ac775de
--- /dev/null
+++ b/meta/recipes-devtools/patch/patch_2.8.bb
@@ -0,0 +1,13 @@
+require patch.inc
+LICENSE = "GPL-3.0-only"
+
+SRC_URI[sha256sum] = "308a4983ff324521b9b21310bfc2398ca861798f02307c79eb99bb0e0d2bf980"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}"
+PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
+
+PROVIDES:append:class-native = " patch-replacement-native"
+
+BBCLASSEXTEND = "native nativesdk"
--
2.34.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 3/5] man-pages: upgrade 6.13 -> 6.14
2025-05-21 8:09 [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3 Hongxu Jia
2025-05-21 8:09 ` [PATCH v2 2/5] patch: upgrade 2.7.6 -> 2.8 Hongxu Jia
@ 2025-05-21 8:09 ` Hongxu Jia
2025-05-21 8:09 ` [PATCH v2 4/5] libgcrypt: upgrade 1.11.0 -> 1.11.1 Hongxu Jia
` (2 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Hongxu Jia @ 2025-05-21 8:09 UTC (permalink / raw)
To: Peter.Marko, mathieu.dubois-briand, alex.kanavin,
openembedded-core
See https://git.kernel.org/pub/scm/docs/man-pages/man-pages.git/tree/Changes?h=man-pages-6.14
for changelog
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
.../man-pages/{man-pages_6.13.bb => man-pages_6.14.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/man-pages/{man-pages_6.13.bb => man-pages_6.14.bb} (96%)
diff --git a/meta/recipes-extended/man-pages/man-pages_6.13.bb b/meta/recipes-extended/man-pages/man-pages_6.14.bb
similarity index 96%
rename from meta/recipes-extended/man-pages/man-pages_6.13.bb
rename to meta/recipes-extended/man-pages/man-pages_6.14.bb
index a2e6a898432..92afff640d2 100644
--- a/meta/recipes-extended/man-pages/man-pages_6.13.bb
+++ b/meta/recipes-extended/man-pages/man-pages_6.14.bb
@@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "file://README;md5=72cff06b7954222c24d38bc2c41b234e \
SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/${BP}.tar.gz \
"
-SRC_URI[sha256sum] = "869a682be64ee634149f62b4bcbd8334fd1e400883181618d7164a43de6a3aa1"
+SRC_URI[sha256sum] = "a298963d8baf37fa5ecd2b07c803e1f29ab0476add405a7e263e5c63baf43588"
inherit manpages lib_package
--
2.34.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 4/5] libgcrypt: upgrade 1.11.0 -> 1.11.1
2025-05-21 8:09 [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3 Hongxu Jia
2025-05-21 8:09 ` [PATCH v2 2/5] patch: upgrade 2.7.6 -> 2.8 Hongxu Jia
2025-05-21 8:09 ` [PATCH v2 3/5] man-pages: upgrade 6.13 -> 6.14 Hongxu Jia
@ 2025-05-21 8:09 ` Hongxu Jia
2025-05-21 8:09 ` [PATCH 5/5] lttng-tools: fix compile failed with libxml2 2.14.0+ Hongxu Jia
2025-05-22 6:30 ` [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3 Mathieu Dubois-Briand
4 siblings, 0 replies; 14+ messages in thread
From: Hongxu Jia @ 2025-05-21 8:09 UTC (permalink / raw)
To: Peter.Marko, mathieu.dubois-briand, alex.kanavin,
openembedded-core
Noteworthy changes in version 1.11.1 (2025-05-07) [C25/A5/R1]
-------------------------------------------------
* Bug fixes:
- Fix build regression on 32 bit Windows using Clang. [T7175]
- Fix build regression on macOS due to symbol naming. [T7170]
- Fix Kyber secret-dependent branch introduced by recent versions
of Clang. [rCf765778e82]
- Fix build regression due to the use of AVX512 in Blake. [T7184]
- Do not build i386 asm on amd64 and vice versa. [T7220]
- Fix build regression on armhf with gcc-14. [T7226]
- Return the proper error code on malloc failure in hex2buffer.
[rCc51151f5b0]
- Fix long standing bug for PRIME % 2 == 0. [rC639b0fca15]
* Performance:
- Add AES Vector Permute intrinsics implementation for AArch64.
[rC94a63aedbb]
- Add GHASH AArch64/SIMD intrinsics implementation. [rCfec871fd18]
- Add RISC-V vector permute AES. [rCb24ebd6163]
- Add GHASH RISC-V Zbb+Zbc implementation. [rC0f1fec12b0]
- Add ChaCha20 RISC-V vector intrinsics implementation.
[rC8dbee93ac2]
- Add SHA3 acceleration for RISC-V Zbb extension. [rC1a660068ba]
* Other:
- Add CET support for i386 and amd64 assembly. [T7220]
- Add PAC/BTI support for AArch64 asm. [T7220]
- Apply changes to Kyber from upstream for final FIPS 203.
[rCcc95c36e7f]
- Introduce an internal API for a revampled FIPS service indicator.
[T7340]
- Several improvements for constant time operation by the
introduction of Least Leak Intended (LLI) variants of internal
functions. [T7519,T7490]
- Remove WindowsCE support. [T7486]
Release-info: https://dev.gnupg.org/T7166
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
...01-libgcrypt-fix-m4-file-for-oe-core.patch | 8 +--
...ilding-error-with-O2-in-sysroot-path.patch | 49 -------------------
...m-fix-undefined-reference-to-pthread.patch | 9 ++--
.../libgcrypt/files/no-bench-slope.patch | 10 ++--
.../libgcrypt/files/no-native-gpg-error.patch | 10 +++-
...ibgcrypt_1.11.0.bb => libgcrypt_1.11.1.bb} | 3 +-
6 files changed, 23 insertions(+), 66 deletions(-)
delete mode 100644 meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
rename meta/recipes-support/libgcrypt/{libgcrypt_1.11.0.bb => libgcrypt_1.11.1.bb} (91%)
diff --git a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch
index 9615611f6eb..7b840644d4e 100644
--- a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch
+++ b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch
@@ -1,4 +1,4 @@
-From bcfd89abdb5110b93314297120412d4c7f2da313 Mon Sep 17 00:00:00 2001
+From fcb53181b18c00083a8b08625db74829cfd6b4b2 Mon Sep 17 00:00:00 2001
From: Trevor Gamblin <trevor.gamblin@windriver.com>
Date: Tue, 29 Oct 2019 14:08:32 -0400
Subject: [PATCH] libgcrypt: fix m4 file for oe-core
@@ -11,13 +11,12 @@ settings.
Upstream-Status: Inappropriate [oe-specific]
Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
-
---
src/libgcrypt.m4 | 90 +++---------------------------------------------
1 file changed, 4 insertions(+), 86 deletions(-)
diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
-index 353df81b6d..b195e22894 100644
+index 353df81..b195e22 100644
--- a/src/libgcrypt.m4
+++ b/src/libgcrypt.m4
@@ -116,41 +116,6 @@ dnl
@@ -144,6 +143,3 @@ index 353df81b6d..b195e22894 100644
ifelse([$3], , :, [$3])
fi
AC_SUBST(LIBGCRYPT_CFLAGS)
---
-2.34.1
-
diff --git a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
deleted file mode 100644
index 78b02eda9d2..00000000000
--- a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001
-From: "simit.ghane" <simit.ghane@lge.com>
-Date: Tue, 11 Jun 2024 07:22:28 +0530
-Subject: [PATCH] random:cipher: handle substitution in sed command
-
-Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=e96df0c82e086bf348753d2d0fa37fa6191b4b14]
-
-* cipher/Makefile.am (o_flag_munging): Add 'g' flag for first sed
-expression.
-* random/Makefile.am (o_flag_munging): Likewise.
---
-
-It was there earlier and accidentally removed from
-Makefile.am of cipher and random
-
-Signed-off-by: simit.ghane <simit.ghane@lge.com>
-[jk: add changelog to commit message]
-Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
----
- cipher/Makefile.am | 2 +-
- random/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cipher/Makefile.am b/cipher/Makefile.am
-index ea9014cc98..149c9f2101 100644
---- a/cipher/Makefile.am
-+++ b/cipher/Makefile.am
-@@ -169,7 +169,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c
-
-
- if ENABLE_O_FLAG_MUNGING
--o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g'
-+o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g'
- else
- o_flag_munging = cat
- endif
-diff --git a/random/Makefile.am b/random/Makefile.am
-index c7100ef8b8..a42e430649 100644
---- a/random/Makefile.am
-+++ b/random/Makefile.am
-@@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h
-
- # The rndjent module needs to be compiled without optimization. */
- if ENABLE_O_FLAG_MUNGING
--o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g'
-+o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g'
- else
- o_flag_munging = cat
- endif
diff --git a/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch b/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
index 4233fa7877f..ccf4e18910b 100644
--- a/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
+++ b/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
@@ -1,4 +1,4 @@
-From 9182bc2dc676858a823c477d8f45a578b8c4f69f Mon Sep 17 00:00:00 2001
+From c7a99e7a15f1f703ac90fc2a16b2c2115a66a996 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Sun, 12 Jun 2016 04:44:29 -0400
Subject: [PATCH] tests/Makefile.am: fix undefined reference to
@@ -9,16 +9,15 @@ Add missing '-lpthread' to CFLAGS
Upstream-Status: Pending
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-
---
tests/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
-index e6953fd..f47e1d3 100644
+index 3170a58..9a9e1c2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
-@@ -76,7 +76,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
+@@ -93,7 +93,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
@@ -27,7 +26,7 @@ index e6953fd..f47e1d3 100644
testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE)
# Build a version of the test driver for the build platform.
-@@ -95,7 +95,7 @@ else
+@@ -112,7 +112,7 @@ else
xtestsuite_libs = ../src/.libs/libgcrypt.so*
xtestsuite_driver = testdrv
t_kdf_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
diff --git a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch
index ed65ed4e67c..44aac1913e1 100644
--- a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch
+++ b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch
@@ -1,3 +1,8 @@
+From eb3a5bc4d5a212da64c0f9396c7f31f83aa6f36c Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Fri, 9 Sep 2022 11:13:37 +0100
+Subject: [PATCH] libgcrypt: disable bench-slope test case
+
The bench-slope test appears to be aborting fairly frequently, which causes
failures on the autobuilder.
@@ -10,10 +15,10 @@ Signed-off-by: Ross Burton <ross.burton@arm.com>
1 file changed, 1 deletion(-)
diff --git a/tests/testdrv.c b/tests/testdrv.c
-index bfca4c2314..5a755f512e 100644
+index 634b718..1e9dddb 100644
--- a/tests/testdrv.c
+++ b/tests/testdrv.c
-@@ -77,7 +77,6 @@ static struct {
+@@ -76,7 +76,6 @@ static struct {
{ "t-x448" },
{ "t-ed448" },
{ "benchmark" },
@@ -21,4 +26,3 @@ index bfca4c2314..5a755f512e 100644
{ "hashtest-6g", "hashtest", "--hugeblock --gigs 6 SHA1 SHA256 SHA512 "
"SHA3-512 SM3 BLAKE2S_256 "
"BLAKE2B_512 CRC32 "
-
diff --git a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch
index b9a607863d3..98874ce12a9 100644
--- a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch
+++ b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch
@@ -1,11 +1,19 @@
+From ede03b847038afc294e206ca345d12d75bbba844 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Fri, 26 Aug 2022 15:23:37 +0100
+Subject: [PATCH] libgcrypt: rewrite ptest
+
Don't depend on a native libgpg-error to build the test driver, as it's
an optional dependency for some C annotations.
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@arm.com>
+---
+ tests/testdrv.c | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/tests/testdrv.c b/tests/testdrv.c
-index 0ccde326..6d6abd57 100644
+index bfca4c2..634b718 100644
--- a/tests/testdrv.c
+++ b/tests/testdrv.c
@@ -32,7 +32,6 @@
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb
similarity index 91%
rename from meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb
rename to meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb
index ea1f34e8cea..e51a20e5bfb 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb
@@ -20,13 +20,12 @@ DEPENDS = "libgpg-error"
UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
file://0001-libgcrypt-fix-m4-file-for-oe-core.patch \
- file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
file://no-native-gpg-error.patch \
file://no-bench-slope.patch \
file://run-ptest \
"
-SRC_URI[sha256sum] = "09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c"
+SRC_URI[sha256sum] = "24e91c9123a46c54e8371f3a3a2502f1198f2893fbfbf59af95bc1c21499b00e"
BINCONFIG = "${bindir}/libgcrypt-config"
--
2.34.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 5/5] lttng-tools: fix compile failed with libxml2 2.14.0+
2025-05-21 8:09 [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3 Hongxu Jia
` (2 preceding siblings ...)
2025-05-21 8:09 ` [PATCH v2 4/5] libgcrypt: upgrade 1.11.0 -> 1.11.1 Hongxu Jia
@ 2025-05-21 8:09 ` Hongxu Jia
2025-05-22 6:30 ` [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3 Mathieu Dubois-Briand
4 siblings, 0 replies; 14+ messages in thread
From: Hongxu Jia @ 2025-05-21 8:09 UTC (permalink / raw)
To: Peter.Marko, mathieu.dubois-briand, alex.kanavin,
openembedded-core
Description:
| In file included from /srv/pokybuild/yocto-worker/qemux86-alt/build/build/tmp/work/core2-32-poky-linux/lttng-tools/2.13.15/recipe-sysroot/usr/include/libxml2/libxml/parser.h:25,
| from ../../../../lttng-tools-2.13.15/src/common/config/session-config.c:29:
| /srv/pokybuild/yocto-worker/qemux86-alt/build/build/tmp/work/core2-32-poky-linux/lttng-tools/2.13.15/recipe-sysroot/usr/include/libxml2/libxml/encoding.h:173:7: note: declared here
| 173 | } input XML_DEPRECATED_MEMBER;
| | ^~~~~
| ../../../../lttng-tools-2.13.15/src/common/config/session-config.c:432:15: error: called object is not a function or function pointer
| 432 | ret = handler->input(out_str, &out_len, (const xmlChar *) in_str, &in_len);
| | ^~~~~~~
| At top level:
| cc1: note: unrecognized command-line option '-Wno-incomplete-setjmp-declaration' may have been intended to silence earlier diagnostics
According to [1][2], the UTF-8 handler is
```
static xmlCharEncError
UTF8ToUTF8(void *vctxt ATTRIBUTE_UNUSED,
unsigned char* out, int *outlen,
const unsigned char* in, int *inlen,
int flush ATTRIBUTE_UNUSED)
```
Update input.func with setting ATTRIBUTE_UNUSED params with NULL and 0
[1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/38f475072aefe032fff1dc058df3e56c1e7062fa
[2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/69b83bb68e2a8ed0013f80c51b9a358714b00c9a#478024cc18a2cc8dbaed34076e9775f6827f413d_2188_2201
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
...fails-to-compile-with-libxml2-2.14.0.patch | 55 +++++++++++++++++++
.../lttng/lttng-tools_2.13.15.bb | 1 +
2 files changed, 56 insertions(+)
create mode 100644 meta/recipes-kernel/lttng/lttng-tools/0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch
new file mode 100644
index 00000000000..7c2b8937313
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch
@@ -0,0 +1,55 @@
+From 0b19e10a8a52fab0bfadbac5ce70f1b2d185a1d1 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Wed, 21 May 2025 13:09:25 +0800
+Subject: [PATCH] fix lttng-tools fails to compile with libxml2 2.14.0+
+
+Description:
+| In file included from /srv/pokybuild/yocto-worker/qemux86-alt/build/build/tmp/work/core2-32-poky-linux/lttng-tools/2.13.15/recipe-sysroot/usr/include/libxml2/libxml/parser.h:25,
+| from ../../../../lttng-tools-2.13.15/src/common/config/session-config.c:29:
+| /srv/pokybuild/yocto-worker/qemux86-alt/build/build/tmp/work/core2-32-poky-linux/lttng-tools/2.13.15/recipe-sysroot/usr/include/libxml2/libxml/encoding.h:173:7: note: declared here
+| 173 | } input XML_DEPRECATED_MEMBER;
+| | ^~~~~
+| ../../../../lttng-tools-2.13.15/src/common/config/session-config.c:432:15: error: called object is not a function or function pointer
+| 432 | ret = handler->input(out_str, &out_len, (const xmlChar *) in_str, &in_len);
+| | ^~~~~~~
+| At top level:
+| cc1: note: unrecognized command-line option '-Wno-incomplete-setjmp-declaration' may have been intended to silence earlier diagnostics
+
+
+According to [1][2], the UTF-8 handler is
+```
+static xmlCharEncError
+UTF8ToUTF8(void *vctxt ATTRIBUTE_UNUSED,
+ unsigned char* out, int *outlen,
+ const unsigned char* in, int *inlen,
+ int flush ATTRIBUTE_UNUSED)
+```
+
+Update input.func with setting ATTRIBUTE_UNUSED params with NULL and 0
+
+[1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/38f475072aefe032fff1dc058df3e56c1e7062fa
+[2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/69b83bb68e2a8ed0013f80c51b9a358714b00c9a#478024cc18a2cc8dbaed34076e9775f6827f413d_2188_2201
+
+Upstream-Status: Submitted [https://github.com/lttng/lttng-tools/pull/170]
+Signed-off-by: Marko, Peter <Peter.Marko@siemens.com>
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ src/common/config/session-config.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
+index bb4e9fe..4042d34 100644
+--- a/src/common/config/session-config.c
++++ b/src/common/config/session-config.c
+@@ -429,7 +429,7 @@ static xmlChar *encode_string(const char *in_str)
+ goto end;
+ }
+
+- ret = handler->input(out_str, &out_len, (const xmlChar *) in_str, &in_len);
++ ret = handler->input.func(NULL, out_str, &out_len, (const xmlChar *) in_str, &in_len, 0);
+ if (ret < 0) {
+ xmlFree(out_str);
+ out_str = NULL;
+--
+2.34.1
+
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.15.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.15.bb
index 762d4e5c2fe..f39404afa0f 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.15.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.15.bb
@@ -39,6 +39,7 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
file://0001-compat-Define-off64_t-as-off_t-on-linux.patch \
file://0001-tests-add-check_skip_kernel_test-to-check-root-user-.patch \
file://0001-Fix-rotation-destroy-flush-fix-session-daemon-abort-.patch \
+ file://0001-fix-lttng-tools-fails-to-compile-with-libxml2-2.14.0.patch \
"
SRC_URI[sha256sum] = "96ea42351ee112c19dad9fdc7aae93b583d9f1722b2175664a381d2d337703c4"
--
2.34.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
2025-05-21 8:09 [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3 Hongxu Jia
` (3 preceding siblings ...)
2025-05-21 8:09 ` [PATCH 5/5] lttng-tools: fix compile failed with libxml2 2.14.0+ Hongxu Jia
@ 2025-05-22 6:30 ` Mathieu Dubois-Briand
2025-05-22 6:35 ` Marko, Peter
4 siblings, 1 reply; 14+ messages in thread
From: Mathieu Dubois-Briand @ 2025-05-22 6:30 UTC (permalink / raw)
To: Hongxu Jia, Peter.Marko, alex.kanavin, openembedded-core
On Wed May 21, 2025 at 10:09 AM CEST, Hongxu Jia wrote:
> - Rebase install-tests.patch
> - Remove --enable-ipv6, due to upstream [build: Remove check for IPv6 ][2]
>
> License-Update: Mention contributors in Copyright [1]
>
> [1] https://gitlab.gnome.org/GNOME/libxml2/-/commit/4bd66d4549b2e8925a752e0daac3a189d2fec8f7
> [2] https://gitlab.gnome.org/GNOME/libxml2/-/commit/dc6f55cf6e03ae63a40e3af9ad6879821558d6a7
>
> Release notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.3
> Regressions
>
> reader: Fix reading compressed data
> parser: Make undeclared entities in XML content fatal
> save: Fix XML escape table
> save: Fix xmlSave with NULL encoding
> Revert "valid: Remove duplicate error messages when streaming"
>
> Bug fixes
>
> save: Fix serialization of attribute defaults containing <
> io: Fix linkage of __xml*BufferCreateFilename functions
>
> Build systems
>
> cmake: Fix installation directories in libxml2-config.cmake
> meson: Install libxml2.py
>
> Improvements
>
> parser: Make xmlCtxtGetValidCtxt depend on VALID_ENABLED
> html: Avoid HTML_PARSE_HTML5 clashing with XML_PARSE_NOENT
>
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
Hi,
Thanks for the lttng fix.
Build is now correct with this version of libxml2, but we do have some
ptest failures:
Failed ptests:
{'libxml2': ['testThreads']}
https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/1541
https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/1540
Corresponding ptest logs can be found here:
https://valkyrie.yocto.io/pub/non-release/20250521-95/testresults/qemuarm64-ptest/core-image-ptest-libxml2/
https://valkyrie.yocto.io/pub/non-release/20250521-95/testresults/qemux86-64-ptest/core-image-ptest-libxml2/
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
2025-05-22 6:30 ` [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3 Mathieu Dubois-Briand
@ 2025-05-22 6:35 ` Marko, Peter
2025-05-22 8:58 ` Mathieu Dubois-Briand
0 siblings, 1 reply; 14+ messages in thread
From: Marko, Peter @ 2025-05-22 6:35 UTC (permalink / raw)
To: Mathieu Dubois-Briand, Hongxu Jia, alex.kanavin@gmail.com,
openembedded-core@lists.openembedded.org
> -----Original Message-----
> From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
> Sent: Thursday, May 22, 2025 8:31
> To: Hongxu Jia <hongxu.jia@windriver.com>; Marko, Peter (FT D EU SK BFS1)
> <Peter.Marko@siemens.com>; alex.kanavin@gmail.com; openembedded-
> core@lists.openembedded.org
> Subject: Re: [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
>
> On Wed May 21, 2025 at 10:09 AM CEST, Hongxu Jia wrote:
> > - Rebase install-tests.patch
> > - Remove --enable-ipv6, due to upstream [build: Remove check for IPv6 ][2]
> >
> > License-Update: Mention contributors in Copyright [1]
> >
> > [1] https://gitlab.gnome.org/GNOME/libxml2/-
> /commit/4bd66d4549b2e8925a752e0daac3a189d2fec8f7
> > [2] https://gitlab.gnome.org/GNOME/libxml2/-
> /commit/dc6f55cf6e03ae63a40e3af9ad6879821558d6a7
> >
> > Release notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.3
> > Regressions
> >
> > reader: Fix reading compressed data
> > parser: Make undeclared entities in XML content fatal
> > save: Fix XML escape table
> > save: Fix xmlSave with NULL encoding
> > Revert "valid: Remove duplicate error messages when streaming"
> >
> > Bug fixes
> >
> > save: Fix serialization of attribute defaults containing <
> > io: Fix linkage of __xml*BufferCreateFilename functions
> >
> > Build systems
> >
> > cmake: Fix installation directories in libxml2-config.cmake
> > meson: Install libxml2.py
> >
> > Improvements
> >
> > parser: Make xmlCtxtGetValidCtxt depend on VALID_ENABLED
> > html: Avoid HTML_PARSE_HTML5 clashing with XML_PARSE_NOENT
> >
> > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> > ---
>
> Hi,
>
> Thanks for the lttng fix.
>
> Build is now correct with this version of libxml2, but we do have some
> ptest failures:
>
> Failed ptests:
> {'libxml2': ['testThreads']}
Mathieu, you can take my limxml2 upgrade instead of this one, the ptests are fixed there.
https://lists.openembedded.org/g/openembedded-core/message/215559
Alternatively, my changes in run-ptests can be shamelessly copied.
Peter
>
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/1541
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/1540
>
> Corresponding ptest logs can be found here:
>
> https://valkyrie.yocto.io/pub/non-release/20250521-95/testresults/qemuarm64-
> ptest/core-image-ptest-libxml2/
> https://valkyrie.yocto.io/pub/non-release/20250521-95/testresults/qemux86-64-
> ptest/core-image-ptest-libxml2/
>
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
2025-05-22 6:35 ` Marko, Peter
@ 2025-05-22 8:58 ` Mathieu Dubois-Briand
2025-05-22 12:14 ` Marko, Peter
0 siblings, 1 reply; 14+ messages in thread
From: Mathieu Dubois-Briand @ 2025-05-22 8:58 UTC (permalink / raw)
To: Marko, Peter, Hongxu Jia, alex.kanavin@gmail.com,
openembedded-core@lists.openembedded.org
On Thu May 22, 2025 at 8:35 AM CEST, Peter Marko wrote:
>
>
>> -----Original Message-----
>> From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
>> Sent: Thursday, May 22, 2025 8:31
>> To: Hongxu Jia <hongxu.jia@windriver.com>; Marko, Peter (FT D EU SK BFS1)
>> <Peter.Marko@siemens.com>; alex.kanavin@gmail.com; openembedded-
>> core@lists.openembedded.org
>> Subject: Re: [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
>>
>> On Wed May 21, 2025 at 10:09 AM CEST, Hongxu Jia wrote:
>> > - Rebase install-tests.patch
>> > - Remove --enable-ipv6, due to upstream [build: Remove check for IPv6 ][2]
>> >
>> > License-Update: Mention contributors in Copyright [1]
>> >
>> > [1] https://gitlab.gnome.org/GNOME/libxml2/-
>> /commit/4bd66d4549b2e8925a752e0daac3a189d2fec8f7
>> > [2] https://gitlab.gnome.org/GNOME/libxml2/-
>> /commit/dc6f55cf6e03ae63a40e3af9ad6879821558d6a7
>> >
>> > Release notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.3
>> > Regressions
>> >
>> > reader: Fix reading compressed data
>> > parser: Make undeclared entities in XML content fatal
>> > save: Fix XML escape table
>> > save: Fix xmlSave with NULL encoding
>> > Revert "valid: Remove duplicate error messages when streaming"
>> >
>> > Bug fixes
>> >
>> > save: Fix serialization of attribute defaults containing <
>> > io: Fix linkage of __xml*BufferCreateFilename functions
>> >
>> > Build systems
>> >
>> > cmake: Fix installation directories in libxml2-config.cmake
>> > meson: Install libxml2.py
>> >
>> > Improvements
>> >
>> > parser: Make xmlCtxtGetValidCtxt depend on VALID_ENABLED
>> > html: Avoid HTML_PARSE_HTML5 clashing with XML_PARSE_NOENT
>> >
>> > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
>> > ---
>>
>> Hi,
>>
>> Thanks for the lttng fix.
>>
>> Build is now correct with this version of libxml2, but we do have some
>> ptest failures:
>>
>> Failed ptests:
>> {'libxml2': ['testThreads']}
>
> Mathieu, you can take my limxml2 upgrade instead of this one, the ptests are fixed there.
> https://lists.openembedded.org/g/openembedded-core/message/215559
>
> Alternatively, my changes in run-ptests can be shamelessly copied.
>
> Peter
>
Oh right, I remember this one now. But the patch version differs. I
could change it in your patch while picking it, but I believe it would
be better if the modified patch goes on the mailing list before landing
on master-next.
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
2025-05-22 8:58 ` Mathieu Dubois-Briand
@ 2025-05-22 12:14 ` Marko, Peter
2025-05-22 12:25 ` Mathieu Dubois-Briand
0 siblings, 1 reply; 14+ messages in thread
From: Marko, Peter @ 2025-05-22 12:14 UTC (permalink / raw)
To: Mathieu Dubois-Briand, Hongxu Jia, alex.kanavin@gmail.com,
openembedded-core@lists.openembedded.org
> -----Original Message-----
> From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
> Sent: Thursday, May 22, 2025 10:59
> To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>; Hongxu Jia
> <hongxu.jia@windriver.com>; alex.kanavin@gmail.com; openembedded-
> core@lists.openembedded.org
> Subject: Re: [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
>
> On Thu May 22, 2025 at 8:35 AM CEST, Peter Marko wrote:
> >
> >
> >> -----Original Message-----
> >> From: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
> >> Sent: Thursday, May 22, 2025 8:31
> >> To: Hongxu Jia <hongxu.jia@windriver.com>; Marko, Peter (FT D EU SK BFS1)
> >> <Peter.Marko@siemens.com>; alex.kanavin@gmail.com; openembedded-
> >> core@lists.openembedded.org
> >> Subject: Re: [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
> >>
> >> On Wed May 21, 2025 at 10:09 AM CEST, Hongxu Jia wrote:
> >> > - Rebase install-tests.patch
> >> > - Remove --enable-ipv6, due to upstream [build: Remove check for IPv6 ][2]
> >> >
> >> > License-Update: Mention contributors in Copyright [1]
> >> >
> >> > [1] https://gitlab.gnome.org/GNOME/libxml2/-
> >> /commit/4bd66d4549b2e8925a752e0daac3a189d2fec8f7
> >> > [2] https://gitlab.gnome.org/GNOME/libxml2/-
> >> /commit/dc6f55cf6e03ae63a40e3af9ad6879821558d6a7
> >> >
> >> > Release notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.3
> >> > Regressions
> >> >
> >> > reader: Fix reading compressed data
> >> > parser: Make undeclared entities in XML content fatal
> >> > save: Fix XML escape table
> >> > save: Fix xmlSave with NULL encoding
> >> > Revert "valid: Remove duplicate error messages when streaming"
> >> >
> >> > Bug fixes
> >> >
> >> > save: Fix serialization of attribute defaults containing <
> >> > io: Fix linkage of __xml*BufferCreateFilename functions
> >> >
> >> > Build systems
> >> >
> >> > cmake: Fix installation directories in libxml2-config.cmake
> >> > meson: Install libxml2.py
> >> >
> >> > Improvements
> >> >
> >> > parser: Make xmlCtxtGetValidCtxt depend on VALID_ENABLED
> >> > html: Avoid HTML_PARSE_HTML5 clashing with XML_PARSE_NOENT
> >> >
> >> > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> >> > ---
> >>
> >> Hi,
> >>
> >> Thanks for the lttng fix.
> >>
> >> Build is now correct with this version of libxml2, but we do have some
> >> ptest failures:
> >>
> >> Failed ptests:
> >> {'libxml2': ['testThreads']}
> >
> > Mathieu, you can take my limxml2 upgrade instead of this one, the ptests are
> fixed there.
> > https://lists.openembedded.org/g/openembedded-core/message/215559
> >
> > Alternatively, my changes in run-ptests can be shamelessly copied.
> >
> > Peter
> >
>
> Oh right, I remember this one now. But the patch version differs. I
> could change it in your patch while picking it, but I believe it would
> be better if the modified patch goes on the mailing list before landing
> on master-next.
>
OK, I have updated my patch to .3 and sent to mailing list.
Don't forget to pick the lttng-tools patch again with it...
Peter
>
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
2025-05-22 12:14 ` Marko, Peter
@ 2025-05-22 12:25 ` Mathieu Dubois-Briand
2025-05-26 1:55 ` [OE-core] " Khem Raj
0 siblings, 1 reply; 14+ messages in thread
From: Mathieu Dubois-Briand @ 2025-05-22 12:25 UTC (permalink / raw)
To: Marko, Peter, Hongxu Jia, alex.kanavin@gmail.com,
openembedded-core@lists.openembedded.org
On Thu May 22, 2025 at 2:14 PM CEST, Peter Marko wrote:
>
> OK, I have updated my patch to .3 and sent to mailing list.
> Don't forget to pick the lttng-tools patch again with it...
>
> Peter
>
Thanks, I will take both patches for my next build.
--
Mathieu Dubois-Briand, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [OE-core] [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
2025-05-22 12:25 ` Mathieu Dubois-Briand
@ 2025-05-26 1:55 ` Khem Raj
2025-05-26 17:48 ` Marko, Peter
0 siblings, 1 reply; 14+ messages in thread
From: Khem Raj @ 2025-05-26 1:55 UTC (permalink / raw)
To: mathieu.dubois-briand
Cc: Marko, Peter, Hongxu Jia, alex.kanavin@gmail.com,
openembedded-core@lists.openembedded.org
libxml2 upgrade will need some package adjustments in other recipes
depending on it. e.g. libiio from meta-oe see
https://autobuilder.yoctoproject.org/valkyrie/api/v2/logs/2490442/raw_inline
On Thu, May 22, 2025 at 5:25 AM Mathieu Dubois-Briand via
lists.openembedded.org
<mathieu.dubois-briand=bootlin.com@lists.openembedded.org> wrote:
>
> On Thu May 22, 2025 at 2:14 PM CEST, Peter Marko wrote:
> >
> > OK, I have updated my patch to .3 and sent to mailing list.
> > Don't forget to pick the lttng-tools patch again with it...
> >
> > Peter
> >
>
> Thanks, I will take both patches for my next build.
>
> --
> Mathieu Dubois-Briand, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#217094): https://lists.openembedded.org/g/openembedded-core/message/217094
> Mute This Topic: https://lists.openembedded.org/mt/113225735/1997914
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [OE-core] [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
2025-05-26 1:55 ` [OE-core] " Khem Raj
@ 2025-05-26 17:48 ` Marko, Peter
2025-05-26 18:57 ` Khem Raj
0 siblings, 1 reply; 14+ messages in thread
From: Marko, Peter @ 2025-05-26 17:48 UTC (permalink / raw)
To: Khem Raj, mathieu.dubois-briand@bootlin.com
Cc: Hongxu Jia, alex.kanavin@gmail.com,
openembedded-core@lists.openembedded.org
I have checked the problem and cmake file generated by libxml2 points to /usr/include now.
Build succeeds when I revert following libxml2 commit:
https://gitlab.gnome.org/GNOME/libxml2/-/commit/75dde50b20215a2a3a445b62f36a67c8ed337cab
This clearly breaks cross-compilation scenario which always has a prefix which is usually calculated from cmake file location.
Since this is included only in 2.14.3, we could for now take 2.14.2 which I submitted before.
Or take 2.14.3 plus add a patch to revert this commit.
But ultimately, we need to discuss this with upstream.
Peter
> -----Original Message-----
> From: Khem Raj <raj.khem@gmail.com>
> Sent: Monday, May 26, 2025 3:55
> To: mathieu.dubois-briand@bootlin.com
> Cc: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>; Hongxu Jia
> <hongxu.jia@windriver.com>; alex.kanavin@gmail.com; openembedded-
> core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
>
> libxml2 upgrade will need some package adjustments in other recipes
> depending on it. e.g. libiio from meta-oe see
>
> https://autobuilder.yoctoproject.org/valkyrie/api/v2/logs/2490442/raw_inline
>
> On Thu, May 22, 2025 at 5:25 AM Mathieu Dubois-Briand via
> lists.openembedded.org
> <mathieu.dubois-briand=bootlin.com@lists.openembedded.org> wrote:
> >
> > On Thu May 22, 2025 at 2:14 PM CEST, Peter Marko wrote:
> > >
> > > OK, I have updated my patch to .3 and sent to mailing list.
> > > Don't forget to pick the lttng-tools patch again with it...
> > >
> > > Peter
> > >
> >
> > Thanks, I will take both patches for my next build.
> >
> > --
> > Mathieu Dubois-Briand, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#217094): https://lists.openembedded.org/g/openembedded-
> core/message/217094
> > Mute This Topic: https://lists.openembedded.org/mt/113225735/1997914
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
> [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [OE-core] [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
2025-05-26 17:48 ` Marko, Peter
@ 2025-05-26 18:57 ` Khem Raj
2025-05-26 19:36 ` Marko, Peter
0 siblings, 1 reply; 14+ messages in thread
From: Khem Raj @ 2025-05-26 18:57 UTC (permalink / raw)
To: Marko, Peter
Cc: mathieu.dubois-briand@bootlin.com, Hongxu Jia,
alex.kanavin@gmail.com, openembedded-core@lists.openembedded.org
On Mon, May 26, 2025 at 10:48 AM Marko, Peter <Peter.Marko@siemens.com> wrote:
>
> I have checked the problem and cmake file generated by libxml2 points to /usr/include now.
> Build succeeds when I revert following libxml2 commit:
> https://gitlab.gnome.org/GNOME/libxml2/-/commit/75dde50b20215a2a3a445b62f36a67c8ed337cab
> This clearly breaks cross-compilation scenario which always has a prefix which is usually calculated from cmake file location.
>
> Since this is included only in 2.14.3, we could for now take 2.14.2 which I submitted before.
> Or take 2.14.3 plus add a patch to revert this commit.
a revert of the troubling patch on top of 2.14.3 is fine. OE is not
affected by the
the case this patch is trying to fix anyway
> But ultimately, we need to discuss this with upstream.
>
> Peter
>
> > -----Original Message-----
> > From: Khem Raj <raj.khem@gmail.com>
> > Sent: Monday, May 26, 2025 3:55
> > To: mathieu.dubois-briand@bootlin.com
> > Cc: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>; Hongxu Jia
> > <hongxu.jia@windriver.com>; alex.kanavin@gmail.com; openembedded-
> > core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
> >
> > libxml2 upgrade will need some package adjustments in other recipes
> > depending on it. e.g. libiio from meta-oe see
> >
> > https://autobuilder.yoctoproject.org/valkyrie/api/v2/logs/2490442/raw_inline
> >
> > On Thu, May 22, 2025 at 5:25 AM Mathieu Dubois-Briand via
> > lists.openembedded.org
> > <mathieu.dubois-briand=bootlin.com@lists.openembedded.org> wrote:
> > >
> > > On Thu May 22, 2025 at 2:14 PM CEST, Peter Marko wrote:
> > > >
> > > > OK, I have updated my patch to .3 and sent to mailing list.
> > > > Don't forget to pick the lttng-tools patch again with it...
> > > >
> > > > Peter
> > > >
> > >
> > > Thanks, I will take both patches for my next build.
> > >
> > > --
> > > Mathieu Dubois-Briand, Bootlin
> > > Embedded Linux and Kernel engineering
> > > https://bootlin.com
> > >
> > >
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > > Links: You receive all messages sent to this group.
> > > View/Reply Online (#217094): https://lists.openembedded.org/g/openembedded-
> > core/message/217094
> > > Mute This Topic: https://lists.openembedded.org/mt/113225735/1997914
> > > Group Owner: openembedded-core+owner@lists.openembedded.org
> > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
> > [raj.khem@gmail.com]
> > > -=-=-=-=-=-=-=-=-=-=-=-
> > >
^ permalink raw reply [flat|nested] 14+ messages in thread
* RE: [OE-core] [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
2025-05-26 18:57 ` Khem Raj
@ 2025-05-26 19:36 ` Marko, Peter
0 siblings, 0 replies; 14+ messages in thread
From: Marko, Peter @ 2025-05-26 19:36 UTC (permalink / raw)
To: Khem Raj
Cc: mathieu.dubois-briand@bootlin.com, Hongxu Jia,
alex.kanavin@gmail.com, openembedded-core@lists.openembedded.org
https://lists.openembedded.org/g/openembedded-core/message/217275
which also includes link to upstream ticket.
Peter
> -----Original Message-----
> From: Khem Raj <raj.khem@gmail.com>
> Sent: Monday, May 26, 2025 20:57
> To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>
> Cc: mathieu.dubois-briand@bootlin.com; Hongxu Jia
> <hongxu.jia@windriver.com>; alex.kanavin@gmail.com; openembedded-
> core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
>
> On Mon, May 26, 2025 at 10:48 AM Marko, Peter <Peter.Marko@siemens.com>
> wrote:
> >
> > I have checked the problem and cmake file generated by libxml2 points to
> /usr/include now.
> > Build succeeds when I revert following libxml2 commit:
> > https://gitlab.gnome.org/GNOME/libxml2/-
> /commit/75dde50b20215a2a3a445b62f36a67c8ed337cab
> > This clearly breaks cross-compilation scenario which always has a prefix which
> is usually calculated from cmake file location.
> >
> > Since this is included only in 2.14.3, we could for now take 2.14.2 which I
> submitted before.
> > Or take 2.14.3 plus add a patch to revert this commit.
>
> a revert of the troubling patch on top of 2.14.3 is fine. OE is not
> affected by the
> the case this patch is trying to fix anyway
>
> > But ultimately, we need to discuss this with upstream.
> >
> > Peter
> >
> > > -----Original Message-----
> > > From: Khem Raj <raj.khem@gmail.com>
> > > Sent: Monday, May 26, 2025 3:55
> > > To: mathieu.dubois-briand@bootlin.com
> > > Cc: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>; Hongxu
> Jia
> > > <hongxu.jia@windriver.com>; alex.kanavin@gmail.com; openembedded-
> > > core@lists.openembedded.org
> > > Subject: Re: [OE-core] [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3
> > >
> > > libxml2 upgrade will need some package adjustments in other recipes
> > > depending on it. e.g. libiio from meta-oe see
> > >
> > > https://autobuilder.yoctoproject.org/valkyrie/api/v2/logs/2490442/raw_inline
> > >
> > > On Thu, May 22, 2025 at 5:25 AM Mathieu Dubois-Briand via
> > > lists.openembedded.org
> > > <mathieu.dubois-briand=bootlin.com@lists.openembedded.org> wrote:
> > > >
> > > > On Thu May 22, 2025 at 2:14 PM CEST, Peter Marko wrote:
> > > > >
> > > > > OK, I have updated my patch to .3 and sent to mailing list.
> > > > > Don't forget to pick the lttng-tools patch again with it...
> > > > >
> > > > > Peter
> > > > >
> > > >
> > > > Thanks, I will take both patches for my next build.
> > > >
> > > > --
> > > > Mathieu Dubois-Briand, Bootlin
> > > > Embedded Linux and Kernel engineering
> > > > https://bootlin.com
> > > >
> > > >
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > > Links: You receive all messages sent to this group.
> > > > View/Reply Online (#217094):
> https://lists.openembedded.org/g/openembedded-
> > > core/message/217094
> > > > Mute This Topic: https://lists.openembedded.org/mt/113225735/1997914
> > > > Group Owner: openembedded-core+owner@lists.openembedded.org
> > > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
> > > [raj.khem@gmail.com]
> > > > -=-=-=-=-=-=-=-=-=-=-=-
> > > >
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2025-05-26 19:36 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-21 8:09 [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3 Hongxu Jia
2025-05-21 8:09 ` [PATCH v2 2/5] patch: upgrade 2.7.6 -> 2.8 Hongxu Jia
2025-05-21 8:09 ` [PATCH v2 3/5] man-pages: upgrade 6.13 -> 6.14 Hongxu Jia
2025-05-21 8:09 ` [PATCH v2 4/5] libgcrypt: upgrade 1.11.0 -> 1.11.1 Hongxu Jia
2025-05-21 8:09 ` [PATCH 5/5] lttng-tools: fix compile failed with libxml2 2.14.0+ Hongxu Jia
2025-05-22 6:30 ` [PATCH 1/5] libxml2: upgrade 2.13.8 -> 2.14.3 Mathieu Dubois-Briand
2025-05-22 6:35 ` Marko, Peter
2025-05-22 8:58 ` Mathieu Dubois-Briand
2025-05-22 12:14 ` Marko, Peter
2025-05-22 12:25 ` Mathieu Dubois-Briand
2025-05-26 1:55 ` [OE-core] " Khem Raj
2025-05-26 17:48 ` Marko, Peter
2025-05-26 18:57 ` Khem Raj
2025-05-26 19:36 ` Marko, Peter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.