diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-01-14 15:44:35 +0100 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2019-01-15 10:35:28 +0100 |
| commit | beea5852720b22043aefcd1e6b7243c202b40601 (patch) | |
| tree | 0cf26e346917b772a144c73b7c569a625c653211 | |
| parent | 0609ea4fc27f34367716bf41c0cdaa7785aed9da (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>
| -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 2923f2055bca..641d2a9eb3e6 100644 --- a/download.lst +++ b/download.lst @@ -156,8 +156,8 @@ export LIBTOMMATH_SHA256SUM := 083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304 export LIBTOMMATH_TARBALL := ltm-1.0.zip export XMLSEC_SHA256SUM := 97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6 export XMLSEC_TARBALL := xmlsec1-1.2.27.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 := 526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460 export LIBXSLT_VERSION_MICRO := 32 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 { |