diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2019-02-22 13:47:46 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-02-22 13:47:46 +0100 |
| commit | 77f9849e8da15174876dde027d86289648256d85 (patch) | |
| tree | 90c5168d9da1d5f983671a76b766e1014b9cd01b | |
| parent | d4c92d8dea89025e7ce7d977aca83ed9f1eac7ae (diff) | |
cairo: upgrade to release 1.16.0
This fixes some minor CVEs.
Not including the fix for CVE-2018-18064, which does not affect LO
because we use the default implementation of FT_Memory which uses
free/malloc.
Change-Id: Ic047ed52cff3fdeba068f1b8d303c6c96c69addd
Reviewed-on: https://gerrit.libreoffice.org/68088
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
| -rw-r--r-- | download.lst | 3 | ||||
| -rw-r--r-- | external/cairo/ExternalPackage_cairo.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/download.lst b/download.lst index ff5b360c3150..cf2117c9e43f 100644 --- a/download.lst +++ b/download.lst @@ -12,7 +12,8 @@ export BREAKPAD_TARBALL := breakpad.zip export BREAKPAD_MD5SUM := 415ce291aa6f2ee1d5db7b62bf62ade8 export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz -export CAIRO_TARBALL := 23a0b2f0235431d35238df1d3a517fdb-cairo-1.14.6.tar.xz +export CAIRO_MD5SUM := f19e0353828269c22bd72e271243a552 +export CAIRO_TARBALL := cairo-1.16.0.tar.xz export CDR_MD5SUM := e369f30b5b861ee0fc4f9e6cbad701fe export CDR_TARBALL := libcdr-0.1.3.tar.bz2 export CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk index b1686973537a..6c9ec5ed1594 100644 --- a/external/cairo/ExternalPackage_cairo.mk +++ b/external/cairo/ExternalPackage_cairo.mk @@ -13,7 +13,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) ifneq ($(OS),ANDROID) -$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11400.6)) +$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11600.0)) endif |