gdk-pixbuf2: update to 2.36.12.

2.36.12
=======
* build: meson fixes for win32
* build: Make --without-libtiff work
* build: Make x11 support optional
* gif, ico, jpeg, tiff, icns: various fixes (#778584, #779012, #753605, #779020, #779016)
* Implement async loading without threads
* Translation updates

5 files changed, 7 insertions, 77 deletions

diff --git a/graphics/gdk-pixbuf2/Makefile.version b/graphics/gdk-pixbuf2/Makefile.version
index f6ab3979250..86856cdf521 100644
--- a/graphics/gdk-pixbuf2/Makefile.version
+++ b/graphics/gdk-pixbuf2/Makefile.version
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.version,v 1.20 2017/10/16 09:37:27 adam Exp $
+# $NetBSD: Makefile.version,v 1.21 2018/04/16 12:22:40 wiz Exp $
 #
 # used by graphics/gdk-pixbuf2/Makefile
 # used by graphics/gdk-pixbuf2-jasper/Makefile
 # used by graphics/gdk-pixbuf2-xlib/Makefile
 
-PIXBUF2_VERSION=	2.36.11
+PIXBUF2_VERSION=	2.36.12
 MSITE_VERSION=		${PIXBUF2_VERSION:R}
diff --git a/graphics/gdk-pixbuf2/distinfo b/graphics/gdk-pixbuf2/distinfo
index 904be163755..ce5b7ffb2f7 100644
--- a/graphics/gdk-pixbuf2/distinfo
+++ b/graphics/gdk-pixbuf2/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.38 2017/10/16 09:37:27 adam Exp $
+$NetBSD: distinfo,v 1.39 2018/04/16 12:22:40 wiz Exp $
 
-SHA1 (gdk-pixbuf-2.36.11.tar.xz) = 445bb95b234c3b3cea273353b7464f3b796dbd0e
-RMD160 (gdk-pixbuf-2.36.11.tar.xz) = 855d1321e3f74b41fa4e80e3c4abddc1147f59f7
-SHA512 (gdk-pixbuf-2.36.11.tar.xz) = 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
-Size (gdk-pixbuf-2.36.11.tar.xz) = 5675908 bytes
+SHA1 (gdk-pixbuf-2.36.12.tar.xz) = 2a32bf71fd7c47b22abd9843bc3116e771772fbe
+RMD160 (gdk-pixbuf-2.36.12.tar.xz) = 283963dfc2e04e7f51a3b195afb514379ecfda7b
+SHA512 (gdk-pixbuf-2.36.12.tar.xz) = 5d3bd620cf464bf92079b15c78f8400db48c427053c6eeedc4ea9652a4c290a09a26310100cc7eb487daf4b565df9f7e3a6edf14685f81ddbff6a0652fb6b41b
+Size (gdk-pixbuf-2.36.12.tar.xz) = 5675768 bytes
 SHA1 (patch-configure) = 8078e64aae9b3897819635851c72d0ba6d377b18
 SHA1 (patch-contrib_gdk-pixbuf-xlib_Makefile.in) = 636ab94c6bfde10c118b7833b4637a586781bfd5
 SHA1 (patch-gdk-pixbuf_Makefile.in) = 9173c4dbc89e4a4d34359e52885121c19a8a7ba6
 SHA1 (patch-gdk-pixbuf_gdk-pixbuf-scaled-anim.c) = 486db8d3f352b0d72b7074ba48f14ccbfa09deda
-SHA1 (patch-gdk-pixbuf_io-icns.c) = 71c1aa8ab88a260086b2bb345094d6a4376319a4
-SHA1 (patch-gdk-pixbuf_io-ico.c) = 182c1e599259d6a043612abbad69a9527fa969e9
-SHA1 (patch-gdk-pixbuf_io-tiff.c) = a43137f861ff9a240d148adb2a278c2112291652
diff --git a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-icns.c b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-icns.c
deleted file mode 100644
index 87def76a5ef..00000000000
--- a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-icns.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-gdk-pixbuf_io-icns.c,v 1.3 2017/05/14 12:55:16 spz Exp $
-
-from hint in https://bugzilla.gnome.org/show_bug.cgi?id=779016
-for CVE-2017-6313
-
---- gdk-pixbuf/io-icns.c.orig	2016-10-22 03:38:29.000000000 +0000
-+++ gdk-pixbuf/io-icns.c
-@@ -95,7 +95,7 @@ load_resources (unsigned size, IN gpoint
-       blocklen = GUINT32_FROM_BE (header->size);
- 
-       /* Check that blocklen isn't garbage */
--      if (blocklen > icnslen - (current - bytes))
-+      if ((blocklen > icnslen - (current - bytes)) || (blocklen < sizeof (IcnsBlockHeader)))
-         return FALSE;
- 
-       switch (size)
diff --git a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-ico.c b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-ico.c
deleted file mode 100644
index 77d313d9a6b..00000000000
--- a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-ico.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-gdk-pixbuf_io-ico.c,v 1.2 2017/08/08 16:52:10 adam Exp $
-
-from https://bugzilla.gnome.org/attachment.cgi?id=347366&action=diff
-for CVE-2017-6312
-
---- gdk-pixbuf/io-ico.c.orig	2017-08-07 16:52:44.000000000 +0000
-+++ gdk-pixbuf/io-ico.c
-@@ -333,10 +333,8 @@ static void DecodeHeader(guchar *Data, g
- 	for (l = State->entries; l != NULL; l = g_list_next (l)) {
- 		entry = l->data;
- 
--		/* We know how many bytes are in the "header" part. */
--		State->HeaderSize = entry->DIBoffset + INFOHEADER_SIZE;
--
--		if (State->HeaderSize < 0) {
-+		/* Avoid invoking undefined behavior in the State->HeaderSize calculation below */
-+		if (entry->DIBoffset > G_MAXINT - INFOHEADER_SIZE) {
- 			g_set_error (error,
- 			             GDK_PIXBUF_ERROR,
- 			             GDK_PIXBUF_ERROR_CORRUPT_IMAGE,
-@@ -344,6 +342,9 @@ static void DecodeHeader(guchar *Data, g
- 			return;
- 		}
- 
-+		/* We know how many bytes are in the "header" part. */
-+		State->HeaderSize = entry->DIBoffset + INFOHEADER_SIZE;
-+
- 		if (State->HeaderSize>State->BytesInHeaderBuf) {
- 			guchar *tmp=g_try_realloc(State->HeaderBuf,State->HeaderSize);
- 			if (!tmp) {
diff --git a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-tiff.c b/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-tiff.c
deleted file mode 100644
index 15397b28723..00000000000
--- a/graphics/gdk-pixbuf2/patches/patch-gdk-pixbuf_io-tiff.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-gdk-pixbuf_io-tiff.c,v 1.1 2017/05/14 12:55:16 spz Exp $
-
-from https://bugzilla.gnome.org/attachment.cgi?id=350204&action=diff
-for CVE-2017-6314
-
---- gdk-pixbuf/io-tiff.c.orig	2017-03-26 11:12:32.000000000 +0000
-+++ gdk-pixbuf/io-tiff.c
-@@ -505,9 +505,12 @@ make_available_at_least (TiffContext *co
-         need_alloc = context->used + needed;
-         if (need_alloc > context->allocated) {
-                 guint new_size = 1;
--                while (new_size < need_alloc)
-+                while (new_size && (new_size < need_alloc))
-                         new_size *= 2;
- 
-+		if(!(new_size))
-+			return FALSE;
-+
-                 new_buffer = g_try_realloc (context->buffer, new_size);
-                 if (new_buffer) {
-                         context->buffer = new_buffer;