From 4090dfd2d2c2be4cd3eccf155db2a3ddf1dd4091 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 30 Jan 2019 23:27:45 +0100 Subject: [PATCH] app-text/poppler: Security cleanup Bug: https://bugs.gentoo.org/659828 Package-Manager: Portage-2.3.59, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner --- app-text/poppler/Manifest | 1 - .../poppler/files/poppler-0.62.0-glibc.patch | 34 ----- .../files/poppler-0.62.0-openjpeg2.patch | 14 -- app-text/poppler/poppler-0.62.0-r1.ebuild | 127 ------------------ 4 files changed, 176 deletions(-) delete mode 100644 app-text/poppler/files/poppler-0.62.0-glibc.patch delete mode 100644 app-text/poppler/files/poppler-0.62.0-openjpeg2.patch delete mode 100644 app-text/poppler/poppler-0.62.0-r1.ebuild diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 7091647900a7..5b7815221685 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,4 +1,3 @@ -DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706 DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e SHA512 98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c44447aaeb6817 SHA512 8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e DIST poppler-0.72.0.tar.xz 1492912 BLAKE2B 6582b418031c52e5e9031e9f25b80841ba471c1308030bef2cdb13cd607ddd0ca51639d93c09f33e42d5f9378ee44b5ebe4dbac29254f952f7c2ec147799bc5e SHA512 57dc98ff3e433cb8c7e3c31016c080e09586410622d70fb2fe1aa36c2a55017508dd5b5b253cfe987b86f9197bdd34345e038c89f542003cf021900c86614145 diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch b/app-text/poppler/files/poppler-0.62.0-glibc.patch deleted file mode 100644 index 6808e91601dc..000000000000 --- a/app-text/poppler/files/poppler-0.62.0-glibc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001 -From: Pekka Vuorela -Date: Fri, 15 Dec 2017 16:56:20 +0200 -Subject: Honor configuration for building glibc copy of strtok_r - -config.h didn't get included and HAVE_STRTOK_R was never defined. -Now getting via glibc.h. ---- - goo/glibc_strtok_r.cc | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc -index e779bf5..e323bc2 100644 ---- a/goo/glibc_strtok_r.cc -+++ b/goo/glibc_strtok_r.cc -@@ -50,12 +50,15 @@ - // Copyright (C) 2012 Alexey Pavlov - // Copyright (C) 2012 Albert Astals Cid - // Copyright (C) 2017 Adrian Johnson -+// Copyright (C) 2017 Pekka Vuorela - // - // 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 - // - //======================================================================== - -+#include "glibc.h" -+ - #ifndef HAVE_STRTOK_R - - #include --- -cgit v1.1 - diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch deleted file mode 100644 index 789090cc9b22..000000000000 --- a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch +++ /dev/null @@ -1,14 +0,0 @@ -Sadly the CMake side of openjpeg slotting in Gentoo is broken. -To reliably find openjpeg:2 we need to use pkg-config. - ---- poppler-0.62.0/CMakeLists.txt -+++ poppler-0.62.0/CMakeLists.txt -@@ -193,7 +193,7 @@ - endif() - set(WITH_OPENJPEG FALSE) - if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2") -- find_package(LIBOPENJPEG2) -+ pkg_check_modules(LIBOPENJPEG2 libopenjp2) - set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND}) - if(NOT LIBOPENJPEG2_FOUND) - message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.") diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild deleted file mode 100644 index 568a800956bf..000000000000 --- a/app-text/poppler/poppler-0.62.0-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" - SLOT="0/9999" -else - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/73" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION -fi - -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE="https://poppler.freedesktop.org/" - -LICENSE="GPL-2" -IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils" - -# No test data provided -RESTRICT="test" - -COMMON_DEPEND=" - >=media-libs/fontconfig-2.6.0 - >=media-libs/freetype-2.3.9 - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - >=x11-libs/cairo-1.10.0 - introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2= ) - lcms? ( media-libs/lcms:2 ) - nss? ( >=dev-libs/nss-3.19:0 ) - png? ( media-libs/libpng:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtxml:5 - ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - cjk? ( >=app-text/poppler-data-0.4.7 ) -" - -DOCS=(AUTHORS NEWS README README-XPDF) - -PATCHES=( - "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch" - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" - "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch" - "${FILESDIR}/${PN}-0.62.0-openjpeg2.patch" - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch" - "${FILESDIR}/${P}-glibc.patch" # bug 643858 -) - -src_prepare() { - cmake-utils_src_prepare - - # Clang doesn't grok this flag, the configure nicely tests that, but - # cmake just uses it, so remove it if we use clang - if [[ ${CC} == clang ]] ; then - sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die - fi - - if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then - sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \ - -i CMakeLists.txt || die - else - einfo "policy(SET CMP0002 OLD) - workaround can be removed" - fi - - # we need to up the C++ version, bug #622526, #643278 - append-cxxflags -std=c++11 -} - -src_configure() { - xdg_environment_reset - local mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DENABLE_SPLASH=ON - -DENABLE_ZLIB=ON - -DENABLE_ZLIB_UNCOMPRESS=OFF - -DENABLE_XPDF_HEADERS=ON - -DSPLASH_CMYK=OFF - -DUSE_FIXEDPOINT=OFF - -DUSE_FLOAT=OFF - -DWITH_Cairo=$(usex cairo) - -DENABLE_LIBCURL=$(usex curl) - -DENABLE_CPP=$(usex cxx) - -DWITH_GObjectIntrospection=$(usex introspection) - -DWITH_JPEG=$(usex jpeg) - -DENABLE_DCTDECODER=$(usex jpeg libjpeg none) - -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none) - -DENABLE_CMS=$(usex lcms lcms2 none) - -DWITH_NSS3=$(usex nss) - -DWITH_PNG=$(usex png) - $(cmake-utils_use_find_package qt5 Qt5Core) - -DWITH_TIFF=$(usex tiff) - -DENABLE_UTILS=$(usex utils) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # live version doesn't provide html documentation - if use cairo && use doc && [[ ${PV} != 9999 ]]; then - # For now install gtk-doc there - insinto /usr/share/gtk-doc/html/poppler - doins -r "${S}"/glib/reference/html/* - fi -} -- 2.26.2