Integrated moreipme-patch

4 files changed, 151 insertions, 150 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 9361e7dbd720..bcc803f951a0 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/qmail
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.12 2004/11/17 07:02:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.13 2004/12/15 11:27:18 hansmi Exp $
+
+  15 Dec 2004; Michael Hanselmann <hansmi@gentoo.org> qmail-1.03-r15.ebuild:
+  Rediffed and integrated the moreipme-patch from Scott Gifford.
 
   17 Nov 2004; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r15.ebuild:
   RDEPEND for selinux, bug #62906.
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 0aaed5fe608c..7d3cce3b91f1 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,186 +1,177 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 414fc72e81c6331156dc186159478995 qmail-1.03-r14.ebuild 15791
 MD5 035e489d1b15d18e0a9c5edfbc780e10 qmail-1.03-r11.ebuild 11387
-MD5 1326fc29d4004be71ba6ea2898d23edc qmail-1.03-r9.ebuild 9889
-MD5 fee2da8e07fe53237fd81f4fd3e44039 qmail-1.03-r13.ebuild 14072
-MD5 1c6d466a6db8c2b4af62190284d90d98 qmail-1.03-r15.ebuild 16906
-MD5 56c3888ff57050f81ff0b4747e29e0ab qmail-1.03-r10.ebuild 11111
 MD5 99e11a3d000c4a33843a65fadc605c3f qmail-1.03-r8.ebuild 8062
-MD5 0339ddd1c43028c8a8c6ad53ac7008b3 qmail-1.03-r12.ebuild 13685
-MD5 14b32075514221df65dfc201019f995b ChangeLog 18866
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
-MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
-MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
+MD5 56c3888ff57050f81ff0b4747e29e0ab qmail-1.03-r10.ebuild 11111
+MD5 14b32075514221df65dfc201019f995b ChangeLog 18866
+MD5 1326fc29d4004be71ba6ea2898d23edc qmail-1.03-r9.ebuild 9889
+MD5 0339ddd1c43028c8a8c6ad53ac7008b3 qmail-1.03-r12.ebuild 13685
+MD5 414fc72e81c6331156dc186159478995 qmail-1.03-r14.ebuild 15791
+MD5 5b29220a5477b26eb321030e34ebe385 qmail-1.03-r15.ebuild 17213
+MD5 fee2da8e07fe53237fd81f4fd3e44039 qmail-1.03-r13.ebuild 14072
+MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
+MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
+MD5 f78805c8cc5af05c668df8c2380b9be6 files/digest-qmail-1.03-r15 1648
+MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
+MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850
+MD5 041e9e9ee360bc691a642048b54c1d5b files/run-qmailsmtpdlog 319
+MD5 cb4bafe4fe0260c575331b93a17e831b files/digest-qmail-1.03-r14 1564
 MD5 836c401d53b4f1d40872dcb3c3ccbd46 files/conf-send 235
-MD5 c5fe4a6ceb6786211e5953ede7437209 files/run-qmailpop3d 908
-MD5 0396cd9a5fc41ef7583548fa4a87fd86 files/run-qmailqmqpd 842
+MD5 d2aab8d06da2697ea72ef2c06e752414 files/run-qmailsend 168
+MD5 317fd1bccf34f09f57639e6ffbb1d8e5 files/qmail-config-system 1076
+MD5 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
+MD5 a57fd00fc0d3ab86cad0974853c9fa33 files/run-qmailqmqpdlog 319
 MD5 ba8f93b127ae78f3e2fd045d03c63396 files/run-qmailqmtpd 842
+MD5 9e5d2ac8b47e094d63eb620f5067446f files/conf-qmtpd 557
+MD5 d6b150617bc5d76374fe010fc2902923 files/digest-qmail-1.03-r11 764
+MD5 7f17bb21b4ada140e73809d6478a5544 files/config-sanity-check 1223
+MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
 MD5 8b50041a2bb1f630b728dd07b6940506 files/run-qmailsmtpd 842
-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 a57fd00fc0d3ab86cad0974853c9fa33 files/run-qmailqmqpdlog 319
-MD5 78e194c9fe61cab604d3d5a464965f72 files/run-qmailqmtpdlog 319
+MD5 5c22397958f313d4cc62239e3e90c188 files/conf-smtpd 1702
 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 78e194c9fe61cab604d3d5a464965f72 files/run-qmailqmtpdlog 319
 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 cb4bafe4fe0260c575331b93a17e831b files/digest-qmail-1.03-r15 1564
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/dot_qmail 82
-MD5 041e9e9ee360bc691a642048b54c1d5b files/run-qmailsmtpdlog 319
-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 5c22397958f313d4cc62239e3e90c188 files/conf-smtpd 1702
-MD5 317fd1bccf34f09f57639e6ffbb1d8e5 files/qmail-config-system 1076
-MD5 5ddcb673977385f4bfdc93a2d4e65162 files/run-qmailsendlog 143
-MD5 91b1a3e8204f46c743031bad44bb88bd files/mkservercert 1429
-MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
+MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
 MD5 490c49c812e7a04baadbbda6f4fc05b0 files/conf-common 2331
