5 files changed, 127 insertions, 12 deletions
diff --git a/app-text/ghostscript/ChangeLog b/app-text/ghostscript/ChangeLog
index e7c2d5734b9a..e9314f4a4cf7 100644
--- a/app-text/ghostscript/ChangeLog
+++ b/app-text/ghostscript/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/ghostscript
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.31 2003/06/02 14:04:57 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ChangeLog,v 1.32 2003/06/14 18:19:45 aliz Exp $
+
+*ghostscript-7.05.6-r2 (14 Jun 2003)
+
+  14 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update. Added patch from Mandrake for ps2epsi vulnerability.
 
 *ghostscript-7.05.6-r1 (02 Jun 2003)
 
diff --git a/app-text/ghostscript/Manifest b/app-text/ghostscript/Manifest
index f29756f5a10b..b1ce770dbdf4 100644
--- a/app-text/ghostscript/Manifest
+++ b/app-text/ghostscript/Manifest
@@ -1,20 +1,23 @@
-MD5 1fe2b02da9962c7fa27fc54121f4d126 ghostscript-7.05.5-r1.ebuild 2477
-MD5 6f81d5ce7e4a2392c92493a1ebff304a ghostscript-7.05.6.ebuild 2588
+MD5 944d4067db60490027d0967e99a936dd ChangeLog 5750
 MD5 5969230b95c1114627460bc012999274 ghostscript-7.05.3-r1.ebuild 1964
-MD5 b109fca2c805d2bea14c0261a373616f ghostscript-7.05.5.ebuild 1886
+MD5 1fe2b02da9962c7fa27fc54121f4d126 ghostscript-7.05.5-r1.ebuild 2477
 MD5 b5e1b95c3cd9eabd6dee995b35277219 ghostscript-7.05.5-r2.ebuild 2599
-MD5 fce6a12a8b96acf00726b8926c8c1f51 ChangeLog 5589
+MD5 b109fca2c805d2bea14c0261a373616f ghostscript-7.05.5.ebuild 1886
 MD5 287fa5316c873a5ce2ae460b99b3ba95 ghostscript-7.05.6-r1.ebuild 2601
-MD5 f9c4821dac99d593d62405379f6653ec files/png.diff 426
-MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.5.man.patch 1231
-MD5 86e743552ef51cab2ef4c70728ad6954 files/lxm3200-cups.diff 1256
-MD5 94358e6edac540eb4858c0f0f034d454 files/gs7.05-cjk.diff 20004
+MD5 6f81d5ce7e4a2392c92493a1ebff304a ghostscript-7.05.6.ebuild 2588
+MD5 47f7a54801a5b3825a26f7f4d1955183 ghostscript-7.05.6-r2.ebuild 2703
 MD5 cd47befad950c27337bdc21511f89050 files/digest-ghostscript-7.05.3-r1 295
+MD5 ac5b31ed5b19e7d882fc094159e35e8d files/digest-ghostscript-7.05.5 220
 MD5 3cdc3dc3a080a9e1e29ba2ddf05debd4 files/digest-ghostscript-7.05.5-r1 359
 MD5 3cdc3dc3a080a9e1e29ba2ddf05debd4 files/digest-ghostscript-7.05.5-r2 359
-MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6-r1 359
-MD5 ac5b31ed5b19e7d882fc094159e35e8d files/digest-ghostscript-7.05.5 220
 MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6 359
-MD5 f0a076c486b8d72e90c8aac2355ccd4d files/gs7.05.6-cjk.diff 20038
+MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6-r1 359
+MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.5.man.patch 1231
 MD5 fd34b2b7a029f19eab4ba3f69afe295e files/ghostscript-7.05.6.man.patch 1231
+MD5 94358e6edac540eb4858c0f0f034d454 files/gs7.05-cjk.diff 20004
 MD5 e9bbafad9ed02da2accd420908d98502 files/gs7.05-gdevhl12.c 21998
