head/tails fixes in some patches.

massive update of tcprule stuff, moved to /etc/tcprules.d/ in new versions (the config file checks the new location first before falling back to the old location). -r15 does the move to the new tcprules location.
fix bug #34646 (again) in -r15.
fixed #36721 in all recent ebuilds.
fixed #38771 in main config stuff.

19 files changed, 745 insertions, 171 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index a6aab1c16a3a..4c673485b611 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-mail/qmail
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.54 2003/12/14 23:05:02 spider Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.55 2004/01/20 09:35:05 robbat2 Exp $
+
+  20 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild,
+  qmail-1.03-r13.ebuild, qmail-1.03-r14.ebuild, files/conf-common,
+  files/config-sanity-check, files/run-qmailpop3d, files/run-qmailqmqpd,
+  files/run-qmailqmtpd, files/run-qmailsmtpd, files/tcp.pop3.sample,
+  files/tcp.qmqp.sample, files/tcp.qmtp.sample, files/tcp.smtp.sample,
+  files/1.03-r10/tls-patch.txt,
+  files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch:
+  head/tails fixes in some patches. massive update of tcprule stuff, moved to
+  /etc/tcprules.d/ in new versions (the config file checks the new location
+  first before falling back to the old location). -r15 does the move to the new
+  tcprules location. fix bug #34646 (again) in -r15. fixed #36721 in all recent
+  ebuilds. fixed #38771 in main config stuff.
 
   15 Dec 2003; <spider@gentoo.org> files/gencert.sh,
   files/1.03-r8/qmail-1.03-starttls-smtp-auth.patch:
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index 0ddf4de940f0..f56679b5cd43 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -1,171 +1,174 @@
-MD5 04385f0d1ff641ccfca70dff5be8ada3 qmail-1.03-r8.ebuild 8115
-MD5 a5f9e30ddaa5bd516e541c9561279a04 ChangeLog 14849
+MD5 ee0a49c92ff4860919abedd0eff76371 qmail-1.03-r14.ebuild 15819
+MD5 ded2ff2bdb5763a3cca002f79425be66 qmail-1.03-r11.ebuild 11395
+MD5 bc20b8ab3977f5ae84b74e3c6eec2f3b qmail-1.03-r9.ebuild 9963
+MD5 803411d6c2e811660ad36475018d1d53 qmail-1.03-r13.ebuild 14085
+MD5 8dc2451f8a2e21d98ca5e209c2683eea qmail-1.03-r15.ebuild 16677
+MD5 4ec9b420e902b04f70b810720a5d5bd7 qmail-1.03-r10.ebuild 11151
+MD5 42789d45c1d7895767ef8d7007ac5caf qmail-1.03-r8.ebuild 8114
+MD5 77b31e1013dd31eb916f917233f4587f qmail-1.03-r12.ebuild 13689
+MD5 9b17a6a22f879367df9f65c9d9738913 ChangeLog 15650
 MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
-MD5 ca8c1fd3699356d5d50fc31c4465230f qmail-1.03-r10.ebuild 11152
-MD5 cbba5cbc6fe57034ed1b3c94ee0d8224 qmail-1.03-r11.ebuild 11396
-MD5 19583e871e259de34c1008437028b536 qmail-1.03-r12.ebuild 13625
-MD5 557c562d272a9947b9e21eeebd0d2906 qmail-1.03-r9.ebuild 9964
-MD5 fc1c0786c1dff2ddfed4b06347dbd22e qmail-1.03-r13.ebuild 14027
-MD5 ce655231667993d518d4b738d340647c qmail-1.03-r14.ebuild 15755
+MD5 f376490154b9fce6c3d79640a7aed64e files/rc 280
+MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
+MD5 672badcf15d42d4ff53f12a20ca7f757 files/conf-send 231
+MD5 11d8b48d6579e44639363c7c12306f1a files/run-qmailpop3d 879
+MD5 a3a09fe3fcdac5a43681822cd9d58fb3 files/run-qmailqmqpd 838
+MD5 e31065006801466486d3c367bfefaa28 files/run-qmailqmtpd 838
+MD5 2730d4d8cf40969895729389e4e2894a 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 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
+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 a1ac3318481064fc73553bec0cb8d554 files/digest-qmail-1.03-r12 1496
-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 55b519379b1330f57110fa6d60982cff files/tcp.pop3.sample 285
-MD5 e0686e52df7f0c840a7ac2bfe1fd291a files/tcp.qmqp.sample 337
-MD5 76d218a258e2ec859ab80c377351afce files/tcp.qmtp.sample 370
-MD5 946a715ffdd5e6d2d29c6fdfb29376dd files/tcp.smtp.sample 3726
 MD5 7078e735b0f3b50c8a3a7d08aa160aa3 files/digest-qmail-1.03-r13 1359
-MD5 30bfaccf0205a7d21569ae4e99ade7a2 files/conf-common 1658
-MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
-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 e5dfcebc0db5ee64778d28900d47c5ae files/config-sanity-check 1069
 MD5 8e2958f246aa212be1658f74d677338f 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 5c7739d0f34833a96b8deca39760ff84 files/rc 281
-MD5 2f5e3e99a5c50442afcbf5a10faa6b54 files/run-qmailpop3d 876
-MD5 f0cb3ba83f46f9660ac8b2af5aaba467 files/run-qmailpop3dlog 316
-MD5 6d15529a03930af69eb9022dd30b622d files/run-qmailqmqpd 841
-MD5 bdba96fffe177107ebd0f1bdfd2e17b9 files/run-qmailqmqpdlog 316
-MD5 ed3371349df63a2157ed64e99c3a8380 files/run-qmailqmtpd 841
-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 5cab74b19a5face7e1a220f9a5e93469 files/run-qmailsmtpd 841
-MD5 dd0ab9ada888a6d5f176a48885558271 files/run-qmailsmtpdlog 316
-MD5 ae700b42d7bee192174d67615a634b89 files/servercert.cnf 1095
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r10/defaultdelivery 34
-MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44
-MD5 a33acd5b72a4390c9b0d599a7b170ee7 files/1.03-r10/qmail-control 810
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r10/dot_qmail 12
-MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r10/errno.patch 850
+MD5 d0847a866b79499bb21311a49ae0a0b6 files/mkservercert 1425
+MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
+MD5 34267f8cd3c91f64c00972b775494e42 files/conf-common 2327
+MD5 beb4394344bc2ccba9cd169430ac8556 files/config-sanity-check 1193
+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 0e97c0b031776f40cacdfbf3114af574 files/1.03-r10/run-qmailpop3dlog 97
 MD5 ec7a73ba2bca7d6dd54ba92cf13136c9 files/1.03-r10/run-qmailpop3d 223
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r10/run-qmailsmtpdlog 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 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 b1a3fcd28ed415f92d775ac6fbe54dda files/1.03-r10/tls-patch.txt 5803
+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 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r11/defaultdelivery 34
-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 f3ef132c6ead81c42cea91da37c4db73 files/1.03-r11/qmail-control 859
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r11/dot_qmail 12
-MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r11/errno.patch 850
+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 0e97c0b031776f40cacdfbf3114af574 files/1.03-r11/run-qmailpop3dlog 97
 MD5 88f15101dd4bc36b52d13f336713e716 files/1.03-r11/run-qmailpop3d 221
