gentoo resync : 24.12.2018

5 files changed, 26 insertions, 55 deletions

diff --git a/kde-apps/okular/Manifest b/kde-apps/okular/Manifest
index 1fc2c23533ca..1a5df726b62e 100644
--- a/kde-apps/okular/Manifest
+++ b/kde-apps/okular/Manifest
@@ -1,7 +1,7 @@
-AUX okular-18.04.3-path-traversal-issue.patch 1618 BLAKE2B 7a4339189f98e24e2cd85af6cb34efa7858b1e110e504b7957826944f30e7f0a822764d29a734c258b64b5fdc51c6f1d904c8b6c8ea3d15673b3b850afcedf46 SHA512 35fbc65d941cf83d916ff2c44b220f7f72bc9ee4afac2e35652f4a86ed2e68b260a8316d5960a6537152e33b96675870c0dd0afdad45b921036f42af1cb4a5dc
 AUX okular-18.08.0-tests.patch 5197 BLAKE2B 8173bc550940cc783186e48794a911ed1fdc6015d48b1897d0cea1abee137f63ff9441c3c51c26b4bcd52c668046b37cb601a00e7192f5cd714d65606c5a4f38 SHA512 993fb48d8e2f51da617fa8a36ea20b479ff9c88e7aa848f52b6eda68ec58c4fe79876369ba3500009443d0ae970284c0a37da39ae39cfd6d48d767f3eb6dae96
-DIST okular-18.04.3.tar.xz 5784876 BLAKE2B 5f6c28f3825a9dd3f551044d22ec57fbcbb209afd5e2e2b4900d99b6fb4bf74ab4ed9999c4146c27cecf3004469841950b13039690fd31b8c1c757ea10f5920d SHA512 9ee463627089caec1b4fb63263daeb8ab1001d415a053720adb498bfebe44a3572b322841625b9419a34156866302bfc35eac6a68ae123a99fe61b19287c9c0b
+AUX okular-18.12.0-tests.patch 568 BLAKE2B ad0a70fb37b513df846b0831d2335917817e12f63dcdc46955618de6e07ccca72c9e8378f625deabd11ab174fddc5122f68237decd3402cb5b402e5b21fe55e9 SHA512 29d9271e4165fa4f3d1cf02cb00e32be662f5ae39b77fdf9f7d9ccfa24dcded5d38cd7b9fe1a1c6e65021faa77504663dd5030506baffdbc3f449bc67f6b21d8
 DIST okular-18.08.3.tar.xz 5770760 BLAKE2B e698507b400068abb76ca4030ca57c0c020fe8b0ba7cb4a6e81519ea7cdc24a5a3a26422f4e6b1badeef211723114811ccd81a2180335e37ab0e9e8684f23a01 SHA512 a03775c10d56d8d2740a82d9e44e3fc59259408dde855cb8d5a1ad824502e78a442adfa2c795ea0ffdcc14bd3bef52e1a14da2967b854107027221bf8e32aec2
