download.lst | 10 ++--- external/cairo/ExternalPackage_cairo.mk | 2 - external/freetype/UnpackedTarball_freetype.mk | 1 external/freetype/freetype-msvc-disable-sse2.patch.1 | 37 ------------------- 4 files changed, 6 insertions(+), 44 deletions(-)
New commits: commit caeaa7b90e42c60ec407e1f0cd5b5db2b30f55d2 Author: Michael Stahl <[email protected]> AuthorDate: Wed Feb 20 13:31:44 2019 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Wed Feb 20 17:13:49 2019 +0100 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 <[email protected]> diff --git a/download.lst b/download.lst index 1d1b78fc2457..60ed11e0503a 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 := 6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48 export CDR_TARBALL := libcdr-0.1.5.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 commit 7d352599ef3c6e38b3ba21ffbf3ebab3e060a6f8 Author: Michael Stahl <[email protected]> AuthorDate: Wed Feb 20 13:06:13 2019 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Wed Feb 20 17:13:44 2019 +0100 freetype: upgrade to release 2.9.1 Fixes CVE-2018-6942. Remove freetype-msvc-disable-sse2.patch.1 (doesn't apply and freetype is only used on Android). Change-Id: Ia89329f758a077c1493cdea45f99e5f58d1ef265 Reviewed-on: https://gerrit.libreoffice.org/68087 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index dc0274ab4fc5..1d1b78fc2457 100644 --- a/download.lst +++ b/download.lst @@ -88,8 +88,8 @@ export FONT_SCHEHERAZADE_SHA256SUM := 251c8817ceb87d9b661ce1d5b49e732a0116add10a export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip export FREEHAND_SHA256SUM := 0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz -export FREETYPE_SHA256SUM := e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78 -export FREETYPE_TARBALL := freetype-2.8.1.tar.bz2 +export FREETYPE_SHA256SUM := db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d +export FREETYPE_TARBALL := freetype-2.9.1.tar.bz2 export GLM_SHA256SUM := d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip export GPGME_SHA256SUM := 1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb diff --git a/external/freetype/UnpackedTarball_freetype.mk b/external/freetype/UnpackedTarball_freetype.mk index 847ae6f4e5d5..6f724d1776fc 100644 --- a/external/freetype/UnpackedTarball_freetype.mk +++ b/external/freetype/UnpackedTarball_freetype.mk @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,freetype,$(FREETYPE_TARBALL),,freet $(eval $(call gb_UnpackedTarball_add_patches,freetype,\ external/freetype/freetype-2.6.5.patch.1 \ - external/freetype/freetype-msvc-disable-sse2.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/freetype/freetype-msvc-disable-sse2.patch.1 b/external/freetype/freetype-msvc-disable-sse2.patch.1 deleted file mode 100644 index ba6ff4f011c4..000000000000 --- a/external/freetype/freetype-msvc-disable-sse2.patch.1 +++ /dev/null @@ -1,37 +0,0 @@ -diff -up freetype/builds/windows/vc2010/freetype.vcxproj.dt freetype/builds/windows/vc2010/freetype.vcxproj ---- freetype/builds/windows/vc2010/freetype.vcxproj.dt 2017-02-01 22:49:01.394494374 +0100 -+++ freetype/builds/windows/vc2010/freetype.vcxproj 2017-02-01 22:49:22.392286704 +0100 -@@ -392,7 +392,7 @@ - <DisableSpecificWarnings>4001</DisableSpecificWarnings> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <WholeProgramOptimization>false</WholeProgramOptimization> -- <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> -+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>false</FloatingPointExceptions> - <CreateHotpatchableImage>false</CreateHotpatchableImage> - <CompileAsManaged>false</CompileAsManaged> -@@ -472,7 +472,7 @@ - <DisableSpecificWarnings>4001</DisableSpecificWarnings> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <WholeProgramOptimization>false</WholeProgramOptimization> -- <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> -+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>false</FloatingPointExceptions> - <CreateHotpatchableImage>false</CreateHotpatchableImage> - <RuntimeTypeInfo>false</RuntimeTypeInfo> -@@ -554,7 +554,7 @@ - <DisableSpecificWarnings>4001</DisableSpecificWarnings> - <MultiProcessorCompilation>true</MultiProcessorCompilation> - <WholeProgramOptimization>false</WholeProgramOptimization> -- <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet> -+ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> - <FloatingPointExceptions>false</FloatingPointExceptions> - <CreateHotpatchableImage>false</CreateHotpatchableImage> - <CompileAsManaged>false</CompileAsManaged> -@@ -1715,4 +1715,4 @@ - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> --</Project> -\ No newline at end of file -+</Project> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