-MD5 249138d56492deb0f856849bc002e46a files/1.03-r11/run-qmailqmqpdlog 97
 MD5 2f110e27392d0ed6ba55d836c390e691 files/1.03-r11/run-qmailqmqpd 611
-MD5 795f633858c0919b6e201cf2b845779e files/1.03-r11/run-qmailqmtpdlog 97
 MD5 dd55f8bfa444c07533725f67cb67dc50 files/1.03-r11/run-qmailqmtpd 611
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r11/run-qmailsmtpdlog 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 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 180a513f34e3f00abc609672a190072c files/1.03-r12/99qmail 137
-MD5 546b88fd5657cae5ba8e0ae7257c8171 files/1.03-r12/maildir-quota-fix.patch 547
-MD5 a993cab8b077162680bb09fa8e5ed896 files/1.03-r12/bad-rcpt-noisy-patch 10388
-MD5 34f7596fc9a7dd82ac15d3219d530650 files/1.03-r12/conf-pop3d 1072
-MD5 e79f7c227fc10d6d653850d36abe319a files/1.03-r12/conf-qmqpd 471
+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 dda736a7fb5a56209abead6e840252e8 files/1.03-r12/badrcptto-morebadrcptto-accdias-gentoo 19322
-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 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 c47d861aeef098d12d022d44c27386b5 files/1.03-r12/errno.patch 850
-MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r12/run-qmailpop3dlog 97
-MD5 9d4267c5dd8af7bc1a095a644368201c files/1.03-r12/qmail-control 859
-MD5 2a725c31201c59077cd389486407624f files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch 2131
 MD5 598b04b6274ef4d946a60a5d30fd95ff files/1.03-r12/qmail-remote-auth-login.patch 7504
-MD5 4925f6854709734bf0e068060a6bdbfb files/1.03-r12/run-qmailpop3d 1177
+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 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch 1433
-MD5 3ec92d93fe2d5557755ca83614f926ee files/1.03-r12/run-qmailqmqpd 1166
+MD5 a993cab8b077162680bb09fa8e5ed896 files/1.03-r12/bad-rcpt-noisy-patch 10388
 MD5 795f633858c0919b6e201cf2b845779e files/1.03-r12/run-qmailqmtpdlog 97
-MD5 b4f227fd286e0a3df4a9299c56753271 files/1.03-r12/run-qmailqmtpd 1166
+MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r12/dot_qmail 82
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r12/run-qmailsmtpdlog 97
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r12/run-qmailsend 29
+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 42b44c0e7dd6afc184d526cd90d7a3e0 files/1.03-r12/run-qmailsmtpd 1166
-MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r12/smtp-auth-close3.patch 728
-MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r8/qmail-linksync.patch 1363
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r8/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r8/dot_qmail 12
-MD5 8ca0f00a5f3404506b70f8f4420cafc9 files/1.03-r8/qmail-control 809
-MD5 71aa0894c118dda3405f1f847944158c files/1.03-r8/qmail-queue.patch 1512
-MD5 f5508c8f592c8f7ce7dcfc4c5ed797d6 files/1.03-r8/qmail-1.03-starttls-smtp-auth.patch 41786
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r8/run-qmailsmtpdlog 97
-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 abc975ae7274a2b5332231ba3f78db76 files/1.03-r9/qmail-linksync.patch 1363
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r9/defaultdelivery 34
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r9/dot_qmail 12
-MD5 0b5b699aaf38366692d70ac3aa3a51e9 files/1.03-r9/qmail-control 809
-MD5 71aa0894c118dda3405f1f847944158c files/1.03-r9/qmail-queue.patch 1512
-MD5 f42d6f2e58b7031ceb491820e85ddd16 files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch 41786
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r9/run-qmailsmtpdlog 97
-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 3aed6f85eaec2d6380a2a148bb18c367 files/1.03-r13/conf-common 1095
+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 b4c1c9313544bdf46aae688569137d91 files/1.03-r13/qmail-control 858
+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 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 d046c053c7dd353891dd6778000890bf files/1.03-r14/qmail-pop3d-capa-outputfix.patch 424
-MD5 9fa1fc2153d5a4659ddf02d9e3a1f9ba files/1.03-r14/qmail-pop3d-stat.tls.patch 750
 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 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728
+MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
diff --git a/net-mail/qmail/files/1.03-r10/tls-patch.txt b/net-mail/qmail/files/1.03-r10/tls-patch.txt
index 62d11e8d295f..11b29a778f89 100644
--- a/net-mail/qmail/files/1.03-r10/tls-patch.txt
+++ b/net-mail/qmail/files/1.03-r10/tls-patch.txt
@@ -35,7 +35,7 @@ Optional: - when DEBUG is defined, some extra TLS info will be logged
        	    qmail-smtpd. Periodical replacement can be done by crontab:
        	    01 01 * * *  umask 0077; /usr/local/ssl/bin/openssl genrsa \
        	     -out /var/qmail/control/rsa512.new 512 > /dev/null 2>&1 &&\
-       	     chown qmaild.qmail /var/qmail/control/rsa512.new && /bin/mv -f \
+       	     chown qmaild:qmail /var/qmail/control/rsa512.new && /bin/mv -f \
        	     /var/qmail/control/rsa512.new /var/qmail/control/rsa512.pem
           - server authentication:
             qmail-remote requires authentication from servers for which
diff --git a/net-mail/qmail/files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch b/net-mail/qmail/files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch
index 683aac888516..1a427fb55b62 100644
--- a/net-mail/qmail/files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch
+++ b/net-mail/qmail/files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch
@@ -66,7 +66,7 @@ diff -urP qmail-1.03-vanilla/Makefile qmail-1.03-tls-auth/Makefile
 +	-out /var/qmail/control/servercert.pem -days 366 \
 +	-keyout /var/qmail/control/servercert.pem
 +	chmod 640 /var/qmail/control/servercert.pem
-+	chown qmaild.qmail /var/qmail/control/servercert.pem
++	chown qmaild:qmail /var/qmail/control/servercert.pem
 +	ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem
 +
 +cert-req:
@@ -74,7 +74,7 @@ diff -urP qmail-1.03-vanilla/Makefile qmail-1.03-tls-auth/Makefile
 +	-out req.pem \
 +	-keyout /var/qmail/control/servercert.pem
 +	chmod 640 /var/qmail/control/servercert.pem
-+	chown qmaild.qmail /var/qmail/control/servercert.pem
++	chown qmaild:qmail /var/qmail/control/servercert.pem
 +	ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem
 +	@echo
 +	@echo "Send req.pem to your CA to obtain signed_req.pem, and do:"
