fix bugs #41955, #43223

4 files changed, 148 insertions, 143 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index 5e0799776fbc..aff814f18f73 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/qmail
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.61 2004/02/18 14:38:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.62 2004/02/28 23:13:12 robbat2 Exp $
+
+  28 Feb 2004; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org>
+  qmail-1.03-r13.ebuild, files/1.03-r13/qmail-control:
+  fix bugs #41955, #43223
 
   18 Feb 2004; Aron Griffis <agriffis@gentoo.org> qmail-1.03-r15.ebuild:
   stable on ia64
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index b6bd7da7a50d..009e8c52616f 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -1,174 +1,174 @@
-MD5 a6e8748017c36f23056b54128e340eed ChangeLog 16448
+MD5 771f38806bdd07476d2abcda1f6a11db qmail-1.03-r14.ebuild 15802
+MD5 772daa1028eb151da8f4296cad432225 qmail-1.03-r11.ebuild 11397
+MD5 1ebc83e666cc242f2367d78456b3eb67 qmail-1.03-r9.ebuild 9931
+MD5 1e2357670e560180dfd8bd64aad20728 qmail-1.03-r13.ebuild 14083
+MD5 4354cf9a7f71df3d6d22c48f78b23ae2 qmail-1.03-r15.ebuild 16680
+MD5 9a43c345c7c50ebad0ed58cc711407da qmail-1.03-r10.ebuild 11119
+MD5 6c6fb74ae91b689f86d4aacc17c66765 qmail-1.03-r8.ebuild 8082
+MD5 0a96bc3cc02a2fd9d408d134efcf6801 qmail-1.03-r12.ebuild 13689
+MD5 cba486aae93d3c6e89aecb40134c5fbf ChangeLog 16605
 MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
-MD5 980e45a60dbbbd6cba71d49d323d9106 qmail-1.03-r10.ebuild 11120
-MD5 21b35cb77e64aac3de0c85dbe1df1e3c qmail-1.03-r11.ebuild 11398
-MD5 3043edc09319ff16bd111747b5fea7bf qmail-1.03-r12.ebuild 13690
-MD5 2fd82d453ce0096e14f16d12d9140f4f qmail-1.03-r8.ebuild 8083
-MD5 97d2870996d90dc5d57a819d6cd7e1ee qmail-1.03-r9.ebuild 9932
-MD5 79448dc8d1c2f66869cbfc50d74ebd78 qmail-1.03-r13.ebuild 14077
-MD5 b40516b6dde0fb60e4540158ab9d8df3 qmail-1.03-r14.ebuild 15803
-MD5 36dadfbfc5bb98969125f25dd03545a4 qmail-1.03-r15.ebuild 16681
-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 f376490154b9fce6c3d79640a7aed64e files/rc 280
+MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
+MD5 672badcf15d42d4ff53f12a20ca7f757 files/conf-send 231
+MD5 3e31356ccbb964e6547a3153c30830e2 files/run-qmailpop3d 879
+MD5 9d33faab35d172f3d7104556158155ca files/run-qmailqmqpd 838
+MD5 f770419f6908df6b43195fd81cdf8a2a files/run-qmailqmtpd 838
+MD5 4eca06650a83ebd55c6f9beb6603d977 files/run-qmailsmtpd 838
+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 de951f8e2ae43ef9037e15b2742929ec files/run-qmailqmqpdlog 315
+MD5 f602a790d5e211863fa7dfe9d5e22293 files/run-qmailqmtpdlog 315
 MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
 MD5 48a1e168db29ab4e6c57f1ac135ee2bf files/digest-qmail-1.03-r9 323
-MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224
 MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
-MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
-MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
-MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
-MD5 5c7739d0f34833a96b8deca39760ff84 files/rc 281
+MD5 3fc995c37cc6b6a43bf7c2bb7346458f files/qmail-genrsacert.sh 1161
+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 180a513f34e3f00abc609672a190072c files/99qmail 137
-MD5 9a3c97ca54bf30a001253b32a0ea99ce files/conf-common 2328
-MD5 ae70b77903aeace3588da0cde82310a3 files/conf-pop3d 1204
-MD5 7d366bc457f75a9611657682591ace7f files/conf-qmqpd 462
-MD5 b376d0368b26725d88653cc8c06b79c2 files/conf-qmtpd 554
-MD5 0fe6b91d3619fec6cabd4976268c1393 files/conf-send 232
-MD5 cbb1d75968624a4ead9b79e8ea248b02 files/conf-smtpd 1699
-MD5 f44f8ece70a335317e0e2e53b4b811af files/config-sanity-check 1220
 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 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850
-MD5 cdc7df908cdc8805931a2ba1f38aebec files/mkservercert 1426
-MD5 bf0e21db3cba72240cfe0d5405d68e85 files/qmail-config-system 1073
-MD5 ace61a03afe5e41478ededbaaa68198f files/qmail-genrsacert.sh 1162
-MD5 92810a5db8cc6eba0b9f31cb2fa0398c files/run-qmailpop3d 880
-MD5 f0cb3ba83f46f9660ac8b2af5aaba467 files/run-qmailpop3dlog 316
-MD5 bf900dd9bc5a803d3fba70c6fe67cb70 files/run-qmailqmqpd 839
-MD5 bdba96fffe177107ebd0f1bdfd2e17b9 files/run-qmailqmqpdlog 316
-MD5 507a7b1e87826bef619b06d656d96f6c files/run-qmailqmtpd 839
-MD5 53343335ba410f78117453f9a5c82209 files/run-qmailqmtpdlog 316
-MD5 268b8444295c3a461ae6d00277f68847 files/run-qmailsend 165
+MD5 f1caca4b81dff5a811af45555583598c files/run-qmailsmtpdlog 315
+MD5 263f635783752e960958cdfe92b72b8b files/conf-pop3d 1203
+MD5 9bf16b75da6a3d2fd712fa2e919ea222 files/conf-qmqpd 461
+MD5 83b4cd7dcf5aab8f72c47e8cefb1336d files/conf-qmtpd 553
+MD5 7bad1e9889c58773a5bfe5aea5247872 files/servercert.cnf 1094
+MD5 08340045d1ac7112a32a01d91c0ac7fa files/conf-smtpd 1698
+MD5 b91fe31bbd4d26219132d871e653de38 files/qmail-config-system 1072
 MD5 5ddcb673977385f4bfdc93a2d4e65162 files/run-qmailsendlog 143
-MD5 fd8e762f9e7b04610a939f105b15f57e files/run-qmailsmtpd 839
-MD5 dd0ab9ada888a6d5f176a48885558271 files/run-qmailsmtpdlog 316
-MD5 ae700b42d7bee192174d67615a634b89 files/servercert.cnf 1095
-MD5 cb4bafe4fe0260c575331b93a17e831b files/digest-qmail-1.03-r15 1564
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r10/dot_qmail 12
-MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r10/defaultdelivery 34
-MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r10/errno.patch 850
-MD5 a33acd5b72a4390c9b0d599a7b170ee7 files/1.03-r10/qmail-control 810
+MD5 d0847a866b79499bb21311a49ae0a0b6 files/mkservercert 1425
+MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
+MD5 c22e9634af5b10b1168889a2216d77c1 files/conf-common 2327
+MD5 e21afa3a603cd269050257241df8d8d1 files/config-sanity-check 1219
+MD5 a72db0af2fb1e4784c0faae4e0c08b7b files/run-qmailsend 164
+MD5 16a9a02133fa49ec4bce592221ddf304 files/run-qmailpop3dlog 315
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
+MD5 71aa0894c118dda3405f1f847944158c files/1.03-r8/qmail-queue.patch 1512
+MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r8/run-qmailsmtpd 231
+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 1c2205a92a554256aea046b37a02b939 files/1.03-r8/qmail-control 808
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r8/run-qmailsend 29
+MD5 71aa0894c118dda3405f1f847944158c files/1.03-r9/qmail-queue.patch 1512
+MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r9/run-qmailsmtpd 231
+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 8613299027c41cfcf7bab53417bbb270 files/1.03-r9/qmail-control 808
+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 0e97c0b031776f40cacdfbf3114af574 files/1.03-r10/run-qmailpop3dlog 97
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r10/run-qmailsend 29
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r10/run-qmailsendlog 96
 MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r10/run-qmailsmtpd 231
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r10/run-qmailsmtpdlog 97
+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 64197a14228076ba92cd033bc4798130 files/1.03-r11/conf-common 837
-MD5 180a513f34e3f00abc609672a190072c files/1.03-r11/99qmail 137
-MD5 1095fccd39b78e8534c0554c45d5b6f8 files/1.03-r11/conf-qmqpd 485
-MD5 d5d4a21a9048ec6dc580d3929e7dfd10 files/1.03-r11/conf-qmtpd 577
-MD5 5b2334c4a3d2490abec42ad84b398162 files/1.03-r11/conf-smtpd 338
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r11/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r11/dot_qmail 12
-MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r11/errno.patch 850
-MD5 f3ef132c6ead81c42cea91da37c4db73 files/1.03-r11/qmail-control 859
+MD5 8402bbc75216ce31cdea74a84e1ac2cd files/1.03-r10/qmail-control 809
+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 0e97c0b031776f40cacdfbf3114af574 files/1.03-r11/run-qmailpop3dlog 97
 MD5 2f110e27392d0ed6ba55d836c390e691 files/1.03-r11/run-qmailqmqpd 611
