Pullup ticket #5221 - requested by spz

graphics/gd: security fix

Revisions pulled up:
- graphics/gd/Makefile                                          1.113
- graphics/gd/distinfo                                          1.43
- graphics/gd/patches/patch-src_gd__webp.c                      deleted

---
   Module Name:    pkgsrc
   Committed By:   spz
   Date:           Sat Feb  4 23:05:52 UTC 2017

   Modified Files:
           pkgsrc/graphics/gd: Makefile distinfo
   Removed Files:
           pkgsrc/graphics/gd/patches: patch-src_gd__webp.c

   Log Message:
   update of gd to 2.2.4.

   Upstream Changelog:
   Security

       gdImageCreate() doesn't check for oversized images and as such is prone to DoS vulnerabilities. (CVE-2016-9317)
       double-free in gdImageWebPtr() (CVE-2016-6912)
       potential unsigned underflow in gd_interpolation.c
       DOS vulnerability in gdImageCreateFromGd2Ctx()

   Fixed

       Fix #354: Signed Integer Overflow gd_io.c
       Fix #340: System frozen
       Fix OOB reads of the TGA decompression buffer
       Fix DOS vulnerability in gdImageCreateFromGd2Ctx()
       Fix potential unsigned underflow
       Fix double-free in gdImageWebPtr()
       Fix invalid read in gdImageCreateFromTiffPtr()
       Fix OOB reads of the TGA decompression buffer
       Fix #68: gif: buffer underflow reported by AddressSanitizer
       Avoid potentially dangerous signed to unsigned conversion
       Fix #304: test suite failure in gif/bug00006 [2.2.3]
       Fix #329: GD_BILINEAR_FIXED gdImageScale() can cause black border
       Fix #330: Integer overflow in gdImageScaleBilinearPalette()
       Fix 321: Null pointer dereferences in gdImageRotateInterpolated
       Fix whitespace and add missing comment block
       Fix #319: gdImageRotateInterpolated can have wrong background color
       Fix color quantization documentation
       Fix #309: gdImageGd2() writes wrong chunk sizes on boundaries
       Fix #307: GD_QUANT_NEUQUANT fails to unset trueColor flag
       Fix #300: gdImageClone() assigns res_y = res_x
       Fix #299: Regression regarding gdImageRectangle() with gdImageSetThickness()
       Replace GNU old-style field designators with C89 compatible initializers
       Fix #297: gdImageCrop() converts palette image to truecolor image
       Fix #290: TGA RLE decoding is broken
       Fix unnecessary non NULL checks
       Fix #289: Passing unrecognized formats to gdImageGd2 results in corrupted files
       Fix #280: gdImageWebpEx() quantization parameter is a misnomer
       Publish all gdImageCreateFromWebp*() functions and gdImageWebpCtx()
       Fix issue #276: Sometimes pixels are missing when storing images as BMPs
       Fix issue #275: gdImageBmpCtx() may segfault for non-seekable contexts
       Fix copy&paste error in gdImageScaleBicubicFixed()

   Added

       More documentation
       Documentation on GD and GD2 formats
       More tests

3 files changed, 8 insertions, 30 deletions

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index a8994dfb8d7..8622d54a37a 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.112 2016/10/05 03:10:31 taca Exp $
+# $NetBSD: Makefile,v 1.112.2.1 2017/03/03 15:26:32 bsiegert Exp $
 
-DISTNAME=	libgd-2.2.3
-PKGREVISION=	1
+DISTNAME=	libgd-2.2.4
+#PKGREVISION=	1
 PKGNAME=	${DISTNAME:S/libgd/gd/}
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libgd/}
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index 101b6c76195..f6dd5d6300b 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.42 2016/10/05 03:10:31 taca Exp $
+$NetBSD: distinfo,v 1.42.2.1 2017/03/03 15:26:32 bsiegert Exp $
 
-SHA1 (libgd-2.2.3.tar.xz) = 2f8cebec5afd6c83a3d5cb92f40ea4926b4daa98
-RMD160 (libgd-2.2.3.tar.xz) = e6c29133c2ea33c8ba16571892d2798ef0f5afea
-SHA512 (libgd-2.2.3.tar.xz) = bdc6d086bc054beda6574ec46baa4cd94048a5f2f357f875ba05983e92d247f1b731434b9e438c6aef09d46fa96f1a7e1f330a25a77ffd2dd78aa8a32d652557
-Size (libgd-2.2.3.tar.xz) = 2164152 bytes
-SHA1 (patch-src_gd__webp.c) = 55c5929007ffe0d9ab23b7fed9abf373bc188de8
+SHA1 (libgd-2.2.4.tar.xz) = 67779817d7aecb94594c43ace949af350ca1df7f
+RMD160 (libgd-2.2.4.tar.xz) = 4b0ac89bf547aa7b6550e33d79fe5ca05801b4e6
+SHA512 (libgd-2.2.4.tar.xz) = 07903f322c4f6ab392508b0f60c38ca133699111ea92995dc6cd9379210d598bcb24a46c19657884d9e252f8663d0ee8c89c600e3a382a5ae598198c190f39b5
+Size (libgd-2.2.4.tar.xz) = 2478528 bytes
diff --git a/graphics/gd/patches/patch-src_gd__webp.c b/graphics/gd/patches/patch-src_gd__webp.c
deleted file mode 100644
index de9f9bd80de..00000000000
--- a/graphics/gd/patches/patch-src_gd__webp.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_gd__webp.c,v 1.1 2016/10/05 03:10:31 taca Exp $
-
-Fix for CVE-2016-7568.
-
---- src/gd_webp.c.orig	2016-07-21 08:06:42.000000000 +0000
-+++ src/gd_webp.c
-@@ -126,6 +126,14 @@ void gdImageWebpCtx (gdImagePtr im, gdIO
- 		quantization = 80;
- 	}
- 
-+	if (overflow2(gdImageSX(im), 4)) {
-+		return;
-+	}
-+
-+	if (overflow2(gdImageSX(im) * 4, gdImageSY(im))) {
-+		return;
-+	}
-+
- 	argb = (uint8_t *)gdMalloc(gdImageSX(im) * 4 * gdImageSY(im));
- 	if (!argb) {
- 		return;