diff mbox series

libxml2: upgrade 2.13.6 -> 2.14.2

Message ID 20250427141012.2442478-1-peter.marko@siemens.com
State New
Headers show
Series libxml2: upgrade 2.13.6 -> 2.14.2 | expand

Commit Message

Marko, Peter April 27, 2025, 2:10 p.m. UTC 
From: Peter Marko <peter.marko@siemens.com>

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

Signed-off-by: Peter Marko <peter.marko@siemens.com>
---
 meta/recipes-core/libxml/libxml2/install-tests.patch     | 4 ++--
 meta/recipes-core/libxml/libxml2/run-ptest               | 2 +-
 .../libxml/{libxml2_2.13.6.bb => libxml2_2.14.2.bb}      | 9 +++------
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename meta/recipes-core/libxml/{libxml2_2.13.6.bb => libxml2_2.14.2.bb} (92%)

Comments

Richard Purdie April 27, 2025, 9:54 p.m. UTC | #1 
On Sun, 2025-04-27 at 16:10 +0200, Peter Marko via lists.openembedded.org wrote:
> From: Peter Marko <peter.marko@siemens.com>
> 
> 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
> 
> Signed-off-by: Peter Marko <peter.marko@siemens.com>
> ---
>  meta/recipes-core/libxml/libxml2/install-tests.patch     | 4 ++--
>  meta/recipes-core/libxml/libxml2/run-ptest               | 2 +-
>  .../libxml/{libxml2_2.13.6.bb => libxml2_2.14.2.bb}      | 9 +++------
>  3 files changed, 6 insertions(+), 9 deletions(-)
>  rename meta/recipes-core/libxml/{libxml2_2.13.6.bb => libxml2_2.14.2.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.6.bb b/meta/recipes-core/libxml/libxml2_2.14.2.bb
> similarity index 92%
> rename from meta/recipes-core/libxml/libxml2_2.13.6.bb
> rename to meta/recipes-core/libxml/libxml2_2.14.2.bb
> index 3b3ca87e96..ab06282f17 100644
> --- a/meta/recipes-core/libxml/libxml2_2.13.6.bb
> +++ b/meta/recipes-core/libxml/libxml2_2.14.2.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] = "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96"
> +SRC_URI[archive.sha256sum] = "353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6"
>  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
>  

This breaks lttng-tools unfortunately:

https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1449
(and more in that build)

Cheers,

Richard
Marko, Peter April 27, 2025, 10:12 p.m. UTC | #2 
> -----Original Message-----
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> Sent: Sunday, April 27, 2025 23:54
> To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>;
> openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2
> 
> On Sun, 2025-04-27 at 16:10 +0200, Peter Marko via lists.openembedded.org
> wrote:
> > From: Peter Marko <peter.marko@siemens.com>
> >
> > 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
> >
> > Signed-off-by: Peter Marko <peter.marko@siemens.com>
> > ---
> >  meta/recipes-core/libxml/libxml2/install-tests.patch     | 4 ++--
> >  meta/recipes-core/libxml/libxml2/run-ptest               | 2 +-
> >  .../libxml/{libxml2_2.13.6.bb => libxml2_2.14.2.bb}      | 9 +++------
> >  3 files changed, 6 insertions(+), 9 deletions(-)
> >  rename meta/recipes-core/libxml/{libxml2_2.13.6.bb => libxml2_2.14.2.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.6.bb b/meta/recipes-
> core/libxml/libxml2_2.14.2.bb
> > similarity index 92%
> > rename from meta/recipes-core/libxml/libxml2_2.13.6.bb
> > rename to meta/recipes-core/libxml/libxml2_2.14.2.bb
> > index 3b3ca87e96..ab06282f17 100644
> > --- a/meta/recipes-core/libxml/libxml2_2.13.6.bb
> > +++ b/meta/recipes-core/libxml/libxml2_2.14.2.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=2b4b7b827d2d8b0803724
> 33c4c9c85b6 \
> >                      file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060
> 602d20f3a7 \
> >                      "
> > @@ -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] =
> "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96"
> > +SRC_URI[archive.sha256sum] =
> "353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6"
> >  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
> >
> 
> This breaks lttng-tools unfortunately:
> 
> https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1449
> (and more in that build)
> 
> Cheers,
> 
> Richard

