Security fix: bug #61500. Thanks to vorlon <vorlon@vorlons.info> and Sune Kloppenborg Jeppesen <jaervosz@gentoo.org>.

7 files changed, 210 insertions, 4 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 5a289b821427..f4711fc26433 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.32 2004/08/04 19:16:33 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.33 2004/08/27 18:39:08 usata Exp $
+
+*a2ps-4.13b-r6 (28 Aug 2004)
+
+  28 Aug 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/a2ps-4.13-select-freebsd.patch, +a2ps-4.13b-r6.ebuild,
+  +a2ps-4.13c-r1.ebuild:
+  Security fix: bug #61500. Thanks to vorlon <vorlon@vorlons.info>
+  and Sune Kloppenborg Jeppesen <jaervosz@gentoo.org>.
 
   05 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> -a2ps-4.13b-r4.ebuild,
   a2ps-4.13b-r5.ebuild, a2ps-4.13c.ebuild:
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 540034be1fa4..410d74bff77e 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,10 +1,15 @@
+MD5 eed99acab00d202e60c8785ab9196438 ChangeLog 4952
+MD5 a9ff43f61cdc306f49b1e5c941618b31 a2ps-4.13b-r6.ebuild 1745
 MD5 2a113ef2ef12f9b881d85a4292f3bbe4 a2ps-4.13b-r5.ebuild 1653
 MD5 a7519b22d92578c67bc151c647a9deda a2ps-4.13c.ebuild 1648
-MD5 c2518f355b9d75fb59118ff235cedc61 ChangeLog 4661
 MD5 26dba0307103de2d599fe832e219de72 metadata.xml 178
-MD5 5a02e00e2362711886e28f0d28b299dd files/a2ps-4.13-stdout.diff 462
+MD5 ecb6fe34b1eb5986bc26c919fc22d261 a2ps-4.13c-r1.ebuild 1701
 MD5 404552b249e258ffb606be0cc60f89d5 files/a2ps-4.13-autoconf-gentoo.diff 2247
-MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c 133
+MD5 5a02e00e2362711886e28f0d28b299dd files/a2ps-4.13-stdout.diff 462
 MD5 43277fd40996b817e369f9851aad66f5 files/a2ps-4.13c-locale-gentoo.diff 981
+MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c-r1 133
 MD5 f848a5dda1b74d4f107212702010331a files/digest-a2ps-4.13b-r5 130
+MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c 133
 MD5 449b2445dc0949a990a2b29cab89dc59 files/4.13c-gcc34.patch 348
