diff options
Diffstat (limited to 'kde-apps/okular')
-rw-r--r-- | kde-apps/okular/Manifest | 1 | ||||
-rw-r--r-- | kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch | 46 | ||||
-rw-r--r-- | kde-apps/okular/okular-18.04.3-r1.ebuild | 106 |
3 files changed, 0 insertions, 153 deletions
diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest index bbe285c20dbb..f6f07f9578a7 100644 --- a/kde-apps/okular/Manifest +++ b/kde-apps/okular/Manifest @@ -1,2 +1 @@ -DIST okular-18.04.3.tar.xz 5784876 BLAKE2B 5f6c28f3825a9dd3f551044d22ec57fbcbb209afd5e2e2b4900d99b6fb4bf74ab4ed9999c4146c27cecf3004469841950b13039690fd31b8c1c757ea10f5920d SHA512 9ee463627089caec1b4fb63263daeb8ab1001d415a053720adb498bfebe44a3572b322841625b9419a34156866302bfc35eac6a68ae123a99fe61b19287c9c0b DIST okular-18.08.3.tar.xz 5770760 BLAKE2B e698507b400068abb76ca4030ca57c0c020fe8b0ba7cb4a6e81519ea7cdc24a5a3a26422f4e6b1badeef211723114811ccd81a2180335e37ab0e9e8684f23a01 SHA512 a03775c10d56d8d2740a82d9e44e3fc59259408dde855cb8d5a1ad824502e78a442adfa2c795ea0ffdcc14bd3bef52e1a14da2967b854107027221bf8e32aec2 diff --git a/kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch b/kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch deleted file mode 100644 index 216f235d8646..000000000000 --- a/kde-apps/okular/files/okular-18.04.3-path-traversal-issue.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8ff7abc14d41906ad978b6bc67e69693863b9d47 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Mon, 3 Sep 2018 21:14:30 +0200 -Subject: Fix path traversal issue when extracting an .okular file - -Summary: -With specially crafted .okular files you can trick okular to create temporary files outside the temporary folder - -We fix that by making sure the file doesn't have folders since the ones we create don't - -BUGS: 398096 - -Subscribers: okular-devel - -Tags: #okular - -Differential Revision: https://phabricator.kde.org/D15192 ---- - core/document.cpp | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/core/document.cpp b/core/document.cpp -index 5e3c169..7d46173 100644 ---- a/core/document.cpp -+++ b/core/document.cpp -@@ -4819,6 +4819,18 @@ ArchiveData *DocumentPrivate::unpackDocumentArchive( const QString &archivePath - return nullptr; - - const KArchiveDirectory * mainDir = okularArchive.directory(); -+ -+ // Check the archive doesn't have folders, we don't create them when saving the archive -+ // and folders mean paths and paths mean path traversal issues -+ for ( const QString &entry : mainDir->entries() ) -+ { -+ if ( mainDir->entry( entry )->isDirectory() ) -+ { -+ qWarning() << "Warning: Found a directory inside" << archivePath << " - Okular does not create files like that so it is most probably forged."; -+ return nullptr; -+ } -+ } -+ - const KArchiveEntry * mainEntry = mainDir->entry( QStringLiteral("content.xml") ); - if ( !mainEntry || !mainEntry->isFile() ) - return nullptr; --- -cgit v0.11.2 diff --git a/kde-apps/okular/okular-18.04.3-r1.ebuild b/kde-apps/okular/okular-18.04.3-r1.ebuild deleted file mode 100644 index 08b241b19658..000000000000 --- a/kde-apps/okular/okular-18.04.3-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Universal document viewer based on KDE Frameworks" -HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular" -KEYWORDS="amd64 x86" -IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjs) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpty) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep threadweaver) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - media-libs/freetype - media-libs/phonon[qt5(+)] - sys-libs/zlib - chm? ( - $(add_frameworks_dep khtml) - dev-libs/chmlib - ) - crypt? ( app-crypt/qca:2[qt5(+)] ) - djvu? ( app-text/djvu ) - epub? ( app-text/ebook-tools ) - image-backend? ( - $(add_kdeapps_dep libkexiv2) - $(add_qt_dep qtgui 'gif,jpeg,png') - ) - markdown? ( app-text/discount ) - mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) ) - pdf? ( app-text/poppler[qt5] ) - plucker? ( virtual/jpeg:0 ) - postscript? ( app-text/libspectre ) - share? ( $(add_frameworks_dep purpose) ) - speech? ( $(add_qt_dep qtspeech) ) - tiff? ( media-libs/tiff:0 ) -" -RDEPEND="${DEPEND} - image-backend? ( $(add_frameworks_dep kimageformats) ) - mobile? ( - $(add_frameworks_dep kirigami) - $(add_qt_dep qtquickcontrols) - ) -" - -PATCHES=( - "${FILESDIR}/${PN}-18.08.0-tests.patch" - "${FILESDIR}/${P}-path-traversal-issue.patch" -) - -src_prepare() { - kde5_src_prepare - use mobile || cmake_comment_add_subdirectory mobile - use test || cmake_comment_add_subdirectory conf/autotests -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package chm CHM) - $(cmake-utils_use_find_package crypt Qca-qt5) - $(cmake-utils_use_find_package djvu DjVuLibre) - $(cmake-utils_use_find_package epub EPub) - $(cmake-utils_use_find_package image-backend KF5KExiv2) - $(cmake-utils_use_find_package markdown Discount) - $(cmake-utils_use_find_package mobi QMobipocket) - $(cmake-utils_use_find_package pdf Poppler) - $(cmake-utils_use_find_package plucker JPEG) - $(cmake-utils_use_find_package postscript LibSpectre) - $(cmake-utils_use_find_package share KDEExperimentalPurpose) - $(cmake-utils_use_find_package speech Qt5TextToSpeech) - $(cmake-utils_use_find_package tiff TIFF) - ) - - kde5_src_configure -} - -src_test() { - # mainshelltest hangs, chmgeneratortest fails, bug #603116 - # parttest hangs, bug #641728 - local myctestargs=( - -E "(mainshelltest|chmgeneratortest|parttest)" - ) - - kde5_src_test -} |