diff mbox series

libxml2: upgrade 2.11.5 -> 2.12.3

Message ID 1702978464-7753-1-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series libxml2: upgrade 2.11.5 -> 2.12.3 | expand

Commit Message

Mingyu Wang (Fujitsu) Dec. 19, 2023, 9:34 a.m. UTC
From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
==========
- parser: Fix namespaces redefined from default attributes
- include: Rename XML_EMPTY helper macro
- include: Move declaration of xmlInitGlobals
- include: Add missing includes
- include: Move globals from xmlsave.h to parser.h
- include: Readd circular dependency between tree.h and parser.h

install-tests.patch
refreshed for 2.12.3

License-Update:
 hash: Rewrite hash table code

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 meta/recipes-core/libxml/libxml2/install-tests.patch     | 8 ++++----
 .../libxml/{libxml2_2.11.5.bb => libxml2_2.12.3.bb}      | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename meta/recipes-core/libxml/{libxml2_2.11.5.bb => libxml2_2.12.3.bb} (92%)

Comments

Alexandre Belloni Dec. 20, 2023, 11:36 a.m. UTC | #1
Hello,

I already told you that this is breaking webkit on the 23/11/2023...

On 19/12/2023 17:34:24+0800, wangmy wrote:
> From: Wang Mingyu <wangmy@fujitsu.com>
> 
> Changelog:
> ==========
> - parser: Fix namespaces redefined from default attributes
> - include: Rename XML_EMPTY helper macro
> - include: Move declaration of xmlInitGlobals
> - include: Add missing includes
> - include: Move globals from xmlsave.h to parser.h
> - include: Readd circular dependency between tree.h and parser.h
> 
> install-tests.patch
> refreshed for 2.12.3
> 
> License-Update:
>  hash: Rewrite hash table code
> 
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  meta/recipes-core/libxml/libxml2/install-tests.patch     | 8 ++++----
>  .../libxml/{libxml2_2.11.5.bb => libxml2_2.12.3.bb}      | 9 +++++----
>  2 files changed, 9 insertions(+), 8 deletions(-)
>  rename meta/recipes-core/libxml/{libxml2_2.11.5.bb => libxml2_2.12.3.bb} (92%)
> 
> diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch b/meta/recipes-core/libxml/libxml2/install-tests.patch
> index 14ccce5873..62988f6bfe 100644
> --- a/meta/recipes-core/libxml/libxml2/install-tests.patch
> +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch
> @@ -1,4 +1,4 @@
> -From 3fc716357ce1372d9418dc86f24315b34d9808de Mon Sep 17 00:00:00 2001
> +From 16b46f8ef89aeebe8eb110ab8ef8e69e3a23c145 Mon Sep 17 00:00:00 2001
>  From: Ross Burton <ross.burton@arm.com>
>  Date: Mon, 5 Dec 2022 17:02:32 +0000
>  Subject: [PATCH] add yocto-specific install-ptest target
> @@ -13,11 +13,11 @@ Signed-off-by: Ross Burton <ross.burton@arm.com>
>   1 file changed, 10 insertions(+)
>  
>  diff --git a/Makefile.am b/Makefile.am
> -index 5bc4018..57d27af 100644
> +index 0a49d37..1097c63 100644
>  --- a/Makefile.am
>  +++ b/Makefile.am
> -@@ -26,6 +26,16 @@ check_PROGRAMS = \
> - 	testlimits \
> +@@ -27,6 +27,16 @@ check_PROGRAMS = \
> + 	testparser \
>   	testrecurse
>   
>  +ptestdir=$(libexecdir)
> diff --git a/meta/recipes-core/libxml/libxml2_2.11.5.bb b/meta/recipes-core/libxml/libxml2_2.12.3.bb
> similarity index 92%
> rename from meta/recipes-core/libxml/libxml2_2.11.5.bb
> rename to meta/recipes-core/libxml/libxml2_2.12.3.bb
> index 319833f053..8f37a39fe2 100644
> --- a/meta/recipes-core/libxml/libxml2_2.11.5.bb
> +++ b/meta/recipes-core/libxml/libxml2_2.12.3.bb
> @@ -4,10 +4,11 @@ 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=2044417e2e5006b65a8b9067b683fcf1 \
> -                    file://hash.c;beginline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879 \
> +LIC_FILES_CHKSUM = "file://Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \
> +                    file://hash.c;beginline=6;endline=15;md5=9af9349d0ead24569dc332f2116ef5f8 \
>                      file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \
> -                    file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f"
> +                    file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f \
> +                    "
>  
>  DEPENDS = "zlib virtual/libiconv"
>  
> @@ -19,7 +20,7 @@ SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt
>             file://install-tests.patch \
>             "
>  
> -SRC_URI[archive.sha256sum] = "3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6"
> +SRC_URI[archive.sha256sum] = "8c8f1092340a89ff32bc44ad5c9693aff9bc8a7a3e161bb239666e5d15ac9aaa"
>  SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273"
>  
>  # Disputed as a security issue, but fixed in d39f780
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#192703): https://lists.openembedded.org/g/openembedded-core/message/192703
> Mute This Topic: https://lists.openembedded.org/mt/103259916/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Mingyu Wang (Fujitsu) Dec. 22, 2023, 12:59 a.m. UTC | #2
Sorry, I have recorded this and will not make the same mistake again.

  --
