Revision bump, apply patch to prevent opening /dev/tty when in batch mode. Closes #67150.

5 files changed, 110 insertions, 5 deletions

diff --git a/mail-filter/tmda/ChangeLog b/mail-filter/tmda/ChangeLog
index 59a1ebdcc733..ce227fa073a1 100644
--- a/mail-filter/tmda/ChangeLog
+++ b/mail-filter/tmda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/tmda
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v 1.9 2004/09/29 17:26:28 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v 1.10 2004/10/14 21:56:28 ticho Exp $
+
+*tmda-1.0.3-r3 (14 Oct 2004)
+
+  14 Oct 2004; Andrej Kacian <ticho@gentoo.org>
+  +files/tmda-1.0-non-interactive-tty.patch, +tmda-1.0.3-r3.ebuild:
+  Revision bump, apply patch to prevent opening /dev/tty when running in batch
+  mode. See bug #67150, reported by Jesse D. Guardiani <jesse@wingnet.net>.
 
 *tmda-1.0.3-r2 (29 Sep 2004)
 
diff --git a/mail-filter/tmda/Manifest b/mail-filter/tmda/Manifest
index ec8886371be1..f1b4838573e7 100644
--- a/mail-filter/tmda/Manifest
+++ b/mail-filter/tmda/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 135eb14b2636a4c5cfb6f0219a401321 ChangeLog 7755
+MD5 865ca732fbe3ec7ef734873545db4c1b ChangeLog 8058
 MD5 b054d3c7bd392afff7c8544079f8f3ae tmda-1.0.3-r2.ebuild 1662
 MD5 952475b22dac3406d5d71fdd44c6cde2 tmda-1.0-r1.ebuild 1634
 MD5 477c54625aa12fe135542e36d6939d51 tmda-1.0.3-r1.ebuild 1662
+MD5 5142d7cc8e674eb67d4fb1a6c706656b tmda-1.0.3-r3.ebuild 1782
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 427a0665420e32bc6408c1f67db8f374 tmda-1.0.ebuild 1503
 MD5 0067fa6df94b5c5f0dc272e72ff7d0d0 tmda-0.92.ebuild 1529
 MD5 16661ae384785cab84b49f1edeaf6ea6 tmda-1.0.3.ebuild 1531
 MD5 5953212bfef29b28dc63d4602b7fb9fc files/digest-tmda-1.0 57
+MD5 c7e7e04f751268e6e20f08b217c81e47 files/digest-tmda-1.0.3-r3 59
+MD5 228675d39b4c19f76460c3fd129f56b0 files/tmda-1.0-non-interactive-tty.patch 976
 MD5 5953212bfef29b28dc63d4602b7fb9fc files/digest-tmda-1.0-r1 57
 MD5 7bb9e7641e04129bd8f857fb7feb59e3 files/digest-tmda-0.92 58
 MD5 c7e7e04f751268e6e20f08b217c81e47 files/digest-tmda-1.0.3 59
