security bump; bug #75784

12 files changed, 67 insertions, 232 deletions

diff --git a/app-text/a2ps/ChangeLog b/app-text/a2ps/ChangeLog
index 461f3c3b28f6..5e485b351043 100644
--- a/app-text/a2ps/ChangeLog
+++ b/app-text/a2ps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/a2ps
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.35 2005/01/01 16:01:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/ChangeLog,v 1.36 2005/01/03 16:46:37 lanius Exp $
+
+*a2ps-4.13c-r2 (03 Jan 2005)
+
+  03 Jan 2005; Heinrich Wendel <lanius@gentoo.org>
+  -files/a2ps-4.13-autoconf-gentoo.diff, +files/a2ps-4.13c-fixps.patch,
+  +files/a2ps-4.13c-psmandup.diff, -a2ps-4.13b-r5.ebuild,
+  -a2ps-4.13b-r6.ebuild, +a2ps-4.13c-r2.ebuild, -a2ps-4.13c.ebuild:
+  security bump; bug #75784
 
   29 Dec 2004; Daniel Goller <morfic@gentoo.org> a2ps-4.13c-r1.ebuild:
   Fixing what needs fixing, libtoolize --copy --force
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index d4f4c850e37d..f3f114ce44c4 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,15 +1,12 @@
-MD5 1ca805c67cb1cb31f5e19d5c70c3a748 ChangeLog 5083
-MD5 0474f7253dd9cfab2d4361b1de2ef9da a2ps-4.13b-r5.ebuild 1658
-MD5 2f0ad627af6c08e134619ef35e3fd06e a2ps-4.13c.ebuild 1653
-MD5 26dba0307103de2d599fe832e219de72 metadata.xml 178
-MD5 9c791d72e39390ec73f8005e43585f0d a2ps-4.13b-r6.ebuild 1750
+MD5 92003be3cbff44d6f776e0bbef5c4c6e a2ps-4.13c-r2.ebuild 1867
 MD5 e613078fe797c81396d88cc0c7b57513 a2ps-4.13c-r1.ebuild 1763
-MD5 449b2445dc0949a990a2b29cab89dc59 files/4.13c-gcc34.patch 348
-MD5 404552b249e258ffb606be0cc60f89d5 files/a2ps-4.13-autoconf-gentoo.diff 2247
+MD5 0425dbd4954437162f97b364711b04f6 ChangeLog 5387
+MD5 26dba0307103de2d599fe832e219de72 metadata.xml 178
 MD5 5a02e00e2362711886e28f0d28b299dd files/a2ps-4.13-stdout.diff 462
+MD5 df6bc895cc6fb0fd47f22fd1c36d1ed3 files/a2ps-4.13c-fixps.patch 549
 MD5 43277fd40996b817e369f9851aad66f5 files/a2ps-4.13c-locale-gentoo.diff 981
-MD5 f848a5dda1b74d4f107212702010331a files/digest-a2ps-4.13b-r6 130
-MD5 f848a5dda1b74d4f107212702010331a files/digest-a2ps-4.13b-r5 130
-MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c 133
-MD5 b62538dbd828d995bdc3ce36188b0768 files/a2ps-4.13-select-freebsd.patch 1582
 MD5 b4a7c4e217ab8f2fa45b3282ea68069a files/digest-a2ps-4.13c-r1 133
+MD5 adde8c4bf7673c1b4a07aa8aa62cb273 files/digest-a2ps-4.13c-r2 63
+MD5 b62538dbd828d995bdc3ce36188b0768 files/a2ps-4.13-select-freebsd.patch 1582
+MD5 d68d0bfab547ef1ce70576c7a5570f13 files/a2ps-4.13c-psmandup.diff 569
+MD5 449b2445dc0949a990a2b29cab89dc59 files/4.13c-gcc34.patch 348
diff --git a/app-text/a2ps/a2ps-4.13b-r5.ebuild b/app-text/a2ps/a2ps-4.13b-r5.ebuild
deleted file mode 100644
index e0246c185733..000000000000
--- a/app-text/a2ps/a2ps-4.13b-r5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13b-r5.ebuild,v 1.19 2005/01/01 16:01:45 eradicator 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
-	if use alpha; then
-		gnuconfig_update || die "gnuconfig_update failed"
-	fi
-	cd ${S}
-
-	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_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.13b-r6.ebuild b/app-text/a2ps/a2ps-4.13b-r6.ebuild
deleted file mode 100644
index fa6871624683..000000000000
--- a/app-text/a2ps/a2ps-4.13b-r6.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 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.2 2005/01/01 16:01:45 eradicator 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.ebuild b/app-text/a2ps/a2ps-4.13c-r2.ebuild
index efc360a179a2..60c8c431a538 100644
--- a/app-text/a2ps/a2ps-4.13c.ebuild
+++ b/app-text/a2ps/a2ps-4.13c-r2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c.ebuild,v 1.19 2005/01/01 16:01:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/a2ps/a2ps-4.13c-r2.ebuild,v 1.1 2005/01/03 16:46:37 lanius Exp $
 
 inherit gnuconfig eutils
 
 S=${WORKDIR}/${PN}-${PV:0:4}
 DESCRIPTION="Any to PostScript filter"
