From 74a93af9ff12624824588db196a193b254219779 Mon Sep 17 00:00:00 2001
From: drochner <drochner@pkgsrc.org>
Date: Wed, 23 Dec 2009 13:27:58 +0000
Subject: replace some sprintf by snprintf, fixes CVE-2009-4270 hopefully bump
 PKGREVISION

---
 print/ghostscript/Makefile         |  4 ++--
 print/ghostscript/distinfo         |  3 ++-
 print/ghostscript/patches/patch-ak | 31 +++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 print/ghostscript/patches/patch-ak

(limited to 'print/ghostscript')

diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index a773aa08607..8406a1e5484 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.71 2009/11/02 00:00:31 gdt Exp $
+# $NetBSD: Makefile,v 1.72 2009/12/23 13:27:58 drochner Exp $
 
 DISTNAME=	ghostscript-8.70
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo
index 0a08cb83b2f..69bfbe01f7f 100644
--- a/print/ghostscript/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2009/11/03 00:05:59 wiz Exp $
+$NetBSD: distinfo,v 1.28 2009/12/23 13:27:59 drochner Exp $
 
 SHA1 (ghostscript-8.70.tar.bz2) = 4e4132713258c680a4fbec577e6dfc82b980ec01
 RMD160 (ghostscript-8.70.tar.bz2) = 88f7d380d1075c57829aa7f34334542fd2bbd6ce
@@ -11,3 +11,4 @@ SHA1 (patch-ag) = bdfbe40c849537d84ac2b3def4a0a3a87ecc152f
 SHA1 (patch-ah) = efc85dead838505ee462714167f196db2deeb0aa
 SHA1 (patch-ai) = ad69ddd4a4bd50cf2263ac6c6d17a59798ef3124
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
+SHA1 (patch-ak) = ff4603b188dad8ba8144e96f677ee4bda53df009
diff --git a/print/ghostscript/patches/patch-ak b/print/ghostscript/patches/patch-ak
new file mode 100644
index 00000000000..2ee9568cf4b
--- /dev/null
+++ b/print/ghostscript/patches/patch-ak
@@ -0,0 +1,31 @@
+$NetBSD: patch-ak,v 1.3 2009/12/23 13:27:59 drochner Exp $
+
+--- base/gsmisc.c.orig	2009-12-23 12:29:51.000000000 +0000
++++ base/gsmisc.c
+@@ -69,7 +69,7 @@ int outprintf(const gs_memory_t *mem, co
+ 
+     va_start(args, fmt);
+ 
+-    count = vsprintf(buf, fmt, args);
++    count = vsnprintf(buf, sizeof(buf), fmt, args);
+     outwrite(mem, buf, count);
+     if (count >= PRINTF_BUF_LENGTH) {
+ 	count = sprintf(buf, 
+@@ -89,7 +89,7 @@ int errprintf(const char *fmt, ...)
+ 
+     va_start(args, fmt);
+ 
+-    count = vsprintf(buf, fmt, args);
++    count = vsnprintf(buf, sizeof(buf), fmt, args);
+     errwrite(buf, count);
+     if (count >= PRINTF_BUF_LENGTH) {
+ 	count = sprintf(buf, 
+@@ -236,7 +236,7 @@ int gs_throw_imp(const char *func, const
+     va_list ap;
+ 
+     va_start(ap, fmt);
+-    vsprintf(msg, fmt, ap);
++    vsnprintf(msg, sizeof(msg), fmt, ap);
+     msg[sizeof(msg) - 1] = 0;
+     va_end(ap);
+ 
-- 
cgit v1.2.3