Rediffed spp, mfcheck and logrelay patches.

(Portage version: 2.0.51-r15)

5 files changed, 171 insertions, 195 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 6863577cdcdd..586e4c11b9cf 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2005/02/14 12:26:31 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.33 2005/02/19 13:36:59 hansmi Exp $
+
+  19 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  -files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch,
+  qmail-1.03-r16.ebuild:
+  Rediffed spp, mfcheck and logrelay patches.
 
   14 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> files/conf-common,
   files/1.03-r12/conf-common, files/1.03-r13/conf-common:
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 5cb11c7e05f5..6eb0de456231 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,202 +1,190 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3de01cc671a41f525bc1ce3a931d4bc6 qmail-1.03-r14.ebuild 15864
-MD5 ec0055ae559be5595fb3e8dfe84f114b qmail-1.03-r16.ebuild 20750
 MD5 a3d959909e476f53a4e7ed0d97bc34e2 qmail-1.03-r11.ebuild 11434
-MD5 86b50181e45e60115feeed6215a06090 qmail-1.03-r9.ebuild 9934
-MD5 8881e21753593cfc096d3427d49c3a7d qmail-1.03-r13.ebuild 14403
-MD5 1696a3974a1398a5292afd8425669986 qmail-1.03-r15.ebuild 18022
-MD5 84d2ebc186e49c9a6d39a8f6adcf2f09 qmail-1.03-r10.ebuild 11158
 MD5 2e6df021a4a062f168f7c4ccb05f3576 qmail-1.03-r8.ebuild 8106
-MD5 5a269498e4e7f991cf792adde867f3c9 qmail-1.03-r12.ebuild 13758
-MD5 d8dca073199e65825667009f0fb740db ChangeLog 23476
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
-MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
-MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
+MD5 84d2ebc186e49c9a6d39a8f6adcf2f09 qmail-1.03-r10.ebuild 11158
+MD5 d8dca073199e65825667009f0fb740db ChangeLog 23476
+MD5 8bfcfe4aa57a4b241668e57bd1fd119b qmail-1.03-r16.ebuild 20538
+MD5 86b50181e45e60115feeed6215a06090 qmail-1.03-r9.ebuild 9934
+MD5 5a269498e4e7f991cf792adde867f3c9 qmail-1.03-r12.ebuild 13758
+MD5 3de01cc671a41f525bc1ce3a931d4bc6 qmail-1.03-r14.ebuild 15864
+MD5 1696a3974a1398a5292afd8425669986 qmail-1.03-r15.ebuild 18022
+MD5 8881e21753593cfc096d3427d49c3a7d qmail-1.03-r13.ebuild 14403
+MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
+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 1a4fbc35caee388c5ee4f7413ce63148 files/run-qmailsmtpdlog 321
+MD5 cb4bafe4fe0260c575331b93a17e831b files/digest-qmail-1.03-r14 1564
 MD5 836c401d53b4f1d40872dcb3c3ccbd46 files/conf-send 235
-MD5 5d982dc0db68c72cde9ce03f0da37ce4 files/run-qmailpop3d 909
-MD5 15cef40ec6b06900d3a2cbff9a2c0968 files/run-qmailqmqpd 839
+MD5 70f7b1f551a6dce51f65e2e8b7d7d37a files/run-qmailsend 165
+MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073
+MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
+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
+MD5 9cc72fa27c9643d8b7d8388d6e045d6f files/config-sanity-check 1296
+MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
 MD5 6e7b856c1034c00ee4ff63209c354c25 files/run-qmailsmtpd 839
-MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
-MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850
-MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
 MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224
-MD5 4ee8193d6da00d6930ecadb1e91fd964 files/run-qmailqmqpdlog 321
-MD5 f278840a9cd62309d70cb339fbf1f6a6 files/run-qmailqmtpdlog 321
+MD5 84f1655093d0de27bebc48111dddba5f files/conf-smtpd 1935
 MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
-MD5 48a1e168db29ab4e6c57f1ac135ee2bf files/digest-qmail-1.03-r9 323
+MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
+MD5 f278840a9cd62309d70cb339fbf1f6a6 files/run-qmailqmtpdlog 321
 MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
