| 1 |
commit: ced50dd61da2d434a71ec88f0fec8bd0d52b12e2 |
| 2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Feb 23 20:19:06 2018 +0000 |
| 4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 23 20:19:06 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=ced50dd6 |
| 7 |
|
| 8 |
app-text/atril: Fix CVE-2017-1000083 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/624880 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
...ril-1.12.2-r4.ebuild => atril-1.12.2-r5.ebuild} | 4 +++- |
| 14 |
...ril-1.14.2-r1.ebuild => atril-1.14.2-r2.ebuild} | 4 +++- |
| 15 |
...ril-1.16.1-r1.ebuild => atril-1.16.1-r2.ebuild} | 4 +++- |
| 16 |
app-text/atril/files/atril-cve-2017-1000083.patch | 28 ++++++++++++++++++++++ |
| 17 |
4 files changed, 37 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-text/atril/atril-1.12.2-r4.ebuild b/app-text/atril/atril-1.12.2-r5.ebuild |
| 20 |
similarity index 96% |
| 21 |
rename from app-text/atril/atril-1.12.2-r4.ebuild |
| 22 |
rename to app-text/atril/atril-1.12.2-r5.ebuild |
| 23 |
index aa35302..360dac8 100644 |
| 24 |
--- a/app-text/atril/atril-1.12.2-r4.ebuild |
| 25 |
+++ b/app-text/atril/atril-1.12.2-r5.ebuild |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 1999-2017 Gentoo Foundation |
| 28 |
+# Copyright 1999-2018 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
EAPI=6 |
| 32 |
@@ -67,6 +67,8 @@ DEPEND="${RDEPEND} |
| 33 |
# Tests use dogtail which is not available on Gentoo. |
| 34 |
RESTRICT="test" |
| 35 |
|
| 36 |
+FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" ) |
| 37 |
+ |
| 38 |
src_configure() { |
| 39 |
# Passing --disable-help would drop offline help, that would be inconsistent |
| 40 |
# with helps of the most of GNOME apps that doesn't require network for that. |
| 41 |
|
| 42 |
diff --git a/app-text/atril/atril-1.14.2-r1.ebuild b/app-text/atril/atril-1.14.2-r2.ebuild |
| 43 |
similarity index 96% |
| 44 |
rename from app-text/atril/atril-1.14.2-r1.ebuild |
| 45 |
rename to app-text/atril/atril-1.14.2-r2.ebuild |
| 46 |
index 12e1ae5..792c2c2 100644 |
| 47 |
--- a/app-text/atril/atril-1.14.2-r1.ebuild |
| 48 |
+++ b/app-text/atril/atril-1.14.2-r2.ebuild |
| 49 |
@@ -1,4 +1,4 @@ |
| 50 |
-# Copyright 1999-2017 Gentoo Foundation |
| 51 |
+# Copyright 1999-2018 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
|
| 54 |
EAPI=6 |
| 55 |
@@ -69,6 +69,8 @@ DEPEND="${COMMON_DEPEND} |
| 56 |
# Tests use dogtail which is not available on Gentoo. |
| 57 |
RESTRICT="test" |
| 58 |
|
| 59 |
+FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" ) |
| 60 |
+ |
| 61 |
src_configure() { |
| 62 |
# Passing --disable-help would drop offline help, that would be inconsistent |
| 63 |
# with helps of the most of GNOME apps that doesn't require network for that. |
| 64 |
|
| 65 |
diff --git a/app-text/atril/atril-1.16.1-r1.ebuild b/app-text/atril/atril-1.16.1-r2.ebuild |
| 66 |
similarity index 96% |
| 67 |
rename from app-text/atril/atril-1.16.1-r1.ebuild |
| 68 |
rename to app-text/atril/atril-1.16.1-r2.ebuild |
| 69 |
index 4259cdd..24aad9d 100644 |
| 70 |
--- a/app-text/atril/atril-1.16.1-r1.ebuild |
| 71 |
+++ b/app-text/atril/atril-1.16.1-r2.ebuild |
| 72 |
@@ -1,4 +1,4 @@ |
| 73 |
-# Copyright 1999-2017 Gentoo Foundation |
| 74 |
+# Copyright 1999-2018 Gentoo Foundation |
| 75 |
# Distributed under the terms of the GNU General Public License v2 |
| 76 |
|
| 77 |
EAPI=6 |
| 78 |
@@ -68,6 +68,8 @@ DEPEND="${COMMON_DEPEND} |
| 79 |
# Tests use dogtail which is not available on Gentoo. |
| 80 |
RESTRICT="test" |
| 81 |
|
| 82 |
+FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" ) |
| 83 |
+ |
| 84 |
src_configure() { |
| 85 |
# Passing --disable-help would drop offline help, that would be inconsistent |
| 86 |
# with helps of the most of GNOME apps that doesn't require network for that. |
| 87 |
|
| 88 |
diff --git a/app-text/atril/files/atril-cve-2017-1000083.patch b/app-text/atril/files/atril-cve-2017-1000083.patch |
| 89 |
new file mode 100644 |
| 90 |
index 0000000..29c81f7 |
| 91 |
--- /dev/null |
| 92 |
+++ b/app-text/atril/files/atril-cve-2017-1000083.patch |
| 93 |
@@ -0,0 +1,28 @@ |
| 94 |
+From f4291fd62f7dfe6460d2406a979ccfac0c68dd59 Mon Sep 17 00:00:00 2001 |
| 95 |
+From: ZenWalker <scow@××××××.net> |
| 96 |
+Date: Wed, 19 Jul 2017 11:00:09 +0200 |
| 97 |
+Subject: [PATCH] comics: make the files containing "--checkpoint-action=" |
| 98 |
+ unsupported |
| 99 |
+ |
| 100 |
+Fixes #257 |
| 101 |
+--- |
| 102 |
+ backend/comics/comics-document.c | 6 ++++++ |
| 103 |
+ 1 file changed, 6 insertions(+) |
| 104 |
+ |
| 105 |
+diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c |
| 106 |
+index 9f945c6..4d4d293 100644 |
| 107 |
+--- a/backend/comics/comics-document.c |
| 108 |
++++ b/backend/comics/comics-document.c |
| 109 |
+@@ -983,6 +983,12 @@ extract_argv (EvDocument *document, gint page) |
| 110 |
+ char *command_line, *quoted_archive, *quoted_filename; |
| 111 |
+ GError *err = NULL; |
| 112 |
+ |
| 113 |
++ if (g_strrstr (comics_document->page_names->pdata[page], "--checkpoint-action=")) |
| 114 |
++ { |
| 115 |
++ g_warning ("File unsupported\n"); |
| 116 |
++ gtk_main_quit (); |
| 117 |
++ } |
| 118 |
++ |
| 119 |
+ if (page >= comics_document->page_names->len) |
| 120 |
+ return NULL; |
| 121 |
+ |
Archives