On Sun Apr 30, 2017 at 12:08:47PM +0100, Stuart Henderson wrote:
> On 2017/04/29 23:14, Rafael Sadowski wrote:
> > is there any good reason to not update libgd? Here are eight good
> > reasons for a update:
>
> No reason not to update it. Quite a few things depend on it though,
> so testing is a bit annoying, which might explain why it's old.
>
> > -WANTLIB += c expat fontconfig freetype iconv jpeg m png pthread
> > -WANTLIB += pthread-stubs ${LIBCXX} tiff vpx z
> > +#WANTLIB += c expat fontconfig freetype iconv jpeg m png pthread
> > +#WANTLIB += pthread-stubs ${LIBCXX} tiff vpx z
>
> er?
>
> > LIB_DEPENDS= converters/libiconv \
> > graphics/jpeg \
> > graphics/png \
> > - graphics/tiff \
> > - multimedia/libvpx
> > + graphics/tiff
>
> Need to make sure that dropping libvpx doesn't cause problems in
> dependent ports.
>
> Didn't they change from libvpx to libwebp rather than dropping webp
> support completely?
Please find an new diff with libwebp support from Brad Smith.
The following ports are affected (diff see below):
cad/pcb
graphics/libgphoto2
net/amule
net/rtg
print/texlive/base
sysutils/modlogan
www/analog
Unaffected:
emulators/fceux
mail/rspamd
math/plplot
net/mldonkey
net/nagios/nagios
sysutils/nut
www/rt
www/webalizer
OK? Comments?
Best regards,
Rafael Sadowski
Index: cad/pcb/Makefile
===================================================================
RCS file: /cvs/ports/cad/pcb/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- cad/pcb/Makefile 18 May 2015 11:29:37 -0000 1.33
+++ cad/pcb/Makefile 7 May 2017 20:29:20 -0000
@@ -3,7 +3,7 @@
COMMENT= printed circuit board layout tool
DISTNAME= pcb-20110918
CATEGORIES= cad
-REVISION= 6
+REVISION= 7
HOMEPAGE= http://pcb.gpleda.org/
@@ -15,7 +15,7 @@ WANTLIB += Xi Xinerama Xmu Xrandr Xrende
WANTLIB += fontconfig freetype gd gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gdkglext-x11-1.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += gtk-x11-2.0 gtkglext-x11-1.0 jpeg m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pangox-1.0 png pthread tiff vpx z
+WANTLIB += pangoft2-1.0 pangox-1.0 png pthread tiff webp z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pcb/}
Index: graphics/gd/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gd/Makefile,v
retrieving revision 1.70
diff -u -p -u -p -r1.70 Makefile
--- graphics/gd/Makefile 10 Apr 2017 11:46:20 -0000 1.70
+++ graphics/gd/Makefile 7 May 2017 20:29:34 -0000
@@ -2,12 +2,11 @@
COMMENT= library for dynamic creation of images
-V= 2.1.1
-REVISION= 3
+V= 2.2.4
DISTNAME= libgd-$V
PKGNAME= gd-$V
-SHARED_LIBS += gd 21.1 # 3.0
+SHARED_LIBS += gd 22.0 # 3.0
CATEGORIES= graphics
@@ -16,17 +15,17 @@ HOMEPAGE= http://www.libgd.org/
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c expat fontconfig freetype iconv jpeg m png pthread
-WANTLIB += pthread-stubs ${LIBCXX} tiff vpx z
+WANTLIB += pthread-stubs ${LIBCXX} tiff webp z
-MASTER_SITES= https://bitbucket.org/libgd/gd-libgd/downloads/
+MASTER_SITES= https://github.com/libgd/libgd/releases/download/${PKGNAME}/
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --without-xpm
LIB_DEPENDS= converters/libiconv \
graphics/jpeg \
+ graphics/libwebp \
graphics/png \
- graphics/tiff \
- multimedia/libvpx
+ graphics/tiff
.include <bsd.port.mk>
Index: graphics/gd/distinfo
===================================================================
RCS file: /cvs/ports/graphics/gd/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- graphics/gd/distinfo 14 Nov 2015 12:41:53 -0000 1.8
+++ graphics/gd/distinfo 7 May 2017 20:29:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (libgd-2.1.1.tar.gz) = z0e85aTExtx3uo0DSdHuyc7/d+2G8UskmgeAt/GFVMU=
-SIZE (libgd-2.1.1.tar.gz) = 2390586
+SHA256 (libgd-2.2.4.tar.gz) = SHplCqYUIX7QirG9GqXSgvnTec/ZXHVq7QtDQGOBvmU=
+SIZE (libgd-2.2.4.tar.gz) = 3013928
Index: graphics/gd/patches/patch-src_gd_crop_c
===================================================================
RCS file: graphics/gd/patches/patch-src_gd_crop_c
diff -N graphics/gd/patches/patch-src_gd_crop_c
--- graphics/gd/patches/patch-src_gd_crop_c 30 Jun 2016 13:27:42 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_gd_crop_c,v 1.1 2016/06/30 13:27:42 jasper Exp $
-
-CVE-2016-6128
-https://bugs.php.net/bug.php?id=72494
-https://github.com/libgd/libgd/compare/3fe0a7128bac5000fdcfab888bd2a75ec0c9447d...fd623025505e87bba7ec8555eeb72dae4fb0afd
-
---- src/gd_crop.c.orig Thu Jun 30 15:23:49 2016
-+++ src/gd_crop.c Thu Jun 30 15:24:14 2016
-@@ -136,6 +136,10 @@ BGD_DECLARE(gdImagePtr) gdImageCropThreshold(gdImagePt
- return NULL;
- }
-
-+ if (!gdImageTrueColor(im) && color >= gdImageColorsTotal(im)) {
-+ return NULL;
-+ }
-+
- /* TODO: Add gdImageGetRowPtr and works with ptr at the row level
- * for the true color and palette images
- * new formats will simply work with ptr
Index: graphics/gd/patches/patch-src_gd_gd2_c
===================================================================
RCS file: graphics/gd/patches/patch-src_gd_gd2_c
diff -N graphics/gd/patches/patch-src_gd_gd2_c
--- graphics/gd/patches/patch-src_gd_gd2_c 9 May 2016 06:29:18 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_gd_gd2_c,v 1.1 2016/05/09 06:29:18 ajacoutot Exp $
-
-gd2: handle corrupt images better (CVE-2016-3074)
-
---- src/gd_gd2.c.orig Sun May 8 23:50:58 2016
-+++ src/gd_gd2.c Sun May 8 23:52:14 2016
-@@ -167,6 +167,8 @@ _gd2GetHeader (gdIOCtxPtr in, int *sx, int *sy,
- if (gdGetInt (&cidx[i].size, in) != 1) {
- goto fail2;
- };
-+ if (cidx[i].offset < 0 || cidx[i].size < 0)
-+ goto fail2;
- };
- *chunkIdx = cidx;
- };
Index: graphics/gd/patches/patch-src_gd_gif_out_c
===================================================================
RCS file: graphics/gd/patches/patch-src_gd_gif_out_c
diff -N graphics/gd/patches/patch-src_gd_gif_out_c
--- graphics/gd/patches/patch-src_gd_gif_out_c 6 Jul 2016 08:46:01 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-$OpenBSD: patch-src_gd_gif_out_c,v 1.1 2016/07/06 08:46:01 jasper Exp $
-
-CVE-2016-6161
-https://github.com/libgd/libgd/commit/82b80dcb70a7ca8986125ff412bceddafc896842
-
---- src/gd_gif_out.c.orig Tue Jan 6 10:16:03 2015
-+++ src/gd_gif_out.c Wed Jul 6 10:43:57 2016
-@@ -1442,15 +1442,23 @@ nomatch:
- * code in turn. When the buffer fills up empty it and start over.
- */
-
--static unsigned long masks[] = {
-+static const unsigned long masks[] = {
- 0x0000, 0x0001, 0x0003, 0x0007, 0x000F,
- 0x001F, 0x003F, 0x007F, 0x00FF,
- 0x01FF, 0x03FF, 0x07FF, 0x0FFF,
- 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF
- };
-
-+/* Arbitrary value to mark output is done. When we see EOFCode, then we don't
-+ * expect to see any more data. If we do (e.g. corrupt image inputs),
cur_bits
-+ * might be negative, so flag it to return early.
-+ */
-+#define CUR_BITS_FINISHED -1000
-+
- static void output(code_int code, GifCtx *ctx)
- {
-+ if (ctx->cur_bits == CUR_BITS_FINISHED)
-+ return;
- ctx->cur_accum &= masks[ctx->cur_bits];
-
- if(ctx->cur_bits > 0) {
-@@ -1492,6 +1500,8 @@ static void output(code_int code, GifCtx *ctx)
- ctx->cur_accum >>= 8;
- ctx->cur_bits -= 8;
- }
-+ /* Flag that it's done to prevent re-entry. */
-+ ctx->cur_bits = CUR_BITS_FINISHED;
-
- flush_char(ctx);
- }
Index: graphics/gd/patches/patch-src_webpimg_c
===================================================================
RCS file: graphics/gd/patches/patch-src_webpimg_c
diff -N graphics/gd/patches/patch-src_webpimg_c
--- graphics/gd/patches/patch-src_webpimg_c 18 Apr 2015 09:16:36 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_webpimg_c,v 1.1 2015/04/18 09:16:36 sthen Exp $
-
-Fix the build with newer libvpx.
-
---- src/webpimg.c.orig Sun Apr 12 19:49:36 2015
-+++ src/webpimg.c Sun Apr 12 19:50:47 2015
-@@ -711,14 +711,14 @@ static WebPResult VPXEncode(const uint8* Y,
- codec_ctl(&enc, VP8E_SET_STATIC_THRESHOLD, 0);
- codec_ctl(&enc, VP8E_SET_TOKEN_PARTITIONS, 2);
-
-- vpx_img_wrap(&img, IMG_FMT_I420,
-+ vpx_img_wrap(&img, VPX_IMG_FMT_I420,
- y_width, y_height, 16, (uint8*)(Y));
-- img.planes[PLANE_Y] = (uint8*)(Y);
-- img.planes[PLANE_U] = (uint8*)(U);
-- img.planes[PLANE_V] = (uint8*)(V);
-- img.stride[PLANE_Y] = y_stride;
-- img.stride[PLANE_U] = uv_stride;
-- img.stride[PLANE_V] = uv_stride;
-+ img.planes[VPX_PLANE_Y] = (uint8*)(Y);
-+ img.planes[VPX_PLANE_U] = (uint8*)(U);
-+ img.planes[VPX_PLANE_V] = (uint8*)(V);
-+ img.stride[VPX_PLANE_Y] = y_stride;
-+ img.stride[VPX_PLANE_U] = uv_stride;
-+ img.stride[VPX_PLANE_V] = uv_stride;
-
- res = vpx_codec_encode(&enc, &img, 0, 1, 0, VPX_DL_BEST_QUALITY);
-
Index: graphics/libgphoto2/Makefile
===================================================================
RCS file: /cvs/ports/graphics/libgphoto2/Makefile,v
retrieving revision 1.49
diff -u -p -u -p -r1.49 Makefile
--- graphics/libgphoto2/Makefile 10 Apr 2017 18:11:03 -0000 1.49
+++ graphics/libgphoto2/Makefile 7 May 2017 20:29:35 -0000
@@ -5,6 +5,7 @@ COMMENT= digital camera library
VERSION= 2.5.13
DISTNAME= libgphoto2-${VERSION}
PKGNAME= libgphoto-${VERSION}
+REVISION= 0
GPHOTO2_PORT_API= 0.12.0
SUBST_VARS= GPHOTO2_PORT_API VERSION
@@ -23,7 +24,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c exif expat fontconfig freetype gd iconv intl jpeg
WANTLIB += ltdl lzma m png pthread pthread-stubs tiff usb usb-1.0
-WANTLIB += vpx xml2 z
+WANTLIB += webp xml2 z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gphoto/}
Index: math/graphviz/Makefile
===================================================================
RCS file: /cvs/ports/math/graphviz/Makefile,v
retrieving revision 1.67
diff -u -p -u -p -r1.67 Makefile
--- math/graphviz/Makefile 10 Apr 2017 11:46:22 -0000 1.67
+++ math/graphviz/Makefile 7 May 2017 20:29:38 -0000
@@ -3,7 +3,7 @@
COMMENT-main= graph drawing software
DISTNAME= graphviz-2.36.0
-REVISION= 7
+REVISION= 8
PKGNAME-main= ${DISTNAME}
CATEGORIES= math devel graphics
@@ -54,7 +54,7 @@ WANTLIB += gmodule-2.0 gmp gobject-2.0 g
WANTLIB += guile harfbuzz jpeg lcms2 ltdl lzma m openjp2 pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre perl pixman-1 png
WANTLIB += poppler poppler-glib pthread pthread-stubs rsvg-2 ${LIBCXX}
-WANTLIB += tiff tk85 util vpx xcb xcb-render xcb-shm xml2 z
+WANTLIB += tiff tk85 util webp xcb xcb-render xcb-shm xml2 z
MODULES= devel/gettext \
x11/tk \
Index: net/amule/Makefile
===================================================================
RCS file: /cvs/ports/net/amule/Makefile,v
retrieving revision 1.58
diff -u -p -u -p -r1.58 Makefile
--- net/amule/Makefile 10 Apr 2017 11:46:23 -0000 1.58
+++ net/amule/Makefile 7 May 2017 20:29:40 -0000
@@ -6,7 +6,7 @@ COMMENT-daemon =stand-alone daemon/cmdli
V = 2.3.2
DISTNAME = aMule-$V
-REVISION = 1
+REVISION = 2
CATEGORIES = net
HOMEPAGE = http://www.amule.org/
@@ -52,7 +52,7 @@ RUN_DEPENDS-main = ${RUN_DEPENDS} \
commonWANTLIB = c ixml m pthread ${LIBCXX} threadutil upnp \
wx_base wx_base_net z
WANTLIB-main = ${WANTLIB} ${commonWANTLIB} \
- GeoIP X11 cryptopp fontconfig tiff vpx \
+ GeoIP X11 cryptopp fontconfig tiff webp \
freetype gd jpeg png wx_gtk2_adv wx_gtk2_core
WANTLIB-daemon = ${WANTLIB} ${commonWANTLIB} \
cryptopp readline termcap
Index: net/mldonkey/Makefile
===================================================================
RCS file: /cvs/ports/net/mldonkey/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- net/mldonkey/Makefile 10 Apr 2017 11:46:32 -0000 1.19
+++ net/mldonkey/Makefile 7 May 2017 20:29:41 -0000
@@ -2,7 +2,7 @@
COMMENT = e-donkey client
DISTNAME = mldonkey-3.1.5
-REVISION = 4
+REVISION = 5
CATEGORIES = net
HOMEPAGE = http://mldonkey.sourceforge.net/Main_Page
@@ -18,7 +18,7 @@ WANTLIB += Xrandr Xrender atk-1.0 bz2 c
WANTLIB += freetype gd gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gobject-2.0 gtk-x11-2.0 jpeg m magic miniupnpc natpmp
WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread rsvg-2
-WANTLIB += ${LIBCXX} tiff vpx z
+WANTLIB += ${LIBCXX} tiff webp z
EXTRACT_SUFX = .tar.bz2
Index: net/rtg/Makefile
===================================================================
RCS file: /cvs/ports/net/rtg/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- net/rtg/Makefile 13 Sep 2016 16:12:14 -0000 1.15
+++ net/rtg/Makefile 7 May 2017 20:29:43 -0000
@@ -3,7 +3,7 @@
COMMENT = SNMP statistics monitoring system
DISTNAME = rtg-0.7.4
-REVISION = 11
+REVISION = 12
CATEGORIES = net
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=rtg/}
@@ -15,7 +15,7 @@ MAINTAINER = Stuart Henderson <sthen@op
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c crypto fontconfig freetype gd iconv jpeg m mysqlclient_r
-WANTLIB += netsnmp png pthread tiff vpx z
+WANTLIB += netsnmp png pthread tiff webp z
LIB_DEPENDS = converters/libiconv \
net/net-snmp \
Index: print/texlive/base/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.86
diff -u -p -u -p -r1.86 Makefile
--- print/texlive/base/Makefile 10 Apr 2017 11:46:33 -0000 1.86
+++ print/texlive/base/Makefile 7 May 2017 20:29:44 -0000
@@ -6,7 +6,7 @@ COMMENT = base binaries for TeXLive typ
DIST_V_SOURCE = ${V}0521
DISTNAME = texlive-${DIST_V_SOURCE}-source
PKGNAME = texlive_base-${V}
-REVISION = 0
+REVISION = 1
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
texlive-${DIST_V}-extra${EXTRACT_SUFX}
@@ -20,7 +20,7 @@ WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext
WANTLIB += c cairo expat fontconfig freetype gd glib-2.0 graphite2
WANTLIB += harfbuzz harfbuzz-icu iconv icudata icui18n icuio icuuc intl
WANTLIB += jpeg lcms2 m openjp2 paper pcre pixman-1 png poppler
-WANTLIB += potrace pthread pthread-stubs ${LIBCXX} tiff vpx xcb
+WANTLIB += potrace pthread pthread-stubs ${LIBCXX} tiff webp xcb
WANTLIB += xcb-render xcb-shm z zzip
RUN_DEPENDS = print/ghostscript/gnu \
Index: sysutils/modlogan/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/modlogan/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- sysutils/modlogan/Makefile 27 Mar 2016 20:53:15 -0000 1.29
+++ sysutils/modlogan/Makefile 7 May 2017 20:29:48 -0000
@@ -3,7 +3,7 @@
COMMENT= modular log analyzer
DISTNAME= modlogan-0.8.13
-REVISION= 7
+REVISION= 8
CATEGORIES= sysutils www
HOMEPAGE= http://jan.kneschke.de/projects/modlogan/
@@ -15,8 +15,8 @@ PERMIT_PACKAGE_CDROM= Yes
MODULES= devel/gettext
-WANTLIB += X11 Xpm adns bz2 c expat fontconfig freetype gd jpeg
-WANTLIB += m pcre png pthread-stubs tiff vpx xcb z
+WANTLIB += adns bz2 c expat fontconfig freetype gd jpeg m pcre
+WANTLIB += png pthread pthread-stubs tiff webp z
LIB_DEPENDS= archivers/bzip2 \
devel/pcre \