OK, I'll check the lttng-tools tomorrow evening.

Missing testdata.json is weird, I have run testimage with libxml2-ptest.
But I can also try it with core-image-sato-sdk

Regarding the send-error-reports, I'm not sure how to test that...

Peter
Richard Purdie April 28, 2025, 9:44 a.m. UTC | #3 
On Sun, 2025-04-27 at 22:12 +0000, Marko, Peter wrote:
> 
> 
> > -----Original Message-----
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Sent: Sunday, April 27, 2025 23:54
> > To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>;
> > openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2
> > 
> > On Sun, 2025-04-27 at 16:10 +0200, Peter Marko via
> > lists.openembedded.org
> > wrote:
> > > From: Peter Marko <peter.marko@siemens.com>
> > > 
> > > 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
> > > 
> > > Signed-off-by: Peter Marko <peter.marko@siemens.com>
> > > ---
> > >  meta/recipes-core/libxml/libxml2/install-tests.patch     | 4 ++-
> > > -
> > >  meta/recipes-core/libxml/libxml2/run-ptest               | 2 +-
> > >  .../libxml/{libxml2_2.13.6.bb => libxml2_2.14.2.bb}      | 9
> > > +++------
> > >  3 files changed, 6 insertions(+), 9 deletions(-)
> > >  rename meta/recipes-core/libxml/{libxml2_2.13.6.bb =>
> > > libxml2_2.14.2.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.6.bb
> > > b/meta/recipes-
> > core/libxml/libxml2_2.14.2.bb
> > > similarity index 92%
> > > rename from meta/recipes-core/libxml/libxml2_2.13.6.bb
> > > rename to meta/recipes-core/libxml/libxml2_2.14.2.bb
> > > index 3b3ca87e96..ab06282f17 100644
> > > --- a/meta/recipes-core/libxml/libxml2_2.13.6.bb
> > > +++ b/meta/recipes-core/libxml/libxml2_2.14.2.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=2b4b7b827d2d8b0803724
> > 33c4c9c85b6 \
> > >                     
> > > file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060
> > 602d20f3a7 \
> > >                      "
> > > @@ -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] =
> > "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96"
> > > +SRC_URI[archive.sha256sum] =
> > "353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6"
> > >  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
> > > 
> > 
> > This breaks lttng-tools unfortunately:
> > 
> > https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1449
> > (and more in that build)
> > 
> > Cheers,
> > 
> > Richard
> 
> OK, I'll check the lttng-tools tomorrow evening.
> 
> Missing testdata.json is weird, I have run testimage with libxml2-
> ptest.
> But I can also try it with core-image-sato-sdk
> 
> Regarding the send-error-reports, I'm not sure how to test that...

Those are consequences of the lttng-tools failures, that is the issue
we need to work out.

I've mentioned it on the lttng irc channel. I didn't see any patch in
their repo as of last night.

Cheers,

Richard
Marko, Peter April 28, 2025, 6:14 p.m. UTC | #4 
The solution in lttng-tools is a one-liner.
It is required after https://gitlab.gnome.org/GNOME/libxml2/-/commit/38f475072aefe032fff1dc058df3e56c1e7062fa (2.14.0)

Of course, that one-liner removes compatibility with old libxml2 version, so I think it's inappropriate for upstream.
I don't want to spend time to learn how to do detect this with autotools.
So I'll just try a patch with "Upstream-Status: Inappropriate" and submit it upstream.
I'm currently waiting for admins to approve my account in lttng bugs tool.

I wonder how many recipes in meta-openembedded will break on this.

Peter