-MD5 7f17bb21b4ada140e73809d6478a5544 files/config-sanity-check 1223
-MD5 d2aab8d06da2697ea72ef2c06e752414 files/run-qmailsend 168
 MD5 0486e6491047bf8354f591ed0f536dd4 files/run-qmailpop3dlog 319
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
+MD5 6833866c14d955fee43d202f2c62151a files/qmail-genrsacert.sh 1165
+MD5 c5fe4a6ceb6786211e5953ede7437209 files/run-qmailpop3d 908
+MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
+MD5 48a1e168db29ab4e6c57f1ac135ee2bf files/digest-qmail-1.03-r9 323
+MD5 5ddcb673977385f4bfdc93a2d4e65162 files/run-qmailsendlog 143
+MD5 0d96233f19a26e578c44e9d87f9e80eb files/digest-qmail-1.03-r12 1359
+MD5 91b1a3e8204f46c743031bad44bb88bd files/mkservercert 1429
+MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207
+MD5 0396cd9a5fc41ef7583548fa4a87fd86 files/run-qmailqmqpd 842
+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 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 6b499ce5f62d185eb40a074fdfa03ece files/1.03-r13/conf-common 1098
+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 d6b7332d7cc88782939c3c4edbd79546 files/1.03-r12/conf-common 1098
+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 d6b7332d7cc88782939c3c4edbd79546 files/1.03-r12/conf-common 1098
 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 6b499ce5f62d185eb40a074fdfa03ece files/1.03-r13/conf-common 1098
-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 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 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-Comment: Robbat2 @ Orbis-Terrarum Networks
-
-iD8DBQFBmwXFPpIsIjIzwiwRAkuKAKDKo7J1auYvCDVP8Ql9nCkgkJFjGwCg1i/O
-9BvYLLwxn+8aEzeobSwSQJs=
-=QWYf
------END PGP SIGNATURE-----
+MD5 ec515313e6e1b665dfe437e2bf054eb0 files/1.03-r15/qmail-1.03-moreipme-0.6pre1-gentoo.patch 14014
+MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
+MD5 02e75ec63c3ff42ceb7e23841cb3b8f0 files/1.03-r15/qmail-1.03-moreipme-0.6pre1.patch 13114
+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/digest-qmail-1.03-r15 b/mail-mta/qmail/files/digest-qmail-1.03-r15
index 4d9be20c7e95..8643ac785604 100644
--- a/mail-mta/qmail/files/digest-qmail-1.03-r15
+++ b/mail-mta/qmail/files/digest-qmail-1.03-r15
@@ -21,3 +21,4 @@ MD5 ad597c93426c0938fdb36d853fbcf40d 08-capa.diff 1323
 MD5 00084ddd52a3665b65f2db20a773b382 qmail-hold-1.03.pat.gz 1596
 MD5 68e7697fd61d7cd9a5a7dc88ce2ecd47 netscape-progress.patch 1457
 MD5 598aca7a3a99426d1f49079172986b31 sendmail-ignore-N.patch 636
+MD5 2bd191cca4e640e87cca79bc0405f97a qmail-1.03-moreipme-0.6pre1-gentoo.patch 13942
diff --git a/mail-mta/qmail/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild
index e698718636a5..2d7a5e09e5ff 100644
--- a/mail-mta/qmail/qmail-1.03-r15.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.10 2004/11/17 07:02:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.11 2004/12/15 11:27:18 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
@@ -32,6 +32,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 	http://www.leverton.org/qmail-hold-1.03.pat.gz
 	mirror://qmail/netscape-progress.patch
 	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
 	"
 # broken stuffs
 #http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch
@@ -201,6 +202,11 @@ src_unpack() {
 		epatch ${FILESDIR}/${PVR}/qmail-macos-dns-fix.patch
 	fi
 
+	# Rediffed patch to prevent from a problem which can
+	# happen when using NAT. Rediffed by hansmi@gentoo.org.
+	# See http://www.suspectclass.com/~sgifford/qmail/qmail-moreipme-0.6.README
+	epatch ${DISTDIR}/qmail-1.03-moreipme-0.6pre1-gentoo.patch
+
 	echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc
 	if use ssl; then
 		einfo "Enabling SSL/TLS functionality"