[ptxdist] [PATCH] libxml2: Version bump. 2.9.14 -> 2.10.2.

[ptxdist] [PATCH] libxml2: Version bump. 2.9.14 -> 2.10.2.

[Christian Melki]

https://github.com/GNOME/libxml2/blob/2.10/NEWS$
New major version, introduces a bit of rework.
Might create some issues as a few deprecated things are being dropped.

* Fixes CVE-2022-2309, plus a bunch of other security fixes.
* Move patch forward.
* Remove docbook and another dropped configure option.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 .../0200-xml2-config-is-not-SYSROOT-aware.patch            | 0
 patches/{libxml2-2.9.14 => libxml2-2.10.2}/series          | 0
 rules/libxml2.in                                           | 7 -------
 rules/libxml2.make                                         | 6 ++----
 4 files changed, 2 insertions(+), 11 deletions(-)
 rename patches/{libxml2-2.9.14 => libxml2-2.10.2}/0200-xml2-config-is-not-SYSROOT-aware.patch (100%)
 rename patches/{libxml2-2.9.14 => libxml2-2.10.2}/series (100%)

diff --git a/patches/libxml2-2.9.14/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.10.2/0200-xml2-config-is-not-SYSROOT-aware.patch
similarity index 100%
rename from patches/libxml2-2.9.14/0200-xml2-config-is-not-SYSROOT-aware.patch
rename to patches/libxml2-2.10.2/0200-xml2-config-is-not-SYSROOT-aware.patch
diff --git a/patches/libxml2-2.9.14/series b/patches/libxml2-2.10.2/series
similarity index 100%
rename from patches/libxml2-2.9.14/series
rename to patches/libxml2-2.10.2/series
diff --git a/rules/libxml2.in b/rules/libxml2.in
index a81b0eba6..54fdde42a 100644
--- a/rules/libxml2.in
+++ b/rules/libxml2.in
@@ -50,13 +50,6 @@ config LIBXML2_DEBUG
 	help
 	  Enable debugging support.
 
-config LIBXML2_DOCBOOK
-	bool
-	default y
-	prompt "Docbook support"
-	help
-	  Enable Docbook SGML support
-
 config LIBXML2_FEXCEPTIONS
 	bool
 	prompt "C++ Exception Support"
diff --git a/rules/libxml2.make b/rules/libxml2.make
index 7ddac44aa..58e201a35 100644
--- a/rules/libxml2.make
+++ b/rules/libxml2.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
 #
 # Paths and names
 #
-LIBXML2_VERSION	:= 2.9.14
-LIBXML2_MD5	:= b7b3029ac6beb32a7925225515f83ca3
+LIBXML2_VERSION	:= 2.10.2
+LIBXML2_MD5	:= 5ffd0cd047056d5699b3363c635582bc
 LIBXML2		:= libxml2-$(LIBXML2_VERSION)
 LIBXML2_SUFFIX	:= tar.xz
 LIBXML2_SOURCE	:= $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
@@ -44,13 +44,11 @@ LIBXML2_ENV	:= $(CROSS_ENV)
 LIBXML2_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-static \
-	--disable-rebuild-docs \
 	$(GLOBAL_IPV6_OPTION) \
 	--oldincludedir=$(SYSROOT)/usr/include \
 	--$(call ptx/wwo, PTXCONF_LIBXML2_C14N)-c14n \
 	--$(call ptx/wwo, PTXCONF_LIBXML2_CATALOG)-catalog \
 	--$(call ptx/wwo, PTXCONF_LIBXML2_DEBUG)-debug \
-	--$(call ptx/wwo, PTXCONF_LIBXML2_DOCBOOK)-docbook \
 	--$(call ptx/wwo, PTXCONF_LIBXML2_FEXCEPTIONS)-fexceptions \
 	--$(call ptx/wwo, PTXCONF_LIBXML2_FTP)-ftp \
 	--$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \
-- 
2.34.1

Re: [ptxdist] [APPLIED] libxml2: Version bump. 2.9.14 -> 2.10.2.

[Michael Olbrich]

Thanks, applied as 72884b2179f4aa10c4757e675ca57dc922f49c9d.

Michael

[sent from post-receive hook]

On Sun, 11 Sep 2022 09:10:28 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> https://github.com/GNOME/libxml2/blob/2.10/NEWS$
> New major version, introduces a bit of rework.
> Might create some issues as a few deprecated things are being dropped.
> 
> * Fixes CVE-2022-2309, plus a bunch of other security fixes.
> * Move patch forward.
> * Remove docbook and another dropped configure option.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220908131624.211983-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/libxml2-2.9.14/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.10.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> similarity index 100%
> rename from patches/libxml2-2.9.14/0200-xml2-config-is-not-SYSROOT-aware.patch
> rename to patches/libxml2-2.10.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> diff --git a/patches/libxml2-2.9.14/series b/patches/libxml2-2.10.2/series
> similarity index 100%
> rename from patches/libxml2-2.9.14/series
> rename to patches/libxml2-2.10.2/series
> diff --git a/rules/libxml2.in b/rules/libxml2.in
> index a81b0eba64a1..54fdde42aa43 100644
> --- a/rules/libxml2.in
> +++ b/rules/libxml2.in
> @@ -50,13 +50,6 @@ config LIBXML2_DEBUG
>  	help
>  	  Enable debugging support.
>  
> -config LIBXML2_DOCBOOK
> -	bool
> -	default y
> -	prompt "Docbook support"
> -	help
> -	  Enable Docbook SGML support
> -
>  config LIBXML2_FEXCEPTIONS
>  	bool
>  	prompt "C++ Exception Support"
> diff --git a/rules/libxml2.make b/rules/libxml2.make
> index 7ddac44aa6fb..58e201a358d0 100644
> --- a/rules/libxml2.make
> +++ b/rules/libxml2.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
>  #
>  # Paths and names
>  #
> -LIBXML2_VERSION	:= 2.9.14
> -LIBXML2_MD5	:= b7b3029ac6beb32a7925225515f83ca3
> +LIBXML2_VERSION	:= 2.10.2
> +LIBXML2_MD5	:= 5ffd0cd047056d5699b3363c635582bc
>  LIBXML2		:= libxml2-$(LIBXML2_VERSION)
>  LIBXML2_SUFFIX	:= tar.xz
>  LIBXML2_SOURCE	:= $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
> @@ -44,13 +44,11 @@ LIBXML2_ENV	:= $(CROSS_ENV)
>  LIBXML2_AUTOCONF := \
>  	$(CROSS_AUTOCONF_USR) \
>  	--disable-static \
> -	--disable-rebuild-docs \
>  	$(GLOBAL_IPV6_OPTION) \
>  	--oldincludedir=$(SYSROOT)/usr/include \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_C14N)-c14n \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_CATALOG)-catalog \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_DEBUG)-debug \
> -	--$(call ptx/wwo, PTXCONF_LIBXML2_DOCBOOK)-docbook \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_FEXCEPTIONS)-fexceptions \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_FTP)-ftp \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \