From 689272b3e565a5d84cf0c073f8df6ae6d9402f89 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Tue, 8 Jan 2019 06:06:36 -0200 Subject: [PATCH] poppler: update to 0.73.0. --- common/shlibs | 2 +- srcpkgs/{libpoppler83 => libpoppler84} | 0 srcpkgs/poppler/patches/CVE-2018-20551.patch | 54 -------------------- srcpkgs/poppler/patches/CVE-2018-20650.patch | 38 -------------- srcpkgs/poppler/template | 14 ++--- 5 files changed, 8 insertions(+), 100 deletions(-) rename srcpkgs/{libpoppler83 => libpoppler84} (100%) delete mode 100644 srcpkgs/poppler/patches/CVE-2018-20551.patch delete mode 100644 srcpkgs/poppler/patches/CVE-2018-20650.patch diff --git a/common/shlibs b/common/shlibs index e4b33d4c86b..5485f07eec0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -344,7 +344,7 @@ libMagickCore-6.Q16.so.6 libmagick6-6.9.10.11_1 libMagickWand-6.Q16.so.6 libmagick6-6.9.10.11_1 libMagick++-6.Q16.so.8 libmagick6-6.9.10.11_1 libltdl.so.7 libltdl-2.2.6_1 -libpoppler.so.83 libpoppler83-0.72.0_1 +libpoppler.so.84 libpoppler84-0.73.0_1 libpoppler-glib.so.8 poppler-glib-0.18.2_1 libpoppler-cpp.so.0 poppler-cpp-0.18.2_1 libpoppler-qt5.so.1 poppler-qt5-0.31.0_1 diff --git a/srcpkgs/libpoppler83 b/srcpkgs/libpoppler84 similarity index 100% rename from srcpkgs/libpoppler83 rename to srcpkgs/libpoppler84 diff --git a/srcpkgs/poppler/patches/CVE-2018-20551.patch b/srcpkgs/poppler/patches/CVE-2018-20551.patch deleted file mode 100644 index 3475b1e650b..00000000000 --- a/srcpkgs/poppler/patches/CVE-2018-20551.patch +++ /dev/null @@ -1,54 +0,0 @@ -Source-url: -https://gitlab.freedesktop.org/poppler/poppler/commit/7f87dc10b6adccd6d1b977a28b064add254aa2da - -From 7f87dc10b6adccd6d1b977a28b064add254aa2da Mon Sep 17 00:00:00 2001 -From: Adam Reichold -Date: Thu, 27 Dec 2018 11:54:53 +0100 -Subject: [PATCH] Do not try to construct invalid rich media annotation assets. - Closes #703 - ---- - poppler/Annot.cc | 24 +++++++++++++----------- - 1 file changed, 13 insertions(+), 11 deletions(-) - -diff --git poppler/Annot.cc poppler/Annot.cc -index 2e4770ab..1750dc70 100644 ---- poppler/Annot.cc -+++ poppler/Annot.cc -@@ -6418,20 +6418,22 @@ AnnotRichMedia::Content::Content(Dict *dict) { - if (obj1.isDict()) { - Object obj2 = obj1.getDict()->lookup("Names"); - if (obj2.isArray()) { -- nAssets = obj2.arrayGetLength() / 2; -+ const int length = obj2.arrayGetLength() / 2; - -- assets = (Asset **)gmallocn(nAssets, sizeof(Asset *)); -+ assets = (Asset **)gmallocn(length, sizeof(Asset *)); -+ for (int i = 0; i < length; ++i) { -+ Object objKey = obj2.arrayGet(2 * i); -+ Object objVal = obj2.arrayGet(2 * i + 1); - -- int counter = 0; -- for (int i = 0; i < nAssets; ++i) { -- assets[counter] = new AnnotRichMedia::Asset; -- -- Object objKey = obj2.arrayGet(i * 2); -- assets[counter]->fileSpec = obj2.arrayGet(i * 2 + 1); -- -- assets[counter]->name = std::make_unique( objKey.getString() ); -- ++counter; -+ if (!objKey.isString() || objVal.isNull()) { -+ error(errSyntaxError, -1, "Bad Annot Asset"); -+ continue; -+ } - -+ assets[nAssets] = new AnnotRichMedia::Asset; -+ assets[nAssets]->name = std::make_unique( objKey.getString() ); -+ assets[nAssets]->fileSpec = std::move(objVal); -+ ++nAssets; - } - } - } --- -2.18.1 - diff --git a/srcpkgs/poppler/patches/CVE-2018-20650.patch b/srcpkgs/poppler/patches/CVE-2018-20650.patch deleted file mode 100644 index a68f61653f0..00000000000 --- a/srcpkgs/poppler/patches/CVE-2018-20650.patch +++ /dev/null @@ -1,38 +0,0 @@ -Source-url: -https://gitlab.freedesktop.org/poppler/poppler/commit/de0c0b8324e776f0b851485e0fc9622fc35695b7 - -From de0c0b8324e776f0b851485e0fc9622fc35695b7 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Sat, 29 Dec 2018 01:25:17 +0100 -Subject: [PATCH] FileSpec: Move the fileSpec.dictLookup call inside - fileSpec.isDict if - -Fixes #704 ---- - poppler/FileSpec.cc | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git poppler/FileSpec.cc poppler/FileSpec.cc -index 8a8b9e7e..7c12da63 100644 ---- poppler/FileSpec.cc -+++ poppler/FileSpec.cc -@@ -133,11 +133,12 @@ FileSpec::FileSpec(const Object *fileSpecA) - return; - } - } -- } - -- obj1 = fileSpec.dictLookup("Desc"); -- if (obj1.isString()) -- desc = obj1.getString()->copy(); -+ obj1 = fileSpec.dictLookup("Desc"); -+ if (obj1.isString()) { -+ desc = obj1.getString()->copy(); -+ } -+ } - } - - FileSpec::~FileSpec() --- -2.18.1 - diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template index ea942ab1b43..91790e88658 100644 --- a/srcpkgs/poppler/template +++ b/srcpkgs/poppler/template @@ -3,11 +3,11 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/poppler-qt5". # pkgname=poppler -version=0.72.0 -revision=2 +version=0.73.0 +revision=1 build_style=cmake -configure_args="-DENABLE_XPDF_HEADERS=on $(vopt_if gir -DENABLE_GLIB=on) - -DENABLE_QT5=off" +configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON + -DENABLE_GLIB=$(vopt_if gir ON OFF) -DENABLE_QT5=OFF" hostmakedepends="pkg-config glib-devel" makedepends="libpng-devel libglib-devel cairo-devel tiff-devel lcms2-devel libcurl-devel libopenjpeg2-devel $(vopt_if gir gobject-introspection)" @@ -16,7 +16,7 @@ maintainer="Juan RP " license="GPL-2.0-or-later, GPL-3.0-or-later" homepage="http://poppler.freedesktop.org" distfiles="${homepage}/${pkgname}-${version}.tar.xz" -checksum=c1747eb8f26e9e753c4001ed951db2896edc1021b6d0f547a0bd2a27c30ada51 +checksum=e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03 if [ "$CROSS_BUILD" ]; then configure_args+=" -DTHREADS_PTHREAD_ARG=2" @@ -29,7 +29,7 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" fi -libpoppler83_package() { +libpoppler84_package() { depends="poppler-data" short_desc+=" - poppler runtime library" pkg_install() { @@ -55,7 +55,7 @@ poppler-cpp_package() { } poppler-devel_package() { - depends="libglib-devel libpoppler83-${version}_${revision}" + depends="libglib-devel libpoppler84-${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove "usr/include/poppler/*.h"