@@ -19,7 +22,7 @@ MD5 19cf6a631b8348843ef86773c916d835 files/tmda-1.0-multipart-handling.patch 919
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBWvBN10xuJSrg3/sRAiz+AJsG9yqQByHE9//bIT3KMmNL3OQUEwCfUU+C
-w4S6mcRVtsaealas4uJtdVA=
-=MgUd
+iD8DBQFBbvYl10xuJSrg3/sRAhtYAJwLjlUPSVQdW6i6swxGS1AiS7wxkQCeMgCn
+pSaQFH9UuvOo6hg/dtJscfw=
+=CU4O
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/tmda/files/digest-tmda-1.0.3-r3 b/mail-filter/tmda/files/digest-tmda-1.0.3-r3
new file mode 100644
index 000000000000..ceb38dfa04d8
--- /dev/null
+++ b/mail-filter/tmda/files/digest-tmda-1.0.3-r3
@@ -0,0 +1 @@
+MD5 e5710270586d52444f5d94ecbb0f318f tmda-1.0.3.tgz 392608
diff --git a/mail-filter/tmda/files/tmda-1.0-non-interactive-tty.patch b/mail-filter/tmda/files/tmda-1.0-non-interactive-tty.patch
new file mode 100644
index 000000000000..3900c43dc1a4
--- /dev/null
+++ b/mail-filter/tmda/files/tmda-1.0-non-interactive-tty.patch
@@ -0,0 +1,31 @@
+--- TMDA/Pending.py.bak.20041011	2004-10-11 15:50:13.014474866 -0400
++++ TMDA/Pending.py	2004-10-11 16:06:02.640603837 -0400
+@@ -64,6 +64,7 @@
+         self.verbose = verbose
+         self.younger = younger
+         self.pretend = pretend
++        self.interactive = 0
+ 
+         self.stdout = sys.stdout
+ 
+@@ -86,8 +87,9 @@
+                     self.msgs.extend(line.strip().split())
+                 self.msgs.remove('-')
+                 # re-open stdin on the tty
+-                sys.stdin.close()
+-                sys.stdin = open('/dev/tty', 'r')
++                if self.interactive:
++                    sys.stdin.close()
++                    sys.stdin = open('/dev/tty', 'r')
+ 
+         if not self.msgs and not wantedstdin:
+             cwd = os.getcwd()
+@@ -341,6 +343,8 @@
+                        younger,
+                        pretend)
+ 
++        self.interactive = 1
++
+ 
+     def initQueue(self):
+         """Additionally initialize the interactive queue."""
diff --git a/mail-filter/tmda/tmda-1.0.3-r3.ebuild b/mail-filter/tmda/tmda-1.0.3-r3.ebuild
new file mode 100644
index 000000000000..5cc0638c2ea7
--- /dev/null
+++ b/mail-filter/tmda/tmda-1.0.3-r3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0.3-r3.ebuild,v 1.1 2004/10/14 21:56:28 ticho Exp $
+
+inherit eutils
+
+DESCRIPTION="Python-based SPAM reduction system"
+HOMEPAGE="http://www.tmda.net/"
+LICENSE="GPL-2"
+
+DEPEND=">=dev-lang/python-2.2
+	virtual/mta"
+
+SRC_URI="http://www.tmda.net/releases/stable/${P}.tgz"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc"
+IUSE=""
+
+src_compile () {
+	# Fix multipart mail handling. (See bug #60367)		-ticho
+	epatch ${FILESDIR}/tmda-1.0-multipart-handling.patch
+
+	# Do not open /dev/tty when in batch mode. (bug #67150) -ticho
+	epatch ${FILESDIR}/tmda-1.0-non-interactive-tty.patch
+
+	./compileall || die "tmda compilation failed"
+}
+
+src_install () {
+	# Figure out python version
+	# below hack should be replaced w/ pkg-config, when we get it working
+	local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
+
+	# Executables
+	dobin bin/tmda-*
+
+	# The Python TMDA module
+	insinto "/usr/lib/python${pv}/site-packages/TMDA"
+	doins TMDA/*.py*
+	insinto "/usr/lib/python${pv}/site-packages/TMDA/pythonlib/email"
+	doins TMDA/pythonlib/email/*.py*
+
+	# The templates
+	insinto /etc/tmda
+	doins templates/*.txt
+
+	# Documentation
+	dodoc COPYING ChangeLog README THANKS UPGRADE CRYPTO CODENAMES INSTALL
+	dohtml -r htdocs/*.html
+	dohtml -r htdocs/img
+
+	# Contributed binaries and stuff
+	cd ${S}/contrib
+
+	exeinto /usr/lib/tmda/contrib
+	doexe collectaddys def2html printcdb printdbm \
+	      sendit.sh smtp-check-sender update-internaldomains vadduser-tmda \
+	      vmailmgr-vdir.sh vpopmail-vdir.sh wrapfd3.sh
+
+	insinto /usr/lib/tmda/contrib
+	doins ChangeLog sample.config tmda.el tmda.spec \
+	      tofmipd.init tofmipd.sysconfig vtmdarc
+}