diff --git a/net-mail/qmail/files/conf-common b/net-mail/qmail/files/conf-common
index 60566a2f37a9..c1231d2c6078 100644
--- a/net-mail/qmail/files/conf-common
+++ b/net-mail/qmail/files/conf-common
@@ -1,5 +1,5 @@
 # Common Configuration file for all qmail daemons
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/conf-common,v 1.1 2003/11/30 11:32:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/conf-common,v 1.2 2004/01/20 09:35:05 robbat2 Exp $
 
 # Qmail User IDS to run daemons as
 QMAILDUID=`id -u qmaild`
@@ -18,12 +18,22 @@ TCPSERVER_PORT=${SERVICE}
 # added later
 TCPSERVER_OPTS="-p -v"
 
+#  This tells tcpserver where to file the rules cdb file
+[ -d /etc/tcprules.d/ ] && TCPSERVER_RULESCDB=/etc/tcprules.d/tcp.qmail-${SERVICE}.cdb
+[ ! -f "${TCPSERVER_RULESCDB}" ] && TCPSERVER_RULESCDB=/etc/tcp.${SERVICE}.cdb
+
 # we limit data and stack segments to 8mbytes, you may need to raise this if
 # you are using a filter in QMAILQUEUE
 SOFTLIMIT_OPTS="-m 8000000"
 
-# We don't have anything to set QMAILQUEUE to at the moment, so we leave it alone
-#QMAILQUEUE=""
+# We don't have anything to set QMAILQUEUE to at the moment, so we leave it
+# alone Generally it is best to add this in your appropriate (usually SMTP) cdb
+# files /etc/tcp.*.cdb OR /etc/tcprules.d/tcp.qmail-*.cdb instead of on a
+# global basis, as otherwise outgoing mail will be checked (because qmail-queue
+# is used for most parts of qmail) You can also enable this per-server by just
+# placing it into the other configuration files by placing the line there
+# instead. Please note that the export part is important.
+#export QMAILQUEUE=""
 
 # tcpserver maximum concurrency, defaults to 40 in tcpserver
 # this controls the maximum number of incoming connections that it will accept
@@ -36,7 +46,7 @@ LOG_MAXCOUNT=10 # defaults to '10' if empty
 
 # build LOG_OPTS from this
 [ -n "${LOG_MAXSIZE}" ] && LOG_OPTS="${LOG_OPTS} s${LOG_MAXSIZE}"
-[ -n "${LOG_MAXCOUNT}" ] && LOG_OPTS="${LOG_OPTS} s${LOG_MAXCOUNT}"
+[ -n "${LOG_MAXCOUNT}" ] && LOG_OPTS="${LOG_OPTS} n${LOG_MAXCOUNT}"
 
 # directory to log to
 LOG_DEST=/var/log/qmail/qmail-${SERVICE}d
diff --git a/net-mail/qmail/files/config-sanity-check b/net-mail/qmail/files/config-sanity-check
index aad068af2a44..a4441163732e 100644
--- a/net-mail/qmail/files/config-sanity-check
+++ b/net-mail/qmail/files/config-sanity-check
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Configuration Sanity Checking for qmail
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/config-sanity-check,v 1.1 2003/11/30 11:32:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/config-sanity-check,v 1.2 2004/01/20 09:35:05 robbat2 Exp $
 # This is intended solely to stop qmail eating up all your hard disk space with logs
 
 CONFIG_SANITY_GOOD=1