diff --git a/src/common/config/session-config.c b/src/common/config/session-config.c
index bb4e9fe..413812b 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.legacyFunc(out_str, &out_len, (const xmlChar *) in_str, &in_len);
        if (ret < 0) {
                xmlFree(out_str);
                out_str = NULL;

-----Original Message-----
From: Richard Purdie <richard.purdie@linuxfoundation.org> 
Sent: Monday, April 28, 2025 11:44
To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>; openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2

On Sun, 2025-04-27 at 22:12 +0000, Marko, Peter wrote:
> 
> 
> > -----Original Message-----
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Sent: Sunday, April 27, 2025 23:54
> > To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>;
> > openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2
> > 
> > On Sun, 2025-04-27 at 16:10 +0200, Peter Marko via
> > lists.openembedded.org
> > wrote:
> > > From: Peter Marko <peter.marko@siemens.com>
> > > 
> > > 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
> > > 
> > > Signed-off-by: Peter Marko <peter.marko@siemens.com>
> > > ---
> > >  meta/recipes-core/libxml/libxml2/install-tests.patch     | 4 ++-
> > > -
> > >  meta/recipes-core/libxml/libxml2/run-ptest               | 2 +-
> > >  .../libxml/{libxml2_2.13.6.bb => libxml2_2.14.2.bb}      | 9
> > > +++------
> > >  3 files changed, 6 insertions(+), 9 deletions(-)
> > >  rename meta/recipes-core/libxml/{libxml2_2.13.6.bb =>
> > > libxml2_2.14.2.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.6.bb
> > > b/meta/recipes-
> > core/libxml/libxml2_2.14.2.bb
> > > similarity index 92%
> > > rename from meta/recipes-core/libxml/libxml2_2.13.6.bb
> > > rename to meta/recipes-core/libxml/libxml2_2.14.2.bb
> > > index 3b3ca87e96..ab06282f17 100644
> > > --- a/meta/recipes-core/libxml/libxml2_2.13.6.bb
> > > +++ b/meta/recipes-core/libxml/libxml2_2.14.2.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=2b4b7b827d2d8b0803724
> > 33c4c9c85b6 \
> > >                     
> > > file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060
> > 602d20f3a7 \
> > >                      "
> > > @@ -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] =
> > "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96"
> > > +SRC_URI[archive.sha256sum] =
> > "353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6"
> > >  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
> > > 
> > 
> > This breaks lttng-tools unfortunately:
> > 
> > https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1449
> > (and more in that build)
> > 
> > Cheers,
> > 
> > Richard
> 
> OK, I'll check the lttng-tools tomorrow evening.
> 
> Missing testdata.json is weird, I have run testimage with libxml2-
> ptest.
> But I can also try it with core-image-sato-sdk
> 
> Regarding the send-error-reports, I'm not sure how to test that...

Those are consequences of the lttng-tools failures, that is the issue
we need to work out.

I've mentioned it on the lttng irc channel. I didn't see any patch in
their repo as of last night.

Cheers,

Richard
Marko, Peter April 29, 2025, 1:21 p.m. UTC | #5 
I guess it won't be that easy, maybe take the update to 2.13.8 submitted today for now.

The one-liner compiles, but ptest shows it's crashing.
I guess we need to report this upstream and wait for their solution.
Unfortunately, my account in lltng bugs was still not approved...

Peter

> -----Original Message-----
> From: Marko, Peter (FT D EU SK BFS1)
> Sent: Monday, April 28, 2025 20:14
> To: Richard Purdie <richard.purdie@linuxfoundation.org>; openembedded-
> core@lists.openembedded.org
> Cc: Khem Raj <raj.khem@gmail.com>
> Subject: RE: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2
> 
> The solution in lttng-tools is a one-liner.
> It is required after https://gitlab.gnome.org/GNOME/libxml2/-
> /commit/38f475072aefe032fff1dc058df3e56c1e7062fa (2.14.0)
> 
> Of course, that one-liner removes compatibility with old libxml2 version, so I think
> it's inappropriate for upstream.
> I don't want to spend time to learn how to do detect this with autotools.
> So I'll just try a patch with "Upstream-Status: Inappropriate" and submit it
> upstream.
> I'm currently waiting for admins to approve my account in lttng bugs tool.
> 
> I wonder how many recipes in meta-openembedded will break on this.
> 
> Peter
> 
> diff --git a/src/common/config/session-config.c b/src/common/config/session-
> config.c
> index bb4e9fe..413812b 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.legacyFunc(out_str, &out_len, (const xmlChar *) in_str,
> &in_len);
>         if (ret < 0) {
>                 xmlFree(out_str);
>                 out_str = NULL;
> 
> -----Original Message-----
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> Sent: Monday, April 28, 2025 11:44
> To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>;
> openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2
> 
> On Sun, 2025-04-27 at 22:12 +0000, Marko, Peter wrote:
> >
> >
> > > -----Original Message-----
> > > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > Sent: Sunday, April 27, 2025 23:54
> > > To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>;
> > > openembedded-core@lists.openembedded.org
> > > Subject: Re: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2
> > >
> > > On Sun, 2025-04-27 at 16:10 +0200, Peter Marko via
> > > lists.openembedded.org
> > > wrote:
> > > > From: Peter Marko <peter.marko@siemens.com>
> > > >
> > > > 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
> > > >
> > > > Signed-off-by: Peter Marko <peter.marko@siemens.com>
> > > > ---
> > > >  meta/recipes-core/libxml/libxml2/install-tests.patch     | 4 ++-
> > > > -
> > > >  meta/recipes-core/libxml/libxml2/run-ptest               | 2 +-
> > > >  .../libxml/{libxml2_2.13.6.bb => libxml2_2.14.2.bb}      | 9
> > > > +++------
> > > >  3 files changed, 6 insertions(+), 9 deletions(-)
> > > >  rename meta/recipes-core/libxml/{libxml2_2.13.6.bb =>
> > > > libxml2_2.14.2.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.6.bb
> > > > b/meta/recipes-
> > > core/libxml/libxml2_2.14.2.bb
> > > > similarity index 92%
> > > > rename from meta/recipes-core/libxml/libxml2_2.13.6.bb
> > > > rename to meta/recipes-core/libxml/libxml2_2.14.2.bb
> > > > index 3b3ca87e96..ab06282f17 100644
> > > > --- a/meta/recipes-core/libxml/libxml2_2.13.6.bb
> > > > +++ b/meta/recipes-core/libxml/libxml2_2.14.2.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=2b4b7b827d2d8b0803724
> > > 33c4c9c85b6 \
> > > >
> > > > file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060
> > > 602d20f3a7 \
> > > >                      "
> > > > @@ -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] =
> > > "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96"
> > > > +SRC_URI[archive.sha256sum] =
> > > "353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6"
> > > >  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
> > > >
> > >
> > > This breaks lttng-tools unfortunately:
> > >
> > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1449
> > > (and more in that build)
> > >
> > > Cheers,
> > >
> > > Richard
> >
> > OK, I'll check the lttng-tools tomorrow evening.
> >
> > Missing testdata.json is weird, I have run testimage with libxml2-
> > ptest.
> > But I can also try it with core-image-sato-sdk
> >
> > Regarding the send-error-reports, I'm not sure how to test that...
> 
> Those are consequences of the lttng-tools failures, that is the issue
> we need to work out.
> 
> I've mentioned it on the lttng irc channel. I didn't see any patch in
> their repo as of last night.
> 
> Cheers,
> 
> Richard
Marko, Peter May 5, 2025, 8:43 a.m. UTC | #6 
I have created https://bugs.lttng.org/issues/1427 to report the issue upstream.
Peter

> -----Original Message-----
> From: Marko, Peter (FT D EU SK BFS1)
> Sent: Tuesday, April 29, 2025 15:21
> To: Richard Purdie <richard.purdie@linuxfoundation.org>; openembedded-
> core@lists.openembedded.org
> Cc: Khem Raj <raj.khem@gmail.com>
> Subject: RE: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2
> 
> I guess it won't be that easy, maybe take the update to 2.13.8 submitted today for
> now.
> 
> The one-liner compiles, but ptest shows it's crashing.
> I guess we need to report this upstream and wait for their solution.
> Unfortunately, my account in lltng bugs was still not approved...
> 
> Peter
> 
> > -----Original Message-----
> > From: Marko, Peter (FT D EU SK BFS1)
> > Sent: Monday, April 28, 2025 20:14
> > To: Richard Purdie <richard.purdie@linuxfoundation.org>; openembedded-
> > core@lists.openembedded.org
> > Cc: Khem Raj <raj.khem@gmail.com>
> > Subject: RE: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2
> >
> > The solution in lttng-tools is a one-liner.
> > It is required after https://gitlab.gnome.org/GNOME/libxml2/-
> > /commit/38f475072aefe032fff1dc058df3e56c1e7062fa (2.14.0)
> >
> > Of course, that one-liner removes compatibility with old libxml2 version, so I
> think
> > it's inappropriate for upstream.
> > I don't want to spend time to learn how to do detect this with autotools.
> > So I'll just try a patch with "Upstream-Status: Inappropriate" and submit it
> > upstream.
> > I'm currently waiting for admins to approve my account in lttng bugs tool.
> >
> > I wonder how many recipes in meta-openembedded will break on this.
> >
> > Peter
> >
> > diff --git a/src/common/config/session-config.c b/src/common/config/session-
> > config.c
> > index bb4e9fe..413812b 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.legacyFunc(out_str, &out_len, (const xmlChar *) in_str,
> > &in_len);
> >         if (ret < 0) {
> >                 xmlFree(out_str);
> >                 out_str = NULL;
> >
> > -----Original Message-----
> > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Sent: Monday, April 28, 2025 11:44
> > To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>;
> > openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2
> >
> > On Sun, 2025-04-27 at 22:12 +0000, Marko, Peter wrote:
> > >
> > >
> > > > -----Original Message-----
> > > > From: Richard Purdie <richard.purdie@linuxfoundation.org>
> > > > Sent: Sunday, April 27, 2025 23:54
> > > > To: Marko, Peter (FT D EU SK BFS1) <Peter.Marko@siemens.com>;
> > > > openembedded-core@lists.openembedded.org
> > > > Subject: Re: [OE-core] [PATCH] libxml2: upgrade 2.13.6 -> 2.14.2
> > > >
> > > > On Sun, 2025-04-27 at 16:10 +0200, Peter Marko via
> > > > lists.openembedded.org
> > > > wrote:
> > > > > From: Peter Marko <peter.marko@siemens.com>
> > > > >
> > > > > 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
> > > > >
> > > > > Signed-off-by: Peter Marko <peter.marko@siemens.com>
> > > > > ---
> > > > >  meta/recipes-core/libxml/libxml2/install-tests.patch     | 4 ++-
> > > > > -
> > > > >  meta/recipes-core/libxml/libxml2/run-ptest               | 2 +-
> > > > >  .../libxml/{libxml2_2.13.6.bb => libxml2_2.14.2.bb}      | 9
> > > > > +++------
> > > > >  3 files changed, 6 insertions(+), 9 deletions(-)
> > > > >  rename meta/recipes-core/libxml/{libxml2_2.13.6.bb =>
> > > > > libxml2_2.14.2.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.6.bb
> > > > > b/meta/recipes-
> > > > core/libxml/libxml2_2.14.2.bb
> > > > > similarity index 92%
> > > > > rename from meta/recipes-core/libxml/libxml2_2.13.6.bb
> > > > > rename to meta/recipes-core/libxml/libxml2_2.14.2.bb
> > > > > index 3b3ca87e96..ab06282f17 100644
> > > > > --- a/meta/recipes-core/libxml/libxml2_2.13.6.bb
> > > > > +++ b/meta/recipes-core/libxml/libxml2_2.14.2.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=2b4b7b827d2d8b0803724
> > > > 33c4c9c85b6 \
> > > > >
> > > > > file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060
> > > > 602d20f3a7 \
> > > > >                      "
> > > > > @@ -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] =
> > > > "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96"
> > > > > +SRC_URI[archive.sha256sum] =
> > > > "353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6"
> > > > >  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
> > > > >
> > > >
> > > > This breaks lttng-tools unfortunately:
> > > >
> > > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/20/builds/1449
> > > > (and more in that build)
> > > >
> > > > Cheers,
> > > >
> > > > Richard
> > >
> > > OK, I'll check the lttng-tools tomorrow evening.
> > >
> > > Missing testdata.json is weird, I have run testimage with libxml2-
> > > ptest.
> > > But I can also try it with core-image-sato-sdk
> > >
> > > Regarding the send-error-reports, I'm not sure how to test that...
> >
> > Those are consequences of the lttng-tools failures, that is the issue
> > we need to work out.
> >
> > I've mentioned it on the lttng irc channel. I didn't see any patch in
> > their repo as of last night.
> >
> > Cheers,
> >
> > Richard
diff mbox series

Patch

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.6.bb b/meta/recipes-core/libxml/libxml2_2.14.2.bb
similarity index 92%
rename from meta/recipes-core/libxml/libxml2_2.13.6.bb
rename to meta/recipes-core/libxml/libxml2_2.14.2.bb
index 3b3ca87e96..ab06282f17 100644
--- a/meta/recipes-core/libxml/libxml2_2.13.6.bb
+++ b/meta/recipes-core/libxml/libxml2_2.14.2.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] = "f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96"
+SRC_URI[archive.sha256sum] = "353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6"
 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