Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id BDD637A16F for ; Tue, 18 Apr 2017 22:07:08 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6B5B084DF3; Tue, 18 Apr 2017 22:07:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EFF7284DB7 for ; Tue, 18 Apr 2017 22:07:07 +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 x0xU9DRh1Wuv for ; Tue, 18 Apr 2017 22:07:07 +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 3AB9884C6C for ; Tue, 18 Apr 2017 22:07:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 39148FBE4; Tue, 18 Apr 2017 22:07:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_149255322730950" MIME-Version: 1.0 Date: Tue, 18 Apr 2017 22:07:07 +0000 From: "Tim Zingelman" Subject: CVS commit: pkgsrc/print/ghostscript-gpl To: pkgsrc-changes@NetBSD.org Reply-To: tez@netbsd.org X-Mailer: log_accum Message-Id: <20170418220707.39148FBE4@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. --_----------=_149255322730950 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tez Date: Tue Apr 18 22:07:07 UTC 2017 Modified Files: pkgsrc/print/ghostscript-gpl: Makefile distinfo Added Files: pkgsrc/print/ghostscript-gpl/patches: patch-CVE-2016-10217 patch-CVE-2016-10219 patch-CVE-2016-10220 patch-CVE-2017-5951 Log Message: Patches for CVE-2016-10217, CVE-2016-10219, CVE-2016-10220 & CVE-2017-5951 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 pkgsrc/print/ghostscript-gpl/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/print/ghostscript-gpl/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10217 \ pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10219 \ pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10220 \ pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2017-5951 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_149255322730950 Content-Disposition: inline Content-Length: 7002 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/ghostscript-gpl/Makefile diff -u pkgsrc/print/ghostscript-gpl/Makefile:1.24 pkgsrc/print/ghostscript-gpl/Makefile:1.25 --- pkgsrc/print/ghostscript-gpl/Makefile:1.24 Wed Apr 5 20:11:01 2017 +++ pkgsrc/print/ghostscript-gpl/Makefile Tue Apr 18 22:07:06 2017 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2017/04/05 20:11:01 tez Exp $ +# $NetBSD: Makefile,v 1.25 2017/04/18 22:07:06 tez Exp $ DISTNAME= ghostscript-${GS_VERSION} PKGNAME= ${DISTNAME:S/ghostscript/ghostscript-gpl/} -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} MASTER_SITES+= http://ghostscript.com/releases/ Index: pkgsrc/print/ghostscript-gpl/distinfo diff -u pkgsrc/print/ghostscript-gpl/distinfo:1.16 pkgsrc/print/ghostscript-gpl/distinfo:1.17 --- pkgsrc/print/ghostscript-gpl/distinfo:1.16 Tue Apr 11 10:31:14 2017 +++ pkgsrc/print/ghostscript-gpl/distinfo Tue Apr 18 22:07:06 2017 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2017/04/11 10:31:14 jperkin Exp $ +$NetBSD: distinfo,v 1.17 2017/04/18 22:07:06 tez Exp $ SHA1 (ghostscript-9.06.tar.bz2) = 4c1c2b4cddd16d86b21f36ad4fc15f6100162238 RMD160 (ghostscript-9.06.tar.bz2) = 11ef74cf783ec5f7cde0ceaaf2823a1f62fb4d1d @@ -10,6 +10,10 @@ SHA1 (patch-CVE-2014-8138) = be161051680 SHA1 (patch-CVE-2014-8157) = 18822069b9791fc3553e812878cfca483d881cd4 SHA1 (patch-CVE-2014-8158) = 71387f152a205caaef0fcc518dbb0fbb7b78e531 SHA1 (patch-CVE-2014-9029) = 9636c7d6909fc0dec7ad2102b59fb14d599bac6a +SHA1 (patch-CVE-2016-10217) = 85f2cb708bb38a88215573e63821be8a54bc019e +SHA1 (patch-CVE-2016-10219) = 24ef41da0579840360110cc5c1f79622210f8e6b +SHA1 (patch-CVE-2016-10220) = 6edfa87948ff0f9412a5509efb98bf2d063a5951 +SHA1 (patch-CVE-2017-5951) = a4af8e561b9f5a6a330fbc2f915257bf5ba3cb2a SHA1 (patch-CVE-2017-6196) = 311d9236dd5abcd48ae0f412bf481e105b6207dc SHA1 (patch-CVE-2017-7207) = 31f4a73b49b52942385eaa3c8cf2a94b5bbde6df SHA1 (patch-af) = a556b774993c72481284e0d0cce222c61be4ea94 Added files: Index: pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10217 diff -u /dev/null pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10217:1.1 --- /dev/null Tue Apr 18 22:07:07 2017 +++ pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10217 Tue Apr 18 22:07:07 2017 @@ -0,0 +1,19 @@ +$NetBSD: patch-CVE-2016-10217,v 1.1 2017/04/18 22:07:07 tez Exp $ + +Patch for CVE-2016-10217 from +http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=90fd0c7ca3efc1ddff64a86f4104b13b3ac969eb;hp=d621292fb2c8157d9899dcd83fd04dd250e30fe4 +Patch for CVE-2016-10218 from +http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=d621292fb2c8157d9899dcd83fd04dd250e30fe4;hp=4bef1a1d32e29b68855616020dbff574b9cda08f +(actually no patch, the null check was already in place!) + + +--- base/gdevp14.c.orig 2017-04-05 20:36:47.701597100 +0000 ++++ base/gdevp14.c +@@ -1369,6 +1369,7 @@ pdf14_open(gx_device *dev) + rect.p.y = 0; + rect.q.x = dev->width; + rect.q.y = dev->height; ++ if (pdev->ctx == NULL) + pdev->ctx = pdf14_ctx_new(&rect, dev->color_info.num_components, + pdev->color_info.polarity != GX_CINFO_POLARITY_SUBTRACTIVE, dev); + if (pdev->ctx == NULL) Index: pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10219 diff -u /dev/null pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10219:1.1 --- /dev/null Tue Apr 18 22:07:07 2017 +++ pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10219 Tue Apr 18 22:07:07 2017 @@ -0,0 +1,26 @@ +$NetBSD: patch-CVE-2016-10219,v 1.1 2017/04/18 22:07:07 tez Exp $ + +Patch for CVE-2016-10219 from +http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=4bef1a1d32e29b68855616020dbff574b9cda08f;hp=0aeb0bbd41cc16e70ab6e4b1d56e0c510bf2a758 + + +--- base/gxfill.c.orig 2017-04-05 20:56:07.869067200 +0000 ++++ base/gxfill.c +@@ -1743,7 +1743,7 @@ intersect(active_line *endp, active_line + fixed dx_old = alp->x_current - endp->x_current; + fixed dx_den = dx_old + endp->x_next - alp->x_next; + +- if (dx_den <= dx_old) ++ if (dx_den <= dx_old || dx_den == 0) + return false; /* Intersection isn't possible. */ + dy = y1 - y; + if_debug3('F', "[F]cross: dy=%g, dx_old=%g, dx_new=%g\n", +@@ -1752,7 +1752,7 @@ intersect(active_line *endp, active_line + /* Do the computation in single precision */ + /* if the values are small enough. */ + y_new = +- ((dy | dx_old) < 1L << (size_of(fixed) * 4 - 1) ? ++ (((ufixed)(dy | dx_old)) < (1L << (size_of(fixed) * 4 - 1)) ? + dy * dx_old / dx_den : + (INCR_EXPR(mq_cross), fixed_mult_quo(dy, dx_old, dx_den))) + + y; Index: pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10220 diff -u /dev/null pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10220:1.1 --- /dev/null Tue Apr 18 22:07:07 2017 +++ pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2016-10220 Tue Apr 18 22:07:07 2017 @@ -0,0 +1,16 @@ +$NetBSD: patch-CVE-2016-10220,v 1.1 2017/04/18 22:07:07 tez Exp $ + +Fix for CVE-2016-10220 from +http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=daf85701dab05f17e924a48a81edc9195b4a04e8;hp=2299c9a25fc9ae7b59752f1795f8b53920901c80 + + +--- base/gsdevmem.c.orig 2017-04-05 21:01:59.873181700 +0000 ++++ base/gsdevmem.c +@@ -223,6 +223,7 @@ gs_makewordimagedevice(gx_device ** pnew + + if (pnew == 0) + return_error(gs_error_VMerror); ++ memset(pnew, 0x00, st_device_memory.ssize); + code = gs_initialize_wordimagedevice(pnew, pmat, width, height, + colors, num_colors, word_oriented, + page_device, mem); Index: pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2017-5951 diff -u /dev/null pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2017-5951:1.1 --- /dev/null Tue Apr 18 22:07:07 2017 +++ pkgsrc/print/ghostscript-gpl/patches/patch-CVE-2017-5951 Tue Apr 18 22:07:07 2017 @@ -0,0 +1,24 @@ +$NetBSD: patch-CVE-2017-5951,v 1.1 2017/04/18 22:07:07 tez Exp $ + +Patch for CVE-2017-5951 from + http://git.ghostscript.com/?p=user/chrisl/ghostpdl.git;a=commitdiff;h=bfa6b2ec + +--- psi/iparam.c.orig 2017-04-06 19:05:43.573183800 +0000 ++++ psi/iparam.c +@@ -770,12 +770,13 @@ ref_param_read_typed(gs_param_list * pli + gs_param_enumerator_t enumr; + gs_param_key_t key; + ref_type keytype; ++ dict_param_list *dlist = (dict_param_list *) pvalue->value.d.list; + + param_init_enumerator(&enumr); +- if (!(*((iparam_list *) plist)->enumerate) +- ((iparam_list *) pvalue->value.d.list, &enumr, &key, &keytype) ++ if (!(*(dlist->enumerate)) ++ ((iparam_list *) dlist, &enumr, &key, &keytype) + && keytype == t_integer) { +- ((dict_param_list *) pvalue->value.d.list)->int_keys = 1; ++ dlist->int_keys = 1; + pvalue->type = gs_param_type_dict_int_keys; + } + } --_----------=_149255322730950--