-MD5 6833866c14d955fee43d202f2c62151a files/qmail-genrsacert.sh 1165
-MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
-MD5 d6b150617bc5d76374fe010fc2902923 files/digest-qmail-1.03-r11 764
-MD5 0d96233f19a26e578c44e9d87f9e80eb files/digest-qmail-1.03-r12 1359
 MD5 0d96233f19a26e578c44e9d87f9e80eb files/digest-qmail-1.03-r13 1359
-MD5 cb4bafe4fe0260c575331b93a17e831b files/digest-qmail-1.03-r14 1564
-MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719
-MD5 a23b453ea7fc82666b99ca689f1cd21a files/digest-qmail-1.03-r16 1963
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/dot_qmail 82
-MD5 1a4fbc35caee388c5ee4f7413ce63148 files/run-qmailsmtpdlog 321
-MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207
-MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
-MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557
-MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
-MD5 84f1655093d0de27bebc48111dddba5f files/conf-smtpd 1935
-MD5 86afe93a8dea5d63c6642aea31bb7386 files/qmail-config-system 1073
-MD5 60de9dacc5289d44d64603d76e5ebc99 files/run-qmailsendlog 320
-MD5 24d7af84c757b2892e51d1f88a264983 files/mkservercert 1425
-MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
+MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
 MD5 fd098ab9ede9c74f209bf16e168ab185 files/conf-common 2328
-MD5 9cc72fa27c9643d8b7d8388d6e045d6f files/config-sanity-check 1296
-MD5 70f7b1f551a6dce51f65e2e8b7d7d37a files/run-qmailsend 165
 MD5 9867559d416bd731eed63709f5eef841 files/run-qmailpop3dlog 321
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
+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 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
+MD5 15cef40ec6b06900d3a2cbff9a2c0968 files/run-qmailqmqpd 839
+MD5 982627e4cebbd4b71f2d22d43c51367a files/digest-qmail-1.03-r16 2011
+MD5 c369664bce0646b3d323d08f9ba5b8ce files/dot_qmail 82
+MD5 cc5c84d3a0837007b8af4a1f2e657872 files/1.03-r14/auth-after-tls-only.patch 2151
+MD5 9fa1fc2153d5a4659ddf02d9e3a1f9ba files/1.03-r14/qmail-pop3d-stat.tls.patch 750
+MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r14/maildir-quota-fix.patch 547
+MD5 2a725c31201c59077cd389486407624f files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch 2131
+MD5 a8bfc3cf2c69e8e46b07a357a8572e5e files/1.03-r14/qmail-1.03-qregex-memleak-fix.patch 498
+MD5 d046c053c7dd353891dd6778000890bf files/1.03-r14/qmail-pop3d-capa-outputfix.patch 424
+MD5 518aef241cd482233a3c07608e12276c files/1.03-r14/qmail-1.03-accept-5xx.tls.patch 882
+MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616
+MD5 34a2e22386f4d11874e33b38576a7958 files/1.03-r14/qmail-gentoo-branding.patch 375
+MD5 a91645f4af61ce981e01ef84bc2ae7b6 files/1.03-r14/qmail-qmailqueue-docs.patch 1085
+MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728
+MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch 1433
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r8/run-qmailsmtpdlog 97
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r8/run-qmailsend 29
 MD5 71aa0894c118dda3405f1f847944158c files/1.03-r8/qmail-queue.patch 1512
+MD5 40f781a0a2aa618dd444e1fdc02322a1 files/1.03-r8/qmail-control 792
+MD5 f5508c8f592c8f7ce7dcfc4c5ed797d6 files/1.03-r8/qmail-1.03-starttls-smtp-auth.patch 41786
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
 MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r8/run-qmailsmtpd 231
+MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r8/qmail-linksync.patch 1363
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r8/run-qmailsendlog 96
 MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r8/defaultdelivery 34
