gentoo resync : 24.02.2018

5 files changed, 41 insertions, 6 deletions

diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index e64000131542..b5ed05028262 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,9 +1,10 @@
+AUX atril-cve-2017-1000083.patch 902 BLAKE2B d2840c3cd00f7961262c9b9256a594be77b598cd44fd27064336721f422f5ab315382d9917981a6a5b33b08d100fd32edb19cb54bea1f70f074064dd72af036e SHA512 b34d4cd356b6b0466e77bd837ea03aa5ff9d922f61b0f317fcd02b6d0b0c3efd87fa07ec442a9ee5d71f767751e4ebaa8bbcf6c1a3b0b5905a7610872fbb7d06
 DIST atril-1.12.2.tar.xz 1663920 BLAKE2B 7fa615a3d19fe33b086676d2326d690b5d6c694679a7e934ecf8922ad73aa83eb2ffb6c16aaf776e1d3798c3fa93fa844f52382b9eb9aa813cc6686395a4114e SHA512 2ceeda42adeb284a25caff3a69d15a231129988fb410e4d502a281ccf5819307b9963722a2e330307a1c3b15d3c82405b708d983ed1c266e091a35264766e6ec
 DIST atril-1.14.2.tar.xz 1703272 BLAKE2B e02fee02ad8644be9ea2c388f24c9f9e3480a68ae86bba41939e4fa195626189f9e6d93b97ea4b9d4a256f72ffc3d604f69fe4222c00a385f9d4ad9ac3a8e337 SHA512 9f77abe43848a3a35df1484edef4a6bbc6339f82b0d8e9f3c149c44fd632f2720acf24bcc1354b944c5c364fc4ce1d70b733c1ec5bc40b1a17041e59acf7bd9b
 DIST atril-1.16.1.tar.xz 1691456 BLAKE2B 5fccac614c64e7241ce0369842e97379c98df00f12d61524291afea22eebf18777ec2550592d734ff38aa64b92cbfa6350d11823a043337c6a7ee4b52757989f SHA512 69128171f13f50079b0b40bfada868967c289b5970e3cda3454f10e7cf723000ab29290c7c9ada67648c370472fd51eeb0a8dbbfa0af05babfc85cb28e3570fe
 DIST atril-1.18.3.tar.xz 1695960 BLAKE2B 2479ddd46104153631d34070054e9ba72956468c7b720aa5dc3c4a458a00cc00484cdfefb01981f2e8beeb7a13f1fc3db940dcc9a728863a1378b5b896e71e57 SHA512 d57cf4386651cb871455b003482e896a2735fb023e0b11f192ed1d169e364306f9ba55ef163df02ffd236b5f86d6afe2c1068d00d3fbc309807ded729ce2355a
-EBUILD atril-1.12.2-r4.ebuild 2331 BLAKE2B 7d360aa43a0a549ae7117c6c97f882fe4d80022f8884f8eb5cea6593683d982c410a58728a9367e4d57a3a3fcac247adac875458f688325b7c9e8f658ccbf044 SHA512 897bc693606b157ab17b9a1f56b3a26e3a3d69b0bca0f8d0ebec5af5a0777acfe8dd60457090ae2d1fe04280b9a455e8c92c669fe2afa74b0045ace60a8a6eb4
-EBUILD atril-1.14.2-r1.ebuild 2373 BLAKE2B 9cc6e82f3ab2b401676b61db4bf68db89ee7082b445c3a1c60ec026d8d6b3f6079f50cfcf444e2a2a86a360b8578ece4da872fcc503eac44ecbbd3afa0235c1e SHA512 f10dac5113a74cee27f28f47ae59e850a9331755864016cf35a24fe3ddcea84a7e6ce2d24bbc8237d2b4745afc1fd4616f5f8d0df9c6bd5aa1cc2c36fa5b4625
-EBUILD atril-1.16.1-r1.ebuild 2310 BLAKE2B 9afe9abf863f41048a9c22c750fd5328f00ff669c25c1365b968b63a059d4909b9a4beb15273586fe4aca1956165ae00853090e9f9d827be351e3f11c930a9fa SHA512 61d811ce7d246b8e962dfd60a710da7a5f08ad17bb532a0396f1206599918e0eb89ec7675032fc1a3bdb72724073feb80d35875e7215636fc8d22abff43fb188
+EBUILD atril-1.12.2-r5.ebuild 2385 BLAKE2B f4eedbee9c5c14d57c508d0a6b20d38b4f57117f0db851f2118f88cb20ec2fe74429e270d3ba8872e13f887902acb1febf3a79893c32c92a89124aec7f373847 SHA512 dabe0ec4e02bce40da523298ceaae37181e02c927bf486cdd4e1a799797ad5ab5294ae2272c4bb14f8916b3863eebf22dc37594ac89d180f3210dd3224b1f045
+EBUILD atril-1.14.2-r2.ebuild 2427 BLAKE2B c8197693e593f8ca6db629066b9ad97bde2196e82ef9fecc4dbd957439e69f8fdd403527cd41216166da189eceded8353206f5bca951763eb11cf30e415308cf SHA512 8e9f42cf971654f0ed33b47d7810d7f2f0abe58f6c8272229ff3833075c35c79c38e61f5e7d89d45424d8ddc8a8cc8454d7be6178e25c582ee3d7fc446611a07
+EBUILD atril-1.16.1-r2.ebuild 2364 BLAKE2B 3886d97b14d48097cd60d01062114741a120eeade55330faa0b310bd18a5a260947c98ef9fa583146a0d8b905c34540badf7cb33b346ad36d26dfa6bb5561f08 SHA512 4d6d8e1667d468a5e16e9d496ea16fdc1bcc7ae08b6471f563d3bdf9dafe15820d97c1397dd93a64ba5fac169d8fe8eb4fe6e74de188ff28ee2eeae83530dfc4
 EBUILD atril-1.18.3.ebuild 2169 BLAKE2B 3caa9aaca3f81ab3d1bf63459d73b8da16eafd9378c99665e916afb6e098dd34c1aa25d9f32887b7c5e03d2e4a534c2b3817aef3a515b15395a4b4f7cf7ba2a0 SHA512 c80982fd6d539c26272556b7a08e46ec628ecc42772caf1f080da844a26fc66f20fa569b214e656791f1cd2b0bdd34dc80b86352a510c22087d5eb1e6cc3b655
 MISC metadata.xml 843 BLAKE2B 85c02a872255c9b51727285c86f1f5df7c8b841576557ba7bbc240cc3e549ddf1f681e1c9f416785650d7d9e3168e4db06ca52ce61e50a47fe6660a73e97dc92 SHA512 9248d2446621337488268f0c7f839821383bba8d170620376cb95b96868448fc3bc411e336104f59db0d8bb5d304dc1c0b76ef818686b930c93a04764e9f4fdc
