On 2014/03/17 14:05, Brad Smith wrote:
> On 17/03/14 9:13 AM, Stuart Henderson wrote:
> >This updates GD to the current release. I considered enabling xpm support
> >now that this requires X libs to be installed anyway, but there's a pending
> >security issue with xpm support that hasn't been fixed upstream afaict,
> >so I've left that out for now.
> >
> >Any objections? I don't want to hang about before committing as there are
> >a number of lib syncs to go with it.
> >
> >Diff for GD is inline; diffs for other ports attached.
>
> The Xpm support is enabled now with this diff.
Ah, I forgot to regenerate the diff for gd after I went round fixing
all the WANTLIB again.
> I'm Ok with the update
Corrected below, still OK?
> but I'd prefer if gd is switched to using CMake.
I thought about that and decided to leave it with autoconf initially
but maybe convert sometime after committing it.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gd/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- Makefile 21 Mar 2013 08:45:18 -0000 1.58
+++ Makefile 17 Mar 2014 20:16:03 -0000
@@ -2,34 +2,32 @@
COMMENT= library for dynamic creation of images
-DISTNAME= gd-2.0.35
-REVISION= 1
-SHARED_LIBS= gd 20.35
+V= 2.1.0
+DISTNAME= libgd-$V
+PKGNAME= gd-$V
+
+SHARED_LIBS= gd 21.0
+
CATEGORIES= graphics
-MASTER_SITES= ${HOMEPAGE}/releases/
HOMEPAGE= http://www.libgd.org/
-LIB_DEPENDS= graphics/jpeg \
- graphics/png
+PERMIT_PACKAGE_CDROM= Yes
-MODULES= converters/libiconv
+WANTLIB += c expat fontconfig freetype jpeg m png pthread
+WANTLIB += pthread-stubs tiff vpx z
-WANTLIB= c expat fontconfig freetype jpeg m png z
+MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/
-PERMIT_PACKAGE_CDROM= Yes
-
-CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-xpm
+LIB_DEPENDS= graphics/jpeg \
+ graphics/png \
+ graphics/tiff \
+ multimedia/libvpx
-post-patch:
- @cd ${WRKSRC} && touch Makefile.in aclocal.m4 config.hin configure
+MODULES= converters/libiconv
-post-install:
- @cd ${WRKSRC} && ./gddemo
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gd
- cd ${WRKSRC} && ${INSTALL_DATA} demoin.png demoout.png index.html \
- ${PREFIX}/share/examples/gd
+CONFIGURE_STYLE= gnu
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/gd/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 2 Jul 2007 10:46:04 -0000 1.6
+++ distinfo 17 Mar 2014 20:16:03 -0000
@@ -1,5 +1,2 @@
-MD5 (gd-2.0.35.tar.gz) = mCljRI3DbyDLebbpum/e3g==
-RMD160 (gd-2.0.35.tar.gz) = SuN7VjvsriYwjeG7xIm4zudo3K0=
-SHA1 (gd-2.0.35.tar.gz) = 73+7JQ9Ba6twz9pvdyg2JLg8AdU=
-SHA256 (gd-2.0.35.tar.gz) = u9FrnCaDd6rqnDwtZMXBEExTYA5AkPIi17s4k4w9fVI=
-SIZE (gd-2.0.35.tar.gz) = 1345700
+SHA256 (libgd-2.1.0.tar.gz) = PO72nVRUo5LoeTrpC18NYy3T4gh5wShWqh0dPQY6Ucg=
+SIZE (libgd-2.1.0.tar.gz) = 2330322
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 2 Jul 2007 10:46:04 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,39 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2007/07/02 10:46:04 steven Exp $
---- configure.orig Mon Apr 23 16:57:52 2007
-+++ configure Tue Jun 26 08:11:35 2007
-@@ -22322,7 +22322,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-- CPPFLAGS="$CPPFLAGS $libpng_CPPFLAGS/libpng"
-+ CPPFLAGS="$CPPFLAGS $libpng_CPPFLAGS"
- else
- CPPFLAGS="$_cppflags"
- fi
-@@ -23262,7 +23262,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-- acx_pthread_ok=yes
-+ acx_pthread_ok=no
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -23444,7 +23444,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-- acx_pthread_ok=yes
-+ acx_pthread_ok=no
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -24461,7 +24461,7 @@ FFLAGS!$FFLAGS$ac_delim
- ac_ct_F77!$ac_ct_F77$ac_delim
- LIBTOOL!$LIBTOOL$ac_delim
- XMKMF!$XMKMF$ac_delim
--LIBICONV!$LIBICONV$ac_delim
-+LIBICONV!$LTLIBICONV$ac_delim
- LTLIBICONV!$LTLIBICONV$ac_delim
- LIBPNG12_CONFIG!$LIBPNG12_CONFIG$ac_delim
- LIBPNG_CONFIG!$LIBPNG_CONFIG$ac_delim
Index: patches/patch-gd_gd_c
===================================================================
RCS file: patches/patch-gd_gd_c
diff -N patches/patch-gd_gd_c
--- patches/patch-gd_gd_c 4 Jan 2010 15:05:49 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-gd_gd_c,v 1.1 2010/01/04 15:05:49 jasper Exp $
-
-CVE-2009-3546: buffer overflow or buffer over-read attacks via a crafted GD
file
-http://svn.php.net/viewvc?view=revision&revision=289557
-
---- gd_gd.c.orig Mon Jan 4 16:00:52 2010
-+++ gd_gd.c Mon Jan 4 16:01:35 2010
-@@ -44,6 +44,10 @@ _gdGetColors (gdIOCtx * in, gdImagePtr im, int gd2xFla
- {
- goto fail1;
- }
-+ if (im->colorsTotal > gdMaxColors)
-+ {
-+ goto fail1;
-+ }
- }
- /* Int to accommodate truecolor single-color transparency */
- if (!gdGetInt (&im->transparent, in))
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- pkg/PFRAG.shared 26 Dec 2005 14:40:13 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.5 2005/12/26 14:40:13 steven Exp $
-@lib lib/libgd.so.${LIBgd_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/gd/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 12 Oct 2005 05:37:43 -0000 1.11
+++ pkg/PLIST 17 Mar 2014 20:16:03 -0000
@@ -1,20 +1,21 @@
@comment $OpenBSD: PLIST,v 1.11 2005/10/12 05:37:43 fgsch Exp $
-%%SHARED%%
-bin/annotate
+@bin bin/annotate
bin/bdftogd
-bin/gd2copypal
-bin/gd2togif
-bin/gd2topng
-bin/gdcmpgif
+@bin bin/gd2copypal
+@bin bin/gd2togif
+@bin bin/gd2topng
+@bin bin/gdcmpgif
bin/gdlib-config
-bin/gdparttopng
-bin/gdtopng
-bin/giftogd2
-bin/pngtogd
-bin/pngtogd2
-bin/webpng
+@bin bin/gdparttopng
+@bin bin/gdtopng
+@bin bin/giftogd2
+@bin bin/pngtogd
+@bin bin/pngtogd2
+@bin 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
@@ -23,9 +24,9 @@ include/gdfontmb.h
include/gdfonts.h
include/gdfontt.h
include/gdfx.h
+include/gdpp.h
lib/libgd.a
lib/libgd.la
-share/examples/gd/
-share/examples/gd/demoin.png
-share/examples/gd/demoout.png
-share/examples/gd/index.html
+@lib lib/libgd.so.${LIBgd_VERSION}
+lib/pkgconfig/
+lib/pkgconfig/gdlib.pc