-MD5 f5508c8f592c8f7ce7dcfc4c5ed797d6 files/1.03-r8/qmail-1.03-starttls-smtp-auth.patch 41786
 MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r8/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r8/run-qmailsmtpdlog 97
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r8/run-qmailsendlog 96
-MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r8/qmail-linksync.patch 1363
-MD5 40f781a0a2aa618dd444e1fdc02322a1 files/1.03-r8/qmail-control 792
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r8/run-qmailsend 29
+MD5 a963429b55bc3713ff3a22674101dfdb files/1.03-r16/auth-after-tls-only.patch 2241
+MD5 c0d3c5bd70a49284eb8cc8a5f952202e files/1.03-r16/Makefile-relaymxlookup.patch 1988
+MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571
+MD5 a1e8f454e96a2b23e9daae34fa6b6b5e files/1.03-r16/qmail-1.03-accept-5xx.tls.patch 930
+MD5 8f196c7649132af2c0c3745c1a5f1e9c files/1.03-r16/famd-dnotify.patch 555
+MD5 d48eeee899c7999925dd64afd4109269 files/1.03-r16/nullenvsender-recipcount.tls.patch 1479
+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 b968f9de39ff3cac7e6abbd8705af5f2 files/1.03-r16/qmail-smtpd-relay-reject.gentoo.patch 1206
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r9/run-qmailsmtpdlog 97
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r9/run-qmailsend 29
 MD5 71aa0894c118dda3405f1f847944158c files/1.03-r9/qmail-queue.patch 1512
+MD5 a732c539383e75f9aa9102644bd43689 files/1.03-r9/qmail-control 792
+MD5 f5508c8f592c8f7ce7dcfc4c5ed797d6 files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch 41786
 MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r9/run-qmailsmtpd 231
+MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r9/qmail-linksync.patch 1363
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r9/run-qmailsendlog 96
 MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r9/defaultdelivery 34
-MD5 f5508c8f592c8f7ce7dcfc4c5ed797d6 files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch 41786
 MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r9/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r9/run-qmailsmtpdlog 97
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r9/run-qmailsendlog 96
-MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r9/qmail-linksync.patch 1363
-MD5 a732c539383e75f9aa9102644bd43689 files/1.03-r9/qmail-control 792
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r9/run-qmailsend 29
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r10/rc 108
-MD5 ec7a73ba2bca7d6dd54ba92cf13136c9 files/1.03-r10/run-qmailpop3d 223
-MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r10/run-qmailsmtpd 231
-MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44
-MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r10/errno.patch 850
-MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r10/smtp-auth-close3.patch 535
-MD5 f7956b079a66a93e321d86071dd21d20 files/1.03-r10/tls-patch.txt 5803
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r10/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r10/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r10/run-qmailsmtpdlog 97
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r10/run-qmailsendlog 96
-MD5 dd5158b78a3878d78a68878f1910e0e4 files/1.03-r10/tls.patch.bz2 10458
-MD5 676a679be60e98c9f021af0e8d76bca5 files/1.03-r10/qmail-control 793
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r10/run-qmailsend 29
-MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r10/run-qmailpop3dlog 97
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r11/rc 108
-MD5 88f15101dd4bc36b52d13f336713e716 files/1.03-r11/run-qmailpop3d 221
-MD5 2f110e27392d0ed6ba55d836c390e691 files/1.03-r11/run-qmailqmqpd 611
-MD5 dd55f8bfa444c07533725f67cb67dc50 files/1.03-r11/run-qmailqmtpd 611
-MD5 12c2c3e9a03275a8e701b7719707f37a files/1.03-r11/run-qmailsmtpd 611
+MD5 180a513f34e3f00abc609672a190072c files/1.03-r13/99qmail 137
+MD5 a41b34d2ae83affe00e6ed7cc79802a7 files/1.03-r13/servercert.cnf 1107
+MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r13/errno.patch 850
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r13/run-qmailsmtpdlog 97
+MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r13/maildir-quota-fix.patch 547
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r13/run-qmailsend 29
+MD5 d6450da159ac93199409f1ae48eb6fc4 files/1.03-r13/conf-qmqpd 474
+MD5 249138d56492deb0f856849bc002e46a files/1.03-r13/run-qmailqmqpdlog 97
+MD5 79f431fc61196fa5a2269e7703a511a5 files/1.03-r13/run-qmailqmtpd 1169
+MD5 68cb94e965a5518e68712999557f7cd6 files/1.03-r13/conf-qmtpd 566
+MD5 2a725c31201c59077cd389486407624f files/1.03-r13/qmail-smtpd-esmtp-size-gentoo.patch 2131
+MD5 d4d25a1094931cdc4f939bddb3109284 files/1.03-r13/qmail-control 849
+MD5 df643e542586380cb57bfb621bc3d882 files/1.03-r13/config-sanity-check 818
+MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r13/rc 117
+MD5 e3bf545b5aa8085d5365c95b64eae83a files/1.03-r13/run-qmailsmtpd 1169
+MD5 a7de5b8b21d5f97743756461e5f9adc0 files/1.03-r13/conf-smtpd 1711
+MD5 795f633858c0919b6e201cf2b845779e files/1.03-r13/run-qmailqmtpdlog 97
+MD5 5f482075c109e26152ae16b9741ab042 files/1.03-r13/conf-common 1095
+MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r13/run-qmailpop3dlog 97
+MD5 f6156e29aa1734b8fd20945bc7a545bb files/1.03-r13/qmail-genrsacert.sh 1174
+MD5 87159a5cf497b8b87b149afbebdbde51 files/1.03-r13/run-qmailpop3d 1205
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r13/run-qmailsendlog 96
+MD5 c5d1d8b52fac875bd20438432e36d162 files/1.03-r13/mkservercert 1438
+MD5 4784d25306a62becc8e534fd102584ff files/1.03-r13/conf-pop3d 1075
+MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r13/smtp-auth-close3.patch 728
+MD5 912a9a4e61e3bcba06c1cde604611b08 files/1.03-r13/run-qmailqmqpd 1169
+MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r13/dot_qmail 82
+MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r13/qmail-smtpd-relay-reject.gentoo.patch 1433
 MD5 180a513f34e3f00abc609672a190072c files/1.03-r11/99qmail 137
 MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r11/errno.patch 850
-MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r11/smtp-auth-close3.patch 535
-MD5 249138d56492deb0f856849bc002e46a files/1.03-r11/run-qmailqmqpdlog 97
-MD5 795f633858c0919b6e201cf2b845779e files/1.03-r11/run-qmailqmtpdlog 97
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r11/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r11/dot_qmail 12
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r11/run-qmailsmtpdlog 97
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r11/run-qmailsend 29
 MD5 cdcfbce84f268800f8e2140a04740aaa files/1.03-r11/conf-qmqpd 488
+MD5 249138d56492deb0f856849bc002e46a files/1.03-r11/run-qmailqmqpdlog 97
+MD5 dd55f8bfa444c07533725f67cb67dc50 files/1.03-r11/run-qmailqmtpd 611
 MD5 6528a14c66966deb2cb6b1ddb2572167 files/1.03-r11/conf-qmtpd 580
-MD5 5b2334c4a3d2490abec42ad84b398162 files/1.03-r11/conf-smtpd 338
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r11/run-qmailsendlog 96
 MD5 0841858b17b70abd7324fa491e3153a7 files/1.03-r11/qmail-control 841
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r11/rc 108
+MD5 12c2c3e9a03275a8e701b7719707f37a files/1.03-r11/run-qmailsmtpd 611
+MD5 5b2334c4a3d2490abec42ad84b398162 files/1.03-r11/conf-smtpd 338
+MD5 795f633858c0919b6e201cf2b845779e files/1.03-r11/run-qmailqmtpdlog 97
 MD5 3b98f8ecb44ea7c2061549680413e860 files/1.03-r11/conf-common 840
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r11/run-qmailsend 29
 MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r11/run-qmailpop3dlog 97
-MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r12/rc 117
-MD5 498e8e07f957f387f644a6dbc092c9fc files/1.03-r12/run-qmailpop3d 1180
-MD5 b643468b77484854e9f293f9b1c2f111 files/1.03-r12/run-qmailqmqpd 1169
-MD5 361b679c2717dc0107314a1b27d0310f files/1.03-r12/run-qmailqmtpd 1169
-MD5 0a7a65aa157235088c05d22fd8fe201b files/1.03-r12/run-qmailsmtpd 1169
+MD5 88f15101dd4bc36b52d13f336713e716 files/1.03-r11/run-qmailpop3d 221
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r11/run-qmailsendlog 96
+MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r11/smtp-auth-close3.patch 535
+MD5 2f110e27392d0ed6ba55d836c390e691 files/1.03-r11/run-qmailqmqpd 611
+MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r11/defaultdelivery 34
+MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r11/dot_qmail 12
 MD5 180a513f34e3f00abc609672a190072c files/1.03-r12/99qmail 137
-MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r12/errno.patch 850
-MD5 598b04b6274ef4d946a60a5d30fd95ff files/1.03-r12/qmail-remote-auth-login.patch 7504
-MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r12/maildir-quota-fix.patch 547
-MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r12/smtp-auth-close3.patch 728
-MD5 249138d56492deb0f856849bc002e46a files/1.03-r12/run-qmailqmqpdlog 97
 MD5 a993cab8b077162680bb09fa8e5ed896 files/1.03-r12/bad-rcpt-noisy-patch 10388
-MD5 795f633858c0919b6e201cf2b845779e files/1.03-r12/run-qmailqmtpdlog 97
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r12/dot_qmail 82
+MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r12/errno.patch 850
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r12/run-qmailsmtpdlog 97
-MD5 53258542871dad6d71ea848237e19e19 files/1.03-r12/conf-pop3d 1075
+MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r12/maildir-quota-fix.patch 547
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r12/run-qmailsend 29
 MD5 b5c18c1311be2407aa04bc934463f27a files/1.03-r12/conf-qmqpd 474
+MD5 249138d56492deb0f856849bc002e46a files/1.03-r12/run-qmailqmqpdlog 97
+MD5 361b679c2717dc0107314a1b27d0310f files/1.03-r12/run-qmailqmtpd 1169
 MD5 94edf0a5bce24748695630f812dded2a files/1.03-r12/conf-qmtpd 566
-MD5 0d72a35a965e772b73fff14969377288 files/1.03-r12/conf-smtpd 1713
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r12/run-qmailsendlog 96
 MD5 2a725c31201c59077cd389486407624f files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch 2131
 MD5 157077927d26cf107005e41b8b5ae594 files/1.03-r12/qmail-control 841
-MD5 dda736a7fb5a56209abead6e840252e8 files/1.03-r12/badrcptto-morebadrcptto-accdias-gentoo 19322
-MD5 f70018992fcaa8c3df1f8172dc2536ad files/1.03-r12/conf-common 1095
+MD5 598b04b6274ef4d946a60a5d30fd95ff files/1.03-r12/qmail-remote-auth-login.patch 7504
 MD5 e5d2173b6d5d76cb2f51e440dba6a1d2 files/1.03-r12/config-sanity-check 818
-MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch 1433
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r12/run-qmailsend 29
+MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r12/rc 117
+MD5 0a7a65aa157235088c05d22fd8fe201b files/1.03-r12/run-qmailsmtpd 1169
+MD5 0d72a35a965e772b73fff14969377288 files/1.03-r12/conf-smtpd 1713
+MD5 795f633858c0919b6e201cf2b845779e files/1.03-r12/run-qmailqmtpdlog 97
+MD5 f70018992fcaa8c3df1f8172dc2536ad files/1.03-r12/conf-common 1095
 MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r12/run-qmailpop3dlog 97
-MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r13/rc 117
-MD5 87159a5cf497b8b87b149afbebdbde51 files/1.03-r13/run-qmailpop3d 1205
-MD5 912a9a4e61e3bcba06c1cde604611b08 files/1.03-r13/run-qmailqmqpd 1169
-MD5 79f431fc61196fa5a2269e7703a511a5 files/1.03-r13/run-qmailqmtpd 1169
-MD5 e3bf545b5aa8085d5365c95b64eae83a files/1.03-r13/run-qmailsmtpd 1169
-MD5 180a513f34e3f00abc609672a190072c files/1.03-r13/99qmail 137
-MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r13/errno.patch 850
-MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r13/maildir-quota-fix.patch 547
-MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r13/smtp-auth-close3.patch 728
-MD5 249138d56492deb0f856849bc002e46a files/1.03-r13/run-qmailqmqpdlog 97
-MD5 795f633858c0919b6e201cf2b845779e files/1.03-r13/run-qmailqmtpdlog 97
-MD5 f6156e29aa1734b8fd20945bc7a545bb files/1.03-r13/qmail-genrsacert.sh 1174
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r13/dot_qmail 82
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r13/run-qmailsmtpdlog 97
-MD5 4784d25306a62becc8e534fd102584ff files/1.03-r13/conf-pop3d 1075
-MD5 d6450da159ac93199409f1ae48eb6fc4 files/1.03-r13/conf-qmqpd 474
-MD5 68cb94e965a5518e68712999557f7cd6 files/1.03-r13/conf-qmtpd 566
-MD5 a41b34d2ae83affe00e6ed7cc79802a7 files/1.03-r13/servercert.cnf 1107
-MD5 a7de5b8b21d5f97743756461e5f9adc0 files/1.03-r13/conf-smtpd 1711
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r13/run-qmailsendlog 96
-MD5 c5d1d8b52fac875bd20438432e36d162 files/1.03-r13/mkservercert 1438
-MD5 2a725c31201c59077cd389486407624f files/1.03-r13/qmail-smtpd-esmtp-size-gentoo.patch 2131
-MD5 d4d25a1094931cdc4f939bddb3109284 files/1.03-r13/qmail-control 849
-MD5 5f482075c109e26152ae16b9741ab042 files/1.03-r13/conf-common 1095
-MD5 df643e542586380cb57bfb621bc3d882 files/1.03-r13/config-sanity-check 818
-MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r13/qmail-smtpd-relay-reject.gentoo.patch 1433
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r13/run-qmailsend 29
-MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r13/run-qmailpop3dlog 97
-MD5 cc5c84d3a0837007b8af4a1f2e657872 files/1.03-r14/auth-after-tls-only.patch 2151
-MD5 518aef241cd482233a3c07608e12276c files/1.03-r14/qmail-1.03-accept-5xx.tls.patch 882
-MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r14/maildir-quota-fix.patch 547
-MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728
-MD5 9fa1fc2153d5a4659ddf02d9e3a1f9ba files/1.03-r14/qmail-pop3d-stat.tls.patch 750
-MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616
-MD5 d046c053c7dd353891dd6778000890bf files/1.03-r14/qmail-pop3d-capa-outputfix.patch 424
-MD5 a8bfc3cf2c69e8e46b07a357a8572e5e files/1.03-r14/qmail-1.03-qregex-memleak-fix.patch 498
-MD5 34a2e22386f4d11874e33b38576a7958 files/1.03-r14/qmail-gentoo-branding.patch 375
-MD5 a91645f4af61ce981e01ef84bc2ae7b6 files/1.03-r14/qmail-qmailqueue-docs.patch 1085
-MD5 2a725c31201c59077cd389486407624f files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch 2131
-MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch 1433
-MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
-MD5 47aab2c1e0357f8cf6f173caeca60419 files/1.03-r15/tlsbeforeauth-fix.patch 969
+MD5 dda736a7fb5a56209abead6e840252e8 files/1.03-r12/badrcptto-morebadrcptto-accdias-gentoo 19322
+MD5 498e8e07f957f387f644a6dbc092c9fc files/1.03-r12/run-qmailpop3d 1180
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r12/run-qmailsendlog 96
+MD5 53258542871dad6d71ea848237e19e19 files/1.03-r12/conf-pop3d 1075
+MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r12/smtp-auth-close3.patch 728
+MD5 b643468b77484854e9f293f9b1c2f111 files/1.03-r12/run-qmailqmqpd 1169
+MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r12/dot_qmail 82
+MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch 1433
+MD5 118a42c2a167a1081ccd820f5b7f76db files/1.03-r15/spawn-alloc-h.patch 256
 MD5 3a5f3dbe17b1f4f4318b8941bb55743e files/1.03-r15/Makefile-relaymxlookup.patch 1947
 MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336