@@ -22,8 +22,14 @@ if [ ! -f ${QMAIL_CONTROLDIR}/rcpthosts -a -z "${QMAIL_DISABLE_SANITY_CHECK}" -a
     CONFIG_SANITY_GOOD=0
 fi
 
+if [ ! -f "${TCPSERVER_RULESCDB}" ]; then
+    echo "No CDB file found (${TCPSERVER_RULESCDB})"
+    CONFIG_SANITY_GOOD=0
+fi
+
 if [ ! "${CONFIG_SANITY_GOOD}" -eq "1" ]; then
     echo "Some error detected, sleeping for 30 seconds for safety"
     sleep 30s
     exit 1
 fi
+
diff --git a/net-mail/qmail/files/digest-qmail-1.03-r15 b/net-mail/qmail/files/digest-qmail-1.03-r15
new file mode 100644
index 000000000000..4d9be20c7e95
--- /dev/null
+++ b/net-mail/qmail/files/digest-qmail-1.03-r15
@@ -0,0 +1,23 @@
+MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
+MD5 5a8d7a5863b0c56236af945dedd45754 qmailqueue-patch 2510
+MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546
+MD5 1d5b0aafb651ce2ad02aac6af80758c0 qmail-link-sync.patch 1403
+MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 9331
+MD5 999e360e4b1571663b995ce51f6e056e qmail-1.03-0.0.0.0-0.2.patch 734
+MD5 4e1f2d8315e7e2a5482798c9d19fac4d sendmail-flagf.patch 863
+MD5 122664c38338e5ec35fcac43f33d6927 qmail-1.03-qmtpc.patch 6197
+MD5 24fc1a33089faf12e00b127cd659f317 qmail-smtpd-relay-reject 1230
+MD5 ed5c0ddb6a5cc0386b1e04ced71d26ad qmail-local-tabs.patch 505
+MD5 413be7bb5b407c2964c3275c4d596947 qmail-maildir++.patch 43512
+MD5 d566e8bd99b33efee0194e855b8d6995 qmail-date-localtime.patch.txt 2603
+MD5 1c4518f780d231bde9745cdd0fa313b2 qmail-limit-bounce-size.patch.txt 1753
+MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104
+MD5 83bf5c4a4aade3c6c15faa9665ccfb71 qregex-starttls-2way-auth.patch 63825
+MD5 1d8b89607d35bfa409f8cfe6d23bc554 qmail-remote-auth-patch-doc.txt 1287
+MD5 fc00be3edc2827f1c93112d7d5147122 qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2 4524
+MD5 58d912de1ede57062fa8a3e2e0e75abf qmail-popupnofd2close.patch 401
+MD5 d7151dcbeb02eea1c24c1dedffe20e0b qmail-1.03-reread-concurrency.2.patch 1129
+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
diff --git a/net-mail/qmail/files/run-qmailpop3d b/net-mail/qmail/files/run-qmailpop3d
index 4578df832d76..358c98c21546 100644
--- a/net-mail/qmail/files/run-qmailpop3d
+++ b/net-mail/qmail/files/run-qmailpop3d
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Gentoo Startup script for qmail's POP3 daemon
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/run-qmailpop3d,v 1.1 2003/11/30 11:32:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/run-qmailpop3d,v 1.2 2004/01/20 09:35:05 robbat2 Exp $
 #
 # If you need to edit this file, please look at editing conf-pop3d and
 # conf-common first.  If you still need to change this file, you should
@@ -9,7 +9,8 @@
 SERVICE=pop3
 source /var/qmail/bin/qmail-config-system && \
 exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
-    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x /etc/tcp.${SERVICE}.cdb -c ${MAXCONN} \
+    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \
+    -c ${MAXCONN} \
     ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
     ${QMAIL_POP3_PREAUTH} /var/qmail/bin/qmail-popup ${QMAIL_POP3_POP3HOST} \
     ${QMAIL_POP3_CHECKPASSWORD} ${QMAIL_POP3_POSTAUTH} \
diff --git a/net-mail/qmail/files/run-qmailqmqpd b/net-mail/qmail/files/run-qmailqmqpd
index cbe6edf8ce00..7b56ab3f4665 100644
--- a/net-mail/qmail/files/run-qmailqmqpd
+++ b/net-mail/qmail/files/run-qmailqmqpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Gentoo Startup script for qmail's QMQP daemon
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/run-qmailqmqpd,v 1.1 2003/11/30 11:32:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/run-qmailqmqpd,v 1.2 2004/01/20 09:35:05 robbat2 Exp $
 #
 # If you need to edit this file, please look at editing conf-qmqpd and
 # conf-common first.  If you still need to change this file, you should
@@ -10,7 +10,7 @@ SERVICE=qmqp
 source /var/qmail/bin/qmail-config-system && \
 exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
     ${QMAIL_TCPSERVER_PRE} \
-    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x /etc/tcp.${SERVICE}.cdb \
+    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \
     -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \
     ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
     ${QMAIL_QMQP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_QMQP_POST} \
diff --git a/net-mail/qmail/files/run-qmailqmtpd b/net-mail/qmail/files/run-qmailqmtpd
index 2f26b18278d9..881a899e23c1 100644
--- a/net-mail/qmail/files/run-qmailqmtpd
+++ b/net-mail/qmail/files/run-qmailqmtpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Gentoo Startup script for qmail's QMTP daemon
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/run-qmailqmtpd,v 1.1 2003/11/30 11:32:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/run-qmailqmtpd,v 1.2 2004/01/20 09:35:05 robbat2 Exp $
 #
 # If you need to edit this file, please look at editing conf-qmtpd and
 # conf-common first.  If you still need to change this file, you should
@@ -10,7 +10,7 @@ SERVICE=qmtp
 source /var/qmail/bin/qmail-config-system && \
 exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
     ${QMAIL_TCPSERVER_PRE} \
-    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x /etc/tcp.${SERVICE}.cdb \
+    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \
     -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \
     ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
     ${QMAIL_QMTP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_QMTP_POST} \
diff --git a/net-mail/qmail/files/run-qmailsmtpd b/net-mail/qmail/files/run-qmailsmtpd
index f062ab8df56d..f49e7c9b1b3d 100644
--- a/net-mail/qmail/files/run-qmailsmtpd
+++ b/net-mail/qmail/files/run-qmailsmtpd
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Gentoo Startup script for qmail's SMTP daemon
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/run-qmailsmtpd,v 1.1 2003/11/30 11:32:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/files/run-qmailsmtpd,v 1.2 2004/01/20 09:35:05 robbat2 Exp $
 #
 # If you need to edit this file, please look at editing conf-smtpd and
 # conf-common first.  If you still need to change this file, you should
@@ -10,7 +10,7 @@ SERVICE=smtp
 source /var/qmail/bin/qmail-config-system && \
 exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
     ${QMAIL_TCPSERVER_PRE} \
-    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x /etc/tcp.${SERVICE}.cdb \
+    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \
     -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \
     ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
     ${QMAIL_SMTP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_SMTP_POST} \
diff --git a/net-mail/qmail/files/tcp.pop3.sample b/net-mail/qmail/files/tcp.pop3.sample
index 12405307c5f3..55df788cf074 100644
--- a/net-mail/qmail/files/tcp.pop3.sample
+++ b/net-mail/qmail/files/tcp.pop3.sample
@@ -1,7 +1,6 @@
 # to update the database after changing this file, run:
-# tcprules /etc/tcp.pop3.cdb /etc/.tcp.pop3.tmp < /etc/tcp.pop3
+# tcprules /etc/tcprules.d/tcp.qmail-pop3.cdb /etc/tcprules.d/.tcp.qmail-pop3.tmp < /etc/tcprules.d/tcp.qmail-pop3
 # Allow any client to connect to us via POP3
 # If people are abusing POP3 such as denial-of-service on POP3, 
 # you can add their ips here to block them out
 :allow
-
diff --git a/net-mail/qmail/files/tcp.qmqp.sample b/net-mail/qmail/files/tcp.qmqp.sample
index e8536f1f3163..da21632c950e 100644
--- a/net-mail/qmail/files/tcp.qmqp.sample
+++ b/net-mail/qmail/files/tcp.qmqp.sample
@@ -1,8 +1,8 @@
 # to update the database after changing this file, run:
-# tcprules /etc/tcp.qmqp.cdb /etc/.tcp.qmqp.tmp < /etc/tcp.qmqp
+# tcprules /etc/tcprules.d/tcp.qmail-qmqp.cdb /etc/tcprules.d/.tcp.qmail-qmqp.tmp < /etc/tcprules.d/tcp.qmail-qmqp
 # QMQP is a bulk protocol
 # and we don't want spam to ever come by it
 # and it is intended to go between a few servers only
 # so we don't trust any default people with it
-# see /etc/tcp.smtp.rules for more info
+# see /etc/tcprules.d/tcp.qmail-smtp for more info
 :deny
diff --git a/net-mail/qmail/files/tcp.qmtp.sample b/net-mail/qmail/files/tcp.qmtp.sample
index 825c3f11f1c0..48f77ca4e442 100644
--- a/net-mail/qmail/files/tcp.qmtp.sample
+++ b/net-mail/qmail/files/tcp.qmtp.sample
@@ -1,8 +1,15 @@
 # to update the database after changing this file, run:
-# tcprules /etc/tcp.qmtp.cdb /etc/.tcp.qmtp.tmp < /etc/tcp.qmtp
+# tcprules /etc/tcprules.d/tcp.qmail-qmtp.cdb /etc/tcprules.d/.tcp.qmail-qmtp.tmp < /etc/tcprules.d/tcp.qmail-qmtp
 # We trust QMTP connections just as SMTP by default
-# see /etc/tcp.smtp.rules for more info
+# see /etc/tcprules.d/tcp.qmail-smtp for more info
 # allow relaying from localhost
 127.0.0.1:allow,RELAYCLIENT="",RBLSMTPD=""
 # everybody else is not allowed to relay, and is subject to RBLSMTPD checks
 :allow
+
+# If you are using qmail-scanner, this line here is the correct one to use
+# instead (comment out the above ':allow' line FIRST) and applies that script
+# to any mail coming in that is not from a host allowed to relay. You can
+# change the value of the variable to any other value you desire to use custom
+# scripts for example.
+#:allow,QMAILQUEUE="/var/qmail/bin/qmail-scanner-queue.pl"
diff --git a/net-mail/qmail/files/tcp.smtp.sample b/net-mail/qmail/files/tcp.smtp.sample
index 5f339073c49e..a53d3b651d1a 100644
--- a/net-mail/qmail/files/tcp.smtp.sample
+++ b/net-mail/qmail/files/tcp.smtp.sample
@@ -1,5 +1,5 @@
 # to update the database after changing this file, run:
-# tcprules /etc/tcp.smtp.cdb /etc/.tcp.smtp.tmp < /etc/tcp.smtp
+# tcprules /etc/tcprules.d/tcp.qmail-smtp.cdb /etc/tcprules.d/.tcp.qmail-smtp.tmp < /etc/tcprules.d/tcp.qmail-smtp
 #------------------------------------------------------
 # DESCRIPTION OF THE RULES TO REMIND ME OF HOW THIS FILE WORKS
 #
@@ -81,3 +81,10 @@
 # but not allowed to relay
 # RBL lookups are performed
 :allow
+
+# If you are using qmail-scanner, this line here is the correct one to use
+# instead (comment out the above ':allow' line FIRST) and applies that script
+# to any mail coming in that is not from a host allowed to relay. You can
+# change the value of the variable to any other value you desire to use custom
+# scripts for example.
+#:allow,QMAILQUEUE="/var/qmail/bin/qmail-scanner-queue.pl"
diff --git a/net-mail/qmail/qmail-1.03-r12.ebuild b/net-mail/qmail/qmail-1.03-r12.ebuild
index e255db668b60..f98139295779 100644
--- a/net-mail/qmail/qmail-1.03-r12.ebuild
+++ b/net-mail/qmail/qmail-1.03-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-r12.ebuild,v 1.15 2003/11/06 20:17:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r12.ebuild,v 1.16 2004/01/20 09:35:05 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -113,7 +113,8 @@ src_unpack() {
 	# maildir++ quota system that is used by vpopmail and courier-imap
 	epatch ${DISTDIR}/qmail-maildir++.patch
 	# fix a typo in the patch
-	epatch ${FILESDIR}/${PV}-${PR}/maildir-quota-fix.patch
+	# upstream has changed the patch and this isn't needed anymore
+	#epatch ${FILESDIR}/${PV}-${PR}/maildir-quota-fix.patch
 
 	# Apply patch for local timestamps.
 	# This will make the emails headers be written in localtime rather than GMT
diff --git a/net-mail/qmail/qmail-1.03-r13.ebuild b/net-mail/qmail/qmail-1.03-r13.ebuild
index 89968f20bb13..2cf992220f48 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-2003 Gentoo Technologies, Inc.
+# 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.4 2003/11/29 07:14:28 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r13.ebuild,v 1.5 2004/01/20 09:35:05 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -113,7 +113,8 @@ src_unpack() {
 	# maildir++ quota system that is used by vpopmail and courier-imap
 	epatch ${DISTDIR}/qmail-maildir++.patch
 	# fix a typo in the patch
-	epatch ${FILESDIR}/${PV}-${PR}/maildir-quota-fix.patch
+	# upstream has changed the patch and this isn't needed anymore
+	#epatch ${FILESDIR}/${PV}-${PR}/maildir-quota-fix.patch
 
 	# Apply patch for local timestamps.
 	# This will make the emails headers be written in localtime rather than GMT
@@ -282,15 +283,16 @@ src_install() {
 		insinto /var/qmail/supervise/qmail-${i}/log
 		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i}log run
 		insinto /etc
+	done
+
+	for i in smtp qmtp qmqp pop3; do
 		if [ -f ${FILESDIR}/tcp.${i}.sample ]; then
 			newins ${FILESDIR}/tcp.${i}.sample /etc/tcp.${i}
 		fi
-		for i in smtp qmtp qmqp pop3; do
-			if [ -f ${D}/etc/tcp.${i} ]; then
-				tcprules ${D}/etc/tcp.${i}.cdb ${D}/etc/.tcp.${i}.tmp \
-					< ${D}/etc/tcp.${i}
-			fi
-		done
+		if [ -f ${D}/etc/tcp.${i} ]; then
+			tcprules ${D}/etc/tcp.${i}.cdb ${D}/etc/.tcp.${i}.tmp \
+			< ${D}/etc/tcp.${i}
+		fi
 	done
 
 	einfo "Installing the qmail startup file ..."
diff --git a/net-mail/qmail/qmail-1.03-r14.ebuild b/net-mail/qmail/qmail-1.03-r14.ebuild
index 815f4408af9e..5148664391bb 100644
--- a/net-mail/qmail/qmail-1.03-r14.ebuild
+++ b/net-mail/qmail/qmail-1.03-r14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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-r14.ebuild,v 1.3 2003/11/30 21:24:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r14.ebuild,v 1.4 2004/01/20 09:35:05 robbat2 Exp $
 
 inherit eutils fixheadtails
 
@@ -124,7 +124,8 @@ src_unpack() {
 	# maildir++ quota system that is used by vpopmail and courier-imap
 	epatch ${DISTDIR}/qmail-maildir++.patch
 	# fix a typo in the patch
-	epatch ${FILESDIR}/${PVR}/maildir-quota-fix.patch
+	# upstream has changed the patch and this isn't needed anymore
+	#epatch ${FILESDIR}/${PVR}/maildir-quota-fix.patch
 
 	# Apply patch for local timestamps.
 	# This will make the emails headers be written in localtime rather than GMT
diff --git a/net-mail/qmail/qmail-1.03-r15.ebuild b/net-mail/qmail/qmail-1.03-r15.ebuild
new file mode 100644
index 000000000000..32a64a95e38e
--- /dev/null
+++ b/net-mail/qmail/qmail-1.03-r15.ebuild
@@ -0,0 +1,501 @@
+# Copyright 1999-2003 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-r15.ebuild,v 1.1 2004/01/20 09:35:05 robbat2 Exp $
+
+inherit eutils fixheadtails
+
+IUSE="ssl noauthcram notlsbeforeauth"
+DESCRIPTION="A modern replacement for sendmail which uses maildirs and includes SSL/TLS, AUTH SMTP, and queue optimization"
+HOMEPAGE="http://www.qmail.org/
+	http://members.elysium.pl/brush/qmail-smtpd-auth/
+	http://www.jedi.claranet.fr/qmail-tuning.html"
+SRC_URI="mirror://qmail/${P}.tar.gz
+	mirror://qmail/qmailqueue-patch
+	http://qmail.null.dk/big-todo.103.patch
+	http://www.jedi.claranet.fr/qmail-link-sync.patch
+	mirror://qmail/big-concurrency.patch
+	http://www.suspectclass.com/~sgifford/qmail/qmail-1.03-0.0.0.0-0.2.patch
+	http://david.acz.org/software/sendmail-flagf.patch
+	mirror://qmail/qmail-1.03-qmtpc.patch
+	http://qmail.goof.com/qmail-smtpd-relay-reject
+	mirror://gentoo/qmail-local-tabs.patch
+	http://www.shupp.org/patches/qmail-maildir++.patch
+	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-date-localtime.patch.txt
+	ftp://ftp.pipeline.com.au/pipeint/sources/linux/WebMail/qmail-limit-bounce-size.patch.txt
+	http://www.ckdhr.com/ckd/qmail-103.patch
+	http://www.arda.homeunix.net/store/qmail/qregex-starttls-2way-auth.patch
+	http://www.soffian.org/downloads/qmail/qmail-remote-auth-patch-doc.txt
+	mirror://gentoo/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2
+	http://www.dataloss.nl/software/patches/qmail-popupnofd2close.patch
+	http://js.hu/package/qmail/qmail-1.03-reread-concurrency.2.patch
+	http://www.mcmilk.de/qmail/dl/djb-qmail/patches/08-capa.diff
+	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
+	"
+# broken stuffs
+#http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~mips"
+DEPEND="virtual/glibc
+	sys-apps/groff
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	>=net-mail/queue-fix-1.4-r1"
+
+RDEPEND="!virtual/mta
+	virtual/glibc
+	>=sys-apps/ucspi-tcp-0.88
+	>=sys-apps/daemontools-0.76-r1
+	>=net-mail/checkpassword-0.90
+	>=net-mail/cmd5checkpw-0.22
+	>=net-mail/dot-forward-0.71
+	>=net-mail/queue-fix-1.4-r1"
+
+PROVIDE="virtual/mta
+	 virtual/mda"
+
+S=${WORKDIR}/${P}
+
+#MY_PVR=${PVR}
+MY_PVR=${PV}-r14
+
+TCPRULES_DIR=/etc/tcprules.d
+
+src_unpack() {
+	# unpack the initial stuff
+	unpack ${P}.tar.gz
+
+	# This makes life easy
+	EPATCH_OPTS="-d ${S}"
+
+	# this patch merges a few others already
+	EPATCH_SINGLE_MSG="Adding SMTP AUTH (2 way), Qregex and STARTTLS support" \
+	epatch ${DISTDIR}/qregex-starttls-2way-auth.patch
+	# bug #30570
+	EPATCH_SINGLE_MSG="Fixing a memory leak in Qregex support" \
+	epatch ${FILESDIR}/${MY_PVR}/qmail-1.03-qregex-memleak-fix.patch
+
+	# Fixes a problem when utilizing "morercpthosts"
+	epatch ${FILESDIR}/${MY_PVR}/smtp-auth-close3.patch
+
+	# patch so an alternate queue processor can be used
+	# i.e. - qmail-scanner
+	EPATCH_SINGLE_MSG="Adding QMAILQUEUE support" \
+	epatch ${DISTDIR}/qmailqueue-patch
+	EPATCH_SINGLE_MSG="Adding QMAILQUEUE info to documentation" \
+	epatch ${FILESDIR}/${MY_PVR}/qmail-qmailqueue-docs.patch
+
+	# a patch for faster queue processing
+	EPATCH_SINGLE_MSG="Patching for large queues" \
+	epatch ${DISTDIR}/big-todo.103.patch
+
+	# Support for remote hosts that have QMTP
+	EPATCH_SINGLE_MSG="Adding support for remote QMTP hosts" \
+	epatch ${DISTDIR}/qmail-1.03-qmtpc.patch
+
+	# Large TCP DNS replies confuse it sometimes
+	EPATCH_SINGLE_MSG="Adding support for oversize DNS" \
+	epatch ${DISTDIR}/qmail-103.patch
+
+	# Fix for tabs in .qmail bug noted at
+	# http://www.ornl.gov/its/archives/mailing-lists/qmail/2000/10/msg00696.html
+	# gentoo bug #24293
+	epatch ${DISTDIR}/qmail-local-tabs.patch
+
+	# Account for Linux filesystems lack of a synchronus link()
+	epatch ${DISTDIR}/qmail-link-sync.patch
+
+	# Increase limits for large mail systems
+	epatch ${DISTDIR}/big-concurrency.patch
+
+	# Treat 0.0.0.0 as a local address
+	epatch ${DISTDIR}/qmail-1.03-0.0.0.0-0.2.patch
+
+	# Let the system decide how to define errno
+	epatch ${FILESDIR}/errno.patch
+
+	# holdremote support
+	# pre-process to remove the header added upstream
+	zcat ${DISTDIR}/qmail-hold-1.03.pat.gz | sed '123,150d' >${T}/qmail-hold-1.03.patch
+	epatch ${T}/qmail-hold-1.03.patch
+
+	# make the qmail 'sendmail' binary behave like sendmail's for -f
+	epatch ${DISTDIR}/sendmail-flagf.patch
+
+	# Apply patch to make qmail-local and qmail-pop3d compatible with the
+	# maildir++ quota system that is used by vpopmail and courier-imap
+	epatch ${DISTDIR}/qmail-maildir++.patch
+	# fix a typo in the patch
+	# upstream has changed the patch and this isn't needed anymore
+	#epatch ${FILESDIR}/${MY_PVR}/maildir-quota-fix.patch
+
+	# Apply patch for local timestamps.
+	# This will make the emails headers be written in localtime rather than GMT
+	# If you really want, uncomment it yourself, as mail really should be in GMT
+	epatch ${DISTDIR}/qmail-date-localtime.patch.txt
+
+	# Apply patch to trim large bouncing messages down greatly reduces traffic
+	# when multiple bounces occur (As in with spam)
+	epatch ${DISTDIR}/qmail-limit-bounce-size.patch.txt
+
+	# Apply patch to add ESMTP SIZE support to qmail-smtpd
+	# This helps your server to be able to reject excessively large messages
+	# "up front", rather than waiting the whole message to arrive and then
+	# bouncing it because it exceeded your databytes setting
+	epatch ${FILESDIR}/${MY_PVR}/qmail-smtpd-esmtp-size-gentoo.patch
+
+	#TODO TEST
+	# Reject some bad relaying attempts
+	# gentoo bug #18064
+	epatch ${FILESDIR}/${MY_PVR}/qmail-smtpd-relay-reject.gentoo.patch
+
+	#TODO TEST HEAVILY AS THIS PATCH WAS CUSTOM FIXED
+	# provide badrcptto support
+	# as per bug #17283
+	# patch re-diffed from original at http://sys.pro.br/files/badrcptto-morebadrcptto-accdias.diff.bz2
+	epatch ${DISTDIR}/qmail-gentoo-1.03-r12-badrcptto-morebadrcptto-accdias.diff.bz2
+
+	# bug #31426
+	# original submission by shadow@ines.ro, cleaned up by robbat2@gentoo.org
+	# only allows AUTH after STARTTLS, if compiled TLS && TLS_BEFORE_AUTH defines
+	epatch ${FILESDIR}/${MY_PVR}/auth-after-tls-only.patch
+
+	EPATCH_SINGLE_MSG="Enable stderr logging from checkpassword programs" \
+	epatch ${DISTDIR}/qmail-popupnofd2close.patch
+	EPATCH_SINGLE_MSG="Allow qmail to re-read concurrency limits on HUP" \
+	epatch ${DISTDIR}/qmail-1.03-reread-concurrency.2.patch
+	EPATCH_SINGLE_MSG="Add support for CAPA in POP3d" \
+	epatch ${DISTDIR}/08-capa.diff
+	EPATCH_SINGLE_MSG="Fixing output bug in CAPA-enabled POP3d" \
+	epatch ${FILESDIR}/${MY_PVR}/qmail-pop3d-capa-outputfix.patch
+	EPATCH_SINGLE_MSG="Fixing netscape progress bar bug with POP3d" \
+	epatch ${DISTDIR}/netscape-progress.patch
+
+	EPATCH_SINGLE_MSG="Making the sendmail binary ignore -N options for compatibility" \
+	epatch ${DISTDIR}/sendmail-ignore-N.patch
+
+	# rediff of original at http://www.qmail.org/accept-5xx.patch
+	epatch ${FILESDIR}/${MY_PVR}/qmail-1.03-accept-5xx.tls.patch
+
+	# rediffed from original at http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch
+	# because of TLS
+	EPATCH_SINGLE_MSG="Refuse messages from the null envelope sender if they have more than one envelope recipient" \
+	epatch ${FILESDIR}/${MY_PVR}/nullenvsender-recipcount.tls.patch
+
+	# rediffed from original at http://www.dataloss.nl/software/patches/qmail-pop3d-stat.patch
+	# because of TLS
+	EPATCH_SINGLE_MSG="qmail-pop3d reports erroneous figures on STAT after a DELE" \
+	epatch ${FILESDIR}/${MY_PVR}/qmail-pop3d-stat.tls.patch
+
+	EPATCH_SINGLE_MSG="Branding qmail with Gentoo identifier 'Gentoo Linux ${PF}'" \
+	epatch ${FILESDIR}/${MY_PVR}/qmail-gentoo-branding.patch
+	sed -e "s/__PF__/${PF}/" -i ${S}/qmail-smtpd.c
+
+	EPATCH_SINGLE_MSG="qmail-pop3d fix for top output so Evolution doesn't barf" \
+	epatch ${FILESDIR}/${PVR}/qmail-pop3d-top-outputfix.patch
+
+	echo -n "${CC} ${CFLAGS}" >${S}/conf-cc
+	if use ssl; then
+		einfo "Enabling SSL/TLS functionality"
+		echo -n ' -DTLS ' >>${S}/conf-cc
+
+		# from bug #31426
+		if ! use notlsbeforeauth; then
+			einfo "Enabling STARTTLS before SMTP AUTH"
+			echo -n '-DTLS_BEFORE_AUTH ' >>${S}/conf-cc
+		else
+			einfo "Disabling STARTTLS before SMTP AUTH"
+		fi
+
+	fi
+
+	# fix bug #33818
+	if use noauthcram; then
+		einfo "Disabling AUTHCRAM support"
+		sed -e 's,^#define AUTHCRAM$,//&,' -i ${S}/qmail-smtpd.c
+	else
+		einfo "Enabling AUTHCRAM support"
+	fi
+
+	echo -n "${CC} ${LDFLAGS}" > ${S}/conf-ld
+	echo -n "500" > ${S}/conf-spawn
+
+	# fix coreutils messup
+	ht_fix_file ${S}/Makefile
+
+}
+
+src_compile() {
+	emake it man || die
+}
+
+src_install() {
+
+	einfo "Setting up directory hierarchy ..."
+
+	diropts -m 755 -o root -g qmail
+	dodir /var/qmail
+
+	for i in bin boot control
+	do
+		dodir /var/qmail/${i}
+	done
+
+	keepdir /var/qmail/users
+
+	diropts -m 755 -o alias -g qmail
+	dodir /var/qmail/alias
+
+	einfo "Installing the qmail software ..."
+
+	insopts -o root -g qmail -m 755
+	insinto /var/qmail/boot
+	doins home home+df proc proc+df binm1 binm1+df binm2 \
+		binm2+df binm3 binm3+df
+
+	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
+	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION README* \
+		${DISTDIR}/qmail-remote-auth-patch-doc.txt
+
+	insinto /var/qmail/bin
+	insopts -o qmailq -g qmail -m 4711
+	doins qmail-queue
+
+	insopts -o root -g qmail -m 700
+	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
+
+	insopts -o root -g qmail -m 711
+	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
+	qmail-clean qmail-send splogger qmail-pw2u
+
+	insopts -o root -g qmail -m 755
+	doins qmail-inject predate datemail mailsubj qmail-showctl \
+	qmail-qread qmail-qstat qmail-tcpto qmail-tcpok qmail-pop3d \
+	qmail-popup qmail-qmqpc qmail-qmqpd qmail-qmtpd qmail-smtpd \
+	sendmail tcp-env qreceipt qsmhook qbiff forward preline \
+	condredirect bouncesaying except maildirmake maildir2mbox \
+	maildirwatch qail elq pinq config-fast qmail-newbrt
+
+	into /usr
+	einfo "Installing manpages"
+	doman *.[1-8]
+
+	# use the correct maildirmake
+	# the courier-imap one has some extensions that are nicer
+	[ -e /usr/bin/maildirmake ] && \
+		MAILDIRMAKE="/usr/bin/maildirmake" || \
+		MAILDIRMAKE="${D}/var/qmail/bin/maildirmake"
+
+	einfo "Adding env.d entry for qmail"
+	dodir /etc/env.d
+	insinto /etc/env.d
+	doins ${FILESDIR}/99qmail
+
+	einfo "Creating sendmail replacement ..."
+	diropts -m 755
+	dodir /usr/sbin /usr/lib
+	dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
+	dosym /var/qmail/bin/sendmail /usr/lib/sendmail
+
+	einfo "Setting up the default aliases ..."
+	diropts -m 700 -o alias -g qmail
+	${MAILDIRMAKE} ${D}/var/qmail/alias/.maildir
+	# for good measure
+	keepdir /var/qmail/alias/.maildir/{cur,new,tmp}
+
+	for i in mailer-daemon postmaster root
+	do
+		if [ ! -f ${ROOT}/var/qmail/alias/.qmail-${i} ]; then
+			touch ${D}/var/qmail/alias/.qmail-${i}
+			fowners alias:qmail /var/qmail/alias/.qmail-${i}
+		fi
+	done
+
+	einfo "Setting up maildirs by default in the account skeleton ..."
+	diropts -m 755 -o root -g root
+	insinto /etc/skel
+	newins ${FILESDIR}/dot_qmail .qmail.sample
+	fperms 644 /etc/skel/.qmail.sample
+	${MAILDIRMAKE} ${D}/etc/skel/.maildir
+	# for good measure
+	keepdir /etc/skel/.maildir/{cur,new,tmp}
+
+	einfo "Setting up all services (send, smtp, qmtp, qmqp, pop3) ..."
+	insopts -o root -g root -m 755
+	diropts -m 755 -o root -g root
+	dodir /var/qmail/supervise
+
+	for i in send smtpd qmtpd qmqpd pop3d; do
+		insopts -o root -g root -m 755
+		diropts -m 755 -o root -g root
+		dodir /var/qmail/supervise/qmail-${i}{,/log}
+		diropts -m 755 -o qmaill
+		keepdir /var/log/qmail/qmail-${i}
+		fperms +t /var/qmail/supervise/qmail-${i}{,/log}
+		insinto /var/qmail/supervise/qmail-${i}
+		newins ${FILESDIR}/run-qmail${i} run
+		insinto /var/qmail/supervise/qmail-${i}/log
+		newins ${FILESDIR}/run-qmail${i}log run
+	done
+
+	dodir ${TCPRULES_DIR}
+	insinto ${TCPRULES_DIR}
+	for i in smtp qmtp qmqp pop3; do
+		newins ${FILESDIR}/tcp.${i}.sample tcp.qmail-${i}
+	done
+
+	einfo "Installing the qmail startup file ..."
+	insinto /var/qmail
+	insopts -o root -g root -m 755
+	doins ${FILESDIR}/rc
+
+	einfo "Insalling some stock configuration files"
+	insinto /var/qmail/control
+	insopts -o root -g root -m 644
+	doins ${FILESDIR}/conf-*
+	newins ${FILESDIR}/dot_qmail defaultdelivery
+	use ssl && doins ${FILESDIR}/servercert.cnf
+
+	einfo "Configuration sanity checker and launcher"
+	into /var/qmail
+	insopts -o root -g root -m 644
+	dobin ${FILESDIR}/config-sanity-check
+	dobin ${FILESDIR}/qmail-config-system
+
+	if use ssl; then
+		einfo "SSL Certificate creation script"
+		dobin ${FILESDIR}/mkservercert
+		einfo "RSA key generation cronjob"
+		insinto /etc/cron.hourly
+		doins ${FILESDIR}/qmail-genrsacert.sh
+		chmod +x ${D}/etc/cron.hourly/qmail-genrsacert.sh
+
+		# for some files
+		keepdir /var/qmail/control/tlshosts/
+	fi
+}
+
+rootmailfixup() {
+	# so you can check mail as root easily
+	local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir"
+	if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then
+		einfo "Previously the qmail ebuilds created /root/.maildir/ but not"
+		einfo "mail was every delivered there. If the directory does not"
+		einfo "contain any mail, please delete it and run:"
+		einfo "${TMPCMD}"
+	else
+		${TMPCMD}
+	fi
+	chown -R alias:qmail ${ROOT}/var/qmail/alias/.maildir 2>/dev/null
+}
+
+buildtcprules() {
+	for i in smtp qmtp qmqp pop3; do
+		# please note that we don't check if it exists
+		# as we want it to make the cdb files anyway!
+		f=tcp.qmail-${i}
+		src=${ROOT}${TCPRULES_DIR}/${f}
+		cdb=${ROOT}${TCPRULES_DIR}/${f}.cdb
+		tmp=${ROOT}${TCPRULES_DIR}/.${f}.tmp
+		cat ${src} 2>/dev/null | tcprules ${cdb} ${tmp}
+	done
+}
+
+pkg_postinst() {
+
+	einfo "Setting up the message queue hierarchy ..."
+	# queue-fix makes life easy!
+	/var/qmail/bin/queue-fix ${ROOT}/var/qmail/queue >/dev/null
+
+	rootmailfixup
+	buildtcprules
+
+	# for good measure
+	env-update
+
+	einfo "To setup qmail to run out-of-the-box on your system, run:"
+	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	echo
+	einfo "To start qmail at boot you have to add svscan to your startup"
+	einfo "and create the following links:"
+	einfo "ln -s /var/qmail/supervise/qmail-send /service/qmail-send"
+	einfo "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd"
+	echo
+	einfo "To start the pop3 server as well, create the following link:"
+	einfo "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d"
+	echo
+	einfo "Additionally, the QMTP and QMQP protocols are supported, "
+	einfo "and can be started as:"
+	einfo "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd"
+	einfo "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd"
+	echo
+	einfo "Additionally, if you wish to run qmail right now, you should "
+	einfo "run this before anything else:"
+	einfo "source /etc/profile"
+}
+
+pkg_preinst() {
+	mkdir -p ${TCPRULES_DIR}
+	for proto in smtp qmtp qmqp pop3; do
+		for ext in '' .cdb; do
+			old="/etc/tcp.${proto}${ext}"
+			new="${TCPRULES_DIR}/tcp.qmail-${proto}${ext}"
+			fail=0
+			if [ -f "$old" -a ! -f "$new"]; then
+				einfo "Moving $old to $new"
+				cp $old $new || fail=1
+			else
+				fail=1
+			fi
+			if [ "${fail}" = "1" ]; then
+				eerror "Error moving $old to $new, be sure to check the"
+				eerror "configuration! You may have already moved the files,"
+				eerror "in which case you can delete $old"
+			fi
+		done
+	done
+}
+
+pkg_config() {
+
+	# avoid some weird locale problems
+	export LC_ALL="C"
+
+	if [ ${ROOT} = "/" ] ; then
+		if [ ! -f ${ROOT}var/qmail/control/me ] ; then
+			export qhost=`hostname --fqdn`
+			${ROOT}var/qmail/bin/config-fast $qhost
+		fi
+	else
+		ewarn "Skipping some configuration as it MUST be run on the final host"
+	fi
+
+	einfo "Accepting relaying by default from all ips configured on this machine."
+	LOCALIPS=`/sbin/ifconfig  | grep inet | cut -d' ' -f 12 -s | cut -b 6-20`
+	TCPSTRING=":allow,RELAYCLIENT=\"\",RBLSMTPD=\"\""
+	for ip in $LOCALIPS; do
+		myline="${ip}${TCPSTRING}"
+		for proto in smtp qmtp qmqp; do
+			f="${ROOT}${TCPRULES_DIR}/tcp.qmail-${proto}"
+			egrep -q "${myline}" ${f} || echo "${myline}" >>${f}
+		done
+	done
+
+	buildtcprules
+
+	if use ssl; then
+		${ROOT}etc/cron.daily/qmail-genrsacert.sh
+		einfo "Creating a self-signed ssl-certificate:"
+		/var/qmail/bin/mkservercert
+		einfo "If you want to have a properly signed certificate "
+		einfo "instead, do the following:"
+		einfo "openssl req -new -nodes -out req.pem \\"
+		einfo "-config /var/qmail/control/servercert.cnf \\"
+		einfo "-keyout /var/qmail/control/servercert.pem"
+		einfo "Send req.pem to your CA to obtain signed_req.pem, and do:"
+		einfo "cat signed_req.pem >> /var/qmail/control/servercert.pem"
+	fi
+}
+