mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-04 12:01:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/gdk-pixbuf: upgrade to 2.36.8

Browse Source
This commit is contained in:
Natanael Copa 2017-08-09 06:56:57 +00:00
parent feb7a544d3
commit a64ce8d9b2
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/gdk-pixbuf/APKBUILD
View File

@ -1,12 +1,12 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gdk-pixbuf
pkgver=2.36.6
pkgrel=1
pkgver=2.36.8
pkgrel=0
pkgdesc="GDK Pixbuf library"
url="http://www.gtk.org/"
arch="all"
license="LGPL"
depends=
depends="shared-mime-info"
depends_dev=""
makedepends="$depends_dev tiff-dev libjpeg-turbo-dev gobject-introspection-dev
libpng-dev glib-dev"
@ -14,7 +14,6 @@ install="$pkgname.pre-deinstall"
triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz
CVE-2017-6311.patch
CVE-2017-6312.patch
CVE-2017-6314.patch
"
@ -66,7 +65,6 @@ dev() {
default_dev
}
sha512sums="b963f01161b58463c83499079545aa946fd824ec5e7167e0898698ac46e0cc3fb3dcb0cac5afabd6b7d957391b9c9bba55f340294076433155fc91052d5403ec gdk-pixbuf-2.36.6.tar.xz
b1da3b159b20fe9fcfb06ec77970d3f4adc516dbc63a9fe7e81dbaa61db2f18188775668a2bc764128186696adc9ee3dfd4dcf1a04faa302e23957d38071a610 CVE-2017-6311.patch
sha512sums="db92770098eff80706aad6fcd4ad6709aa6e4643d8740fc49dc0bb0620f94ff1b3df5d9ff65e7b27b060f36119ae654a0358fd40118f75b205f751a870bae052 gdk-pixbuf-2.36.8.tar.xz
3b67e10ae02ecfdb541c427f811541e2cd0cfc3f048b1e4b119767b7f8f3a02de8a9c7302c21d23de1ea886f994d4dcdb687580c970d7d49eba80f17075ff0de CVE-2017-6312.patch
2ea67f0716234de017f7e8c628d544b40513f23689d70e5e5e2621affabce40ae733d399f64d2641616c114ac7f3fa22396e68142656dbb10993d70181ff5a50 CVE-2017-6314.patch"

23
main/gdk-pixbuf/CVE-2017-6311.patch
View File

@ -1,23 +0,0 @@
@@ -, +, @@
returned
thumbnailer/gnome-thumbnailer-skeleton.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/thumbnailer/gnome-thumbnailer-skeleton.c
+++ a/thumbnailer/gnome-thumbnailer-skeleton.c
@@ -315,11 +315,15 @@ int main (int argc, char **argv)
#endif
g_free (input_filename);
- if (!pixbuf) {
+ if (!pixbuf && error) {
g_warning ("Could not thumbnail '%s': %s", filenames[0], error->message);
g_error_free (error);
g_strfreev (filenames);
return 1;
+ } else if (!pixbuf) {
+ g_warning ("Could not thumbnail '%s'", filenames[0]);
+ g_strfreev (filenames);
+ return 1;
}
if (gdk_pixbuf_save (pixbuf, output, "png", &error, NULL) == FALSE) {