-MD5 118a42c2a167a1081ccd820f5b7f76db files/1.03-r15/spawn-alloc-h.patch 256
-MD5 a963429b55bc3713ff3a22674101dfdb files/1.03-r16/auth-after-tls-only.patch 2241
-MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571
-MD5 81330827d80408f9bb6eab01857849dc files/1.03-r16/starttls-recordio.patch 390
-MD5 a1e8f454e96a2b23e9daae34fa6b6b5e files/1.03-r16/qmail-1.03-accept-5xx.tls.patch 930
-MD5 8f196c7649132af2c0c3745c1a5f1e9c files/1.03-r16/famd-dnotify.patch 555
-MD5 d48eeee899c7999925dd64afd4109269 files/1.03-r16/nullenvsender-recipcount.tls.patch 1479
-MD5 72c4027c99c19158d4bbe3ed77efcae6 files/1.03-r16/double-bounce-trim.patch 1662
-MD5 c0d3c5bd70a49284eb8cc8a5f952202e files/1.03-r16/Makefile-relaymxlookup.patch 1988
-MD5 a8af4cf9b59e294737987624bc917e80 files/1.03-r16/smtpplugins 614
-MD5 fe189f1c8c28ae8b15bde3f8bb169997 files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch 454
-MD5 b968f9de39ff3cac7e6abbd8705af5f2 files/1.03-r16/qmail-smtpd-relay-reject.gentoo.patch 1206
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-Comment: Robbat2 @ Orbis-Terrarum Networks
-
-iD8DBQFCEJkGPpIsIjIzwiwRAlgMAKDyY/5GRxbR8KUTKJTKbpCj12cktACg0Lec
-DsuJ/tth7djrEb4He4Xv6vI=
-=B2Az
------END PGP SIGNATURE-----
+MD5 47aab2c1e0357f8cf6f173caeca60419 files/1.03-r15/tlsbeforeauth-fix.patch 969
+MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
+MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44
+MD5 dd5158b78a3878d78a68878f1910e0e4 files/1.03-r10/tls.patch.bz2 10458
+MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r10/errno.patch 850
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r10/run-qmailsmtpdlog 97
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r10/run-qmailsend 29
+MD5 676a679be60e98c9f021af0e8d76bca5 files/1.03-r10/qmail-control 793
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r10/rc 108
+MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r10/run-qmailsmtpd 231
+MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r10/run-qmailpop3dlog 97
+MD5 ec7a73ba2bca7d6dd54ba92cf13136c9 files/1.03-r10/run-qmailpop3d 223
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r10/run-qmailsendlog 96
+MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r10/smtp-auth-close3.patch 535
+MD5 f7956b079a66a93e321d86071dd21d20 files/1.03-r10/tls-patch.txt 5803
+MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r10/defaultdelivery 34
+MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r10/dot_qmail 12
diff --git a/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch b/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch
deleted file mode 100644
index 281b3df92727..000000000000
--- a/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- qmail-1.03.orig/qmail-smtpd.c	2004-11-14 00:55:37.069913288 +0100
-+++ qmail-1.03/qmail-smtpd.c	2004-11-14 00:55:37.072912832 +0100
-@@ -728,7 +728,11 @@
-   }
-   else
- #ifndef TLS
--    if (!addrallowed()) { err_nogateway(); return; }
-+    if (!addrallowed()) { 
-+      strerr_warn6("qmail-smtpd: Attempted relay from ",mailfrom.s," at ",remoteip," to ",addr.s,0);
-+      err_nogateway(); 
-+      return; 
-+    }
- #else
-     if (!addrallowed())
-      {
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r16 b/mail-mta/qmail/files/digest-qmail-1.03-r16
index 75c8a564189f..a5f6e09868fb 100644
--- a/mail-mta/qmail/files/digest-qmail-1.03-r16
+++ b/mail-mta/qmail/files/digest-qmail-1.03-r16
@@ -23,6 +23,7 @@ MD5 68e7697fd61d7cd9a5a7dc88ce2ecd47 netscape-progress.patch 1457
 MD5 598aca7a3a99426d1f49079172986b31 sendmail-ignore-N.patch 636
 MD5 2bd191cca4e640e87cca79bc0405f97a qmail-1.03-moreipme-0.6pre1-gentoo.patch 13942
 MD5 d9408411822973415ff10018ff4419be qmail-relaymxlookup-0.4.diff 3728
-MD5 d898fbb2b4cb259b208dbb8c9d8c47a9 gentoo-qmail-1.03-r16-mfcheck.3.patch 4223
-MD5 95692f3a7574f258489943ca9d09981a gentoo-qmail-1.03-r16-spp.034.patch 34568
+MD5 9b8c96c9636fe0fde3dbfbe092ee3e9b qmail-1.03-r16-spp.diff 34896
+MD5 bcdb312cb6bb5f7ec41eb350a064e70b qmail-1.03-r16-mfcheck.diff 3192
+MD5 bd7d61ba21c1f1d3b134c2e8cfec81c5 qmail-1.03-r16-logrelay.diff 619
 MD5 a6d05602399a51f6133c7ff19142b7c8 qmail-bounce-encap-20040210.patch 4238
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
index 9e62c4e97746..4e331c5cac5e 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.12 2005/01/27 19:19:29 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.13 2005/02/19 13:36:59 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -34,8 +34,9 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 	http://www-dt.e-technik.uni-dortmund.de/~ma/djb/qmail/sendmail-ignore-N.patch
 	mirror://gentoo/qmail-1.03-moreipme-0.6pre1-gentoo.patch
 	http://hansmi.ch/download/qmail/qmail-relaymxlookup-0.4.diff
-	mirror://gentoo/gentoo-qmail-1.03-r16-mfcheck.3.patch
-	mirror://gentoo/gentoo-qmail-1.03-r16-spp.034.patch
+	mirror://gentoo/qmail-1.03-r16-spp.diff
+	mirror://gentoo/qmail-1.03-r16-mfcheck.diff
+	mirror://gentoo/qmail-1.03-r16-logrelay.diff
 	http://www.finnie.org/software/qmail-bounce-encap/qmail-bounce-encap-20040210.patch
 	"
 # broken stuffs
@@ -218,16 +219,17 @@ src_unpack() {
 	# add SPP framework for future extensions. Once this has been tested, most
 	# other patches may be rewritten to add a SPP module instead of patching
 	# qmail-smtpd
-	#EPATCH_SINGLE_MSG="Adding SPP framework for qmail-smtpd" \
-	#epatch ${DISTDIR}/gentoo-qmail-${PVR}-spp.034.patch
+	EPATCH_SINGLE_MSG="Adding SPP framework for qmail-smtpd" \
+	epatch ${DISTDIR}/qmail-1.03-r16-spp.diff
 
 	# add mail from DNS check
-	#EPATCH_SINGLE_MSG="check envelope sender's domain for validity" \
-	#epatch ${DISTDIR}/gentoo-qmail-${PVR}-mfcheck.3.patch
+	EPATCH_SINGLE_MSG="check envelope sender's domain for validity" \
+	#EPATCH_OPTS="${EPATCH_OPTS} -F 3" \
+	epatch ${DISTDIR}/qmail-1.03-r16-mfcheck.diff
 
 	# log relay attempts
-	#EPATCH_SINGLE_MSG="log relay attempts" \
-	#epatch ${FILESDIR}/${PVR}/gentoo-qmail-${PVR}-logrelay.patch
+	EPATCH_SINGLE_MSG="log relay attempts" \
+	epatch ${DISTDIR}/qmail-1.03-r16-logrelay.diff
 
 	# Rediffed patch to prevent from the problem that qmail doesn't know
 	# that it is reachable under another IP address when using NAT.
@@ -260,11 +262,6 @@ src_unpack() {
 	EPATCH_SINGLE_MSG="Adding double-bounce-trim-patch" \
 	epatch ${FILESDIR}/${PVR}/double-bounce-trim.patch
 
-	# Fixes bug 40010
-	# TODO hansmi, 2005-01-06: no longer needed because auth-after-tls-only is fixed
-	#EPATCH_SINGLE_MSG="Fixing broken #ifdef's to #if (TLS && TLS_BEFORE_AUTH)" \
-	#epatch ${FILESDIR}/${PV}-r15/tlsbeforeauth-fix.patch
-
 	# Fix bug 49971
 	EPATCH_SINGLE_MSG="Applying fix for a special case with courier-imapd" \
 	epatch ${FILESDIR}/${PVR}/famd-dnotify.patch