From 383df93c6fd5647242e945510e802523f7dbfabf Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Thu, 22 May 2025 14:13:16 +0200 Subject: [PATCH] libxml2: upgrade 2.13.6 -> 2.14.3 Handle CVE-2025-32414 and CVE-2025-32415. * rebased install-tests.patch * removed testsuite testThreads (merged into runtest.c) * https://gitlab.gnome.org/GNOME/libxml2/-/commit/481fd6bbee029e15a6a4015e5160a332d7c18cba * removed IPv6 option (as part of with ftp support removal) * https://gitlab.gnome.org/GNOME/libxml2/-/commit/dba1ed85a320c36807ee09f44d09fd30852b9370 * added testsuites testlimits testparser (already present before but not executed) License-Update: Mention contributors in Copyright https://gitlab.gnome.org/GNOME/libxml2/-/commit/4bd66d4549b2e8925a752e0daac3a189d2fec8f7 (From OE-Core rev: 6585649fdd2ab9e83dfd60eb77ff7821a1363d50) Signed-off-by: Peter Marko Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-core/libxml/libxml2/install-tests.patch | 4 ++-- meta/recipes-core/libxml/libxml2/run-ptest | 2 +- .../libxml/{libxml2_2.13.8.bb => libxml2_2.14.3.bb} | 9 +++------ 3 files changed, 6 insertions(+), 9 deletions(-) rename meta/recipes-core/libxml/{libxml2_2.13.8.bb => libxml2_2.14.3.bb} (92%) diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch index 1c8c13ab5c..789aeca119 100644 --- a/meta/recipes-core/libxml/libxml2/install-tests.patch +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch @@ -15,7 +15,7 @@ diff --git a/Makefile.am b/Makefile.am index 4cb9a5c..8adcd7e 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -27,6 +27,16 @@ check_PROGRAMS = \ +@@ -26,6 +26,16 @@ check_PROGRAMS = \ testparser \ testrecurse @@ -29,6 +29,6 @@ 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 diff --git a/meta/recipes-core/libxml/libxml2/run-ptest b/meta/recipes-core/libxml/libxml2/run-ptest index f252a78f17..cbbdd5592f 100755 --- a/meta/recipes-core/libxml/libxml2/run-ptest +++ b/meta/recipes-core/libxml/libxml2/run-ptest @@ -5,7 +5,7 @@ set -e export LC_ALL=en_US.UTF-8 # testModule isn't that useful and hard-codes buildtree, so we don't run that -TESTS="runtest runsuite testrecurse testchar testdict testThreads runxmlconf testapi" +TESTS="runtest runsuite testrecurse testchar testdict runxmlconf testapi testlimits testparser" for T in $TESTS; do echo Running $T diff --git a/meta/recipes-core/libxml/libxml2_2.13.8.bb b/meta/recipes-core/libxml/libxml2_2.14.3.bb similarity index 92% rename from meta/recipes-core/libxml/libxml2_2.13.8.bb rename to meta/recipes-core/libxml/libxml2_2.14.3.bb index e82e0e8ec3..d5d144f793 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 @@ -27,11 +27,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" PACKAGECONFIG[python] = "--with-python=${PYTHON},--without-python,python3" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," inherit autotools pkgconfig binconfig-disabled ptest