-HOMEPAGE="http://www-inf.enst.fr/~demaille/a2ps/"
+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"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="nls tetex cjk vanilla"
 
 DEPEND=">=sys-devel/automake-1.6
@@ -30,11 +30,19 @@ RDEPEND="virtual/ghostscript
 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
+
+	# improve tempfile handling
+	epatch ${FILESDIR}/${P}-fixps.patch
+	epatch ${FILESDIR}/${P}-psmandup.diff
+
 	gnuconfig_update || die "gnuconfig_update failed"
+	libtoolize --copy --force || die "libtoolize failed"
 }
 
 src_compile() {
diff --git a/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff b/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff
deleted file mode 100644
index 63b381007540..000000000000
--- a/app-text/a2ps/files/a2ps-4.13-autoconf-gentoo.diff
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -urN a2ps-4.13.ORIG a2ps-4.13
---- a2ps-4.13.ORIG/ogonkify/configure.in	2000-01-07 21:19:55.000000000 +0900
-+++ a2ps-4.13/ogonkify/configure.in	2003-09-16 06:33:29.000000000 +0900
-@@ -53,7 +53,7 @@
- dnl We need the IBM PFA files.
- ad_IBMFONTS
- 
--AC_CONFIG_FILES(composeglyphs, [chmod +x composeglyphs])
-+dnl AC_CONFIG_FILES(composeglyphs, [chmod +x composeglyphs])
- AC_OUTPUT(Makefile ogonkify.in
- 	   doc/Makefile
- 	   m4/Makefile)
-diff -urN a2ps-4.13.ORIG/configure.in a2ps-4.13/configure.in
---- a2ps-4.13.ORIG/configure.in	2003-10-28 15:15:26.000000000 +0900
-+++ a2ps-4.13/configure.in	2003-10-31 02:50:00.000000000 +0900
-@@ -82,7 +82,7 @@
- AC_TYPE_PID_T
- AC_TYPE_SIGNAL
- AC_STRUCT_TM
--AC_CHECK_MEMBERS((struct passwd.pw_gecos),,,
-+AC_CHECK_MEMBERS([struct passwd.pw_gecos], , ,
- [#if HAVE_PWD_H
- # include <pwd.h>
- #endif])
-@@ -149,7 +149,7 @@
- # Needed checks for tinyterm.[ch]
- ad_TINYTERM_CHECKS
- 
--AC_CHECK_DECLS((fputs, strlen, strtoul, strtoull))
-+AC_CHECK_DECLS([fputs, strlen, strtoul, strtoull])
- 
- # Internationalization.
- AM_GNU_GETTEXT
-@@ -288,7 +288,7 @@
- # Nice special printers
- ########################
- # Look for GV or Ghostview
--ad_CHECK_PROGS((gv, ghostview))
-+ad_CHECK_PROGS(gv ghostview)
- if test "$COM_gv$COM_ghostview" = "##"; then
-   COM_DISPLAY="#"
- fi
-@@ -301,7 +301,7 @@
- ad_CHECK_PROG(gzip,
- [a2ps works better with gzip.
- Consider fetching gzip at any ftp site proposing GNU programs])
--ad_CHECK_PROGS((bzip, bzip2))
-+ad_CHECK_PROGS(bzip bzip2)
- 
- # DVI delegation
- ad_CHECK_PROG(dvips)
-@@ -310,7 +310,7 @@
- ad_CHECK_PROG(convert)
- 
- # PDF delegation
--ad_CHECK_PROGS((acroread, pdf2ps))
-+ad_CHECK_PROGS(acroread pdf2ps)
- COM_acroread4='#'
- AC_SUBST(COM_acroread4)
- # If we have acroread, is it a version which supports -shrink etc.?
-@@ -328,7 +328,7 @@
- fi
- 
- # Outputting PDF
--ad_CHECK_PROGS((distill, ps2pdf))
-+ad_CHECK_PROGS(distill ps2pdf)
- test "$COM_distill$COM_ps2pdf" = "##" && COM_PS2PDF="#"
- AC_SUBST(COM_PS2PDF)
- 
-@@ -341,7 +341,7 @@
- Consider fetching groff at any ftp site proposing GNU programs])
- 
- # Texinfo delegation
--ad_CHECK_PROGS((makeinfo, tex, latex))
-+ad_CHECK_PROGS(makeinfo tex latex)
- COM_TEXI="$COM_tex$COM_makeinfo$COM_dvips"
- COM_LATEX="$COM_latex$COM_dvips"
- AC_SUBST(COM_TEXI)
diff --git a/app-text/a2ps/files/a2ps-4.13c-fixps.patch b/app-text/a2ps/files/a2ps-4.13c-fixps.patch
new file mode 100644
index 000000000000..13b196f03e7e
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-fixps.patch
@@ -0,0 +1,19 @@
+--- contrib/fixps.in.orig	2004-12-20 00:11:40.000000000 +0100
++++ contrib/fixps.in	2004-12-20 00:14:12.000000000 +0100
+@@ -38,7 +38,7 @@
+ run_gs=0
+ # What action to perform: fixps, cat, check, and gs
+ task=fixps
+-tmpdir=/tmp/$program.$$
++tmpdir=`mktemp -d -t fixps.XXXXXX` || { echo "$program: Cannot create temporary dir!" >&2 ; exit 1; }
+ verbose=echo
+ 
+ # The version/usage strings
+@@ -191,7 +191,6 @@
+   trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
+ fi
+ 
+-mkdir $tmpdir
+ fixps_sed=$tmpdir/fixps.sed
+ 
+ # If printing from stdin, save into a tmp file
diff --git a/app-text/a2ps/files/a2ps-4.13c-psmandup.diff b/app-text/a2ps/files/a2ps-4.13c-psmandup.diff
new file mode 100644
index 000000000000..67f2fab826b3
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-psmandup.diff
@@ -0,0 +1,19 @@
+--- contrib/psmandup.in.orig	2004-12-20 00:16:07.000000000 +0100
++++ contrib/psmandup.in	2004-12-20 00:16:39.000000000 +0100
+@@ -36,7 +36,7 @@
+ message=
+ psselect=${PSSELECT:-psselect}
+ psset=${PSSET:-psset}
+-tmpdir=/tmp/$program.$$
++tmpdir=`mktemp -d -t fixps.XXXXXX` || { echo "$program: Cannot create temporary dir!" >&2 ; exit 1; }
+ 
+ # These two must be kept in synch.  They are opposed.
+ verbose=echo
+@@ -185,7 +185,6 @@
+   trap "/bin/rm -rf $tmpdir" 0 1 2 3 13 15
+ fi
+ 
+-mkdir $tmpdir
+ 
+ # If printing from stdin, save into a tmp file
+ if test $file = '-'; then
diff --git a/app-text/a2ps/files/digest-a2ps-4.13b-r5 b/app-text/a2ps/files/digest-a2ps-4.13b-r5
deleted file mode 100644
index 91bf8e85e0f3..000000000000
--- a/app-text/a2ps/files/digest-a2ps-4.13b-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-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.13b-r6 b/app-text/a2ps/files/digest-a2ps-4.13b-r6
deleted file mode 100644
index 91bf8e85e0f3..000000000000
--- a/app-text/a2ps/files/digest-a2ps-4.13b-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-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 b/app-text/a2ps/files/digest-a2ps-4.13c
deleted file mode 100644
index 4abfd89450cb..000000000000
--- a/app-text/a2ps/files/digest-a2ps-4.13c
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz 2395885
-MD5 e315466f75d99c0c1ca563d82f2ace2e a2ps-4.13c-ja_nls.patch.gz 38189
diff --git a/app-text/a2ps/files/digest-a2ps-4.13c-r2 b/app-text/a2ps/files/digest-a2ps-4.13c-r2
new file mode 100644
index 000000000000..cf77c579c407
--- /dev/null
+++ b/app-text/a2ps/files/digest-a2ps-4.13c-r2
@@ -0,0 +1 @@
+MD5 97164e84ba911e4604155507e0893669 a2ps-4.13c.tar.gz 2395885