diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-05-21 13:33:26 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-05-21 15:31:22 +0200 |
| commit | bf0c6a98ae38cd2188d7f7e94f1563e5ce6a8ce4 (patch) | |
| tree | b8c83f69ed35e3b02241cca30e1e9c903eb19c7c /external | |
| parent | 2f3a89c2e5d3c420e22e4a3a7319cc4e3bd789a4 (diff) | |
libxml2: upgrade to release 2.9.12
Fixes:
CVE-2021-3516 CVE-2021-3517 CVE-2021-3518 CVE-2021-3537 CVE-2021-3541
* external/libxml2/ubsan.patch.0: remove, fixed upstream
Change-Id: I347dc854b862e78bde87d3e57cf5fdb584ca5673
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115913
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxml2/UnpackedTarball_libxml2.mk | 1 | ||||
| -rw-r--r-- | external/libxml2/libxml2-config.patch.1 | 4 | ||||
| -rw-r--r-- | external/libxml2/libxml2-global-symbols.patch | 4 | ||||
| -rw-r--r-- | external/libxml2/ubsan.patch.0 | 11 |
4 files changed, 4 insertions, 16 deletions
diff --git a/external/libxml2/UnpackedTarball_libxml2.mk b/external/libxml2/UnpackedTarball_libxml2.mk index 37b5bad97549..83df02849cb3 100644 --- a/external/libxml2/UnpackedTarball_libxml2.mk +++ b/external/libxml2/UnpackedTarball_libxml2.mk @@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxml2,\ $(if $(gb_Module_CURRENTMODULE_SYMBOLS_ENABLED), \ external/libxml2/libxml2-icu-sym.patch.0, \ external/libxml2/libxml2-icu.patch.0) \ - external/libxml2/ubsan.patch.0 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/libxml2/libxml2-config.patch.1 b/external/libxml2/libxml2-config.patch.1 index 8c28fb6a7806..5a2ef1485e92 100644 --- a/external/libxml2/libxml2-config.patch.1 +++ b/external/libxml2/libxml2-config.patch.1 @@ -18,9 +18,9 @@ Hack the xml2-config to return paths into WORKDIR. +exec_prefix=${WORKDIR}/UnpackedTarball/libxml2 +includedir=${WORKDIR}/UnpackedTarball/libxml2/include +libdir=${WORKDIR}/UnpackedTarball/libxml2/.libs + cflags= + libs= - usage() - { @@ -67,7 +72,8 @@ ;; diff --git a/external/libxml2/libxml2-global-symbols.patch b/external/libxml2/libxml2-global-symbols.patch index 49ee73731562..cfec9c530281 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 @@ - xmlHashDefaultDeallocator; - } LIBXML2_2.9.1; + xmlPopOutputCallbacks; + } LIBXML2_2.9.8; +# HACK: export global variable accessor functions (globals.h) +LIBXML2_GLOBAL_VARIABLES { diff --git a/external/libxml2/ubsan.patch.0 b/external/libxml2/ubsan.patch.0 deleted file mode 100644 index b52259719673..000000000000 --- a/external/libxml2/ubsan.patch.0 +++ /dev/null @@ -1,11 +0,0 @@ ---- xpath.c -+++ xpath.c -@@ -14529,7 +14529,7 @@ - } - - stream = xmlPatterncompile(str, dict, XML_PATTERN_XPATH, -- &namespaces[0]); -+ namespaces); // i.e., &namespaces[0] if namespaces != NULL - if (namespaces != NULL) { - xmlFree((xmlChar **)namespaces); - } |