From 405755c906d6eb839114ee896720cdae92b8f208 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 6 Jan 2021 19:30:07 +0100 Subject: poppler: upgrade to release 21.01.0 Fixes CVE-2020-27778, CVE-2020-35702 and changelogs mention lots of fuzzing fixes. Change-Id: Ib07bdee726905e74afc13a01bbbd53f218121744 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108912 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit 48e8b32a9b66722bbb28fc15840b3706a461aeb7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108904 Tested-by: Michael Stahl Reviewed-by: Thorsten Behrens (cherry picked from commit fb185106492f5aabac6ab57ae90cd81d51480093) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108949 Tested-by: Thorsten Behrens --- download.lst | 4 +- external/poppler/StaticLibrary_poppler.mk | 22 +++++++++- external/poppler/poppler-config.patch.1 | 72 +++++++++---------------------- 3 files changed, 42 insertions(+), 56 deletions(-) diff --git a/download.lst b/download.lst index d0d3c048da4d..815ac5b1195a 100644 --- a/download.lst +++ b/download.lst @@ -208,8 +208,8 @@ export PIXMAN_SHA256SUM := 21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz export LIBPNG_SHA256SUM := 505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca export LIBPNG_TARBALL := libpng-1.6.37.tar.xz -export POPPLER_SHA256SUM := 234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df -export POPPLER_TARBALL := poppler-0.82.0.tar.xz +export POPPLER_SHA256SUM := 016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3 +export POPPLER_TARBALL := poppler-21.01.0.tar.xz export POSTGRESQL_SHA256SUM := a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126 export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2 export PYTHON_SHA256SUM := 06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136 diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk index 8bf9f528ee9e..3cc0a95e3617 100644 --- a/external/poppler/StaticLibrary_poppler.mk +++ b/external/poppler/StaticLibrary_poppler.mk @@ -35,6 +35,23 @@ endif $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,poppler,cc)) +$(eval $(call gb_StaticLibrary_add_generated_cobjects,poppler,\ + UnpackedTarball/poppler/poppler/CourierWidths.pregenerated \ + UnpackedTarball/poppler/poppler/CourierBoldWidths.pregenerated \ + UnpackedTarball/poppler/poppler/CourierBoldObliqueWidths.pregenerated \ + UnpackedTarball/poppler/poppler/CourierObliqueWidths.pregenerated \ + UnpackedTarball/poppler/poppler/HelveticaWidths.pregenerated \ + UnpackedTarball/poppler/poppler/HelveticaBoldWidths.pregenerated \ + UnpackedTarball/poppler/poppler/HelveticaBoldObliqueWidths.pregenerated \ + UnpackedTarball/poppler/poppler/HelveticaObliqueWidths.pregenerated \ + UnpackedTarball/poppler/poppler/SymbolWidths.pregenerated \ + UnpackedTarball/poppler/poppler/TimesBoldWidths.pregenerated \ + UnpackedTarball/poppler/poppler/TimesBoldItalicWidths.pregenerated \ + UnpackedTarball/poppler/poppler/TimesItalicWidths.pregenerated \ + UnpackedTarball/poppler/poppler/TimesRomanWidths.pregenerated \ + UnpackedTarball/poppler/poppler/ZapfDingbatsWidths.pregenerated \ +)) + $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/goo/gfile \ UnpackedTarball/poppler/goo/GooTimer \ @@ -56,8 +73,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/fofi/FoFiIdentifier \ UnpackedTarball/poppler/poppler/Annot \ UnpackedTarball/poppler/poppler/Array \ - UnpackedTarball/poppler/poppler/BuiltinFont \ - UnpackedTarball/poppler/poppler/BuiltinFontTables \ + UnpackedTarball/poppler/poppler/BBoxOutputDev \ UnpackedTarball/poppler/poppler/CachedFile \ UnpackedTarball/poppler/poppler/Catalog \ UnpackedTarball/poppler/poppler/CertificateInfo \ @@ -79,6 +95,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/poppler/Hints \ UnpackedTarball/poppler/poppler/JArithmeticDecoder \ UnpackedTarball/poppler/poppler/JBIG2Stream \ + UnpackedTarball/poppler/poppler/JSInfo \ UnpackedTarball/poppler/poppler/Lexer \ UnpackedTarball/poppler/poppler/Link \ UnpackedTarball/poppler/poppler/Linearization \ @@ -93,6 +110,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\ UnpackedTarball/poppler/poppler/PageTransition \ UnpackedTarball/poppler/poppler/Parser \ UnpackedTarball/poppler/poppler/PDFDoc \ + UnpackedTarball/poppler/poppler/PDFDocBuilder \ UnpackedTarball/poppler/poppler/PDFDocEncoding \ UnpackedTarball/poppler/poppler/PDFDocFactory \ UnpackedTarball/poppler/poppler/ProfileData \ diff --git a/external/poppler/poppler-config.patch.1 b/external/poppler/poppler-config.patch.1 index cb74cd66fb5e..b902402ea4e7 100644 --- a/external/poppler/poppler-config.patch.1 +++ b/external/poppler/poppler-config.patch.1 @@ -1,5 +1,7 @@ *three* poppler config headers +note: to get the 3rd one, use -DENABLE_CPP=on + mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg -DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none -DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off -DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off manually disabled these because cmake failed to do it: @@ -14,7 +16,7 @@ new file mode 100644 index 0fbd336a..451213f8 100644 --- /dev/null +++ b/config.h -@@ -0,0 +1,248 @@ +@@ -0,0 +1,221 @@ +/* config.h. Generated from config.h.cmake by cmake. */ + +/* Build against libcurl. */ @@ -120,21 +122,6 @@ index 0fbd336a..451213f8 100644 +#endif + +#if !defined(_WIN32) -+/* Define to 1 if you have the `rand_r' function. */ -+#define HAVE_RAND_R 1 -+#endif -+ -+#if defined(_WIN32) -+/* Define to 1 if you have the `strcpy_s' function. */ -+#define HAVE_STRCPY_S 1 -+#endif -+ -+#if defined(_WIN32) -+/* Define to 1 if you have the `strcat_s' function. */ -+#define HAVE_STRCAT_S 1 -+#endif -+ -+#if !defined(_WIN32) +/* Defines if strtok_r is available on your system */ +#define HAVE_STRTOK_R 1 +#endif @@ -147,9 +134,6 @@ index 0fbd336a..451213f8 100644 +#define HAVE_POPEN 1 +#endif + -+/* Use splash for rendering. */ -+/* #undef HAVE_SPLASH */ -+ +#if !defined(__APPLE__) && !defined(_WIN32) +/* Define to 1 if you have the header file, and it defines `DIR'. + */ @@ -179,9 +163,6 @@ index 0fbd336a..451213f8 100644 +/* Define as const if the declaration of iconv() needs const. */ +#define ICONV_CONST + -+/* Enable multithreading support. */ -+#define MULTITHREADED 1 -+ +/* Generate OPI comments in PS output. */ +#define OPI_SUPPORT 1 + @@ -195,7 +176,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_NAME "poppler" + +/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "poppler 0.82.0" ++#define PACKAGE_STRING "poppler 21.01.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "poppler" @@ -204,7 +185,7 @@ index 0fbd336a..451213f8 100644 +#define PACKAGE_URL "" + +/* Define to the version of this package. */ -+#define PACKAGE_VERSION "0.82.0" ++#define PACKAGE_VERSION "21.01.0" + +/* Poppler data dir */ +#define POPPLER_DATADIR "/usr/local/share/poppler" @@ -212,23 +193,17 @@ index 0fbd336a..451213f8 100644 +/* Support for curl based doc builder is compiled in. */ +/* #undef POPPLER_HAS_CURL_SUPPORT */ + -+/* Include support for CMYK rasterization */ -+/* #undef SPLASH_CMYK */ -+ +/* Enable word list support. */ +#define TEXTOUT_WORD_LIST 1 + +/* Defines if use cms */ +/* #undef USE_CMS */ + -+/* Use fixed point arithmetic in the Splash backend */ -+/* #undef USE_FIXEDPOINT */ -+ +/* Use single precision arithmetic in the Splash backend */ +/* #undef USE_FLOAT */ + +/* Version number of package */ -+#define VERSION "0.82.0" ++#define VERSION "21.01.0" + +#if defined(__APPLE__) +#elif defined (_WIN32) @@ -268,7 +243,7 @@ new file mode 100644 index 0fbd336a..451213f8 100644 --- /dev/null +++ b/poppler/poppler-config.h -@@ -0,0 +1,173 @@ +@@ -0,0 +1,166 @@ +//================================================= -*- mode: c++ -*- ==== +// +// poppler-config.h @@ -288,6 +263,9 @@ index 0fbd336a..451213f8 100644 +// Copyright (C) 2014 Hib Eris +// Copyright (C) 2016 Tor Lillqvist +// Copyright (C) 2017 Adrian Johnson ++// Copyright (C) 2018 Adam Reichold ++// Copyright (C) 2018 Stefan Brüns ++// Copyright (C) 2020 Albert Astals Cid +// +// To see a description of the changes please see the Changelog file that +// came with your tarball or type make ChangeLog if you are building from git @@ -304,17 +282,7 @@ index 0fbd336a..451213f8 100644 + +/* Defines the poppler version. */ +#ifndef POPPLER_VERSION -+#define POPPLER_VERSION "0.82.0" -+#endif -+ -+/* Enable multithreading support. */ -+#ifndef MULTITHREADED -+#define MULTITHREADED 1 -+#endif -+ -+/* Use fixedpoint. */ -+#ifndef USE_FIXEDPOINT -+/* #undef USE_FIXEDPOINT */ ++#define POPPLER_VERSION "21.01.0" +#endif + +/* Use single precision arithmetic in the Splash backend */ @@ -401,17 +369,17 @@ index 0fbd336a..451213f8 100644 +/* #undef USE_BOOST_HEADERS */ +#endif + -+// Also, there are preprocessor symbols in the header files -+// that are used but never defined when building poppler using configure -+// or cmake: DISABLE_OUTLINE, DEBUG_MEM, -+// ENABLE_PLUGINS, DEBUG_FORMS ++/* Is splash backend available */ ++#ifndef HAVE_SPLASH ++/* #undef HAVE_SPLASH */ ++#endif + +//------------------------------------------------------------------------ +// version +//------------------------------------------------------------------------ + +// copyright notice -+#define popplerCopyright "Copyright 2005-2018 The Poppler Developers - http://poppler.freedesktop.org" ++#define popplerCopyright "Copyright 2005-2021 The Poppler Developers - http://poppler.freedesktop.org" +#define xpdfCopyright "Copyright 1996-2011 Glyph & Cog, LLC" + +//------------------------------------------------------------------------ @@ -429,7 +397,7 @@ index 0fbd336a..451213f8 100644 +//------------------------------------------------------------------------ + +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) -+#include // __MINGW_PRINTF_FORMAT is defined in the mingw stdio.h ++#include // __MINGW_PRINTF_FORMAT is defined in the mingw stdio.h +#ifdef __MINGW_PRINTF_FORMAT +#define GCC_PRINTF_FORMAT(fmt_index, va_index) \ + __attribute__((__format__(__MINGW_PRINTF_FORMAT, fmt_index, va_index))) @@ -471,9 +439,9 @@ index 0fbd336a..451213f8 100644 + +#include "poppler-global.h" + -+#define POPPLER_VERSION "0.82.0" -+#define POPPLER_VERSION_MAJOR 0 -+#define POPPLER_VERSION_MINOR 82 ++#define POPPLER_VERSION "21.01.0" ++#define POPPLER_VERSION_MAJOR 21 ++#define POPPLER_VERSION_MINOR 1 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler -- cgit