Version bump. Add my patch to break infinite recursion if mailcap rule for

text/plain includes copiousoutput
(Portage version: 2.0.51.22-r2)

5 files changed, 59 insertions, 11 deletions

diff --git a/app-misc/run-mailcap/ChangeLog b/app-misc/run-mailcap/ChangeLog
index e3eace579e4e..d50c6be5dd71 100644
--- a/app-misc/run-mailcap/ChangeLog
+++ b/app-misc/run-mailcap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/run-mailcap
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/run-mailcap/ChangeLog,v 1.33 2005/05/06 03:30:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/run-mailcap/ChangeLog,v 1.34 2005/08/03 19:42:18 agriffis Exp $
+
+*run-mailcap-3.34_p1 (03 Aug 2005)
+
+  03 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/run-mailcap-breakrecursion.patch, +run-mailcap-3.34_p1.ebuild:
+  Version bump. Add my patch to break infinite recursion if mailcap rule for
+  text/plain includes copiousoutput
 
   06 May 2005; Sven Wegener <swegener@gentoo.org>
   run-mailcap-3.26_p1.ebuild, run-mailcap-3.28_p1.ebuild,
diff --git a/app-misc/run-mailcap/Manifest b/app-misc/run-mailcap/Manifest
index 86fa5485067c..ea526893c79a 100644
--- a/app-misc/run-mailcap/Manifest
+++ b/app-misc/run-mailcap/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e2f7179d6bfc67f238e81ab035677b7b run-mailcap-3.28_p1.ebuild 1041
+MD5 a924b8b2eddfad0b98c9a7d57550dcb7 run-mailcap-3.34_p1.ebuild 1076
 MD5 d1daa7badb28af30e026129166852add run-mailcap-3.26_p1.ebuild 1040
 MD5 cd942fe7eab592993da30a710e566ed1 run-mailcap-3.28_p1-r1.ebuild 1023
 MD5 967067b1d9c532f342e6ec8f3667e66f ChangeLog 3974
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+MD5 d0088d928007afcc0011634c7df6693c files/run-mailcap-breakrecursion.patch 419
 MD5 319537083b6740e7f97520fa740a4154 files/digest-run-mailcap-3.28_p1-r1 70
 MD5 0c15db34fcdaa0b84d2df607d75542fa files/digest-run-mailcap-3.26_p1 70
 MD5 319537083b6740e7f97520fa740a4154 files/digest-run-mailcap-3.28_p1 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCeuTDI1lqEGTUzyQRAkKBAJ4ifMrUWvdTt3A0mVubjYyOyHEHgwCfV8xP
-3LMv6oCHP41rcQYcLzoTono=
-=mOv7
------END PGP SIGNATURE-----
+MD5 68bdc7fe3ebfb096e4e5a102636cc400 files/digest-run-mailcap-3.34_p1 70
diff --git a/app-misc/run-mailcap/files/digest-run-mailcap-3.34_p1 b/app-misc/run-mailcap/files/digest-run-mailcap-3.34_p1
new file mode 100644
index 000000000000..eee012cc8624
--- /dev/null
+++ b/app-misc/run-mailcap/files/digest-run-mailcap-3.34_p1
@@ -0,0 +1 @@
+MD5 f592aaf259d4e6f67be3a40e715367bb mime-support_3.34-1.tar.gz 28707
diff --git a/app-misc/run-mailcap/files/run-mailcap-breakrecursion.patch b/app-misc/run-mailcap/files/run-mailcap-breakrecursion.patch
new file mode 100644
index 000000000000..326abd263ce1
--- /dev/null
+++ b/app-misc/run-mailcap/files/run-mailcap-breakrecursion.patch
@@ -0,0 +1,11 @@
+--- mime-support/run-mailcap.old	2005-08-03 15:36:00.000000000 -0400
++++ mime-support/run-mailcap	2005-08-03 15:37:41.000000000 -0400
+@@ -440,7 +440,7 @@
+ 				$fail++;
+ 				next;
+ 			}
+-		} elsif ($action eq 'view' && $match =~ m/;\s*copiousoutput\s*($|;)/) {
++		} elsif ($action eq 'view' && $match =~ m/;\s*copiousoutput\s*($|;)/ && $type ne 'text/plain') {
+ 			$comm .= " | $0 --action=$action text/plain:-";
+ 		}
+ 
diff --git a/app-misc/run-mailcap/run-mailcap-3.34_p1.ebuild b/app-misc/run-mailcap/run-mailcap-3.34_p1.ebuild
new file mode 100644
index 000000000000..4dae4d31726d
--- /dev/null
+++ b/app-misc/run-mailcap/run-mailcap-3.34_p1.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-misc/run-mailcap/run-mailcap-3.34_p1.ebuild,v 1.1 2005/08/03 19:42:18 agriffis Exp $
+
+inherit eutils
+
+MY_PV="${PV/_p/-}"
+DESCRIPTION="Execute programs via entries in the mailcap file"
+HOMEPAGE="http://packages.debian.org/unstable/net/mime-support.html"
+SRC_URI="mirror://debian/pool/main/m/mime-support/mime-support_${MY_PV}.tar.gz"
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE=""
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5.6
+	app-misc/mime-types"
+
+S=${WORKDIR}/mime-support
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/run-mailcap-breakrecursion.patch
+	sed -i run-mailcap -e 's:^\(\$xtermprgrm=\)"/usr/bin/x-terminal-emulator":\1$ENV{XTERMCMD} || "xterm":'
+}
+
+src_install() {
+	dobin run-mailcap
+	newman run-mailcap.man run-mailcap.1
+	newman mailcap.man mailcap.4
+	for i in compose edit see print; do
+		dosym run-mailcap /usr/bin/$i
+		dosym run-mailcap.1 /usr/share/man/man1/$i.1
+	done
+}