-EBUILD okular-18.04.3-r1.ebuild 2984 BLAKE2B 1932c162cc3533da8f955f6d885b369bba7519a5168745a2cc9cc16ff019589742b312077783bf785ffc10401a1f9bbf132ad43a920d33a41cd4eb2857537b4c SHA512 2ecde3207633e2cb45c79b3bd3a729a4df124ac50b680519204e0ff398ad75a4359d2314518bd7952d1eb8be19c805219b76c514257ff8ecf6bc6ef82f0590c0
-EBUILD okular-18.08.3.ebuild 2937 BLAKE2B db605187758113b5aa9045093cc7e9b01aed1293c6f46ed0e7918a954ab6624967f4700a3cae88c9f484c8515bd9bd5132541f5fa39773a7c22711e0ce76f4b1 SHA512 d44c495e7aca10e3d09ce24a555a093667a92f59b0e10cf950324f10cc70fa156759f6353a7bc26d442f9abf577b196b07bc76da6ba9362fcc3aa52b3d96b0b1
+DIST okular-18.12.0.tar.xz 6120152 BLAKE2B 2d49b26df64b72ac322ec2d91cc3714a62fdb89e63dd1a826cfc33d6a0c276e4261694738143fa8c55f875f225bb0896f49e4c0fed0dc703e8876c18f281a1e3 SHA512 174b0ee1cdba2d887922c2f432ca873954ccac31c0e668d88d820d5c7c67898fcc20369514bd1efd74e9ec662608d18642ef76e52b46cc0644ac405ef3046268
+EBUILD okular-18.08.3.ebuild 2935 BLAKE2B 9d1118cae65a8cca51a32f14f68506cd6b46138a443069828dd9b550edb939070aca7b433a22df51db89e7bd633849d989cd6082c43518c7f3a6b4cc8d58a461 SHA512 49de57710e5ecec9d70abe83d3edc78a761e26873652c128ecfe7af2ea835b04c8234fc10bef4b385c862a17c03f9a01d0b41962f78a0345f1be47c52ea698bd
+EBUILD okular-18.12.0.ebuild 2979 BLAKE2B c08007698f1051c4387b488014c6f9d8cff98959aa5286485c53e120a5149044e19873678800794f4a1e77de729465a42c7635d14b71560e2fd0342f06603394 SHA512 24e45cbb9a27124c8b572ae49bdc442f7b90b043e75cda1fc1f63c8848e0d2cb5f5b4b9108ad422b0512ae0470975fea703c424e360e979d0a68c23645551127
 MISC metadata.xml 932 BLAKE2B 456a0365909d541af476ce468c18b0446bd0843d0f4cf4babcfefea66e39ce27a1e0dbc513b9e28b97259232fcdd645e977fc6ebd453c8d418ce9319b3e5d806 SHA512 b5083af937d991ba200bf5044e2cb5206d7ede82043bfcde7b94a2503da3a63f3b356403cf85287fdf76cca61d152a49e1847aa6161fd0837f261b019debc53e
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/files/okular-18.12.0-tests.patch b/kde-apps/okular/files/okular-18.12.0-tests.patch
new file mode 100644
index 000000000000..2b617150508e
--- /dev/null
+++ b/kde-apps/okular/files/okular-18.12.0-tests.patch
@@ -0,0 +1,17 @@
+--- a/generators/epub/CMakeLists.txt	2018-08-19 21:34:51.151645090 +0200
++++ b/generators/epub/CMakeLists.txt	2018-08-19 21:36:28.771109586 +0200
+@@ -23,12 +23,13 @@
+ 
+ ########### autotests ###############
+ 
++if(BUILD_TESTING)
+ add_definitions( -DKDESRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/" )
+ ecm_add_test(autotests/epubgeneratortest.cpp
+     TEST_NAME "epubgeneratortest"
+     LINK_LIBRARIES Qt5::Test KF5::CoreAddons okularcore
+ )
+-
++endif()
+ 
+ ########### install files ###############
+ install( FILES okularEPub.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/kde-apps/okular/okular-18.08.3.ebuild b/kde-apps/okular/okular-18.08.3.ebuild
index eb535ba3bbcb..2042a5330d12 100644
--- a/kde-apps/okular/okular-18.08.3.ebuild
+++ b/kde-apps/okular/okular-18.08.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
diff --git a/kde-apps/okular/okular-18.04.3-r1.ebuild b/kde-apps/okular/okular-18.12.0.ebuild
index 08b241b19658..83bf1eabfd3a 100644
--- a/kde-apps/okular/okular-18.04.3-r1.ebuild
+++ b/kde-apps/okular/okular-18.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="chm crypt djvu epub +image-backend markdown mobi mobile +pdf plucker +postscript share speech +tiff"
 
 DEPEND="
@@ -35,7 +35,7 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	media-libs/freetype
 	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
+	sys-libs/zlib:=
 	chm? (
 		$(add_frameworks_dep khtml)
 		dev-libs/chmlib
@@ -66,7 +66,7 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-18.08.0-tests.patch"
-	"${FILESDIR}/${P}-path-traversal-issue.patch"
+	"${FILESDIR}/${PN}-18.12.0-tests.patch"
 )
 
 src_prepare() {