Fixed bugs 67810, 73492

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 0e7c7caec7db0172ffee3f9631bfa6c2e3ea7ee1..198e7be46aef501f97359922d9476d1115072d26 100644 (file)
--- 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/Manifest b/mail-mta/qmail/Manifest
index 14dfa53dab38a920b0c983ddf42592ce0af9509a..f539f32a009e9d416519700ff62242bc00b500ab 100644 (file)
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -2,8 +2,8 @@ MD5 326c3d12fa42f7d77ec25d0034c6386c qmail-1.03-r11.ebuild 11387
 MD5 b29fd46e11237b9ee8c69b705a91b1bf qmail-1.03-r8.ebuild 8060
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 MD5 d18a1222087e80a39b2588e0f12e6e13 qmail-1.03-r10.ebuild 11111
-MD5 47695c1f6a82d2c961fbcdf3e33e24c2 ChangeLog 20713
-MD5 75b9b9d35949ea71b92d8063f11f9409 qmail-1.03-r16.ebuild 19355
+MD5 ca64c82e7ca1d334fb177927b2b8409d ChangeLog 21029
+MD5 e02137c4ecfe39e088025cf77e0163e4 qmail-1.03-r16.ebuild 19510
 MD5 48561c5b6846d4b381dfdd498b1955f4 qmail-1.03-r9.ebuild 9887
 MD5 a0cae8f720499509864d8c17c7aac5a3 qmail-1.03-r12.ebuild 13710
 MD5 f322d995494a3c1b6198916537b6b907 qmail-1.03-r14.ebuild 15817
@@ -14,13 +14,13 @@ MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
 MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719
 MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
 MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850
-MD5 967b7fc8c81ad203e8f376c60a140159 files/run-qmailsmtpdlog 316
+MD5 1a4fbc35caee388c5ee4f7413ce63148 files/run-qmailsmtpdlog 321
 MD5 cb4bafe4fe0260c575331b93a17e831b files/digest-qmail-1.03-r14 1564
 MD5 836c401d53b4f1d40872dcb3c3ccbd46 files/conf-send 235
 MD5 70f7b1f551a6dce51f65e2e8b7d7d37a files/run-qmailsend 165
 MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073
 MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
-MD5 fa4b2bbbfa9915866ae3f04063dd04bd files/run-qmailqmqpdlog 316
+MD5 4ee8193d6da00d6930ecadb1e91fd964 files/run-qmailqmqpdlog 321
 MD5 05c7891e3fde628aa9aada21a4d6eebe files/run-qmailqmtpd 839
 MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557
 MD5 d6b150617bc5d76374fe010fc2902923 files/digest-qmail-1.03-r11 764
@@ -31,17 +31,17 @@ MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224
 MD5 cb04143679bed2dbe504bcc922b78efc files/conf-smtpd 1875
 MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
 MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
-MD5 8a0617c35da5f6703ad17a74ca617a7e files/run-qmailqmtpdlog 316
+MD5 f278840a9cd62309d70cb339fbf1f6a6 files/run-qmailqmtpdlog 321
 MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
 MD5 0d96233f19a26e578c44e9d87f9e80eb files/digest-qmail-1.03-r13 1359
 MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
 MD5 490c49c812e7a04baadbbda6f4fc05b0 files/conf-common 2331
-MD5 8b155bdcd8ed957168b5180a915ee440 files/run-qmailpop3dlog 316
+MD5 9867559d416bd731eed63709f5eef841 files/run-qmailpop3dlog 321
 MD5 6833866c14d955fee43d202f2c62151a files/qmail-genrsacert.sh 1165
 MD5 5d982dc0db68c72cde9ce03f0da37ce4 files/run-qmailpop3d 909
 MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
 MD5 48a1e168db29ab4e6c57f1ac135ee2bf files/digest-qmail-1.03-r9 323
-MD5 c9017098b4721c4f68418d33236986c2 files/run-qmailsendlog 145
+MD5 60de9dacc5289d44d64603d76e5ebc99 files/run-qmailsendlog 320
 MD5 0d96233f19a26e578c44e9d87f9e80eb files/digest-qmail-1.03-r12 1359
 MD5 24d7af84c757b2892e51d1f88a264983 files/mkservercert 1425
 MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207
@@ -74,6 +74,7 @@ MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r8/dot_qmail 12
 MD5 aa1f60fd8b7d154da1e7d7a6fab422ce files/1.03-r16/Makefile-relaymxlookup.patch 1691
 MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571
 MD5 fe189f1c8c28ae8b15bde3f8bb169997 files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch 454
+MD5 72c4027c99c19158d4bbe3ed77efcae6 files/1.03-r16/double-bounce-trim.patch 1662
 MD5 a8af4cf9b59e294737987624bc917e80 files/1.03-r16/smtpplugins 614
 MD5 81330827d80408f9bb6eab01857849dc files/1.03-r16/starttls-recordio.patch 390
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r9/run-qmailsmtpdlog 97

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 (file)
index 0000000..ad434bb
--- /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 9e25905177eb20004f35c26fa6df15fda194983b..8046922bcc87aa38d7b01db96d0255c25c03f6d1 100644 (file)
--- 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 2bcef3188e2a8bcdc2ae8dfd8aa4908b54906ddb..dc95016b886a943e33f4487a785707ac451241c5 100644 (file)
--- 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 a27490ac960fb110994391065c0e9c2bafca113e..a08cd232782ef71a288b90e284bcd3e97d67b535 100644 (file)
--- 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 f1604c936a5c132519f0857a8168a37ea696d53b..a4d5379fd1c37ebece2550f835e4dbd67d513e40 100644 (file)
--- 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 2af080fabe312b235b3607a879d95ce2bf6753a1..1a0056bcb87e323571231e93e92d5593b049fc3a 100644 (file)
--- 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 45e6721f8ac707cf84aae7f6052f4755f427ec26..fd0db77f5ef5ac87df0ce331f47fc21a8887066b 100644 (file)
--- 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"