Index: head/graphics/gd/Makefile =================================================================== --- head/graphics/gd/Makefile (revision 432647) +++ head/graphics/gd/Makefile (revision 432648) @@ -1,94 +1,93 @@ # Created by: jeff@cetlink.net # $FreeBSD$ PORTNAME= libgd -PORTVERSION= 2.2.3 -PORTREVISION?= 1 +PORTVERSION= 2.2.4 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 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 .include # 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 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.4 .include Index: head/graphics/gd/distinfo =================================================================== --- head/graphics/gd/distinfo (revision 432647) +++ head/graphics/gd/distinfo (revision 432648) @@ -1,3 +1,3 @@ -TIMESTAMP = 1472401416 -SHA256 (libgd-2.2.3.tar.xz) = 746b6cbd6769a22ff3ba6f5756f3512a769bd4cdf4695dff17f4867f25fa7d3c -SIZE (libgd-2.2.3.tar.xz) = 2164152 +TIMESTAMP = 1485463341 +SHA256 (libgd-2.2.4.tar.xz) = 137f13a7eb93ce72e32ccd7cebdab6874f8cf7ddf31d3a455a68e016ecd9e4e6 +SIZE (libgd-2.2.4.tar.xz) = 2478528 Index: head/graphics/gd/files/patch-gdft.c =================================================================== --- head/graphics/gd/files/patch-gdft.c (revision 432647) +++ head/graphics/gd/files/patch-gdft.c (nonexistent) @@ -1,29 +0,0 @@ ---- src/gdft.c.orig 2016-07-21 10:32:27.000000000 +0200 -+++ src/gdft.c 2016-08-28 19:25:01.730120000 +0200 -@@ -139,7 +139,7 @@ - } - #else - --#ifndef HAVE_LIBFONTCONFIG -+#if 0 - static char * font_pattern(char **fontpath, char *fontpattern) - { - (void)fontpath; -@@ -446,15 +446,15 @@ - return (strcmp (a->fontlist, b->fontlist) == 0 && a->flags == b->flags); - } - -+#ifdef HAVE_LIBFONTCONFIG - static int useFontConfig(int flag) - { --#ifdef HAVE_LIBFONTCONFIG - if (fontConfigFlag) { - return (!(flag & gdFTEX_FONTPATHNAME)); - } --#endif - return flag & gdFTEX_FONTCONFIG; - } -+#endif - - static void * - fontFetch (char **error, void *key) Property changes on: head/graphics/gd/files/patch-gdft.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/gd/files/patch-gd_webp.c =================================================================== --- head/graphics/gd/files/patch-gd_webp.c (revision 432647) +++ head/graphics/gd/files/patch-gd_webp.c (nonexistent) @@ -1,27 +0,0 @@ -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 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/gd/pkg-plist =================================================================== --- head/graphics/gd/pkg-plist (revision 432647) +++ head/graphics/gd/pkg-plist (revision 432648) @@ -1,33 +1,33 @@ bin/annotate bin/bdftogd bin/gd2copypal bin/gd2togif bin/gd2topng bin/gdcmpgif bin/gdlib-config bin/gdparttopng bin/gdtopng bin/giftogd2 bin/pngtogd bin/pngtogd2 bin/webpng include/entities.h include/gd.h include/gd_color_map.h include/gd_errors.h include/gd_io.h include/gdcache.h include/gdfontg.h include/gdfontl.h include/gdfontmb.h include/gdfonts.h include/gdfontt.h include/gdfx.h include/gdhelpers.h include/gdpp.h lib/libgd.a lib/libgd.la lib/libgd.so lib/libgd.so.6 -lib/libgd.so.6.0.3 +lib/libgd.so.6.0.4 libdata/pkgconfig/gdlib.pc