summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-06-01 14:02:49 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2020-11-23 10:23:39 +0100
commit44c2764ba94193e835850f92c33ccc4cb9554941 (patch)
tree5882d18db866ed92a11214ef67f6e9681f1a87c0
parent06faa3e05db17429c16ae6533a8d6433f0da264c (diff)
libxslt: upgrade to release 1.1.29
* drop libxslt-freebsd.patch.1 fixed in new upstream libtool * drop libxslt-config-guess.patch.0 fixed in new upstream autoconf * drop libxslt-android.patch fixed in new upstream autoconf * drop libxslt-configure.patch.1 fixed upstream * drop libxslt-vc15.patch fixed upstream * drop second hunk of libxslt-vc10.patch fixed upstream * drop 0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 fixed upstream Reviewed-on: https://gerrit.libreoffice.org/25775 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Conflicts: external/libxslt/UnpackedTarball_xslt.mk Change-Id: I7427725ed6c82da53de12c9e1676e6ce02fd6483
-rw-r--r--download.lst2
-rw-r--r--external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.129
-rw-r--r--external/libxslt/ExternalPackage_xslt.mk2
-rw-r--r--external/libxslt/UnpackedTarball_xslt.mk6
-rw-r--r--external/libxslt/libxslt-android.patch15
-rw-r--r--external/libxslt/libxslt-configure.patch.123
-rw-r--r--external/libxslt/libxslt-freebsd.patch.128
-rw-r--r--external/libxslt/libxslt-msvc.patch.2 (renamed from external/libxslt/libxslt-vc10.patch)13
8 files changed, 3 insertions, 115 deletions
diff --git a/download.lst b/download.lst
index 802f2c3ae6ef..914fd760ccb4 100644
--- a/download.lst
+++ b/download.lst
@@ -94,7 +94,7 @@ export LIBEXTTEXTCAT_TARBALL := ae330b9493bd4503ac390106ff6060d7-libexttextcat-3
export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
-export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
+export LIBXSLT_TARBALL := a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
export MDDS_TARBALL := a67a46ec9d00d283a7cd8dbdd2906b59-mdds_0.11.0.tar.bz2
diff --git a/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 b/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1
deleted file mode 100644
index 4f87e798fb57..000000000000
--- a/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1
+++ /dev/null
@@ -1,29 +0,0 @@
-From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001
-From: Daniel Veillard <veillard@redhat.com>
-Date: Thu, 29 Oct 2015 19:33:23 +0800
-Subject: [PATCH] Fix for type confusion in preprocessing attributes
-
-CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10
-We need to check that the parent node is an element before dereferencing
-its namespace
----
- libxslt/preproc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libxslt/preproc.c b/libxslt/preproc.c
-index 0eb80a0..7f69325 100644
---- a/libxslt/preproc.c
-+++ b/libxslt/preproc.c
-@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) {
- } else if (IS_XSLT_NAME(inst, "attribute")) {
- xmlNodePtr parent = inst->parent;
-
-- if ((parent == NULL) || (parent->ns == NULL) ||
-+ if ((parent == NULL) ||
-+ (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) ||
- ((parent->ns != inst->ns) &&
- (!xmlStrEqual(parent->ns->href, inst->ns->href))) ||
- (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) {
---
-2.4.3
-
diff --git a/external/libxslt/ExternalPackage_xslt.mk b/external/libxslt/ExternalPackage_xslt.mk
index 602a281439dd..41c79a3fe462 100644
--- a/external/libxslt/ExternalPackage_xslt.mk
+++ b/external/libxslt/ExternalPackage_xslt.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.dll,wi
$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.dll,win32/bin.msvc/libexslt.dll))
endif
else # OS!=WNT
-$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.28))
+$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libxslt.so.1,libxslt/.libs/libxslt.so.1.1.29))
$(eval $(call gb_ExternalPackage_add_file,xslt,$(LIBO_LIB_FOLDER)/libexslt.so.0,libexslt/.libs/libexslt.so.0.8.17))
endif
endif # DISABLE_DYNLOADING
diff --git a/external/libxslt/UnpackedTarball_xslt.mk b/external/libxslt/UnpackedTarball_xslt.mk
index e244ebcdfba4..7da9a4f71254 100644
--- a/external/libxslt/UnpackedTarball_xslt.mk
+++ b/external/libxslt/UnpackedTarball_xslt.mk
@@ -13,13 +13,9 @@ $(eval $(call gb_UnpackedTarball_set_tarball,xslt,$(LIBXSLT_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,xslt,\
external/libxslt/libxslt-config.patch.1 \
- external/libxslt/libxslt-configure.patch.1 \
- external/libxslt/libxslt-freebsd.patch.1 \
external/libxslt/libxslt-internal-symbols.patch \
- external/libxslt/libxslt-vc10.patch \
+ external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
- $(if $(filter ANDROID,$(OS)),external/libxslt/libxslt-android.patch) \
- external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/libxslt-android.patch b/external/libxslt/libxslt-android.patch
deleted file mode 100644
index 68069d6e9457..000000000000
--- a/external/libxslt/libxslt-android.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- misc/libxslt-1.1.26/ltmain.sh
-+++ misc/build/libxslt-1.1.26/ltmain.sh
-@@ -3228,6 +3228,12 @@
- func_warning "\`-release' is ignored for convenience libraries"
- else
-
-+ # Force no versioning suffix for Android thanks to silly
-+ # apkbuilder which doesn't add extra native libs unless their
-+ # name ends with .so
-+
-+ version_type=none
-+
- # Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
- set dummy $vinfo 0 0 0
diff --git a/external/libxslt/libxslt-configure.patch.1 b/external/libxslt/libxslt-configure.patch.1
deleted file mode 100644
index 11b3e58945cc..000000000000
--- a/external/libxslt/libxslt-configure.patch.1
+++ /dev/null
@@ -1,23 +0,0 @@
--*- Mode: Diff -*-
-We need to recognize arm-unknown-linux-androideabi
-
---- a/config.sub
-+++ b/config.sub
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+ nto-qnx* | linux-androideabi* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1218,7 +1218,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+ | -mingw32* | -linux-androideabi | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/external/libxslt/libxslt-freebsd.patch.1 b/external/libxslt/libxslt-freebsd.patch.1
deleted file mode 100644
index 2f454cb95850..000000000000
--- a/external/libxslt/libxslt-freebsd.patch.1
+++ /dev/null
@@ -1,28 +0,0 @@
-Usual patch to produce Linux-like .so files on FreeBSD
-
---- a/ltmain.sh Wed Aug 29 14:28:46 2007
-+++ b/ltmain.sh Wed Jun 25 13:06:05 2008
-@@ -6195,9 +6195,9 @@
- revision="$number_revision"
- ;;
- freebsd-aout|freebsd-elf|qnx|sunos)
-- current="$number_major"
-- revision="$number_minor"
-- age="0"
-+ current=`expr $number_major + $number_minor`
-+ age="$number_minor"
-+ revision="$number_revision"
- ;;
- irix|nonstopux)
- func_arith $number_major + $number_minor
-@@ -6271,8 +6271,8 @@
- ;;
-
- freebsd-elf)
-- major=".$current"
-- versuffix=".$current"
-+ major=.`expr $current - $age`
-+ versuffix="$major.$age.$revision"
- ;;
-
- irix | nonstopux)
diff --git a/external/libxslt/libxslt-vc10.patch b/external/libxslt/libxslt-msvc.patch.2
index b50f0abe2e80..d5b01dab2c25 100644
--- a/external/libxslt/libxslt-vc10.patch
+++ b/external/libxslt/libxslt-msvc.patch.2
@@ -8,16 +8,3 @@
# The linker and its options.
LD = link.exe
-@@ -71,8 +71,12 @@
- LDFLAGS = $(LDFLAGS) /DEBUG
- !else
- CFLAGS = $(CFLAGS) /D "NDEBUG" /O2
-+!if "$(_NMAKE_VER)" >= "10.00.30319.01"
-+LDFLAGS = $(LDFLAGS)
-+!else
- LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
- !endif
-+!endif
-
- # Libxslt object files.
- XSLT_OBJS = $(XSLT_INTDIR)\attributes.obj\