Changes 2.2.5:

Security
* Double-free in gdImagePngPtr(). (CVE-2017-6362)
* Buffer over-read into uninitialized memory. (CVE-2017-7890)

Fixed
* Fix 109: XBM reading fails with printed error
* Fix 338: Fatal and normal libjpeg/ibpng errors not distinguishable
* Fix 357: 2.2.4: Segfault in test suite
* Fix 386: gdImageGrayScale() may produce colors
* Fix 406: webpng -i removes the transparent color
* Fix Coverity 155475: Failure to restore alphaBlendingFlag
* Fix Coverity 155476: potential resource leak
* Fix several build issues and test failures
* Fix and reenable optimized support for reading 1 bps TIFFs

Added
* The native MSVC buildchain now supports libtiff and most executables

5 files changed, 16 insertions, 36 deletions

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index de76c863a70..587bba6c66d 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.115 2017/04/15 15:50:42 kim Exp $
+# $NetBSD: Makefile,v 1.116 2017/09/04 06:20:45 adam Exp $
 
-DISTNAME=	libgd-2.2.4
+DISTNAME=	libgd-2.2.5
 PKGNAME=	${DISTNAME:S/libgd/gd/}
-PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libgd/}
 EXTRACT_SUFX=	.tar.xz
@@ -23,7 +22,9 @@ CONFIGURE_ARGS+=	--disable-werror
 CONFIGURE_ARGS+=	--with-fontconfig=${BUILDLINK_PREFIX.fontconfig}
 CONFIGURE_ARGS+=	--with-freetype=${BUILDLINK_PREFIX.freetype2}
 CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_PREFIX.jpeg}
+CONFIGURE_ARGS+=	--with-liq=${BUILDLINK_PREFIX.libimagequant}
 CONFIGURE_ARGS+=	--with-png=${BUILDLINK_PREFIX.png}
+CONFIGURE_ARGS+=	--with-tiff=${BUILDLINK_PREFIX.tiff}
 CONFIGURE_ARGS+=	--with-webp=${BUILDLINK_PREFIX.libwebp}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 REPLACE_PERL+=		src/bdftogd
@@ -33,8 +34,10 @@ PTHREAD_AUTO_VARS=	yes
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libimagequant/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index db8b252a6f8..fcf352cae79 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2017/04/15 15:50:42 kim Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2017/09/04 06:20:45 adam Exp $
 
 BUILDLINK_TREE+=	gd
 
@@ -14,10 +14,6 @@ BUILDLINK_PKGSRCDIR.gd?=	../../graphics/gd
 pkgbase := gd
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.gd:Mtiff)
-.include "../../graphics/tiff/buildlink3.mk"
-.endif
-
 .if !empty(PKG_BUILD_OPTIONS.gd:Mx11)
 .include "../../x11/libXpm/buildlink3.mk"
 .endif
@@ -25,8 +21,10 @@ pkgbase := gd
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/libimagequant/buildlink3.mk"
 .include "../../graphics/libwebp/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # GD_BUILDLINK3_MK
diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo
index a6cbe929a77..8399cd788e6 100644
--- a/graphics/gd/distinfo
+++ b/graphics/gd/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.44 2017/02/09 03:27:30 minskim Exp $
+$NetBSD: distinfo,v 1.45 2017/09/04 06:20:45 adam Exp $
 
-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
-SHA1 (patch-src_gd__gd2.c) = b4c53140dfbdb4251ae3058034b66cbf889672b9
+SHA1 (libgd-2.2.5.tar.xz) = b777b005c401b6fa310ccf09eeb29f6c6e17ab2c
+RMD160 (libgd-2.2.5.tar.xz) = 1c20f719161da596dac6c5c5b92bde71ddc9aedb
+SHA512 (libgd-2.2.5.tar.xz) = e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
+Size (libgd-2.2.5.tar.xz) = 2594092 bytes
diff --git a/graphics/gd/options.mk b/graphics/gd/options.mk
index e11c0fdb675..30a1df11f6d 100644
--- a/graphics/gd/options.mk
+++ b/graphics/gd/options.mk
@@ -1,18 +1,10 @@
-# $NetBSD: options.mk,v 1.6 2017/04/15 15:50:42 kim Exp $
+# $NetBSD: options.mk,v 1.7 2017/09/04 06:20:45 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gd
-PKG_SUPPORTED_OPTIONS=	tiff x11
-PKG_SUGGESTED_OPTIONS=	tiff
+PKG_SUPPORTED_OPTIONS=	x11
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mtiff)
-.include "../../graphics/tiff/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-tiff=${BUILDLINK_PREFIX.tiff}
-.else
-CONFIGURE_ARGS+=	--without-tiff
-.endif
-
 .if !empty(PKG_OPTIONS:Mx11)
 .include "../../x11/libXpm/buildlink3.mk"
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
diff --git a/graphics/gd/patches/patch-src_gd__gd2.c b/graphics/gd/patches/patch-src_gd__gd2.c
deleted file mode 100644
index a847919d6ac..00000000000
--- a/graphics/gd/patches/patch-src_gd__gd2.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_gd__gd2.c,v 1.1 2017/02/09 03:27:30 minskim Exp $
-
---- src/gd_gd2.c.orig	2017-01-18 10:49:29.000000000 +0000
-+++ src/gd_gd2.c
-@@ -73,6 +73,7 @@
- #endif
- 
- /* 2.0.29: no more errno.h, makes windows happy */
-+#include <limits.h>
- #include <math.h>
- #include <string.h>
- #include "gd.h"