-MD5 249138d56492deb0f856849bc002e46a files/1.03-r11/run-qmailqmqpdlog 97
 MD5 dd55f8bfa444c07533725f67cb67dc50 files/1.03-r11/run-qmailqmtpd 611
-MD5 795f633858c0919b6e201cf2b845779e files/1.03-r11/run-qmailqmtpdlog 97
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r11/run-qmailsend 29
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r11/run-qmailsendlog 96
 MD5 12c2c3e9a03275a8e701b7719707f37a files/1.03-r11/run-qmailsmtpd 611
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r11/run-qmailsmtpdlog 97
+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 3a6ceb001139b6c9e8fd7477602c4165 files/1.03-r12/conf-common 1095
+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 8acdae540acadc91e99c66c2223a52e6 files/1.03-r11/conf-qmqpd 484
+MD5 503d4e725e4533cba8ba6eb9df32edac files/1.03-r11/conf-qmtpd 576
+MD5 5b2334c4a3d2490abec42ad84b398162 files/1.03-r11/conf-smtpd 338
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r11/run-qmailsendlog 96
+MD5 76af15d5058316eee26c7dd8e53d7acf files/1.03-r11/qmail-control 858
+MD5 c4dfed6db3b0b96b84bc7eb6c22aec08 files/1.03-r11/conf-common 836
+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 9661e311b06cf9e857e51554eb0d9467 files/1.03-r12/run-qmailpop3d 1176
+MD5 3de48c6d693f19bfeb464f823429e67e files/1.03-r12/run-qmailqmqpd 1165
+MD5 32fac368761cba2989d5aa49376f2846 files/1.03-r12/run-qmailqmtpd 1165
+MD5 ecf959be535f7207d82c06b7ae769114 files/1.03-r12/run-qmailsmtpd 1165
 MD5 180a513f34e3f00abc609672a190072c files/1.03-r12/99qmail 137
-MD5 a993cab8b077162680bb09fa8e5ed896 files/1.03-r12/bad-rcpt-noisy-patch 10388
-MD5 dda736a7fb5a56209abead6e840252e8 files/1.03-r12/badrcptto-morebadrcptto-accdias-gentoo 19322
-MD5 34f7596fc9a7dd82ac15d3219d530650 files/1.03-r12/conf-pop3d 1072
-MD5 e79f7c227fc10d6d653850d36abe319a files/1.03-r12/conf-qmqpd 471
-MD5 657bd64b1e3e9b9c784e60f3c41a7e91 files/1.03-r12/conf-qmtpd 563
-MD5 97dcc908045855f4615851c230c1d4c1 files/1.03-r12/conf-smtpd 1710
-MD5 75d59722b51a097bb3c09b5b5d5b5874 files/1.03-r12/config-sanity-check 815
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r12/dot_qmail 82
 MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r12/errno.patch 850
