diff options
Diffstat (limited to 'user/atril')
| -rw-r--r-- | user/atril/APKBUILD | 21 | ||||
| -rw-r--r-- | user/atril/CVE-2019-11459.patch | 69 |
2 files changed, 12 insertions, 78 deletions
diff --git a/user/atril/APKBUILD b/user/atril/APKBUILD index d36e45f69..12e577e07 100644 --- a/user/atril/APKBUILD +++ b/user/atril/APKBUILD @@ -1,7 +1,7 @@ -# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=atril -pkgver=1.22.2 +pkgver=1.26.1 pkgrel=0 pkgdesc="Document viewer for the MATE desktop environment" url="https://mate-desktop.org" @@ -11,10 +11,11 @@ license="GPL-2.0+ AND Afmparse AND Info-ZIP AND libtiff AND LGPL-2.0+ AND MIT AN depends="" makedepends="caja-dev djvulibre-dev gobject-introspection-dev gtk+3.0-dev intltool itstool libgxps-dev libsecret-dev libsm-dev libspectre-dev - libxml2-dev libxml2-utils poppler-dev python3 tiff-dev" + libxml2-dev libxml2-utils poppler-dev python3 tiff-dev + wayland-protocols" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://pub.mate-desktop.org/releases/1.22/atril-$pkgver.tar.xz - CVE-2019-11459.patch" +source="https://pub.mate-desktop.org/releases/${pkgver%.*}/atril-$pkgver.tar.xz + " # secfixes: # 1.22.1-r1: @@ -24,6 +25,7 @@ source="https://pub.mate-desktop.org/releases/1.22/atril-$pkgver.tar.xz build() { ./configure \ + --disable-maintainer-mode \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -33,7 +35,9 @@ build() { --enable-introspection \ --enable-pixbuf \ --enable-comics \ - --enable-xps + --enable-xps \ + --enable-epub \ + --disable-synctex make } @@ -45,5 +49,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="99ff55f84649dfb8de931ff2506ff0339852fbb7ed368cee1f6632ba243d2b0384cd0bd649d16c30317fbf786612f54c2404da43d14141e6f9c0944e64c34653 atril-1.22.2.tar.xz -ba4ec4b0e10d87f44f189a16cfe2419906e3776edc9bc14f7da9356a8953683e3f7efc441691df131497b08b892d3b291aab416310f259ee6bc0706cc4f02880 CVE-2019-11459.patch" +sha512sums="276e80a81234f3228065f3a804fbd8a306ac948978f3dfd233f678dc4fb6f833ebd1123950996ae08869fac112ebb0d2785ab60fde6bfddd2d2c407a2c991ea3 atril-1.26.1.tar.xz" diff --git a/user/atril/CVE-2019-11459.patch b/user/atril/CVE-2019-11459.patch deleted file mode 100644 index a826cbd29..000000000 --- a/user/atril/CVE-2019-11459.patch +++ /dev/null @@ -1,69 +0,0 @@ -Backport of the following, since it did not apply due to whitespace / -formatting - -From bd4ce9171fef52720e74ffeeeeca3b0c5b5d4808 Mon Sep 17 00:00:00 2001 -From: Victor Kareh <vkareh@redhat.com> -Date: Sun, 11 Aug 2019 05:20:09 +0300 -Subject: [PATCH] tiff: Handle failure from TIFFReadRGBAImageOriented - -The TIFFReadRGBAImageOriented function returns zero if it was unable to -read the image. Return NULL in this case instead of displaying -uninitialized memory. - -This addresses CVE-2019-11459 - -upstream commit: -https://gitlab.gnome.org/GNOME/evince/commit/234f034a4 ---- - ---- atril-1.22.1/backend/tiff/tiff-document.c -+++ atril-1.22.1/backend/tiff/tiff-document.c -@@ -282,17 +282,21 @@ tiff_document_render (EvDocument *d - return NULL; - } - -+ if (!TIFFReadRGBAImageOriented (tiff_document->tiff, -+ width, height, -+ (uint32 *)pixels, -+ orientation, 0)) { -+ g_warning ("Failed to read TIFF image."); -+ g_free (pixels); -+ return NULL; -+ } -+ - surface = cairo_image_surface_create_for_data (pixels, - CAIRO_FORMAT_RGB24, - width, height, - rowstride); - cairo_surface_set_user_data (surface, &key, - pixels, (cairo_destroy_func_t)g_free); -- -- TIFFReadRGBAImageOriented (tiff_document->tiff, -- width, height, -- (uint32 *)pixels, -- orientation, 0); - pop_handlers (); - - /* Convert the format returned by libtiff to -@@ -373,13 +377,17 @@ tiff_document_render_pixbuf (EvDocument - if (!pixels) - return NULL; - -+ if (!TIFFReadRGBAImageOriented (tiff_document->tiff, -+ width, height, -+ (uint32 *)pixels, -+ ORIENTATION_TOPLEFT, 0)) { -+ g_free (pixels); -+ return NULL; -+ } -+ - pixbuf = gdk_pixbuf_new_from_data (pixels, GDK_COLORSPACE_RGB, TRUE, 8, - width, height, rowstride, - (GdkPixbufDestroyNotify) g_free, NULL); -- TIFFReadRGBAImageOriented (tiff_document->tiff, -- width, height, -- (uint32 *)pixels, -- ORIENTATION_TOPLEFT, 0); - pop_handlers (); - - scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf, |