+MD5 f0a076c486b8d72e90c8aac2355ccd4d files/gs7.05.6-cjk.diff 20038
+MD5 86e743552ef51cab2ef4c70728ad6954 files/lxm3200-cups.diff 1256
+MD5 f9c4821dac99d593d62405379f6653ec files/png.diff 426
+MD5 b2cb682bdfaacefe0a5a5c44f8aaa46c files/ps2epsi-security.patch 268
+MD5 c63f6d71a403dbc72265831386b84eb0 files/digest-ghostscript-7.05.6-r2 359
diff --git a/app-text/ghostscript/files/digest-ghostscript-7.05.6-r2 b/app-text/ghostscript/files/digest-ghostscript-7.05.6-r2
new file mode 100644
index 000000000000..a76e8443ea4a
--- /dev/null
+++ b/app-text/ghostscript/files/digest-ghostscript-7.05.6-r2
@@ -0,0 +1,5 @@
+MD5 991cbd7bafc6917a19abf9df3ecad58e espgs-7.05.6-source.tar.bz2 5410541
+MD5 1521fab85ca3e8ce3ce781d4970e6c79 gnu-gs-fonts-std-6.0.tar.gz 1881193
+MD5 33457d3f37de7ef03d2eea05a9e6aa4f gnu-gs-fonts-other-6.0.tar.gz 796086
+MD5 a3bf430a7e21cd82401258a2ec3b8afb adobe-cmaps-200204.tar.gz 4360486
+MD5 2fbae60417d42779f6488ab897dcaaf6 acro5-cmaps-2001.tar.gz 631653
diff --git a/app-text/ghostscript/files/ps2epsi-security.patch b/app-text/ghostscript/files/ps2epsi-security.patch
new file mode 100644
index 000000000000..ce3571f204d0
--- /dev/null
+++ b/app-text/ghostscript/files/ps2epsi-security.patch
@@ -0,0 +1,11 @@
+--- lib/ps2epsi	2003-04-29 10:02:28.000000000 +0000
++++ lib/ps2epsi	2003-04-29 10:02:50.000000000 +0000
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # $Id: ps2epsi-security.patch,v 1.1 2003/06/14 18:19:45 aliz Exp $
+ 
+-tmpfile=/tmp/ps2epsi$$
++tmpfile=$(tempfile --prefix=ps2ep)
+ 
+ export outfile
+ 
diff --git a/app-text/ghostscript/ghostscript-7.05.6-r2.ebuild b/app-text/ghostscript/ghostscript-7.05.6-r2.ebuild
new file mode 100644
index 000000000000..457db6b00adf
--- /dev/null
+++ b/app-text/ghostscript/ghostscript-7.05.6-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript/ghostscript-7.05.6-r2.ebuild,v 1.1 2003/06/14 18:19:45 aliz Exp $
+
+inherit eutils
+
+DESCRIPTION="ESP Ghostscript -- an enhanced version of GNU Ghostscript with better printer support"
+SRC_URI="ftp://ftp.easysw.com/pub/ghostscript/espgs-${PV}-source.tar.bz2
+	ftp://ftp.easysw.com/pub/ghostscript/gnu-gs-fonts-std-6.0.tar.gz
+	ftp://ftp.easysw.com/pub/ghostscript/gnu-gs-fonts-other-6.0.tar.gz
+	cjk? ( ftp://ftp.gyve.org/pub/gs-cjk/adobe-cmaps-200204.tar.gz
+		ftp://ftp.gyve.org/pub/gs-cjk/acro5-cmaps-2001.tar.gz)"
+HOMEPAGE="http://www.easysw.com/"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="x86 ppc sparc alpha"
+IUSE="X cups cjk"
+
+DEPEND="virtual/glibc
+	>=media-libs/jpeg-6b 
+	>=media-libs/libpng-1.2.1
+	>=sys-libs/zlib-1.1.4
+	X? ( virtual/x11 ) 
+	cjk? ( media-fonts/arphicfonts
+		media-fonts/kochi-fonts
+		media-fonts/baekmuk-fonts )
+	cups? ( || ( gimp-print gimp-print-cups ) )"
+
+S=${WORKDIR}/espgs-${PV}
+
+src_unpack() {
+	unpack espgs-${PV}-source.tar.bz2
+	unpack gnu-gs-fonts-std-6.0.tar.gz
+	unpack gnu-gs-fonts-other-6.0.tar.gz
+
+	# Brother HL-12XX support
+	cp ${FILESDIR}/gs7.05-gdevhl12.c ${S}/src/gdevhl12.c || die
+	mv ${S}/src/Makefile.in ${S}/src/Makefile.in.orig
+	sed 's#^\(DEVICE_DEVS6=.*\)$#\1 $(DD)hl1240.dev $(DD)hl1250.dev#' \
+		${S}/src/Makefile.in.orig > ${S}/src/Makefile.in || die
+
+	cd ${S}
+
+##	patch -p0 < ${FILESDIR}/png.diff || die "patch failed"
+
+	use cjk && epatch ${FILESDIR}/gs${PV}-cjk.diff
+
+	# man page patch from absinthe@pobox.com (Dylan Carlson) bug #14150
+#	patch -p0 ${S}/man/gs.1 < ${FILESDIR}/${P}.man.patch || die
+	epatch ${FILESDIR}/${P}.man.patch
+
+	epatch ${FILESDIR}/ps2epsi-security.patch
+}
+
+src_compile() {
+	local myconf
+	myconf="--with-ijs --with-omni"
+
+	use X && myconf="${myconf} --with-x" \
+		|| myconf="${myconf} --without-x" 
+
+	use cups && myconf="${myconf} --enable-cups --with-gimp-print" \
+		|| myconf="${myconf} --disable-cups --without-gimp-print"
+
+	econf ${myconf}
+	make || die "make failed"
+}
+
+src_install() {
+	einstall install_prefix=${D}
+
+	cd ${WORKDIR}
+	cp -a fonts ${D}/usr/share/ghostscript || die
+	cd ${S}
+
+	rm -fr ${D}/usr/share/ghostscript/7.05/doc || die
+	dodoc doc/README doc/COPYING doc/COPYING.LGPL
+	dohtml doc/*.html doc/*.htm
+	insinto /usr/share/emacs/site-lisp
+	doins doc/gsdoc.el || die
+
+	if [ `use cjk` ] ; then
+		dodir /usr/share/ghostscript/Resource
+		dodir /usr/share/ghostscript/Resource/Font
+		dodir /usr/share/ghostscript/Resource/CIDFont
+		cd ${D}/usr/share/ghostscript/Resource
+		unpack adobe-cmaps-200204.tar.gz
+		unpack acro5-cmaps-2001.tar.gz
+	fi
+}