Skip to content
Snippets Groups Projects
Commit 471fd489 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf Committed by Rémi Denis-Courmont
Browse files

Contribs: update libxml2 to 2.9.14

Fixes notably:
CVE-2018-9251 CVE-2018-14567 CVE-2018-14404
CVE-2021-3541 CVE-2022-23308 CVE-2022-29824

And move to the official Gnome Infrastructure
parent 7cb4924e
No related branches found
No related tags found
1 merge request!1993Contribs: update libxml2 to 2.9.14
Pipeline #225605 passed with stage
in 24 minutes and 23 seconds
28903282c7672206effa1362fd564cbe4cf5be44264b083a7d14e383f73bccd1b81bcafb5f4f2f56f5e7e05914c660e27668c9ce91b1b9f256ef5358d55ba917 libxml2-2.9.8.tar.gz
d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606 libxml2-2.9.14.tar.xz
--- libxml2/Makefile.am.orig 2013-08-20 13:57:37.911178174 +0200
+++ libxml2/Makefile.am 2013-08-20 13:57:44.543177895 +0200
--- libxml2-2.9.14/Makefile.am.orig 2022-05-02 12:52:41.000000000 +0200
+++ libxml2-2.9.14/Makefile.am 2022-05-26 19:38:23.251503583 +0200
@@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR)
+SUBDIRS = include . xstc $(PYTHON_SUBDIR)
-SUBDIRS = include . doc example fuzz xstc $(PYTHON_SUBDIR)
+SUBDIRS = include . fuzz xstc $(PYTHON_SUBDIR)
DIST_SUBDIRS = include . doc example python xstc
DIST_SUBDIRS = include . doc example fuzz python xstc
@@ -15,7 +15,7 @@
# testReader testapi testModule runtest runsuite testchar \
# testdict runxmlconf testrecurse testlimits
testReader testapi testModule runtest runsuite testchar \
testdict runxmlconf testrecurse testlimits
-bin_PROGRAMS = xmllint xmlcatalog
+bin_PROGRAMS =
......
--- libxml2-2.9.2/configure.ac 2015-01-21 10:40:13.706152933 +0100
+++ libxml2-2.9.2/configure.ac.new 2015-01-21 10:39:36.014876563 +0100
@@ -1049,12 +1049,17 @@
--- libxml2-2.9.14/configure.ac.orig 2022-05-02 13:12:33.000000000 +0200
+++ libxml2-2.9.14/configure.ac 2022-05-26 19:45:13.697273909 +0200
@@ -1036,11 +1036,16 @@
dnl Use pthread by default in other cases
if test -z "$THREADS_W32"; then
if test "$with_threads" = "pthread" || test "$with_threads" = "" || test "$with_threads" = "yes" ; then
......@@ -13,7 +13,6 @@
+ if test "$THREAD_LIBS" = "none required"; then
+ THREAD_LIBS=""
+ fi
AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)])
AC_DEFINE([HAVE_PTHREAD_H], [], [Define if <pthread.h> is there])
WITH_THREADS="1"]))
+ LIBS="$LIBS_saved"
......
# libxml2
LIBXML2_VERSION := 2.9.8
LIBXML2_URL := http://xmlsoft.org/sources/libxml2-$(LIBXML2_VERSION).tar.gz
LIBXML2_VERSION := 2.9.14
LIBXML2_URL := https://download.gnome.org/sources/libxml2/2.9/libxml2-$(LIBXML2_VERSION).tar.xz
PKGS += libxml2
ifeq ($(call need_pkg,"libxml-2.0"),)
PKGS_FOUND += libxml2
endif
$(TARBALLS)/libxml2-$(LIBXML2_VERSION).tar.gz:
$(TARBALLS)/libxml2-$(LIBXML2_VERSION).tar.xz:
$(call download_pkg,$(LIBXML2_URL),libxml2)
.sum-libxml2: libxml2-$(LIBXML2_VERSION).tar.gz
.sum-libxml2: libxml2-$(LIBXML2_VERSION).tar.xz
XMLCONF = --with-minimal \
--with-catalog \
......@@ -35,7 +35,7 @@ ifdef WITH_OPTIMIZATION
XMLCONF+= --without-debug
endif
libxml2: libxml2-$(LIBXML2_VERSION).tar.gz .sum-libxml2
libxml2: libxml2-$(LIBXML2_VERSION).tar.xz .sum-libxml2
$(UNPACK)
$(APPLY) $(SRC)/libxml2/win32.patch
$(APPLY) $(SRC)/libxml2/bins.patch
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment