[gentoo-commits] proj/gentoo-mate:master commit in: app-text/atril/files/, app-text/atril/
commit: fc3a305449e6ba1438a92a4b055b1fc4ef3acb56
Author: Adam Feldman gentoo org>
AuthorDate: Sun Mar 29 17:37:45 2020 +
Commit: Adam Feldman gentoo org>
CommitDate: Thu Apr 9 22:49:22 2020 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=fc3a3054
app-text/atril: Drop old, sync with Gentoo
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman gentoo.org>
app-text/atril/Manifest| 7 +-
app-text/atril/atril-1.14.2-r2.ebuild | 98 --
...{atril-1.12.2-r5.ebuild => atril-1.22.1.ebuild} | 66 +++
.../{atril-1.18.3.ebuild => atril-1.22.3.ebuild} | 47 ++-
...{atril-1.16.1-r2.ebuild => atril-1.24.0.ebuild} | 72
app-text/atril/atril-.ebuild | 55 ++--
app-text/atril/files/atril-cve-2017-183.patch | 28 ---
app-text/atril/metadata.xml| 1 -
8 files changed, 124 insertions(+), 250 deletions(-)
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 6b8a9c6..c4442d6 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,4 +1,3 @@
-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
+DIST atril-1.22.1.tar.xz 1766980 BLAKE2B
0b7b1a7dfff13c5d803fed4140596940b20a322fce54c9f0faecd8e80bdc1e5e498603851a10a88763b20444377bcf4e7b124ac08953ab6aa4b3b2cce021a46c
SHA512
838ae397c868ac417c9266e4a06525d66214650cf8647e91c1472d83d50c8954f6dbb29411384892a98f0929e1fbac9947118bd0db10d50400fc0d5270a3619d
+DIST atril-1.22.3.tar.xz 1798396 BLAKE2B
1f06585393e1a9a6d51b7cc50c52bd61e8e115aa3985ffca0233c2e09219a88c3a30b4ddbcc70bfb9ddf663810e6cc67e968f8a32bfd4a3f07b4646e896a7f18
SHA512
f4a83702818e1fb32279c67f1727c01480d27fe756f3fc0ff9dcd42584ce74ce10ac7ee81c0149f3756b6eb08f2a011ede28706ab54ff16a51c544a1af3b103f
+DIST atril-1.24.0.tar.xz 2062468 BLAKE2B
374c7769f5c9753b1d9a6143c796a317914aebbb638b6f0a85b732b43b0e9ad2fff1374a5f3f4dc1abc8c265ce003bfef2cddc47cdb18ddc7f24c4905ef5232c
SHA512
dfdd5ed82ba76c4f0a446a95b0a6201bedf8b4d00ff46ce697a5b937251f6d7a1888ca76eef623eb84dcddb425c7ad662e179f593686bba064b7491d4d940293
diff --git a/app-text/atril/atril-1.14.2-r2.ebuild
b/app-text/atril/atril-1.14.2-r2.ebuild
deleted file mode 100644
index 792c2c2..000
--- a/app-text/atril/atril-1.14.2-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3
+postscript t1lib tiff xps"
-
-REQUIRED_USE="t1lib? ( dvi )
- !gtk3? ( !epub )" #608604
-
-COMMON_DEPEND=">=app-text/poppler-0.16:0=[cairo]
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2.5:2
- >=mate-base/mate-desktop-1.9[gtk3(-)=]
- sys-libs/zlib:0
- x11-libs/gdk-pixbuf:2
- x11-libs/libICE:0
- >=x11-libs/libSM-1:0
- x11-libs/libX11:0
- >=x11-libs/cairo-1.9.10:0
- x11-libs/pango:0
- caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
- djvu? ( >=app-text/djvu-3.5.17:0 )
- dvi? (
- virtual/tex-base:0
- t1lib? ( >=media-libs/t1lib-5:5 )
- )
- epub? ( dev-libs/mathjax )
- gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
- !gtk3? (
- >=x11-libs/gtk+-2.24.0:2[introspection?]
- )
- gtk3? (
- >=x11-libs/gtk+-3.0:3[introspection?]
- epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
- )
- introspection? (
[gentoo-commits] proj/gentoo-mate:master commit in: app-text/atril/files/, app-text/atril/
commit: ced50dd61da2d434a71ec88f0fec8bd0d52b12e2
Author: NP-Hardass gentoo org>
AuthorDate: Fri Feb 23 20:19:06 2018 +
Commit: NP Hardass gentoo org>
CommitDate: Fri Feb 23 20:19:06 2018 +
URL:https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=ced50dd6
app-text/atril: Fix CVE-2017-183
Bug: https://bugs.gentoo.org/624880
Package-Manager: Portage-2.3.24, Repoman-2.3.6
...ril-1.12.2-r4.ebuild => atril-1.12.2-r5.ebuild} | 4 +++-
...ril-1.14.2-r1.ebuild => atril-1.14.2-r2.ebuild} | 4 +++-
...ril-1.16.1-r1.ebuild => atril-1.16.1-r2.ebuild} | 4 +++-
app-text/atril/files/atril-cve-2017-183.patch | 28 ++
4 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/app-text/atril/atril-1.12.2-r4.ebuild
b/app-text/atril/atril-1.12.2-r5.ebuild
similarity index 96%
rename from app-text/atril/atril-1.12.2-r4.ebuild
rename to app-text/atril/atril-1.12.2-r5.ebuild
index aa35302..360dac8 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-183.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
similarity index 96%
rename from app-text/atril/atril-1.14.2-r1.ebuild
rename to app-text/atril/atril-1.14.2-r2.ebuild
index 12e1ae5..792c2c2 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-183.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
similarity index 96%
rename from app-text/atril/atril-1.16.1-r1.ebuild
rename to app-text/atril/atril-1.16.1-r2.ebuild
index 4259cdd..24aad9d 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-183.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-183.patch
b/app-text/atril/files/atril-cve-2017-183.patch
new file mode 100644
index 000..29c81f7
--- /dev/null
+++ b/app-text/atril/files/atril-cve-2017-183.patch
@@ -0,0 +1,28 @@
+From f4291fd62f7dfe6460d2406a979ccfac0c68dd59 Mon Sep 17 00:00:00 2001
+From: ZenWalker
+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;
+