diff --git a/app-text/atril/atril-1.12.2-r4.ebuild b/app-text/atril/atril-1.12.2-r5.ebuild
index aa353029fbdf..360dac80db22 100644
--- a/app-text/atril/atril-1.12.2-r4.ebuild
+++ b/app-text/atril/atril-1.12.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -67,6 +67,8 @@ DEPEND="${RDEPEND}
 # Tests use dogtail which is not available on Gentoo.
 RESTRICT="test"
 
+FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
+
 src_configure() {
 	# Passing --disable-help would drop offline help, that would be inconsistent
 	# with helps of the most of GNOME apps that doesn't require network for that.
diff --git a/app-text/atril/atril-1.14.2-r1.ebuild b/app-text/atril/atril-1.14.2-r2.ebuild
index 12e1ae529a2d..792c2c2e6a06 100644
--- a/app-text/atril/atril-1.14.2-r1.ebuild
+++ b/app-text/atril/atril-1.14.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -69,6 +69,8 @@ DEPEND="${COMMON_DEPEND}
 # Tests use dogtail which is not available on Gentoo.
 RESTRICT="test"
 
+FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
+
 src_configure() {
 	# Passing --disable-help would drop offline help, that would be inconsistent
 	# with helps of the most of GNOME apps that doesn't require network for that.
diff --git a/app-text/atril/atril-1.16.1-r1.ebuild b/app-text/atril/atril-1.16.1-r2.ebuild
index 4259cddf89bc..24aad9d4f3c7 100644
--- a/app-text/atril/atril-1.16.1-r1.ebuild
+++ b/app-text/atril/atril-1.16.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -68,6 +68,8 @@ DEPEND="${COMMON_DEPEND}
 # Tests use dogtail which is not available on Gentoo.
 RESTRICT="test"
 
+FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
+
 src_configure() {
 	# Passing --disable-help would drop offline help, that would be inconsistent
 	# with helps of the most of GNOME apps that doesn't require network for that.
diff --git a/app-text/atril/files/atril-cve-2017-1000083.patch b/app-text/atril/files/atril-cve-2017-1000083.patch
new file mode 100644
index 000000000000..29c81f7e5424
--- /dev/null
+++ b/app-text/atril/files/atril-cve-2017-1000083.patch
@@ -0,0 +1,28 @@
+From f4291fd62f7dfe6460d2406a979ccfac0c68dd59 Mon Sep 17 00:00:00 2001
+From: ZenWalker <scow@riseup.net>
+Date: Wed, 19 Jul 2017 11:00:09 +0200
+Subject: [PATCH] comics: make the files containing "--checkpoint-action="
+ unsupported
+
+Fixes #257
+---
+ backend/comics/comics-document.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
+index 9f945c6..4d4d293 100644
+--- a/backend/comics/comics-document.c
++++ b/backend/comics/comics-document.c
+@@ -983,6 +983,12 @@ extract_argv (EvDocument *document, gint page)
+ 	char *command_line, *quoted_archive, *quoted_filename;
+ 	GError *err = NULL;
+ 
++	if (g_strrstr (comics_document->page_names->pdata[page], "--checkpoint-action="))
++	{
++		g_warning ("File unsupported\n");
++		gtk_main_quit ();
++	}
++
+         if (page >= comics_document->page_names->len)
+                 return NULL;
+