diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-01-14 15:44:35 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-10 16:16:16 +0200 |
| commit | a5bef4a033b5ff8e63cecce99b5c7e25fab2a63e (patch) | |
| tree | d335ee20642a450e6aae9b78ac0ab93b01a353c0 | |
| parent | 98e2953c923793bac1c0f6cc0c54e24ab32e9f0a (diff) | |
libxml2: upgrade to release 2.9.9
* fixes CVE-2018-14404
* drop one hunk from libxml2-android.patch that was added in commit
6a17d2f2ba7acfec277314b97b50e41532d6b44d; presumably nan() exists now
given that other code is calling it.
Change-Id: I696cc4e1da55536ea1c89a6e0446ce5bc8398ba4
Reviewed-on: https://gerrit.libreoffice.org/66308
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit beea5852720b22043aefcd1e6b7243c202b40601)
Reviewed-on: https://gerrit.libreoffice.org/66367
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 69b5995ed815bea4d21080f64a4232f44131696f)
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libxml2/libxml2-android.patch | 12 | ||||
| -rw-r--r-- | external/libxml2/libxml2-global-symbols.patch | 4 |
3 files changed, 4 insertions, 16 deletions
diff --git a/download.lst b/download.lst index 7f5bef729cc3..2614c875ee9e 100644 --- a/download.lst +++ b/download.lst @@ -139,8 +139,8 @@ export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304 export LIBTOMMATH_TARBALL := ltm-1.0.zip export LIBXMLSEC_SHA256SUM := 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc export LIBXMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz -export LIBXML_SHA256SUM := 0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732 -export LIBXML_VERSION_MICRO := 8 +export LIBXML_SHA256SUM := 94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871 +export LIBXML_VERSION_MICRO := 9 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz export LIBXSLT_SHA256SUM := b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce export LIBXSLT_TARBALL := a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz diff --git a/external/libxml2/libxml2-android.patch b/external/libxml2/libxml2-android.patch index bd7e15b5d39e..714de61068fb 100644 --- a/external/libxml2/libxml2-android.patch +++ b/external/libxml2/libxml2-android.patch @@ -1,15 +1,3 @@ ---- misc/libxml2-2.7.6/trionan.c -+++ misc/build/libxml2-2.7.6/trionan.c -@@ -327,7 +327,7 @@ - - if (result == 0.0) { - --#if defined(TRIO_COMPILER_SUPPORTS_C99) -+#if defined(TRIO_COMPILER_SUPPORTS_C99) && !(defined(__ANDROID__) && defined(__clang__)) - result = nan(""); - - #elif defined(NAN) && defined(__STDC_IEC_559__) - --- misc/libxml2-2.7.6/Makefile.in +++ misc/build/libxml2-2.7.6/Makefile.in @@ -1635,7 +1635,7 @@ diff --git a/external/libxml2/libxml2-global-symbols.patch b/external/libxml2/libxml2-global-symbols.patch index ba34ac9cc0c6..49ee73731562 100644 --- a/external/libxml2/libxml2-global-symbols.patch +++ b/external/libxml2/libxml2-global-symbols.patch @@ -14,8 +14,8 @@ LIBXML2_2.6.32 { @@ -2231,3 +2231,43 @@ - xmlXPathSetContextNode; - } LIBXML2_2.9.0; + xmlHashDefaultDeallocator; + } LIBXML2_2.9.1; +# HACK: export global variable accessor functions (globals.h) +LIBXML2_GLOBAL_VARIABLES { |