Attachment #195061 for bug #229707




# $FreeBSD$

PORTNAME=	libgd
PORTVERSION=	2.2.5
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES+=	graphics
MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/

SHEBANG_FILES=	${WRKSRC}/src/bdftogd
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
TEST_TARGET=	check

OPTIONS_DEFINE=	FONTCONFIG ICONV XPM WEBP
OPTIONS_DEFAULT=FONTCONFIG WEBP

post-install:
	${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \
		${STAGEDIR}${PREFIX}/include/
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6*

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1485463341	1	TIMESTAMP = 1531337629
2	SHA256 (libgd-2.2.4.tar.xz) = 137f13a7eb93ce72e32ccd7cebdab6874f8cf7ddf31d3a455a68e016ecd9e4e6	2	SHA256 (libgd-2.2.5.tar.xz) = 8c302ccbf467faec732f0741a859eef4ecae22fea2d2ab87467be940842bde51
3	SIZE (libgd-2.2.4.tar.xz) = 2478528	3	SIZE (libgd-2.2.5.tar.xz) = 2594092




See:

	https://bugs.php.net/bug.php?id=75571

--- src/gd_gif_in.c	2017-08-30 07:05:54.000000000 -0400
+++ src/gd_gif_in.c	2018-07-11 15:39:11.746181000 -0400
@@ -336,9 +336,4 @@
 	}
 
-	if(!im->colorsTotal) {
-		gdImageDestroy(im);
-		return 0;
-	}
-
 	/* Check for open colors at the end, so
 	 * we can reduce colorsTotal and ultimately
@@ -352,4 +347,9 @@
 	}
 
+	if(!im->colorsTotal) {
+		gdImageDestroy(im);
+		return 0;
+	}
+
 	return im;
 }
@@ -447,6 +447,5 @@
 GetCode_(gdIOCtx *fd, CODE_STATIC_DATA *scd, int code_size, int flag, int *ZeroDataBlockP)
 {
-	int i, j, ret;
-	unsigned char count;
+	int i, j, ret, count;
 
 	if(flag) {

Lines 29-33 Link Here

(-)pkg-plist (-1 / +1 lines)
29	lib/libgd.la	29	lib/libgd.la
30	lib/libgd.so	30	lib/libgd.so
31	lib/libgd.so.6	31	lib/libgd.so.6
32	lib/libgd.so.6.0.4	32	lib/libgd.so.6.0.5
33	libdata/pkgconfig/gdlib.pc	33	libdata/pkgconfig/gdlib.pc

Return to bug 229707

Lines 2-9 Link Here

(-)Makefile (-3 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= libgd	4	PORTNAME= libgd
5	PORTVERSION= 2.2.4	5	PORTVERSION= 2.2.5
6	PORTREVISION= 1
7	PORTEPOCH= 1	6	PORTEPOCH= 1
8	CATEGORIES+= graphics	7	CATEGORIES+= graphics
9	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/	8	MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/gd-${PORTVERSION}/
Lines 24-29 Link Here
24	SHEBANG_FILES= ${WRKSRC}/src/bdftogd	23	SHEBANG_FILES= ${WRKSRC}/src/bdftogd
25	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
26	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
		26	TEST_TARGET= check
27		27
28	OPTIONS_DEFINE= FONTCONFIG ICONV XPM WEBP	28	OPTIONS_DEFINE= FONTCONFIG ICONV XPM WEBP
29	OPTIONS_DEFAULT=FONTCONFIG WEBP	29	OPTIONS_DEFAULT=FONTCONFIG WEBP
Lines 90-95 Link Here
90	post-install:	90	post-install:
91	${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \	91	${INSTALL_DATA} ${WRKSRC}/src/gdhelpers.h \
92	${STAGEDIR}${PREFIX}/include/	92	${STAGEDIR}${PREFIX}/include/
93	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6.0.4	93	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgd.so.6*
94		94
95	.include <bsd.port.mk>	95	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-gd_gif_in.c (+34 lines)
	1	See:
	2
	3	https://bugs.php.net/bug.php?id=75571
	4
	5	--- src/gd_gif_in.c 2017-08-30 07:05:54.000000000 -0400
	6	+++ src/gd_gif_in.c 2018-07-11 15:39:11.746181000 -0400
	7	@@ -336,9 +336,4 @@
	8	}
	9
	10	- if(!im->colorsTotal) {
	11	- gdImageDestroy(im);
	12	- return 0;
	13	- }
	14	-
	15	/* Check for open colors at the end, so
	16	* we can reduce colorsTotal and ultimately
	17	@@ -352,4 +347,9 @@
	18	}
	19
	20	+ if(!im->colorsTotal) {
	21	+ gdImageDestroy(im);
	22	+ return 0;
	23	+ }
	24	+
	25	return im;
	26	}
	27	@@ -447,6 +447,5 @@
	28	GetCode_(gdIOCtx fd, CODE_STATIC_DATA scd, int code_size, int flag, int *ZeroDataBlockP)
	29	{
	30	- int i, j, ret;
	31	- unsigned char count;
	32	+ int i, j, ret, count;
	33
	34	if(flag) {