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

21 files changed, 225 insertions, 13 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 9758c5356d8..ccea111bf9f 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2005/10/13 13:10:05 hira Exp $
+# $NetBSD: Makefile,v 1.5 2005/11/27 17:04:18 adrianp Exp $
 #
 
 DISTNAME=		ghostscript-8.51
 PKGNAME=		ghostscript-afpl-8.51
+PKGREVISION=		1
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index 279eb1c4cd2..f726afd2ea8 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/08/12 19:20:20 drochner Exp $
+$NetBSD: distinfo,v 1.2 2005/11/27 17:04:18 adrianp Exp $
 
 SHA1 (ghostscript-8.51.tar.bz2) = 2230c8cc565ab2fbff669ae4118937b07727cad6
 RMD160 (ghostscript-8.51.tar.bz2) = 2e4e4e72d00ce84914910136dafa702fa28d8174
@@ -8,3 +8,5 @@ RMD160 (jpegsrc.v6b.tar.gz) = 18892206014fbb8cae2a44e281f4ed53feaf7882
 Size (jpegsrc.v6b.tar.gz) = 613261 bytes
 SHA1 (patch-aa) = f9d706b19430c32f568316c0b02eee792e311236
 SHA1 (patch-ab) = ee1cad8503700d088e2a4dcf4c3d14237cb84b0e
+SHA1 (patch-ac) = 2d320ff00f77c8a62c549e0e3288a55af63fd7aa
+SHA1 (patch-ad) = ed75f35c19ae2b19bc8902522b5d4828dfa278fe
diff --git a/print/ghostscript-afpl/patches/patch-ac b/print/ghostscript-afpl/patches/patch-ac
new file mode 100644
index 00000000000..8ed2635412e
--- /dev/null
+++ b/print/ghostscript-afpl/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.1 2005/11/27 17:04:18 adrianp Exp $
+
+--- lib/ps2epsi.orig	2005-11-27 15:39:22.000000000 +0000
++++ lib/ps2epsi
+@@ -5,7 +5,8 @@
+ # executable name set in the makefile
+ GS_EXECUTABLE=gs
+ 
+-tmpfile=/tmp/ps2epsi$$
++tmpfile=`mktemp -t ps2epsi.XXXXXX || exit 1`
++trap "rm -rf $tmpfile" 0 1 2 3 7 13 15
+ 
+ export outfile
+ 
diff --git a/print/ghostscript-afpl/patches/patch-ad b/print/ghostscript-afpl/patches/patch-ad
new file mode 100644
index 00000000000..a0729a6e64c
--- /dev/null
+++ b/print/ghostscript-afpl/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2005/11/27 17:04:18 adrianp Exp $
+
+--- lib/pv.sh.orig	2004-08-04 01:55:46.000000000 +0100
++++ lib/pv.sh
+@@ -34,9 +34,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_EXECUTABLE $FILE.$$.pv
++dvips -p $PAGE -n 1 $FILE $* -o $TEMPFILE
++gs $TEMPFILE
+ exit 0
diff --git a/print/ghostscript-esp-nox11/Makefile b/print/ghostscript-esp-nox11/Makefile
index b6523e0495b..944f91c0606 100644
--- a/print/ghostscript-esp-nox11/Makefile
+++ b/print/ghostscript-esp-nox11/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2005/11/21 06:17:58 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/11/27 17:05:56 adrianp Exp $
 
 .include "../../print/ghostscript-esp/Makefile.common"
 
 PKGNAME=	ghostscript-esp-nox11-${GS_VERS}
+PKGREVISION=	1
 COMMENT=	ESP/CUPS Postscript interpreter without X11 drivers
 
 CONFIGURE_ARGS+=	--without-x
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
diff --git a/print/ghostscript-gnu-nox11/Makefile b/print/ghostscript-gnu-nox11/Makefile
index 630cf15cec2..3949a68209c 100644
--- a/print/ghostscript-gnu-nox11/Makefile
+++ b/print/ghostscript-gnu-nox11/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2005/05/30 15:39:11 dillo Exp $
+# $NetBSD: Makefile,v 1.6 2005/11/27 17:06:59 adrianp Exp $
 
 PKGNAME=	ghostscript-gnu-nox11-${GS_VERS}
+PKGREVISION=	1
 COMMENT=	GNU Postscript interpreter without X11 drivers
 
 CONFIGURE_ARGS+=	--without-x
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index a8f62dfc37e..88bd302a43f 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:09 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/11/27 17:06:36 adrianp Exp $
 
 PKGNAME=	ghostscript-gnu-${GS_VERS}
+PKGREVISION=	1
 COMMENT=	GNU Postscript interpreter with all drivers
 
 CONFIGURE_ARGS+=	--with-x
diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo
index e2c60bd5f2b..9abbdf9154c 100644
--- a/print/ghostscript-gnu/distinfo
+++ b/print/ghostscript-gnu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/05/30 15:39:11 dillo Exp $
+$NetBSD: distinfo,v 1.5 2005/11/27 17:06:36 adrianp Exp $
 
 SHA1 (ghostscript/ghostscript-8.15.tar.bz2) = 9b72a87e0521545265ec207bf12b7c20003ae2ad
 RMD160 (ghostscript/ghostscript-8.15.tar.bz2) = fb8f997c164c98c8c73dee032bb4f2fef3e90901
@@ -8,3 +8,5 @@ RMD160 (ghostscript/jpegsrc.v6b.tar.gz) = 18892206014fbb8cae2a44e281f4ed53feaf78
 Size (ghostscript/jpegsrc.v6b.tar.gz) = 613261 bytes
 SHA1 (patch-aa) = f9d706b19430c32f568316c0b02eee792e311236
 SHA1 (patch-ab) = ee1cad8503700d088e2a4dcf4c3d14237cb84b0e
+SHA1 (patch-ac) = 9758dcf3427ab1a7b018060b928d60f42dd9fd5e
+SHA1 (patch-ad) = 964023e6d5e94f7cd471a9e7c5b29c4ce7db715e
diff --git a/print/ghostscript-gnu/patches/patch-ac b/print/ghostscript-gnu/patches/patch-ac
new file mode 100644
index 00000000000..c96f3e35996
--- /dev/null
+++ b/print/ghostscript-gnu/patches/patch-ac
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.1 2005/11/27 17:06:36 adrianp Exp $
+
+--- lib/ps2epsi.orig	2005-11-27 15:45:05.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-gnu/patches/patch-ad b/print/ghostscript-gnu/patches/patch-ad
new file mode 100644
index 00000000000..7e661668ef1
--- /dev/null
+++ b/print/ghostscript-gnu/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1 2005/11/27 17:06:36 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
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
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 73c33d04bb7..42def2114e9 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:09 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/11/27 17:07:29 adrianp Exp $
 
 PKGNAME=	ghostscript-${GS_VERS}
-PKGREVISION=	5
+PKGREVISION=	6
 COMMENT=	Aladdin Postscript interpreter
 
 GS_DISPLAY_DEVICE=	x11.dev