Index: head/graphics/gd/Makefile
===================================================================
--- head/graphics/gd/Makefile	(revision 424077)
+++ head/graphics/gd/Makefile	(revision 424078)
@@ -1,95 +1,94 @@
 # Created by: jeff@cetlink.net
 # $FreeBSD$
 
 PORTNAME=	libgd
 PORTVERSION=	2.2.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/
 
 MAINTAINER?=	dinoex@FreeBSD.org
 COMMENT?=	Graphics library for fast creation of images
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libtiff.so:graphics/tiff \
 		libpng.so:graphics/png \
 		libfreetype.so:print/freetype2
 
 CONFLICTS=	bazaar-1.*
 
 USES=		tar:xz pkgconfig pathfix libtool:keepla shebangfix jpeg
 SHEBANG_FILES=	${WRKSRC}/src/bdftogd
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	FONTCONFIG ICONV XPM WEBP
-OPTIONS_DEFAULT=FONTCONFIG
+OPTIONS_DEFAULT=FONTCONFIG WEBP
 NO_OPTIONS_SORT=yes
 FONTCONFIG_LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
 FONTCONFIG_CONFIGURE_OFF=	--with-fontconfig=no
 ICONV_USES=	iconv
 ICONV_CONFIGURE_ON=	${ICONV_CONFIGURE_ARG}
 XPM_USE=	xorg=xpm,x11
 XPM_CONFIGURE_ON=	--with-x
 XPM_CONFIGURE_OFF=	--with-xpm=no
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CONFIGURE_OFF=	--without-webp
-WEBP_BROKEN=	circular dependencies
 
 .include <bsd.port.options.mk>
 
 # force gdlib-config --ldflags
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # The GD_FONTS environment variable can be set to specify the gzipped
 # tar-ball containing the fonts in bdf format and the bdf file names.
 # The tarball is the first argument, the tiny, small, medium-bold,
 # large, and giant fonts follow.
 #
 # For example:
 # GD_FONTS="/usr/ports/distfiles/x-koi8u.tgz koi6x10.bdf koi8x13.bdf \
 #       koi9x15.bdf koi12x24.bdf koi10x20.bdf"
 #
 .if defined(GD_FONTS)
 USES+=		perl5
 USE_PERL5=	build
 WRKFONTS=	${WRKSRC}/src
 .endif
 
 pre-extract::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "GD_FONTS can be set to specify an alternative list of .bdf files"
 	@${ECHO_MSG} ""
 
 post-extract:
 .if defined(GD_FONTS)
 	cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts extract ${GD_FONTS}
 .endif
 
 pre-configure:
 .if defined(GD_FONTS)
 	cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts configure ${GD_FONTS}
 .endif
 	# bump shlib version
 	${REINPLACE_CMD} \
 		-e 's|^GDLIB_LT_CURRENT=3|GDLIB_LT_CURRENT=6|' \
 		${WRKSRC}/configure
 .if ! ${PORT_OPTIONS:MICONV}
 	${REINPLACE_CMD} \
 		-e 's|iconv|noiconv|' \
 		${WRKSRC}/configure
 .endif
 
 .if defined(GD_FONTS)
 pre-build:
 	cd ${WRKFONTS} && ${SH} ${FILESDIR}/makefonts build ${GD_FONTS}
 .endif
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \
 		${STAGEDIR}${PREFIX}/include/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.3
 
 .include <bsd.port.mk>
Index: head/graphics/gd/files/patch-gd_webp.c
===================================================================
--- head/graphics/gd/files/patch-gd_webp.c	(nonexistent)
+++ head/graphics/gd/files/patch-gd_webp.c	(revision 424078)
@@ -0,0 +1,27 @@
+LibGD Issue: https://github.com/libgd/libgd/issues/308
+Commit: https://github.com/libgd/libgd/commit/40bec0f38f50e8510f5bb71a82f516d46facde03
+
+Fix integer overflow in gdImageWebpCtx
+
+Integer overflow can be happened in expression gdImageSX(im) * 4 *
+gdImageSY(im). It could lead to heap buffer overflow in the following
+code. This issue has been reported to the PHP Bug Tracking System. The
+proof-of-concept file will be supplied some days later. This issue was
+discovered by Ke Liu of Tencent's Xuanwu LAB.
+--- src/gd_webp.c.orig	2016-07-21 10:06:42.000000000 +0200
++++ src/gd_webp.c	2016-10-16 20:27:17.150066000 +0200
+@@ -126,6 +126,14 @@
+ 		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;

Property changes on: head/graphics/gd/files/patch-gd_webp.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property