diff options
Diffstat (limited to 'user/evince')
| -rw-r--r-- | user/evince/APKBUILD | 44 | ||||
| -rw-r--r-- | user/evince/CVE-2019-11459.patch | 72 |
2 files changed, 5 insertions, 111 deletions
diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD index ea6b66231..8d6368a9b 100644 --- a/user/evince/APKBUILD +++ b/user/evince/APKBUILD @@ -1,21 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=evince -pkgver=3.32.0 -pkgrel=2 +pkgver=3.36.7 +pkgrel=0 pkgdesc="GNOME document viewer" url="https://wiki.gnome.org/Apps/Evince" arch="all" license="GPL-2.0+ AND MIT AND BSD-3-Clause AND LGPL-2.0+ AND X11 AND LGPL-3.0-only AND Public-Domain AND LGPL-2.1+" -depends="gst-plugins-base gst-plugins-good" +depends="gsettings-desktop-schemas gst-plugins-base gst-plugins-good" makedepends="djvulibre-dev glib-dev gobject-introspection-dev gsettings-desktop-schemas-dev gstreamer-dev gst-plugins-base-dev gtk+3.0-dev itstool libarchive-dev libexecinfo-dev libgxps-dev libsecret-dev libspectre-dev libxml2-dev libxml2-utils poppler-dev tiff-dev zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://ftp.gnome.org/pub/gnome/sources/evince/3.32/evince-$pkgver.tar.xz - CVE-2019-11459.patch" +source="https://ftp.gnome.org/pub/gnome/sources/evince/${pkgver%.*}/evince-$pkgver.tar.xz" # secfixes: # 3.32.0-r2: @@ -33,38 +32,6 @@ build() { --disable-nautilus \ --enable-introspection \ --enable-ps - - # our msgfmt(1) can't do --desktop - cp data/org.gnome.Evince.desktop.in data/org.gnome.Evince.desktop - cp data/org.gnome.Evince-previewer.desktop.in \ - data/org.gnome.Evince-previewer.desktop - cp backend/pdf/evince-pdfdocument.metainfo.xml.in \ - backend/pdf/evince-pdfdocument.metainfo.xml - cp backend/pdf/pdfdocument.evince-backend.desktop.in \ - backend/pdf/pdfdocument.evince-backend - cp backend/djvu/evince-djvudocument.metainfo.xml.in \ - backend/djvu/evince-djvudocument.metainfo.xml - cp backend/djvu/djvudocument.evince-backend.desktop.in \ - backend/djvu/djvudocument.evince-backend - cp backend/tiff/evince-tiffdocument.metainfo.xml.in \ - backend/tiff/evince-tiffdocument.metainfo.xml - cp backend/tiff/tiffdocument.evince-backend.desktop.in \ - backend/tiff/tiffdocument.evince-backend - cp backend/comics/evince-comicsdocument.metainfo.xml.in \ - backend/comics/evince-comicsdocument.metainfo.xml - cp backend/comics/comicsdocument.evince-backend.desktop.in \ - backend/comics/comicsdocument.evince-backend - cp backend/xps/evince-xpsdocument.metainfo.xml.in \ - backend/xps/evince-xpsdocument.metainfo.xml - cp backend/xps/xpsdocument.evince-backend.desktop.in \ - backend/xps/xpsdocument.evince-backend - cp backend/ps/evince-psdocument.metainfo.xml.in \ - backend/ps/evince-psdocument.metainfo.xml - cp backend/ps/psdocument.evince-backend.desktop.in \ - backend/ps/psdocument.evince-backend - cp org.gnome.Evince.appdata.xml.in org.gnome.Evince.appdata.xml - - # we now return you to your regularly scheduled build make } @@ -76,5 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="565298a200d9ae2f6b4cb53c3cba0d0d0e4cfbef60e4145bfb9c82a5682947ceb2371e52c27179cd69a238cd387bcfd744d3c55df814b6347f07781aec3ea658 evince-3.32.0.tar.xz -ebb8e2e0b2754d4634c99fda7669171e97b583dfbcd383682b70eb36ce816f1bcf1c2cb81b4ffbfac86db891d9f63bd0c2d90ff9ca3838c64a258b6a0002f7c4 CVE-2019-11459.patch" +sha512sums="dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910 evince-3.36.7.tar.xz" diff --git a/user/evince/CVE-2019-11459.patch b/user/evince/CVE-2019-11459.patch deleted file mode 100644 index b331a0c30..000000000 --- a/user/evince/CVE-2019-11459.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 234f034a4d15cd46dd556f4945f99fbd57ef5f15 Mon Sep 17 00:00:00 2001 -From: Jason Crain <jcrain@src.gnome.org> -Date: Mon, 15 Apr 2019 23:06:36 -0600 -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. - -Fixes #1129 ---- - backend/tiff/tiff-document.c | 28 ++++++++++++++++++---------- - 1 file changed, 18 insertions(+), 10 deletions(-) - -diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c -index 7715031b..38bb3bd8 100644 ---- a/backend/tiff/tiff-document.c -+++ b/backend/tiff/tiff-document.c -@@ -292,18 +292,22 @@ tiff_document_render (EvDocument *document, - g_warning("Failed to allocate memory for rendering."); - 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 -@@ -384,13 +388,17 @@ tiff_document_get_thumbnail (EvDocument *document, - 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 (); - - ev_render_context_compute_scaled_size (rc, width, height * (x_res / y_res), --- -2.21.0 - |