+MD5 b62538dbd828d995bdc3ce36188b0768 files/a2ps-4.13-select-freebsd.patch 1582
+MD5 f848a5dda1b74d4f107212702010331a files/digest-a2ps-4.13b-r6 130
diff --git a/app-text/a2ps/a2ps-4.13b-r6.ebuild b/app-text/a2ps/a2ps-4.13b-r6.ebuild
new file mode 100644
index 000000000000..5616a77a349e
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.13b-r6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13b-r6.ebuild,v 1.1 2004/08/27 18:39:08 usata Exp $
+
+inherit gnuconfig eutils
+
+S=${WORKDIR}/${P/b/}
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="http://www-inf.enst.fr/~demaille/a2ps/"
+SRC_URI="ftp://ftp.enst.fr/pub/unix/a2ps/${P}.tar.gz
+	cjk? ( http://www.on.cs.keio.ac.jp/~yasu/linux/GNU/a2ps-4.13-ja_nls.patch ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ia64 x86 ppc sparc alpha hppa"
+IUSE="nls tetex cjk vanilla"
+
+RDEPEND="virtual/ghostscript
+	>=app-text/psutils-1.17
+	tetex? ( virtual/tetex )
+	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	>=dev-util/gperf-2.7.2
+	>=dev-util/yacc-1.9.1
+	cjk? ( >=sys-apps/sed-4 )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	if use alpha; then
+		gnuconfig_update || die "gnuconfig_update failed"
+	fi
+
+	# security fix
+	epatch ${FILESDIR}/a2ps-4.13-select-freebsd.patch
+
+	epatch ${FILESDIR}/a2ps-4.13-autoconf-gentoo.diff
+	use vanilla || epatch ${FILESDIR}/a2ps-4.13-stdout.diff
+	use cjk && epatch ${DISTDIR}/a2ps-4.13-ja_nls.patch
+	#stop running autoconf (bug #24264)
+	#find . | xargs touch
+}
+
+src_compile() {
+	export YACC=yacc
+	export WANT_AUTOMAKE=1.6
+	export WANT_AUTOCONF=2.5 ; autoreconf
+
+	econf --sysconfdir=/etc/a2ps \
+		--includedir=/usr/include \
+		`use_enable nls` || die "econf failed"
+	make || die "make failed"
+}
+
+src_install() {
+	dodir /usr/share/emacs/site-lisp
+
+	einstall \
+		sysconfdir=${D}/etc/a2ps \
+		includedir=${D}/usr/include \
+		lispdir=${D}/usr/share/emacs/site-lisp \
+		|| die "einstall failed"
+
+	dosed /etc/a2ps/a2ps.cfg
+
+	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
+}
diff --git a/app-text/a2ps/a2ps-4.13c-r1.ebuild b/app-text/a2ps/a2ps-4.13c-r1.ebuild
new file mode 100644
index 000000000000..cbf285cd06a8
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.13c-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r1.ebuild,v 1.1 2004/08/27 18:39:08 usata Exp $
+
+inherit gnuconfig eutils
+
+S=${WORKDIR}/${PN}-${PV:0:4}
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="http://www-inf.enst.fr/~demaille/a2ps/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	cjk? ( http://dev.gentoo.org/~usata/distfiles/${P}-ja_nls.patch.gz ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ~ia64 ppc64"
+IUSE="nls tetex cjk vanilla"
+
+DEPEND=">=sys-devel/automake-1.6
+	>=sys-devel/autoconf-2.57
+	>=dev-util/gperf-2.7.2
+	>=dev-util/yacc-1.9.1
+	virtual/ghostscript
+	>=app-text/psutils-1.17
+	tetex? ( virtual/tetex )"
+RDEPEND="virtual/ghostscript
+	>=app-text/psutils-1.17
+	tetex? ( virtual/tetex )
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${FILESDIR}/a2ps-4.13-select-freebsd.patch
+	epatch ${FILESDIR}/${P}-locale-gentoo.diff
+	use vanilla || epatch ${FILESDIR}/a2ps-4.13-stdout.diff
+	epatch ${FILESDIR}/${PV}-gcc34.patch
+	use cjk && epatch ${DISTDIR}/${P}-ja_nls.patch.gz
+	gnuconfig_update || die "gnuconfig_update failed"
+}
+
+src_compile() {
+
+	export YACC=yacc
+	econf --sysconfdir=/etc/a2ps \
+		--includedir=/usr/include \
+		`use_enable nls` || die "econf failed"
+
+	# sometimes emake doesn't work
+	make || die "make failed"
+}
+
+src_install() {
+	dodir /usr/share/emacs/site-lisp
+
+	einstall \
+		sysconfdir=${D}/etc/a2ps \
+		includedir=${D}/usr/include \
+		lispdir=${D}/usr/share/emacs/site-lisp \
+		|| die "einstall failed"
+
+	dosed /etc/a2ps/a2ps.cfg
+
+	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
+}
diff --git a/app-text/a2ps/files/a2ps-4.13-select-freebsd.patch b/app-text/a2ps/files/a2ps-4.13-select-freebsd.patch
new file mode 100644
index 000000000000..a2c38898fdc6
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13-select-freebsd.patch
@@ -0,0 +1,57 @@
+--- src/select.c.orig	Thu Dec 16 02:04:56 1999
++++ src/select.c	Sat Aug 21 12:05:31 2004
+@@ -131,6 +131,36 @@
+   return 1;
+ }
+ 
++/* escapes the name of a file so that the shell groks it in 'single' q.marks. 
++   The resulting pointer has to be free()ed when not longer used. */
++char *
++shell_escape(const char *fn)
++{
++  size_t len = 0;
++  const char *inp;
++  char *retval, *outp;
++
++  for(inp = fn; *inp; ++inp)
++    switch(*inp)
++    {
++      case '\'': len += 4; break;
++      default:   len += 1; break;
++    }
++
++  outp = retval = malloc(len + 1);
++  if(!outp)
++    return NULL; /* perhaps one should do better error handling here */
++  for(inp = fn; *inp; ++inp)
++    switch(*inp)
++    {
++      case '\'': *outp++ = '\''; *outp++ = '\\'; *outp++ = '\'', *outp++ = '\''; break;
++      default:   *outp++ = *inp; break;
++    }
++  *outp = 0;
++
++  return retval;
++}
++
+ /* What says file about the type of a file (result is malloc'd).  NULL
+   if could not be run.  */
+ 
+@@ -144,11 +174,15 @@
+   if (IS_EMPTY (job->file_command))
+     return NULL;
+ 
++  filename = shell_escape(filename);
++  if(filename == NULL)
++    return NULL;
+   /* Call file(1) with the correct option */
+-  command = ALLOCA (char, (2
++  command = ALLOCA (char, (4
+ 			   + strlen (job->file_command)
+ 			   + ustrlen (filename)));
+-  sprintf (command, "%s %s", job->file_command, (const char *) filename);
++  sprintf (command, "%s '%s'", job->file_command, (const char *) filename);
++  free(filename);
+   message (msg_tool, (stderr, "Reading pipe: `%s'\n", command));
+   file_out = popen (command, "r");
+ 
diff --git a/app-text/a2ps/files/digest-a2ps-4.13b-r6 b/app-text/a2ps/files/digest-a2ps-4.13b-r6
new file mode 100644
index 000000000000..91bf8e85e0f3
--- /dev/null
+++ b/app-text/a2ps/files/digest-a2ps-4.13b-r6
@@ -0,0 +1,2 @@
+MD5 0c8e0c31b08c14f7a7198ce967eb3281 a2ps-4.13b.tar.gz 1944289
+MD5 75820c89316d271519e8c5a18c479c1e a2ps-4.13-ja_nls.patch 138290
diff --git a/app-text/a2ps/files/digest-a2ps-4.13c-r1 b/app-text/a2ps/files/digest-a2ps-4.13c-r1
new file mode 100644
index 000000000000..4abfd89450cb
--- /dev/null
+++ b/app-text/a2ps/files/digest-a2ps-4.13c-r1
@@ -0,0 +1,2 @@
+MD5 97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz 2395885
+MD5 e315466f75d99c0c1ca563d82f2ace2e a2ps-4.13c-ja_nls.patch.gz 38189