- add patch from bug #100245 discovered by Max Vozeler to prevent arbitrary code execution by pstotext

Package-Manager: portage-2.0.51.22-r1

5 files changed, 68 insertions, 5 deletions

diff --git a/app-text/pstotext/ChangeLog b/app-text/pstotext/ChangeLog
index 1cfa59d45e26..90f06d84f413 100644
--- a/app-text/pstotext/ChangeLog
+++ b/app-text/pstotext/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/pstotext
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/ChangeLog,v 1.12 2005/07/16 16:13:38 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/ChangeLog,v 1.13 2005/07/27 16:39:41 solar Exp $
+
+*pstotext-1.8g-r1 (27 Jul 2005)
+
+  27 Jul 2005; <solar.@gentoo.org> +files/pstotext-1.8g-dsafer.patch,
+  +pstotext-1.8g-r1.ebuild:
+  - add patch from bug #100245 discovered by Max Vozeler to prevent arbitrary
+  code execution by pstotext
 
   16 Jul 2005; Joseph Jezak <josejx@gentoo.org> pstotext-1.8g.ebuild:
   Marked ppc stable for bug #99218.
diff --git a/app-text/pstotext/Manifest b/app-text/pstotext/Manifest
index 1abfc4850639..7aa4c7839297 100644
--- a/app-text/pstotext/Manifest
+++ b/app-text/pstotext/Manifest
@@ -1,13 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6da8cf56705fd36fb7aa6b56c1c9aec3 ChangeLog 1027
+MD5 23758bbeb8883b462d80a293d1de0c2c pstotext-1.8g-r1.ebuild 788
 MD5 8114238320af66caa1e90d5c8f67dce8 pstotext-1.8g.ebuild 681
+MD5 68be7fe0356165ad0f4aa0ccd54b3c23 ChangeLog 1265
+MD5 7959110be19f6b828a6c39a43b79354f files/pstotext-1.8g-dsafer.patch 668
 MD5 84a047e65494c9f47e4af70d3276320f files/digest-pstotext-1.8g 58
+MD5 84a047e65494c9f47e4af70d3276320f files/digest-pstotext-1.8g-r1 58
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC2TKhcsIHjyDViGQRAkgdAKDE3zMkp/ogtKor1UuRe33dSNsIWwCeKJTZ
-IIKHJ5EWhw7am9uAALpVvQ8=
-=xfG/
+iQCVAwUBQue4LZ4WFLgrx1GWAQIOdQP+KF8C6bDEHFOZ8WbNIcll0aI86SaAhjn/
+3EpGnls72q98qrYCRZ7IEADjZ+Gp4QQ+z67gLBQFEnwldDMmfMFPwqYWZNeO8/pJ
+Rb4wCcTaT4m1VJyL12j7WbSNyHuciPqawbGT7RMeSZvwWT+da4yoWB4+0BHTVgaC
+IadSUokL7+M=
+=UVrr
 -----END PGP SIGNATURE-----
diff --git a/app-text/pstotext/files/digest-pstotext-1.8g-r1 b/app-text/pstotext/files/digest-pstotext-1.8g-r1
new file mode 100644
index 000000000000..606fe5da9487
--- /dev/null
+++ b/app-text/pstotext/files/digest-pstotext-1.8g-r1
@@ -0,0 +1 @@
+MD5 1be0be028ccc85be1bf55d7e90976b18 pstotext.tar.Z 58743
diff --git a/app-text/pstotext/files/pstotext-1.8g-dsafer.patch b/app-text/pstotext/files/pstotext-1.8g-dsafer.patch
new file mode 100644
index 000000000000..06e67e897cba
--- /dev/null
+++ b/app-text/pstotext/files/pstotext-1.8g-dsafer.patch
@@ -0,0 +1,14 @@
+--- pstotext-1.9/main.c~	2005-06-02 15:42:33.754177096 +0200
++++ pstotext-1.9/main.c	2005-06-02 15:45:20.412084016 +0200
+@@ -231,9 +231,9 @@
+   sprintf(
+     gs_cmdline,
+ #ifdef VMS
+-    "%s -r72 \"-dNODISPLAY\" \"-dFIXEDMEDIA\" \"-dDELAYBIND\" \"-dWRITESYSTEMDICT\" %s \"-dNOPAUSE\" %s %s %s",
++    "%s -r72 \"-dNODISPLAY\" \"-dFIXEDMEDIA\" \"-dDELAYBIND\" \"-dWRITESYSTEMDICT\" %s \"-dNOPAUSE\" \"-dSAFER\" %s %s %s",
+ #else
+-    "%s -r72 -dNODISPLAY -dFIXEDMEDIA -dDELAYBIND -dWRITESYSTEMDICT %s -dNOPAUSE %s %s %s",
++    "%s -r72 -dNODISPLAY -dFIXEDMEDIA -dDELAYBIND -dWRITESYSTEMDICT %s -dNOPAUSE -dSAFER %s %s %s",
+ #endif
+     gs_cmd,
+     (debug ? "" : "-q"),
diff --git a/app-text/pstotext/pstotext-1.8g-r1.ebuild b/app-text/pstotext/pstotext-1.8g-r1.ebuild
new file mode 100644
index 000000000000..32b457fb842e
--- /dev/null
+++ b/app-text/pstotext/pstotext-1.8g-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pstotext/pstotext-1.8g-r1.ebuild,v 1.1 2005/07/27 16:39:41 solar Exp $
+
+inherit eutils
+
+DESCRIPTION="extract ASCII text from a PostScript or PDF file"
+HOMEPAGE="http://research.compaq.com/SRC/virtualpaper/pstotext.html"
+SRC_URI="http://research.compaq.com/SRC/virtualpaper/binaries/pstotext.tar.Z"
+
+LICENSE="PSTT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/ncompress"
+
+RDEPEND="virtual/ghostscript"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}"/${PN}-1.8g-dsafer.patch
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install () {
+	into /usr
+	dobin pstotext
+	doman pstotext.1
+}