From cd22741d31d049f05bd8e34dac9c971146c86f6b Mon Sep 17 00:00:00 2001
From: adrianp <adrianp>
Date: Sun, 27 Nov 2005 17:04:18 +0000
Subject: Update for
 http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0967

---
 print/ghostscript-esp/Makefile         |  3 ++-
 print/ghostscript-esp/distinfo         |  4 +++-
 print/ghostscript-esp/patches/patch-ad | 18 ++++++++++++++++++
 print/ghostscript-esp/patches/patch-ae | 18 ++++++++++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 print/ghostscript-esp/patches/patch-ad
 create mode 100644 print/ghostscript-esp/patches/patch-ae

(limited to 'print/ghostscript-esp')

diff --git a/print/ghostscript-esp/Makefile b/print/ghostscript-esp/Makefile
index 8174d18b236..5088304eb74 100644
--- a/print/ghostscript-esp/Makefile
+++ b/print/ghostscript-esp/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2005/11/21 06:17:58 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/11/27 17:05:29 adrianp Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	ghostscript-esp-${GS_VERS}
+PKGREVISION=	1
 COMMENT=	ESP/CUPS Postscript interpreter
 
 CONFIGURE_ARGS+=	--with-x
diff --git a/print/ghostscript-esp/distinfo b/print/ghostscript-esp/distinfo
index f81bcb2d4b3..111fb22e584 100644
--- a/print/ghostscript-esp/distinfo
+++ b/print/ghostscript-esp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/11/21 06:17:58 jlam Exp $
+$NetBSD: distinfo,v 1.9 2005/11/27 17:05:29 adrianp Exp $
 
 SHA1 (ghostscript/espgs-8.15.1-source.tar.bz2) = 55e51f6dcaa9c645ea500fa849b92a18dcabfd90
 RMD160 (ghostscript/espgs-8.15.1-source.tar.bz2) = 8c03b9304d098cea7cb1ce0f056820d048b91423
@@ -9,3 +9,5 @@ Size (ghostscript/jpegsrc.v6b.tar.gz) = 613261 bytes
 SHA1 (patch-aa) = acc927ec55f3b45196a6bcc76048ddef21e3a236
 SHA1 (patch-ab) = 6ad4a094820b1e4e5b67abc77412c76d54661552
 SHA1 (patch-ac) = 8b525bbc73369721ef52d6789c36693e98576013
+SHA1 (patch-ad) = 2a8dc901edf104a9d2cc25216d99ab12c3fd7d67
+SHA1 (patch-ae) = 964023e6d5e94f7cd471a9e7c5b29c4ce7db715e
diff --git a/print/ghostscript-esp/patches/patch-ad b/print/ghostscript-esp/patches/patch-ad
new file mode 100644
index 00000000000..0003717c6e9
--- /dev/null
+++ b/print/ghostscript-esp/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.3 2005/11/27 17:05:29 adrianp Exp $
+
+--- lib/ps2epsi.orig	2005-04-20 20:09:25.000000000 +0100
++++ lib/ps2epsi
+@@ -5,12 +5,7 @@ if test ! -x "$gs"; then
+ 	gs=gs
+ fi
+ 
+-tmpfile=/tmp/ps2epsi$$
+-rm -f $tmpfile
+-if test -e $tmpfile; then
+-	echo "$0: Our temporary file $tmpfile already exists." 1>&2
+-	exit 1
+-fi
++tmpfile=`mktemp -t ps2epsiXXXXXX` || exit 1
+ trap "rm -rf $tmpfile" 0 1 2 3 7 13 15
+ 
+ export outfile
diff --git a/print/ghostscript-esp/patches/patch-ae b/print/ghostscript-esp/patches/patch-ae
new file mode 100644
index 00000000000..1105fe98f64
--- /dev/null
+++ b/print/ghostscript-esp/patches/patch-ae
@@ -0,0 +1,18 @@
+$NetBSD: patch-ae,v 1.4 2005/11/27 17:05:29 adrianp Exp $
+
+--- lib/pv.sh.orig	2005-11-27 14:39:25.000000000 +0000
++++ lib/pv.sh
+@@ -29,9 +29,10 @@ TEMPDIR=.
+ PAGE=$1
+ shift
+ FILE=$1
++TEMPFILE=`mktemp -t ${FILE}XXXXXX` || exit 1
+ shift
+-trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
++trap "rm -rf $TEMPFILE" 0 1 2 15
+ #dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
+-dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
+-gs $FILE.$$.pv
++dvips -p $PAGE -n 1 $FILE $* -o $TEMPFILE
++gs $TEMPFILE
+ exit 0
-- 
cgit v1.2.3