Re: [ptxdist] [APPLIED] libxml2: Version bump. 2.13.6 -> 2.14.2

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as ed33392b3168b7a3e2a31b1d61887501ae64892a.

Michael

[sent from post-receive hook]

On Sat, 17 May 2025 00:02:51 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Moving ahead. Deprecating a bunch of stuff, adding new.
> https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.0
> https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.1
> https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.14.2
> 
> Plugs CVEs:
> CVE-2025-32415: schemas: Fix heap buffer overflow in xmlSchemaIDCFillNodeTables
> CVE-2025-32414: python: Read at most len/4 characters. (Maks Verver)
> 
> * Remove deprecated options (incl. ftp) . XML (DOM) trees seem to be always enabled.
> 
> * Add relax-ng as a non-default option. Probably soon deprecated anyway.
> 
> * Move patchset, applies cleanly.
> 
> * Fix builds with readline libhistory (fix minor spelling issue too).
> 
> * License hash changed. Contributor list changed.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20250513195039.3096689-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/libxml2-2.13.6/0200-xml2-config-is-not-SYSROOT-aware.patch b/patches/libxml2-2.14.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> similarity index 100%
> rename from patches/libxml2-2.13.6/0200-xml2-config-is-not-SYSROOT-aware.patch
> rename to patches/libxml2-2.14.2/0200-xml2-config-is-not-SYSROOT-aware.patch
> diff --git a/patches/libxml2-2.13.6/series b/patches/libxml2-2.14.2/series
> similarity index 100%
> rename from patches/libxml2-2.13.6/series
> rename to patches/libxml2-2.14.2/series
> diff --git a/rules/libxml2.in b/rules/libxml2.in
> index c34ab0fcc748..649b12441bd5 100644
> --- a/rules/libxml2.in
> +++ b/rules/libxml2.in
> @@ -5,6 +5,7 @@ menuconfig LIBXML2
>  	prompt "libxml2                       "
>  	select LIBC_M
>  	select LIBC_DL	if LIBXML2_MODULES
> +	select READLINE	if LIBXML2_HISTORY
>  	select ZLIB	if LIBXML2_ZLIB
>  	select XZ	if LIBXML2_LZMA
>  	help
> @@ -50,16 +51,9 @@ config LIBXML2_DEBUG
>  	help
>  	  Enable debugging support.
>  
> -config LIBXML2_FTP
> -	bool
> -	default y
> -	prompt "FTP Support"
> -	help
> -	  Add FTP support.
> -
>  config LIBXML2_HISTORY
>  	bool
> -	prompt "History support for xmlling shell"
> +	prompt "History support for xmllint shell"
>  	help
>  	  This feature adds history support to the xmllint shell.
>  
> @@ -137,7 +131,11 @@ config LIBXML2_REGEXPS
>  	help
>  	  Add support for Regular Expressions.
>  
> -#  --with-readline=DIR     use readline in DIR
> +config LIBXML2_RELAXNG
> +	bool
> +	prompt "Relax-NG support"
> +	help
> +	  Add support Relax-NG schema for XML.
>  
>  config LIBXML2_SAX1
>  	bool
> @@ -176,14 +174,6 @@ config LIBXML2_THREADS_ALLOC
>  	help
>  	  Add per-thread memory.
>  
> -config LIBXML2_DOM
> -	bool
> -	default y
> -	# FIXME: http://bugzilla.gnome.org/show_bug.cgi?id=545581
> -	#prompt "DOM API"
> -	help
> -	  Add the DOM tree manipulation API.
> -
>  config LIBXML2_DTD
>  	bool
>  	default y
> diff --git a/rules/libxml2.make b/rules/libxml2.make
> index d391bcfd2b36..7e0f99264fd2 100644
> --- a/rules/libxml2.make
> +++ b/rules/libxml2.make
> @@ -16,15 +16,15 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2
>  #
>  # Paths and names
>  #
> -LIBXML2_VERSION	:= 2.13.6
> -LIBXML2_MD5	:= 85dffa2387ff756bdf8b3b247594914a
> +LIBXML2_VERSION	:= 2.14.2
> +LIBXML2_MD5	:= 7119ed27bed2d6542b8b4baeac6d53be
>  LIBXML2		:= libxml2-$(LIBXML2_VERSION)
>  LIBXML2_SUFFIX	:= tar.xz
>  LIBXML2_SOURCE	:= $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
>  LIBXML2_DIR	:= $(BUILDDIR)/$(LIBXML2)
>  LIBXML2_LICENSE	:= MIT AND ISC
>  LIBXML2_LICENSE_FILES := \
> -	file://Copyright;md5=f437ed9058e8e5135e47c01e973376ba \
> +	file://Copyright;md5=5873615e8a9ecbf5c8857c4312ee05d6 \
>  	file://dict.c;startline=5;endline=16;md5=6bf674402d04fa793fdc1f4d26635d33 \
>  	file://list.c;startline=4;endline=15;md5=3fca05145285fa81f48c16c86a4a70b8
>  
> @@ -42,13 +42,12 @@ LIBXML2_CONF_TOOL := autoconf
>  LIBXML2_CONF_OPT := \
>  	$(CROSS_AUTOCONF_USR) \
>  	--disable-static \
> -	$(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_FTP)-ftp \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-history \
> +	--$(call ptx/wwo, PTXCONF_LIBXML2_HISTORY)-readline \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_HTML)-html \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_HTTP)-http \
>  	--without-icu \
> @@ -61,18 +60,17 @@ LIBXML2_CONF_OPT := \
>  	--without-python \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_READER)-reader \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_REGEXPS)-regexps \
> +	--$(call ptx/wwo, PTXCONF_LIBXML2_RELAXNG)-relaxng \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_SAX1)-sax1 \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_SCHEMAS)-schemas \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_SCHEMATRON)-schematron \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_THREADS)-threads \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_THREADS_ALLOC)-thread-alloc \
> -	--$(call ptx/wwo, PTXCONF_LIBXML2_DOM)-tree \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_DTD)-valid \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_WRITER)-writer \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_XINCLUDE)-xinclude \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_XPATH)-xpath \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_XPTR)-xptr \
> -	--$(call ptx/wwo, PTXCONF_LIBXML2_XPTR)-xptr-locs \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_MINIMUM)-minimum \
>  	--$(call ptx/wwo, PTXCONF_LIBXML2_LEGACY)-legacy \
>  	--with-tls