gentoo Easter resync : 12.04.2020

4 files changed, 32 insertions, 116 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index a7083255a9b9..fcf863d6148d 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,6 @@
 AUX okular-18.08.0-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
 AUX okular-18.12.0-tests.patch 568 BLAKE2B ad0a70fb37b513df846b0831d2335917817e12f63dcdc46955618de6e07ccca72c9e8378f625deabd11ab174fddc5122f68237decd3402cb5b402e5b21fe55e9 SHA512 29d9271e4165fa4f3d1cf02cb00e32be662f5ae39b77fdf9f7d9ccfa24dcded5d38cd7b9fe1a1c6e65021faa77504663dd5030506baffdbc3f449bc67f6b21d8
-DIST okular-19.08.3.tar.xz 7068828 BLAKE2B 8805936e7be73d3eb937fed0fe77d535c0d40fe839c9923466cada7f8cbf0f37253348d608d52eaaa7780c22db5f792ccb9bbbc474d35663e58b5b542b40fd13 SHA512 2fffce8023d9b0d08ec03cc51d21827772ed07c3004fcf8a23589211e7f676b61253dc39c8a41da5d9c4764ac9895c1a0e16c72c7157213b2e79ccaf35db77fa
-DIST okular-19.12.2.tar.xz 7203480 BLAKE2B 2f97b6d4dbdccbf68726ea20f3e89fb492a7547e9aaea3465f8b5358a21f399cc79e2c50c897c40a27b9001a3d13f637332e8fe6ec300660745924f8a6493533 SHA512 acd9640c120d73a0b84054941a76d8eaa7434fc9a6d82e77edf5bd4827ab17334f4e4bedc521133d922afa7cd9ba9e08057534ac08281fd23f9bed7fff28f304
-EBUILD okular-19.08.3.ebuild 3138 BLAKE2B f777e0bc890e929034594cc10d3bacec0babbab1b0b141e5b1e3d7d128cc87411a2a340796c1ffd00dc0ecc353f033f7ac269c4b92588413b9c82bdc01c7216c SHA512 39bba7b56d1114b51d41f07034b5a960428446bcfad8a44676d3fd734a35ed5d46fe8ba61c0e0e13179122f7d01f7befb915632684daef44e5a50245e26fcb04
-EBUILD okular-19.12.2.ebuild 3155 BLAKE2B d950a4f8880d46ec599c121f55c9336d13d50924ce00fe4ab4b02885f0d49fd33f7ad807980363f252075002146faa625a247acd4f6ce39822b93736627b52fe SHA512 d31b9ccaea3a364d409ed9da14a2fcf669f3cd7646728c5de432fe746c8e526049d7e14686bd2a2f5428557d2b75bd8cf303914ce0ae9f372699048f195dee59
+AUX okular-19.12.3-CVE-2020-9359.patch 902 BLAKE2B 644004775b9a66637ed75697524c6f0b2a8077fae7cfcf36a063b46e2f921946c285319740e6debef25b2ea93c18ad5dc8c9b739b8950af305416416517849b5 SHA512 2d8870f1aa63defcf2ecfd42c0dfb0d474af6885c2448566704795d7caa2e9c20e5ede284db58139ea5736d5d0074d23c023a89f359d09fd6051d1f03f561903
+DIST okular-19.12.3.tar.xz 7208888 BLAKE2B c98e6708d5784ce2dc976de0b205681cc34c0a6b5684e408267da05ba335fa4e9c064eec393dc080dd97f06f38ef665aba9354787d2e42d13312b4820836f168 SHA512 ccc3c357fefe04691bba7bc803321789c3a1fdad4cfc610e9c425b2373efd94340fa2ceb2e357569ad14f1c0c69ef0db8079d9bc082a6d5708ccbfb3b65d8b3d
+EBUILD okular-19.12.3-r1.ebuild 3205 BLAKE2B c000e95e21e6637b94a9afab498a98b27b6e9ca25f53b2e59a6d1fb5763dbd29ea3beeb1daf6d1991bb6ac15b49af7fca1c0535847795d8503c00636315d682c SHA512 90eecfadef6170fe4d0ef1a9ea4c86cf43de8d693cf48568ee7ac5b60d05f4402bbf61b48d497d167a3beb3100214754149d1ebf571ce8d33b983c586149de3f
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
diff --git a/kde-apps/okular/files/okular-19.12.3-CVE-2020-9359.patch b/kde-apps/okular/files/okular-19.12.3-CVE-2020-9359.patch
new file mode 100644
index 000000000000..e7d72487621f
--- /dev/null
+++ b/kde-apps/okular/files/okular-19.12.3-CVE-2020-9359.patch
@@ -0,0 +1,27 @@
+From 6a93a033b4f9248b3cd4d04689b8391df754e244 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid@kde.org>
+Date: Tue, 10 Mar 2020 23:07:24 +0100
+Subject: [PATCH] Document::processAction: If the url points to a binary, don't
+ run it
+
+---
+ core/document.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/core/document.cpp b/core/document.cpp
+index 3215a1abc..0aa5b6980 100644
+--- a/core/document.cpp
++++ b/core/document.cpp
+@@ -4388,7 +4388,8 @@ void Document::processAction( const Action * action )
+                 {
+                     const QUrl realUrl = KIO::upUrl(d->m_url).resolved(url);
+                     // KRun autodeletes
+-                    new KRun( realUrl, d->m_widget );
++                    KRun *r = new KRun( realUrl, d->m_widget );
++                    r->setRunExecutables(false);
+                 }
+             }
+             } break;
+-- 
+2.24.1
+
diff --git a/kde-apps/okular/okular-19.08.3.ebuild b/kde-apps/okular/okular-19.08.3.ebuild
deleted file mode 100644
index 0e62728af08e..000000000000
--- a/kde-apps/okular/okular-19.08.3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Universal document viewer based on KDE Frameworks"
-HOMEPAGE="https://okular.kde.org https://kde.org/applications/graphics/okular"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
-
-DEPEND="
-	>=kde-frameworks/kactivities-${KFMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjs-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kpty-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/threadweaver-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	media-libs/freetype
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	chm? (
-		>=kde-frameworks/khtml-${KFMIN}:5
-		dev-libs/chmlib
-	)
-	crypt? ( app-crypt/qca:2[qt5(+)] )
-	djvu? ( app-text/djvu )
-	epub? ( app-text/ebook-tools )
-	image-backend? (
-		>=kde-apps/libkexiv2-${PVCUT}:5
-		>=dev-qt/qtgui-${QTMIN}:5[gif,jpeg,png]
-	)
-	markdown? ( app-text/discount )
-	mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
-	pdf? ( app-text/poppler[qt5] )
-	plucker? ( virtual/jpeg:0 )
-	postscript? ( app-text/libspectre )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	image-backend? ( >=kde-frameworks/kimageformats-${KFMIN}:5 )
-	mobile? (
-		>=kde-frameworks/kirigami-${KFMIN}:5
-		>=dev-qt/qtquickcontrols-${QTMIN}:5
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-18.08.0-tests.patch"
-	"${FILESDIR}/${PN}-18.12.0-tests.patch"
-)
-
-src_prepare() {
-	ecm_src_prepare
-	use mobile || cmake_comment_add_subdirectory mobile
-	use test || cmake_comment_add_subdirectory conf/autotests
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package chm CHM)
-		$(cmake_use_find_package crypt Qca-qt5)
-		$(cmake_use_find_package djvu DjVuLibre)
-		$(cmake_use_find_package epub EPub)
-		$(cmake_use_find_package image-backend KF5KExiv2)
-		$(cmake_use_find_package markdown Discount)
-		$(cmake_use_find_package mobi QMobipocket)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package plucker JPEG)
-		$(cmake_use_find_package postscript LibSpectre)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package speech Qt5TextToSpeech)
-		$(cmake_use_find_package tiff TIFF)
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	# mainshelltest hangs, chmgeneratortest fails, bug #603116
-	# parttest hangs, bug #641728
-	local myctestargs=(
-		-E "(mainshelltest|chmgeneratortest|parttest)"
-	)
-
-	ecm_src_test
-}
diff --git a/kde-apps/okular/okular-19.12.2.ebuild b/kde-apps/okular/okular-19.12.3-r1.ebuild
index c6e7409eb7f8..2cb79f21ec1d 100644
--- a/kde-apps/okular/okular-19.12.2.ebuild
+++ b/kde-apps/okular/okular-19.12.3-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://okular.kde.org https://kde.org/applications/office/org.kde.oku
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
@@ -73,6 +73,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-18.08.0-tests.patch"
 	"${FILESDIR}/${PN}-18.12.0-tests.patch"
+	"${FILESDIR}/${P}-CVE-2020-9359.patch" # bug 712490
 )
 
 src_prepare() {