Best Regards
---------------------------------------------------
Wang Mingyu
Development Dept.I
Nanjing Fujitsu Nanda Software Tech. Co., Ltd.(FNST) No. 6 Wenzhu Road, Nanjing, 210012, China
TEL: +86+25-86630566-8568
COINS: 79988548
FAX: +86+25-83317685
MAIL: wangmy@fujitsu.com
http://www.fujitsu.com/cn/fnst/

> -----Original Message-----
> From: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Sent: Wednesday, December 20, 2023 7:36 PM
> To: Wang, Mingyu/王 鸣瑜 <wangmy@fujitsu.com>
> Cc: openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH] libxml2: upgrade 2.11.5 -> 2.12.3
> 
> Hello,
> 
> I already told you that this is breaking webkit on the 23/11/2023...
> 
> On 19/12/2023 17:34:24+0800, wangmy wrote:
> > From: Wang Mingyu <wangmy@fujitsu.com>
> >
> > Changelog:
> > ==========
> > - parser: Fix namespaces redefined from default attributes
> > - include: Rename XML_EMPTY helper macro
> > - include: Move declaration of xmlInitGlobals
> > - include: Add missing includes
> > - include: Move globals from xmlsave.h to parser.h
> > - include: Readd circular dependency between tree.h and parser.h
> >
> > install-tests.patch
> > refreshed for 2.12.3
> >
> > License-Update:
> >  hash: Rewrite hash table code
> >
> > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> > ---
> >  meta/recipes-core/libxml/libxml2/install-tests.patch     | 8 ++++----
> >  .../libxml/{libxml2_2.11.5.bb => libxml2_2.12.3.bb}      | 9 +++++----
> >  2 files changed, 9 insertions(+), 8 deletions(-)  rename
> > meta/recipes-core/libxml/{libxml2_2.11.5.bb => libxml2_2.12.3.bb}
> > (92%)
> >
> > diff --git a/meta/recipes-core/libxml/libxml2/install-tests.patch
> > b/meta/recipes-core/libxml/libxml2/install-tests.patch
> > index 14ccce5873..62988f6bfe 100644
> > --- a/meta/recipes-core/libxml/libxml2/install-tests.patch
> > +++ b/meta/recipes-core/libxml/libxml2/install-tests.patch
> > @@ -1,4 +1,4 @@
> > -From 3fc716357ce1372d9418dc86f24315b34d9808de Mon Sep 17 00:00:00
> > 2001
> > +From 16b46f8ef89aeebe8eb110ab8ef8e69e3a23c145 Mon Sep 17 00:00:00
> > +2001
> >  From: Ross Burton <ross.burton@arm.com>
> >  Date: Mon, 5 Dec 2022 17:02:32 +0000
> >  Subject: [PATCH] add yocto-specific install-ptest target @@ -13,11
> > +13,11 @@ Signed-off-by: Ross Burton <ross.burton@arm.com>
> >   1 file changed, 10 insertions(+)
> >
> >  diff --git a/Makefile.am b/Makefile.am -index 5bc4018..57d27af 100644
> > +index 0a49d37..1097c63 100644
> >  --- a/Makefile.am
> >  +++ b/Makefile.am
> > -@@ -26,6 +26,16 @@ check_PROGRAMS = \
> > - 	testlimits \
> > +@@ -27,6 +27,16 @@ check_PROGRAMS = \
> > + 	testparser \
> >   	testrecurse
> >
> >  +ptestdir=$(libexecdir)
> > diff --git a/meta/recipes-core/libxml/libxml2_2.11.5.bb
> > b/meta/recipes-core/libxml/libxml2_2.12.3.bb
> > similarity index 92%
> > rename from meta/recipes-core/libxml/libxml2_2.11.5.bb
> > rename to meta/recipes-core/libxml/libxml2_2.12.3.bb
> > index 319833f053..8f37a39fe2 100644
> > --- a/meta/recipes-core/libxml/libxml2_2.11.5.bb
> > +++ b/meta/recipes-core/libxml/libxml2_2.12.3.bb
> > @@ -4,10 +4,11 @@ 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=2044417e2e5006b65a8b9067b683fcf1 \
> > -
> file://hash.c;beginline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee8
> 79 \
> > +LIC_FILES_CHKSUM =
> "file://Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \
> > +
> > +file://hash.c;beginline=6;endline=15;md5=9af9349d0ead24569dc332f2116e
> > +f5f8 \
> >
> file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7
> \
> > -
> file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f"
> > +
> file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f \
> > +                    "
> >
> >  DEPENDS = "zlib virtual/libiconv"
> >
> > @@ -19,7 +20,7 @@ SRC_URI +=
> "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt
> >             file://install-tests.patch \
> >             "
> >
> > -SRC_URI[archive.sha256sum] =
> "3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6"
> > +SRC_URI[archive.sha256sum] =
> "8c8f1092340a89ff32bc44ad5c9693aff9bc8a7a3e161bb239666e5d15ac9aaa"
> >  SRC_URI[testtar.sha256sum] =
> "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273
> "
> >
> >  # Disputed as a security issue, but fixed in d39f780
> > --
> > 2.34.1
> >
> 
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#192703):
> https://lists.openembedded.org/g/openembedded-core/message/192703
> > Mute This Topic: https://lists.openembedded.org/mt/103259916/3617179
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
> [alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
> 
> 
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
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 14ccce5873..62988f6bfe 100644
--- a/meta/recipes-core/libxml/libxml2/install-tests.patch
+++ b/meta/recipes-core/libxml/libxml2/install-tests.patch
@@ -1,4 +1,4 @@ 
-From 3fc716357ce1372d9418dc86f24315b34d9808de Mon Sep 17 00:00:00 2001
+From 16b46f8ef89aeebe8eb110ab8ef8e69e3a23c145 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@arm.com>
 Date: Mon, 5 Dec 2022 17:02:32 +0000
 Subject: [PATCH] add yocto-specific install-ptest target
@@ -13,11 +13,11 @@  Signed-off-by: Ross Burton <ross.burton@arm.com>
  1 file changed, 10 insertions(+)
 
 diff --git a/Makefile.am b/Makefile.am
-index 5bc4018..57d27af 100644
+index 0a49d37..1097c63 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -26,6 +26,16 @@ check_PROGRAMS = \
- 	testlimits \
+@@ -27,6 +27,16 @@ check_PROGRAMS = \
+ 	testparser \
  	testrecurse
  
 +ptestdir=$(libexecdir)
diff --git a/meta/recipes-core/libxml/libxml2_2.11.5.bb b/meta/recipes-core/libxml/libxml2_2.12.3.bb
similarity index 92%
rename from meta/recipes-core/libxml/libxml2_2.11.5.bb
rename to meta/recipes-core/libxml/libxml2_2.12.3.bb
index 319833f053..8f37a39fe2 100644
--- a/meta/recipes-core/libxml/libxml2_2.11.5.bb
+++ b/meta/recipes-core/libxml/libxml2_2.12.3.bb
@@ -4,10 +4,11 @@  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=2044417e2e5006b65a8b9067b683fcf1 \
-                    file://hash.c;beginline=6;endline=15;md5=e77f77b12cb69e203d8b4090a0eee879 \
+LIC_FILES_CHKSUM = "file://Copyright;md5=fec7ecfe714722b2bb0aaff7d200c701 \
+                    file://hash.c;beginline=6;endline=15;md5=9af9349d0ead24569dc332f2116ef5f8 \
                     file://list.c;beginline=4;endline=13;md5=b9c25b021ccaf287e50060602d20f3a7 \
-                    file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f"
+                    file://trio.c;beginline=5;endline=14;md5=cd4f61e27f88c1d43df112966b1cd28f \
+                    "
 
 DEPENDS = "zlib virtual/libiconv"
 
@@ -19,7 +20,7 @@  SRC_URI += "http://www.w3.org/XML/Test/xmlts20130923.tar;subdir=${BP};name=testt
            file://install-tests.patch \
            "
 
-SRC_URI[archive.sha256sum] = "3727b078c360ec69fa869de14bd6f75d7ee8d36987b071e6928d4720a28df3a6"
+SRC_URI[archive.sha256sum] = "8c8f1092340a89ff32bc44ad5c9693aff9bc8a7a3e161bb239666e5d15ac9aaa"
 SRC_URI[testtar.sha256sum] = "c6b2d42ee50b8b236e711a97d68e6c4b5c8d83e69a2be4722379f08702ea7273"
 
 # Disputed as a security issue, but fixed in d39f780