Date: Sun, 28 Aug 2016 17:42:42 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421029 - in head/graphics/gd: . files Message-ID: <201608281742.u7SHggJk086171@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sun Aug 28 17:42:42 2016 New Revision: 421029 URL: https://svnweb.freebsd.org/changeset/ports/421029 Log: - update to 2.2.3 - remove option VPX Security: CVE-2016-6207 Security: CVE-2016-6214 Security: CVE-2016-6132 Security: CVE-2016-5766 PR: 211562 MFH: 2016Q3 Added: head/graphics/gd/files/patch-gdft.c (contents, props changed) Deleted: head/graphics/gd/files/patch-configure head/graphics/gd/files/patch-gd_tga.c Modified: head/graphics/gd/Makefile head/graphics/gd/distinfo head/graphics/gd/pkg-plist Modified: head/graphics/gd/Makefile ============================================================================== --- head/graphics/gd/Makefile Sun Aug 28 17:10:30 2016 (r421028) +++ head/graphics/gd/Makefile Sun Aug 28 17:42:42 2016 (r421029) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libgd -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES+= graphics @@ -24,15 +24,13 @@ SHEBANG_FILES= ${WRKSRC}/src/bdftogd GNU_CONFIGURE= yes USE_LDCONFIG= yes -OPTIONS_DEFINE= FONTCONFIG ICONV VPX XPM WEBP +OPTIONS_DEFINE= FONTCONFIG ICONV XPM WEBP OPTIONS_DEFAULT=FONTCONFIG 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} -VPX_LIB_DEPENDS= libvpx.so:multimedia/libvpx -VPX_CONFIGURE_OFF= --without-vpx XPM_USE= xorg=xpm,x11 XPM_CONFIGURE_ON= --with-x XPM_CONFIGURE_OFF= --with-xpm=no @@ -76,24 +74,13 @@ pre-configure: .endif # bump shlib version ${REINPLACE_CMD} \ - -e 's|GDLIB_CURRENT=.*|GDLIB_CURRENT=5|' \ + -e 's|^GDLIB_LT_CURRENT=3|GDLIB_LT_CURRENT=6|' \ ${WRKSRC}/configure - # workaround for broken configure .if ! ${PORT_OPTIONS:MICONV} ${REINPLACE_CMD} \ -e 's|iconv|noiconv|' \ ${WRKSRC}/configure .endif -.if ! ${PORT_OPTIONS:MXPM} - ${REINPLACE_CMD} \ - -e 's|xpm|noxpm|' \ - ${WRKSRC}/configure -.endif -.if ! ${PORT_OPTIONS:MFONTCONFIG} - ${REINPLACE_CMD} \ - -e 's|fontconfig|nofontconfig|' \ - ${WRKSRC}/configure -.endif .if defined(GD_FONTS) pre-build: @@ -103,6 +90,6 @@ pre-build: post-install: ${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \ ${STAGEDIR}${PREFIX}/include/ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.20202 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.3 .include <bsd.port.mk> Modified: head/graphics/gd/distinfo ============================================================================== --- head/graphics/gd/distinfo Sun Aug 28 17:10:30 2016 (r421028) +++ head/graphics/gd/distinfo Sun Aug 28 17:42:42 2016 (r421029) @@ -1,3 +1,3 @@ -TIMESTAMP = 1468106153 -SHA256 (libgd-2.2.2.tar.xz) = 489f756ce07f0c034b1a794f4d34fdb4d829256112cb3c36feb40bb56b79218c -SIZE (libgd-2.2.2.tar.xz) = 2105628 +TIMESTAMP = 1472401416 +SHA256 (libgd-2.2.3.tar.xz) = 746b6cbd6769a22ff3ba6f5756f3512a769bd4cdf4695dff17f4867f25fa7d3c +SIZE (libgd-2.2.3.tar.xz) = 2164152 Added: head/graphics/gd/files/patch-gdft.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gd/files/patch-gdft.c Sun Aug 28 17:42:42 2016 (r421029) @@ -0,0 +1,29 @@ +--- 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) Modified: head/graphics/gd/pkg-plist ============================================================================== --- head/graphics/gd/pkg-plist Sun Aug 28 17:10:30 2016 (r421028) +++ head/graphics/gd/pkg-plist Sun Aug 28 17:42:42 2016 (r421029) @@ -29,5 +29,5 @@ lib/libgd.a lib/libgd.la lib/libgd.so lib/libgd.so.6 -lib/libgd.so.6.0.20202 +lib/libgd.so.6.0.3 libdata/pkgconfig/gdlib.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608281742.u7SHggJk086171>