From 691f908eb4df8c5a978e85f51218a0edece57ec1 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 20 Feb 2019 13:31:44 +0100 Subject: 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 (cherry picked from commit caeaa7b90e42c60ec407e1f0cd5b5db2b30f55d2) Reviewed-on: https://gerrit.libreoffice.org/68217 Reviewed-by: Thorsten Behrens --- download.lst | 6 +++--- external/cairo/ExternalPackage_cairo.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/download.lst b/download.lst index 362234fecc16..e2008d900008 100644 --- a/download.lst +++ b/download.lst @@ -14,9 +14,9 @@ export BSH_SHA256SUM := 9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e6222 export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip export BZIP2_SHA256SUM := a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd export BZIP2_TARBALL := 00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz -export CAIRO_SHA256SUM := 7623081b94548a47ee6839a7312af34e9322997806948b6eec421a8c6d0594c9 -export CAIRO_VERSION_MICRO := 12 -export CAIRO_TARBALL := cairo-1.15.$(CAIRO_VERSION_MICRO).tar.xz +export CAIRO_SHA256SUM := 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 +export CAIRO_VERSION_MICRO := 0 +export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz export CDR_SHA256SUM := e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d export CDR_TARBALL := libcdr-0.1.4.tar.xz export CLUCENE_SHA256SUM := ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk index 154c84919a03..3b78a52fed76 100644 --- a/external/cairo/ExternalPackage_cairo.mk +++ b/external/cairo/ExternalPackage_cairo.mk @@ -14,7 +14,7 @@ $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) ifneq ($(DISABLE_DYNLOADING),TRUE) ifneq ($(OS),ANDROID) -$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.115$(CAIRO_VERSION_MICRO).0)) +$(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.1160$(CAIRO_VERSION_MICRO).0)) endif endif -- cgit v1.2.3