Received: by mail.netbsd.org (Postfix, from userid 605) id DC04784DF2; Mon, 10 Sep 2018 13:34:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D9F4684D1F for ; Mon, 10 Sep 2018 13:34:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id hba3mcNVzCmQ for ; Mon, 10 Sep 2018 13:34:16 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5897384D6F for ; Mon, 10 Sep 2018 13:34:16 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 471BBFBF8; Mon, 10 Sep 2018 13:34:16 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1536586456215080" MIME-Version: 1.0 Date: Mon, 10 Sep 2018 13:34:16 +0000 From: "Kimmo Suominen" Subject: CVS commit: pkgsrc/graphics/gd To: pkgsrc-changes@NetBSD.org Reply-To: kim@netbsd.org X-Mailer: log_accum Message-Id: <20180910133416.471BBFBF8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1536586456215080 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kim Date: Mon Sep 10 13:34:16 UTC 2018 Modified Files: pkgsrc/graphics/gd: Makefile buildlink3.mk distinfo options.mk Log Message: Add upstream patch to address CVE-2018-1000222. Restore the tiff option, so libtiff can be avoided. Ok by adam@. To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 pkgsrc/graphics/gd/Makefile cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/gd/buildlink3.mk cvs rdiff -u -r1.46 -r1.47 pkgsrc/graphics/gd/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/gd/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1536586456215080 Content-Disposition: inline Content-Length: 4626 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/gd/Makefile diff -u pkgsrc/graphics/gd/Makefile:1.120 pkgsrc/graphics/gd/Makefile:1.121 --- pkgsrc/graphics/gd/Makefile:1.120 Wed Aug 22 09:45:12 2018 +++ pkgsrc/graphics/gd/Makefile Mon Sep 10 13:34:16 2018 @@ -1,12 +1,16 @@ -# $NetBSD: Makefile,v 1.120 2018/08/22 09:45:12 wiz Exp $ +# $NetBSD: Makefile,v 1.121 2018/09/10 13:34:16 kim Exp $ DISTNAME= libgd-2.2.5 PKGNAME= ${DISTNAME:S/libgd/gd/} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GITHUB:=libgd/} EXTRACT_SUFX= .tar.xz +PATCH_SITES= ${MASTER_SITE_GITHUB:=libgd/libgd/commit/} +PATCHFILES= 4b1e18a00ce7c4b7e6919c3b3109a034393b805a.patch +PATCH_DIST_STRIP= -p1 + MAINTAINER= adam@NetBSD.org HOMEPAGE= https://libgd.github.io/ COMMENT= Graphics library for the dynamic creation of images @@ -25,7 +29,6 @@ CONFIGURE_ARGS+= --with-freetype=${BUILD CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} CONFIGURE_ARGS+= --with-liq=${BUILDLINK_PREFIX.libimagequant} CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png} -CONFIGURE_ARGS+= --with-tiff=${BUILDLINK_PREFIX.tiff} CONFIGURE_ARGS+= --with-webp=${BUILDLINK_PREFIX.libwebp} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} REPLACE_PERL+= src/bdftogd @@ -38,7 +41,6 @@ PTHREAD_AUTO_VARS= yes .include "../../graphics/libimagequant/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/graphics/gd/buildlink3.mk diff -u pkgsrc/graphics/gd/buildlink3.mk:1.43 pkgsrc/graphics/gd/buildlink3.mk:1.44 --- pkgsrc/graphics/gd/buildlink3.mk:1.43 Mon Mar 12 11:15:34 2018 +++ pkgsrc/graphics/gd/buildlink3.mk Mon Sep 10 13:34:16 2018 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.43 2018/03/12 11:15:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.44 2018/09/10 13:34:16 kim Exp $ BUILDLINK_TREE+= gd @@ -14,6 +14,10 @@ BUILDLINK_PKGSRCDIR.gd?= ../../graphics/ pkgbase := gd .include "../../mk/pkg-build-options.mk" +.if !empty(PKG_BUILD_OPTIONS.gd:Mtiff) +.include "../../graphics/tiff/buildlink3.mk" +.endif + .if !empty(PKG_BUILD_OPTIONS.gd:Mx11) .include "../../x11/libXpm/buildlink3.mk" .endif @@ -24,7 +28,6 @@ pkgbase := gd .include "../../graphics/libimagequant/buildlink3.mk" .include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/tiff/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif # GD_BUILDLINK3_MK Index: pkgsrc/graphics/gd/distinfo diff -u pkgsrc/graphics/gd/distinfo:1.46 pkgsrc/graphics/gd/distinfo:1.47 --- pkgsrc/graphics/gd/distinfo:1.46 Sun Feb 25 14:34:22 2018 +++ pkgsrc/graphics/gd/distinfo Mon Sep 10 13:34:16 2018 @@ -1,5 +1,9 @@ -$NetBSD: distinfo,v 1.46 2018/02/25 14:34:22 rillig Exp $ +$NetBSD: distinfo,v 1.47 2018/09/10 13:34:16 kim Exp $ +SHA1 (4b1e18a00ce7c4b7e6919c3b3109a034393b805a.patch) = 3e063656c754229b56137f8213e726ff976043c0 +RMD160 (4b1e18a00ce7c4b7e6919c3b3109a034393b805a.patch) = b1bf60fa82dd125f9440547e75ab27be40ffa720 +SHA512 (4b1e18a00ce7c4b7e6919c3b3109a034393b805a.patch) = d94e4bf09e450936d2946292deee0223614a9c4461a2b8e0509e67f82ae191deabe0e1007b92fa17c99704a00085f08110cf04a4869e1b1af837a1931180737f +Size (4b1e18a00ce7c4b7e6919c3b3109a034393b805a.patch) = 2561 bytes SHA1 (libgd-2.2.5.tar.xz) = b777b005c401b6fa310ccf09eeb29f6c6e17ab2c RMD160 (libgd-2.2.5.tar.xz) = 1c20f719161da596dac6c5c5b92bde71ddc9aedb SHA512 (libgd-2.2.5.tar.xz) = e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b Index: pkgsrc/graphics/gd/options.mk diff -u pkgsrc/graphics/gd/options.mk:1.7 pkgsrc/graphics/gd/options.mk:1.8 --- pkgsrc/graphics/gd/options.mk:1.7 Mon Sep 4 06:20:45 2017 +++ pkgsrc/graphics/gd/options.mk Mon Sep 10 13:34:16 2018 @@ -1,10 +1,18 @@ -# $NetBSD: options.mk,v 1.7 2017/09/04 06:20:45 adam Exp $ +# $NetBSD: options.mk,v 1.8 2018/09/10 13:34:16 kim Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gd -PKG_SUPPORTED_OPTIONS= x11 +PKG_SUPPORTED_OPTIONS= tiff x11 +PKG_SUGGESTED_OPTIONS= tiff .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Mtiff) +.include "../../graphics/tiff/buildlink3.mk" +CONFIGURE_ARGS+= --with-tiff=${BUILDLINK_PREFIX.tiff} +.else +CONFIGURE_ARGS+= --without-tiff +.endif + .if !empty(PKG_OPTIONS:Mx11) .include "../../x11/libXpm/buildlink3.mk" CONFIGURE_ENV+= X11BASE=${X11BASE} --_----------=_1536586456215080--