Kaydet (Commit) beea5852 authored tarafından Michael Stahl's avatar Michael Stahl

libxml2: upgrade to release 2.9.9

* fixes CVE-2018-14404
* drop one hunk from libxml2-android.patch that was added in commit
  6a17d2f2; 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: 's avatarMichael Stahl <Michael.Stahl@cib.de>
üst 0609ea4f
......@@ -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
......
--- 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 @@
......
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment