Fixed bugs 67810, 73492

8 files changed, 67 insertions, 11 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 0e7c7caec7db..198e7be46aef 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/qmail
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.20 2005/01/03 22:08:32 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.21 2005/01/04 21:35:13 hansmi Exp $
+
+  04 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  files/run-qmailpop3dlog, files/run-qmailqmqpdlog, files/run-qmailqmtpdlog,
+  files/run-qmailsendlog, files/run-qmailsmtpdlog,
+  +files/1.03-r16/double-bounce-trim.patch, qmail-1.03-r16.ebuild:
+  Added double-bounce-trim-patch from bug 67810. Fixed bug 73492.
 
   03 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r12.ebuild,
   qmail-1.03-r13.ebuild, qmail-1.03-r14.ebuild, qmail-1.03-r15.ebuild,
diff --git a/mail-mta/qmail/files/1.03-r16/double-bounce-trim.patch b/mail-mta/qmail/files/1.03-r16/double-bounce-trim.patch
new file mode 100644
index 000000000000..ad434bb150e2
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r16/double-bounce-trim.patch
@@ -0,0 +1,44 @@
+If you don't want doublebounces to hit your queue a second time
+(because you have, say, ten million mailboxes and as much legitimate
+email traffic and more spam), the following patch will immediately
+discard bouncing bounces.  Note that doublebounceto must start with a
+blank line; that is, it must have one newline in it.  A totally empty
+file means "use the default of 'posthamster'".
+
+This version was rewritten by Charles Cazabon from my original patch
+to include a man page, turn the patch around in the right direction,
+and emit its own message for the logfile.
+
+Apply this patch as so:
+
+cd /usr/local/src/qmail-1.03
+patch <doublebounce-trim.patch
+
+diff -urN qmail-1.03.orig/qmail-send.9 qmail-1.03.nodoublebounce/qmail-send.9
+--- qmail-1.03.orig/qmail-send.9        Mon Jun 15 04:53:16 1998
++++ qmail-1.03.nodoublebounce/qmail-send.9      Tue Sep  9 12:59:04 2003
+@@ -115,6 +115,10 @@
+ (If that bounces,
+ .B qmail-send
+ gives up.)
++As a special case, if the first line of
++.IR doublebounceto
++is blank (contains a single linefeed), qmail-send will not queue
++the double-bounce at all.
+ .TP 5
+ .I envnoathost
+ Presumed domain name for addresses without @ signs.
+diff -urN qmail-1.03.orig/qmail-send.c qmail-1.03.nodoublebounce/qmail-send.c
+--- qmail-1.03.orig/qmail-send.c        Mon Jun 15 04:53:16 1998
++++ qmail-1.03.nodoublebounce/qmail-send.c      Tue Sep  9 13:02:43 2003
+@@ -683,6 +683,8 @@
+   }
+  if (str_equal(sender.s,"#@[]"))
+    log3("triple bounce: discarding ",fn2.s,"\n");
++ else if (!*sender.s && *doublebounceto.s == '@')
++   log3("double bounce: discarding ",fn2.s,"\n");
+  else
+   {
+    if (qmail_open(&qqt) == -1)
+
+--9jxsPFA5p3P2qPhR--
diff --git a/mail-mta/qmail/files/run-qmailpop3dlog b/mail-mta/qmail/files/run-qmailpop3dlog
index 9e25905177eb..8046922bcc87 100644
--- a/mail-mta/qmail/files/run-qmailpop3dlog
+++ b/mail-mta/qmail/files/run-qmailpop3dlog
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Gentoo Startup script for qmail's POP3 daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailpop3dlog,v 1.3 2005/01/03 20:55:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailpop3dlog,v 1.4 2005/01/04 21:35:13 hansmi Exp $
 SERVICE=pop3
 source /var/qmail/bin/qmail-config-system && \
-exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
+eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/files/run-qmailqmqpdlog b/mail-mta/qmail/files/run-qmailqmqpdlog
index 2bcef3188e2a..dc95016b886a 100644
--- a/mail-mta/qmail/files/run-qmailqmqpdlog
+++ b/mail-mta/qmail/files/run-qmailqmqpdlog
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Gentoo Startup script for qmail's QMQP daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmqpdlog,v 1.3 2005/01/03 20:55:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmqpdlog,v 1.4 2005/01/04 21:35:13 hansmi Exp $
 SERVICE=qmqp
 source /var/qmail/bin/qmail-config-system && \
-exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
+eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/files/run-qmailqmtpdlog b/mail-mta/qmail/files/run-qmailqmtpdlog
index a27490ac960f..a08cd232782e 100644
--- a/mail-mta/qmail/files/run-qmailqmtpdlog
+++ b/mail-mta/qmail/files/run-qmailqmtpdlog
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Gentoo Startup script for qmail's QMTP daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmtpdlog,v 1.3 2005/01/03 20:55:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailqmtpdlog,v 1.4 2005/01/04 21:35:13 hansmi Exp $
 SERVICE=qmtp
 source /var/qmail/bin/qmail-config-system && \
-exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
+eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/files/run-qmailsendlog b/mail-mta/qmail/files/run-qmailsendlog
index f1604c936a5c..a4d5379fd1c3 100644
--- a/mail-mta/qmail/files/run-qmailsendlog
+++ b/mail-mta/qmail/files/run-qmailsendlog
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Gentoo Startup script for qmail's send daemon (logging)
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsendlog,v 1.3 2005/01/04 21:35:13 hansmi Exp $
 SERVICE=send
 source /var/qmail/bin/qmail-config-system && \
-exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
+eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/files/run-qmailsmtpdlog b/mail-mta/qmail/files/run-qmailsmtpdlog
index 2af080fabe31..1a0056bcb87e 100644
--- a/mail-mta/qmail/files/run-qmailsmtpdlog
+++ b/mail-mta/qmail/files/run-qmailsmtpdlog
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Gentoo Startup script for qmail's SMTP daemon (logging)
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsmtpdlog,v 1.3 2005/01/03 20:55:10 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/files/run-qmailsmtpdlog,v 1.4 2005/01/04 21:35:13 hansmi Exp $
 SERVICE=smtp
 source /var/qmail/bin/qmail-config-system && \
-exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
+eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST}
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index 45e6721f8ac7..fd0db77f5ef5 100644
--- a/mail-mta/qmail/qmail-1.03-r16.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.4 2005/01/03 22:08:32 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.5 2005/01/04 21:35:13 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -245,6 +245,10 @@ src_unpack() {
 	# Fixes bug 40521
 	epatch ${FILESDIR}/${PVR}/starttls-recordio.patch
 
+	# Add double-bounce-trim-patch from bug 45782
+	EPATCH_SINGLE_MSG="Adding double-bounce-trim-patch" \
+	epatch ${FILESDIR}/${PVR}/double-bounce-trim.patch
+
 	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"