-MD5 546b88fd5657cae5ba8e0ae7257c8171 files/1.03-r12/maildir-quota-fix.patch 547
-MD5 9d4267c5dd8af7bc1a095a644368201c files/1.03-r12/qmail-control 859
 MD5 598b04b6274ef4d946a60a5d30fd95ff files/1.03-r12/qmail-remote-auth-login.patch 7504
-MD5 2a725c31201c59077cd389486407624f files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch 2131
-MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch 1433
-MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r12/rc 117
-MD5 4925f6854709734bf0e068060a6bdbfb files/1.03-r12/run-qmailpop3d 1177
-MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r12/run-qmailpop3dlog 97
-MD5 3ec92d93fe2d5557755ca83614f926ee files/1.03-r12/run-qmailqmqpd 1166
+MD5 546b88fd5657cae5ba8e0ae7257c8171 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 b4f227fd286e0a3df4a9299c56753271 files/1.03-r12/run-qmailqmtpd 1166
+MD5 a993cab8b077162680bb09fa8e5ed896 files/1.03-r12/bad-rcpt-noisy-patch 10388
 MD5 795f633858c0919b6e201cf2b845779e files/1.03-r12/run-qmailqmtpdlog 97
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r12/run-qmailsend 29
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r12/run-qmailsendlog 96
-MD5 42b44c0e7dd6afc184d526cd90d7a3e0 files/1.03-r12/run-qmailsmtpd 1166
+MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r12/dot_qmail 82
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r12/run-qmailsmtpdlog 97
-MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r12/smtp-auth-close3.patch 728
-MD5 3aed6f85eaec2d6380a2a148bb18c367 files/1.03-r13/conf-common 1095
+MD5 98c5a7c23416baf7c086b93ed586eb81 files/1.03-r12/conf-pop3d 1071
+MD5 53f8a798a9a11ef0352581244a7c1ad4 files/1.03-r12/conf-qmqpd 470
+MD5 7e3617ddb00abaa780f29cfdb838fd16 files/1.03-r12/conf-qmtpd 562
+MD5 1d7e48b17ef49117c4f975adf4757bf1 files/1.03-r12/conf-smtpd 1709
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r12/run-qmailsendlog 96
+MD5 2a725c31201c59077cd389486407624f files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch 2131
+MD5 fc7391f02934a9c75a92dce36229d590 files/1.03-r12/qmail-control 858
+MD5 dda736a7fb5a56209abead6e840252e8 files/1.03-r12/badrcptto-morebadrcptto-accdias-gentoo 19322
+MD5 2eb76f26c4ae70595f013d34519a41b8 files/1.03-r12/conf-common 1094
+MD5 aac562ac21608c8110340b31eec932e2 files/1.03-r12/config-sanity-check 814
+MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch 1433
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r12/run-qmailsend 29
+MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r12/run-qmailpop3dlog 97
+MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r13/rc 117
+MD5 9b155a2ee5b007f5b73dc2b7b74a5479 files/1.03-r13/run-qmailpop3d 1176
+MD5 4d68354d61f3ebde2284565dba6acb95 files/1.03-r13/run-qmailqmqpd 1165
+MD5 27ed92380dfeda24cbd1300e69a14aa5 files/1.03-r13/run-qmailqmtpd 1165
+MD5 2e4d0fc52fe4b044b5bbedc443bfa0ae files/1.03-r13/run-qmailsmtpd 1165
 MD5 180a513f34e3f00abc609672a190072c files/1.03-r13/99qmail 137
