Update for http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0967

6 files changed, 108 insertions, 3 deletions

diff --git a/print/ghostscript-nox11/Makefile b/print/ghostscript-nox11/Makefile
index bfa1efb6278..40a098c2b99 100644
--- a/print/ghostscript-nox11/Makefile
+++ b/print/ghostscript-nox11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/05/30 14:57:28 dillo Exp $
+# $NetBSD: Makefile,v 1.10 2005/11/27 17:08:31 adrianp Exp $
 
 PKGNAME=	ghostscript-nox11-${GS_VERS}
-PKGREVISION=	5
+PKGREVISION=	6
 COMMENT=	Aladdin Postscript interpreter without X11 drivers
 
 .include "Makefile.common"
diff --git a/print/ghostscript-nox11/distinfo b/print/ghostscript-nox11/distinfo
index d2c40d41ab4..357e388699b 100644
--- a/print/ghostscript-nox11/distinfo
+++ b/print/ghostscript-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2005/02/24 12:51:42 agc Exp $
+$NetBSD: distinfo,v 1.12 2005/11/27 17:08:31 adrianp Exp $
 
 SHA1 (ghostscript/ghostscript-6.01.tar.bz2) = 405a8ab16453a8c3f846eae2aa4abbea6a093300
 RMD160 (ghostscript/ghostscript-6.01.tar.bz2) = cbf5a1774726ba0b165ab539cb7ef16f2596f210
@@ -72,4 +72,8 @@ SHA1 (patch-av) = 87f3c9e01a4e2fa63c75c348b1a5ec2be07948a5
 SHA1 (patch-aw) = 9855cacc48db068f87aa37568b198e22e6c391a0
 SHA1 (patch-ay) = a39a1e27a2f8437103a93ac06e5f857ec5e32fa3
 SHA1 (patch-az) = 2bd5ddec9bf82aeca1fc2e928084cadc51bc88be
+SHA1 (patch-ba) = df97981a9582d542be77532d0dcd407e4000c8d7
+SHA1 (patch-bb) = c5cbc6db2948f7b3e81d7a23c6f5fa93e1053d84
+SHA1 (patch-bc) = 26ac5cb13ee57f9bdcf71fc07dfe033020ebb59c
+SHA1 (patch-bd) = 88a00f51b624c0758ef80ce2dd7a13963fce42f8
 SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
diff --git a/print/ghostscript-nox11/patches/patch-ba b/print/ghostscript-nox11/patches/patch-ba
new file mode 100644
index 00000000000..4ab4ce3b1c3
--- /dev/null
+++ b/print/ghostscript-nox11/patches/patch-ba
@@ -0,0 +1,42 @@
+$NetBSD: patch-ba,v 1.1 2005/11/27 17:08:31 adrianp Exp $
+
+--- lib/pj-gs.sh.orig	2000-03-09 08:40:40.000000000 +0000
++++ lib/pj-gs.sh
+@@ -241,6 +241,7 @@ do
+ 			then
+ 				/usr/lib/lprcat $Nofilter $Nolabel $file PCL1 $user $dev
+ 			else
++				TEMPFILE=`mktemp -t pjXXXXXX` || exit 1
+ 				type=`file $file | sed 's/^[^:]*..//'`
+ 				case "$type" in
+ 				postscript*)
+@@ -251,22 +252,22 @@ do
+ #
+ #					gs -q -sDEVICE=paintjet -r180 -sOutputFile=- -dDISKFONTS -dNOPAUSE - < $file 2>/tmp/sh$$
+ 
+-					gs -q -sDEVICE=paintjet -r180 -sOutputFile=/tmp/pj$$ -dDISKFONTS -dNOPAUSE - < $file 1>2
+-					cat /tmp/pj$$
+-					rm /tmp/pj$$
++					gs -q -sDEVICE=paintjet -r180 -sOutputFile=$TEMPFILE -dDISKFONTS -dNOPAUSE - < $file 1>2
++					cat $TEMPFILE
++					rm $TEMPFILE
+ 					needff=
+ 					;;
+-				*)	cat "$file" 2>/tmp/sh$$
++				*)	cat "$file" 2>$TEMPFILE
+ 					needff=1
+ 					;;
+ 				esac
+ 
+-				if [ -s /tmp/sh$$ ]
++				if [ -s $TEMPFILE ]
+ 				then
+ #				    cat /tmp/sh$$	# output any errors
+-				    cat /tmp/sh$$ 1>2	# output any errors
++				    cat $TEMPFILE 1>2	# output any errors
+ 				fi
+-				rm -f /tmp/sh$$
++				rm -f $TEMPFILE
+ 				if [ $needff ]; then echo "\014\r\c"; fi
+ 			fi
+ 
diff --git a/print/ghostscript-nox11/patches/patch-bb b/print/ghostscript-nox11/patches/patch-bb
new file mode 100644
index 00000000000..2e974cc3b23
--- /dev/null
+++ b/print/ghostscript-nox11/patches/patch-bb
@@ -0,0 +1,10 @@
+$NetBSD: patch-bb,v 1.1 2005/11/27 17:08:31 adrianp Exp $
+
+--- lib/ps2epsi.orig	2000-03-09 08:40:40.000000000 +0000
++++ lib/ps2epsi
+@@ -3,3 +3,4 @@
+ 
+-tmpfile=/tmp/ps2epsi$$
++tmpfile=`mktemp -t ps2epsi.XXXXXX || exit 1`
++trap "rm -rf $tmpfile" 0 1 2 3 7 13 15
+ 
diff --git a/print/ghostscript-nox11/patches/patch-bc b/print/ghostscript-nox11/patches/patch-bc
new file mode 100644
index 00000000000..b1704066f4b
--- /dev/null
+++ b/print/ghostscript-nox11/patches/patch-bc
@@ -0,0 +1,18 @@
+$NetBSD: patch-bc,v 1.1 2005/11/27 17:08:31 adrianp Exp $
+
+--- lib/pv.sh.orig	2000-03-09 08:40:40.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
diff --git a/print/ghostscript-nox11/patches/patch-bd b/print/ghostscript-nox11/patches/patch-bd
new file mode 100644
index 00000000000..095c843cd62
--- /dev/null
+++ b/print/ghostscript-nox11/patches/patch-bd
@@ -0,0 +1,31 @@
+$NetBSD: patch-bd,v 1.1 2005/11/27 17:08:31 adrianp Exp $
+
+--- lib/sysvlp.sh.orig	2000-03-09 08:40:40.000000000 +0000
++++ lib/sysvlp.sh
+@@ -27,20 +27,23 @@ files="$*"
+ # Brother HL-4: switch to HP laserjet II+ emulation
+ # echo "\033\015H\c"
+ 
++TEMPDIR=`mktemp -td sysvlp.XXXXXX` || exit 1
++
+ i=1
+ while [ $i -le $copies ]
+ do
+ 	for file in $files
+ 	do
+ 		$GSHOME/gs \
+-			-sOUTPUTFILE=/tmp/psp$$.%02d \
++			-sOUTPUTFILE=$TEMPDIR/psp$$.%02d \
+ 			-sDEVICE=$DEVICE \
+ 			$EHANDLER $file \
+ 			< /dev/null >> /usr/tmp/ps_log 2>&1
+ 
+-		cat /tmp/psp$$.* 2>> /usr/tmp/ps_log
+-		rm -f /tmp/psp$$.*
++		cat $TEMPDIR/psp$$.* 2>> /usr/tmp/ps_log
++		rm -f $TEMPDIR/psp$$.*
+ 	done
+ 	i=`expr $i + 1`
+ done
++rmdir $TEMPDIR
+ exit 0