-MD5 9ff22287be03d0bc2b2df7de0e5fb8fc files/1.03-r13/conf-pop3d 1072
-MD5 1206c93f66f1b3b693e62b3c258056fb files/1.03-r13/conf-qmqpd 471
-MD5 cb6c94f6e67f0a56387b2414ee83e45e files/1.03-r13/conf-qmtpd 563
-MD5 396f7fdc43d67484bffb5df304eb7dc5 files/1.03-r13/conf-smtpd 1708
-MD5 44ac6d2c4dd5695e5c51d1b62e33916a files/1.03-r13/config-sanity-check 815
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r13/dot_qmail 82
 MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r13/errno.patch 850
 MD5 d45baac78eaa8ebcde16214655d05d21 files/1.03-r13/maildir-quota-fix.patch 547
-MD5 d2cf8d49ed92d2e2b8a2fb60297b873e files/1.03-r13/mkservercert 1435
-MD5 d84d620ea58527778b8e83d5fd33f37b files/1.03-r13/qmail-control 859
-MD5 27ac5d225776e4d7f87e979e3372ed97 files/1.03-r13/qmail-genrsacert.sh 1171
-MD5 2a725c31201c59077cd389486407624f files/1.03-r13/qmail-smtpd-esmtp-size-gentoo.patch 2131
-MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r13/qmail-smtpd-relay-reject.gentoo.patch 1433
-MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r13/rc 117
-MD5 5fb854cb6fc145630f26042b1b8bf8a8 files/1.03-r13/run-qmailpop3d 1177
-MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r13/run-qmailpop3dlog 97
-MD5 7e124f05e69b46e9ef28459cc44705f6 files/1.03-r13/run-qmailqmqpd 1166
+MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r13/smtp-auth-close3.patch 728
 MD5 249138d56492deb0f856849bc002e46a files/1.03-r13/run-qmailqmqpdlog 97
-MD5 d58e2d3a200d3f559ffb8c42c7988147 files/1.03-r13/run-qmailqmtpd 1166
 MD5 795f633858c0919b6e201cf2b845779e files/1.03-r13/run-qmailqmtpdlog 97
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r13/run-qmailsend 29
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r13/run-qmailsendlog 96
-MD5 f75591dc86bb54f0929b4a0f21e074f3 files/1.03-r13/run-qmailsmtpd 1166
+MD5 bda652bf331978ad291ad0cef31167dc files/1.03-r13/qmail-genrsacert.sh 1170
+MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r13/dot_qmail 82
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r13/run-qmailsmtpdlog 97
-MD5 369438aeb9dd9355df557eedca89ea8b files/1.03-r13/servercert.cnf 1104
-MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r13/smtp-auth-close3.patch 728
+MD5 5cd8bf9433959230cac597db56fc09c2 files/1.03-r13/conf-pop3d 1071
+MD5 77e5d77ee07503b5635d7ae32d0867f9 files/1.03-r13/conf-qmqpd 470
+MD5 4b8681487ba234b51333c6e67d878f0d files/1.03-r13/conf-qmtpd 562
+MD5 776bd8c07655f8b2d155bb73408530db files/1.03-r13/servercert.cnf 1103
+MD5 75a0493ec2aceeb0cbcda02bdd505f3c files/1.03-r13/conf-smtpd 1707
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r13/run-qmailsendlog 96
+MD5 7e6dbdfa1e3c30491d076eba152822ce files/1.03-r13/mkservercert 1434
+MD5 2a725c31201c59077cd389486407624f files/1.03-r13/qmail-smtpd-esmtp-size-gentoo.patch 2131
+MD5 b2417d1a1321f126fb13d6258adf1a5d files/1.03-r13/qmail-control 866
+MD5 ae80de3e5557744c2424f28f20bbec2b files/1.03-r13/conf-common 1094
+MD5 e316a51ae24c697944e54a52aa6e84ea files/1.03-r13/config-sanity-check 814
+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 658b97492286c6ec0f594ad1ed931d42 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 518aef241cd482233a3c07608e12276c files/1.03-r14/qmail-1.03-accept-5xx.tls.patch 882
-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 9fa1fc2153d5a4659ddf02d9e3a1f9ba files/1.03-r14/qmail-pop3d-stat.tls.patch 750
-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 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728
+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 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r8/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r8/dot_qmail 12
-MD5 f5508c8f592c8f7ce7dcfc4c5ed797d6 files/1.03-r8/qmail-1.03-starttls-smtp-auth.patch 41786
-MD5 8ca0f00a5f3404506b70f8f4420cafc9 files/1.03-r8/qmail-control 809
-MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r8/qmail-linksync.patch 1363
-MD5 71aa0894c118dda3405f1f847944158c files/1.03-r8/qmail-queue.patch 1512
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r8/run-qmailsend 29
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r8/run-qmailsendlog 96
-MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r8/run-qmailsmtpd 231
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r8/run-qmailsmtpdlog 97
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r9/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r9/dot_qmail 12
-MD5 f5508c8f592c8f7ce7dcfc4c5ed797d6 files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch 41786
-MD5 0b5b699aaf38366692d70ac3aa3a51e9 files/1.03-r9/qmail-control 809
-MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r9/qmail-linksync.patch 1363
-MD5 71aa0894c118dda3405f1f847944158c files/1.03-r9/qmail-queue.patch 1512
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r9/run-qmailsend 29
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r9/run-qmailsendlog 96
-MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r9/run-qmailsmtpd 231
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r9/run-qmailsmtpdlog 97
+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
diff --git a/net-mail/qmail/files/1.03-r13/qmail-control b/net-mail/qmail/files/1.03-r13/qmail-control
index da7fb7c17762..3a874ee78d0e 100644
--- a/net-mail/qmail/files/1.03-r13/qmail-control
+++ b/net-mail/qmail/files/1.03-r13/qmail-control
@@ -1,25 +1,25 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/1.03-r13/qmail-control,v 1.1 2003/10/27 09:42:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/1.03-r13/qmail-control,v 1.2 2004/02/28 23:13:12 robbat2 Exp $
 
 opts="start stop restart reload"
 
 start() {
     ebegin "Starting qmail mta ..."
-    svc -u /service/qmail-{smtpd,send,qmqp,qmtp}
+    svc -u /service/qmail-{smtpd,send,qmqpd,qmtpd}
     eend $?
     ebegin "Starting qmail mta logging ..."
-    svc -u /service/qmail-{smtpd,send,qmqp,qmtp}/log
+    svc -u /service/qmail-{smtpd,send,qmqpd,qmtpd}/log
     eend $?
 }
 
 stop() {
     ebegin "Stopping qmail mta ..."
-    svc -d /service/qmail-{smtpd,send,qmqp,qmtp}
+    svc -d /service/qmail-{smtpd,send,qmqpd,qmtpd}
     eend $?
     ebegin "Stopping qmail mta logging ..."
-    svc -d /service/qmail-{smtpd,send,qmqp,qmtp}/log
+    svc -d /service/qmail-{smtpd,send,qmqpd,qmtpd}/log
     eend $?
 }
 
diff --git a/net-mail/qmail/qmail-1.03-r13.ebuild b/net-mail/qmail/qmail-1.03-r13.ebuild
index 54f05c5a989a..b8a16bf13939 100644
--- a/net-mail/qmail/qmail-1.03-r13.ebuild
+++ b/net-mail/qmail/qmail-1.03-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r13.ebuild,v 1.8 2004/02/24 09:31:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r13.ebuild,v 1.9 2004/02/28 23:13:12 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -285,9 +285,10 @@ src_install() {
 		insinto /etc
 	done
 
+	insinto /etc
 	for i in smtp qmtp qmqp pop3; do
 		if [ -f ${FILESDIR}/tcp.${i}.sample ]; then
-			newins ${FILESDIR}/tcp.${i}.sample /etc/tcp.${i}
+			newins ${FILESDIR}/tcp.${i}.sample tcp.${i}
 		fi
 		if [ -f ${D}/etc/tcp.${i} ]; then
 			tcprules ${D}/etc/tcp.${i}.cdb ${D}/etc/.tcp.${i}.tmp \