New, hardmasked ebuild

16 files changed, 832 insertions, 154 deletions

diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog
index 28e4a34f8772..251e0ee39634 100644
--- a/mail-mta/qmail/ChangeLog
+++ b/mail-mta/qmail/ChangeLog
@@ -1,6 +1,15 @@
 # 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.15 2004/12/29 00:25:44 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.16 2005/01/02 22:16:06 hansmi Exp $
+
+*qmail-1.03-r16 (02 Jan 2005)
+
+  02 Jan 2005; Michael Hanselmann <hansmi@gentoo.org>
+  +files/1.03-r16/Makefile-relaymxlookup.patch,
+  +files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch,
+  +files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch,
+  +files/1.03-r16/smtpplugins, +qmail-1.03-r16.ebuild:
+  New, hardmasked ebuild derived from bug #40486.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/mail-mta/qmail/Manifest b/mail-mta/qmail/Manifest
index 53fee5388b14..ff2724af27be 100644
--- a/mail-mta/qmail/Manifest
+++ b/mail-mta/qmail/Manifest
@@ -1,176 +1,182 @@
-MD5 56c3888ff57050f81ff0b4747e29e0ab qmail-1.03-r10.ebuild 11111
-MD5 035e489d1b15d18e0a9c5edfbc780e10 qmail-1.03-r11.ebuild 11387
-MD5 321f2367cbf6c322ecc4e4edc920c517 ChangeLog 19353
-MD5 99e11a3d000c4a33843a65fadc605c3f qmail-1.03-r8.ebuild 8062
-MD5 d6cc29d6baf11a73e53cba5feb129f36 qmail-1.03-r15.ebuild 17465
-MD5 414fc72e81c6331156dc186159478995 qmail-1.03-r14.ebuild 15791
-MD5 1326fc29d4004be71ba6ea2898d23edc qmail-1.03-r9.ebuild 9889
-MD5 fee2da8e07fe53237fd81f4fd3e44039 qmail-1.03-r13.ebuild 14072
-MD5 0339ddd1c43028c8a8c6ad53ac7008b3 qmail-1.03-r12.ebuild 13685
+MD5 326c3d12fa42f7d77ec25d0034c6386c qmail-1.03-r11.ebuild 11387
+MD5 b29fd46e11237b9ee8c69b705a91b1bf qmail-1.03-r8.ebuild 8060
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
-MD5 ba8f93b127ae78f3e2fd045d03c63396 files/run-qmailqmtpd 842
+MD5 d18a1222087e80a39b2588e0f12e6e13 qmail-1.03-r10.ebuild 11111
+MD5 9af01892acf1d6dfeac50c674e8886b4 ChangeLog 19716
+MD5 bf936c8d04f78d9af3d923fd853b039f qmail-1.03-r16.ebuild 18554
+MD5 48561c5b6846d4b381dfdd498b1955f4 qmail-1.03-r9.ebuild 9887
+MD5 c53a30f429eecc567a0079b699150187 qmail-1.03-r12.ebuild 13686
+MD5 09b1f3a68c4b311e015e5659e0fe9949 qmail-1.03-r14.ebuild 15792
+MD5 0c91415205fdad5a78c7203cded883eb qmail-1.03-r15.ebuild 17465
+MD5 e98868f5438e0bad8815e8c2e629d611 qmail-1.03-r13.ebuild 14073
 MD5 180a513f34e3f00abc609672a190072c files/99qmail 137
-MD5 7f17bb21b4ada140e73809d6478a5544 files/config-sanity-check 1223
-MD5 78e194c9fe61cab604d3d5a464965f72 files/run-qmailqmtpdlog 319
-MD5 d2aab8d06da2697ea72ef2c06e752414 files/run-qmailsend 168
-MD5 5c22397958f313d4cc62239e3e90c188 files/conf-smtpd 1702
-MD5 0396cd9a5fc41ef7583548fa4a87fd86 files/run-qmailqmqpd 842
+MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
 MD5 55e71180b55e809b7bc8ccbd86c92dc4 files/digest-qmail-1.03-r15 1719
-MD5 317fd1bccf34f09f57639e6ffbb1d8e5 files/qmail-config-system 1076
-MD5 5ddcb673977385f4bfdc93a2d4e65162 files/run-qmailsendlog 143
-MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
+MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
 MD5 c47d861aeef098d12d022d44c27386b5 files/errno.patch 850
-MD5 a57fd00fc0d3ab86cad0974853c9fa33 files/run-qmailqmqpdlog 319
-MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
-MD5 cab514962524125fd83969a3751d2c6e files/servercert.cnf 1098
-MD5 836c401d53b4f1d40872dcb3c3ccbd46 files/conf-send 235
-MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207
-MD5 c5fe4a6ceb6786211e5953ede7437209 files/run-qmailpop3d 908
-MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
-MD5 0d96233f19a26e578c44e9d87f9e80eb files/digest-qmail-1.03-r13 1359
-MD5 8b50041a2bb1f630b728dd07b6940506 files/run-qmailsmtpd 842
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/dot_qmail 82
 MD5 041e9e9ee360bc691a642048b54c1d5b files/run-qmailsmtpdlog 319
-MD5 490c49c812e7a04baadbbda6f4fc05b0 files/conf-common 2331
-MD5 48a1e168db29ab4e6c57f1ac135ee2bf files/digest-qmail-1.03-r9 323
-MD5 0d96233f19a26e578c44e9d87f9e80eb files/digest-qmail-1.03-r12 1359
-MD5 1fa33b460954492678129c60520e9cba files/digest-qmail-1.03-r10 442
 MD5 cb4bafe4fe0260c575331b93a17e831b files/digest-qmail-1.03-r14 1564
+MD5 836c401d53b4f1d40872dcb3c3ccbd46 files/conf-send 235
+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 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
 MD5 d6b150617bc5d76374fe010fc2902923 files/digest-qmail-1.03-r11 764
-MD5 6833866c14d955fee43d202f2c62151a files/qmail-genrsacert.sh 1165
+MD5 7f17bb21b4ada140e73809d6478a5544 files/config-sanity-check 1223
+MD5 ed8621dc81c25323e10609fc05d861df files/rc 284
+MD5 8b50041a2bb1f630b728dd07b6940506 files/run-qmailsmtpd 842
+MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224
+MD5 5c22397958f313d4cc62239e3e90c188 files/conf-smtpd 1702
+MD5 5897cb300c3233c91c7e221c8b4b8501 files/digest-qmail-1.03-r8 245
+MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
+MD5 78e194c9fe61cab604d3d5a464965f72 files/run-qmailqmtpdlog 319
+MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
+MD5 0d96233f19a26e578c44e9d87f9e80eb files/digest-qmail-1.03-r13 1359
+MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
+MD5 490c49c812e7a04baadbbda6f4fc05b0 files/conf-common 2331
 MD5 0486e6491047bf8354f591ed0f536dd4 files/run-qmailpop3dlog 319
+MD5 6833866c14d955fee43d202f2c62151a files/qmail-genrsacert.sh 1165
+MD5 c5fe4a6ceb6786211e5953ede7437209 files/run-qmailpop3d 908
 MD5 2d3271eba444e0c0ad2bd39626ba9156 files/tcp.qmtp.sample 821
-MD5 c8254c53c104004d5beecb39ca689d48 files/gencert.sh 224
+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 52892cdf994815c6767ffbafc49df454 files/conf-qmqpd 465
-MD5 fe86ebf974cc7cb1aaddff8311ae89bc files/tcp.smtp.sample 4166
-MD5 f5508c8f592c8f7ce7dcfc4c5ed797d6 files/1.03-r9/qmail-1.03-starttls-smtp-auth.patch 41786
+MD5 ae967da8c38fde8f69960392f89e262f files/conf-pop3d 1207
+MD5 0396cd9a5fc41ef7583548fa4a87fd86 files/run-qmailqmqpd 842
+MD5 721fae7da8d79f3dc8b0c28bd91251d5 files/digest-qmail-1.03-r16 1878
+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 c378c5845848ee31d70f0d05cbcf86be files/1.03-r8/dot_qmail 12
+MD5 aa1f60fd8b7d154da1e7d7a6fab422ce files/1.03-r16/Makefile-relaymxlookup.patch 1691
+MD5 dbfe7d95b274567088123575d5da00ba files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch 571
+MD5 fe189f1c8c28ae8b15bde3f8bb169997 files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch 454
+MD5 a8af4cf9b59e294737987624bc917e80 files/1.03-r16/smtpplugins 614
+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 abc975ae7274a2b5332231ba3f78db76 files/1.03-r9/qmail-linksync.patch 1363
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r9/defaultdelivery 34
 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 c378c5845848ee31d70f0d05cbcf86be files/1.03-r9/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r9/run-qmailsmtpdlog 97
-MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r10/run-qmailsend 29
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r10/run-qmailsendlog 96
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r10/defaultdelivery 34
-MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r10/errno.patch 850
-MD5 ec7a73ba2bca7d6dd54ba92cf13136c9 files/1.03-r10/run-qmailpop3d 223
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r10/rc 108
-MD5 676a679be60e98c9f021af0e8d76bca5 files/1.03-r10/qmail-control 793
-MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r10/smtp-auth-close3.patch 535
-MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r10/run-qmailsmtpd 231
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r10/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r10/run-qmailsmtpdlog 97
-MD5 dd5158b78a3878d78a68878f1910e0e4 files/1.03-r10/tls.patch.bz2 10458
-MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r10/run-qmailpop3dlog 97
-MD5 f7956b079a66a93e321d86071dd21d20 files/1.03-r10/tls-patch.txt 5803
-MD5 518aef241cd482233a3c07608e12276c files/1.03-r14/qmail-1.03-accept-5xx.tls.patch 882
-MD5 34a2e22386f4d11874e33b38576a7958 files/1.03-r14/qmail-gentoo-branding.patch 375
-MD5 a8bfc3cf2c69e8e46b07a357a8572e5e files/1.03-r14/qmail-1.03-qregex-memleak-fix.patch 498
-MD5 2a725c31201c59077cd389486407624f files/1.03-r14/qmail-smtpd-esmtp-size-gentoo.patch 2131
-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 d3997795df512803e6a27b5486d2b81e files/1.03-r14/qmail-smtpd-relay-reject.gentoo.patch 1433
-MD5 a91645f4af61ce981e01ef84bc2ae7b6 files/1.03-r14/qmail-qmailqueue-docs.patch 1085
-MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r14/smtp-auth-close3.patch 728
-MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r14/maildir-quota-fix.patch 547
-MD5 b8f5d6adfb941c184715695cc58a5c72 files/1.03-r14/nullenvsender-recipcount.tls.patch 1616
-MD5 cc5c84d3a0837007b8af4a1f2e657872 files/1.03-r14/auth-after-tls-only.patch 2151
-MD5 79f431fc61196fa5a2269e7703a511a5 files/1.03-r13/run-qmailqmtpd 1169
 MD5 180a513f34e3f00abc609672a190072c files/1.03-r13/99qmail 137
-MD5 df643e542586380cb57bfb621bc3d882 files/1.03-r13/config-sanity-check 818
-MD5 795f633858c0919b6e201cf2b845779e files/1.03-r13/run-qmailqmtpdlog 97
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r13/run-qmailsend 29
-MD5 a7de5b8b21d5f97743756461e5f9adc0 files/1.03-r13/conf-smtpd 1711
-MD5 912a9a4e61e3bcba06c1cde604611b08 files/1.03-r13/run-qmailqmqpd 1169
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r13/run-qmailsendlog 96
+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 a41b34d2ae83affe00e6ed7cc79802a7 files/1.03-r13/servercert.cnf 1107
-MD5 4784d25306a62becc8e534fd102584ff files/1.03-r13/conf-pop3d 1075
-MD5 87159a5cf497b8b87b149afbebdbde51 files/1.03-r13/run-qmailpop3d 1205
-MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r13/qmail-smtpd-relay-reject.gentoo.patch 1433
-MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r13/rc 117
 MD5 d4d25a1094931cdc4f939bddb3109284 files/1.03-r13/qmail-control 849
-MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r13/smtp-auth-close3.patch 728
+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 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r13/dot_qmail 82
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r13/run-qmailsmtpdlog 97
+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 68cb94e965a5518e68712999557f7cd6 files/1.03-r13/conf-qmtpd 566
-MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r13/maildir-quota-fix.patch 547
-MD5 f6156e29aa1734b8fd20945bc7a545bb files/1.03-r13/qmail-genrsacert.sh 1174
 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 d6450da159ac93199409f1ae48eb6fc4 files/1.03-r13/conf-qmqpd 474
-MD5 d0aef5e4c492dbdc768bc1e0f7558870 files/1.03-r15/Makefile-relaymxlookup.patch 1947
-MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336
-MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
-MD5 f5508c8f592c8f7ce7dcfc4c5ed797d6 files/1.03-r8/qmail-1.03-starttls-smtp-auth.patch 41786
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r8/run-qmailsend 29
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r8/run-qmailsendlog 96
-MD5 abc975ae7274a2b5332231ba3f78db76 files/1.03-r8/qmail-linksync.patch 1363
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r8/defaultdelivery 34
-MD5 71aa0894c118dda3405f1f847944158c files/1.03-r8/qmail-queue.patch 1512
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r8/rc 108
-MD5 40f781a0a2aa618dd444e1fdc02322a1 files/1.03-r8/qmail-control 792
-MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r8/run-qmailsmtpd 231
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r8/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r8/run-qmailsmtpdlog 97
-MD5 dd55f8bfa444c07533725f67cb67dc50 files/1.03-r11/run-qmailqmtpd 611
+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 795f633858c0919b6e201cf2b845779e files/1.03-r11/run-qmailqmtpdlog 97
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r11/run-qmailsend 29
-MD5 5b2334c4a3d2490abec42ad84b398162 files/1.03-r11/conf-smtpd 338
-MD5 2f110e27392d0ed6ba55d836c390e691 files/1.03-r11/run-qmailqmqpd 611
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r11/run-qmailsendlog 96
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r11/defaultdelivery 34
 MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r11/errno.patch 850
+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 88f15101dd4bc36b52d13f336713e716 files/1.03-r11/run-qmailpop3d 221
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r11/rc 108
+MD5 dd55f8bfa444c07533725f67cb67dc50 files/1.03-r11/run-qmailqmtpd 611
+MD5 6528a14c66966deb2cb6b1ddb2572167 files/1.03-r11/conf-qmtpd 580
 MD5 0841858b17b70abd7324fa491e3153a7 files/1.03-r11/qmail-control 841
-MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r11/smtp-auth-close3.patch 535
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r11/rc 108
 MD5 12c2c3e9a03275a8e701b7719707f37a files/1.03-r11/run-qmailsmtpd 611
-MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r11/dot_qmail 12
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r11/run-qmailsmtpdlog 97
+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 6528a14c66966deb2cb6b1ddb2572167 files/1.03-r11/conf-qmtpd 580
 MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r11/run-qmailpop3dlog 97
-MD5 cdcfbce84f268800f8e2140a04740aaa files/1.03-r11/conf-qmqpd 488
-MD5 361b679c2717dc0107314a1b27d0310f files/1.03-r12/run-qmailqmtpd 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 e5d2173b6d5d76cb2f51e440dba6a1d2 files/1.03-r12/config-sanity-check 818
-MD5 598b04b6274ef4d946a60a5d30fd95ff files/1.03-r12/qmail-remote-auth-login.patch 7504
-MD5 795f633858c0919b6e201cf2b845779e files/1.03-r12/run-qmailqmtpdlog 97
-MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r12/run-qmailsend 29
-MD5 0d72a35a965e772b73fff14969377288 files/1.03-r12/conf-smtpd 1713
-MD5 b643468b77484854e9f293f9b1c2f111 files/1.03-r12/run-qmailqmqpd 1169
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r12/run-qmailsendlog 96
+MD5 a993cab8b077162680bb09fa8e5ed896 files/1.03-r12/bad-rcpt-noisy-patch 10388
 MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r12/errno.patch 850
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r12/run-qmailsmtpdlog 97
+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 2a725c31201c59077cd389486407624f files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch 2131
-MD5 53258542871dad6d71ea848237e19e19 files/1.03-r12/conf-pop3d 1075
-MD5 498e8e07f957f387f644a6dbc092c9fc files/1.03-r12/run-qmailpop3d 1180
-MD5 d3997795df512803e6a27b5486d2b81e files/1.03-r12/qmail-smtpd-relay-reject.gentoo.patch 1433
-MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r12/rc 117
 MD5 157077927d26cf107005e41b8b5ae594 files/1.03-r12/qmail-control 841
-MD5 a993cab8b077162680bb09fa8e5ed896 files/1.03-r12/bad-rcpt-noisy-patch 10388
-MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r12/smtp-auth-close3.patch 728
+MD5 598b04b6274ef4d946a60a5d30fd95ff files/1.03-r12/qmail-remote-auth-login.patch 7504
+MD5 e5d2173b6d5d76cb2f51e440dba6a1d2 files/1.03-r12/config-sanity-check 818
+MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r12/rc 117
 MD5 0a7a65aa157235088c05d22fd8fe201b files/1.03-r12/run-qmailsmtpd 1169
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r12/dot_qmail 82
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r12/run-qmailsmtpdlog 97
+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 94edf0a5bce24748695630f812dded2a files/1.03-r12/conf-qmtpd 566
-MD5 3eb989291a872a5ff2f5d40d6eba92d8 files/1.03-r12/maildir-quota-fix.patch 547
-MD5 dda736a7fb5a56209abead6e840252e8 files/1.03-r12/badrcptto-morebadrcptto-accdias-gentoo 19322
 MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r12/run-qmailpop3dlog 97
-MD5 b5c18c1311be2407aa04bc934463f27a files/1.03-r12/conf-qmqpd 474
+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 d0aef5e4c492dbdc768bc1e0f7558870 files/1.03-r15/Makefile-relaymxlookup.patch 1947
+MD5 fe69ece20420ed8c2400dc423cdd5c22 files/1.03-r15/qmail-macos-dns-fix.patch 336
+MD5 82945c7eee4a2bd8be0b9b9718114a7d files/1.03-r15/qmail-pop3d-top-outputfix.patch 574
+MD5 5cb0c8c4c9feeee55362d77a99076c2f files/1.03-r10/99qmail 44
+MD5 dd5158b78a3878d78a68878f1910e0e4 files/1.03-r10/tls.patch.bz2 10458
+MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r10/errno.patch 850
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r10/run-qmailsmtpdlog 97
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r10/run-qmailsend 29
+MD5 676a679be60e98c9f021af0e8d76bca5 files/1.03-r10/qmail-control 793
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r10/rc 108
+MD5 aa0823cdce32c502c856664c8b0ce775 files/1.03-r10/run-qmailsmtpd 231
+MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r10/run-qmailpop3dlog 97
+MD5 ec7a73ba2bca7d6dd54ba92cf13136c9 files/1.03-r10/run-qmailpop3d 223
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r10/run-qmailsendlog 96
+MD5 3933f961a8a65da65afaa65d22b075ef files/1.03-r10/smtp-auth-close3.patch 535
+MD5 f7956b079a66a93e321d86071dd21d20 files/1.03-r10/tls-patch.txt 5803
+MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r10/defaultdelivery 34
+MD5 c378c5845848ee31d70f0d05cbcf86be files/1.03-r10/dot_qmail 12
diff --git a/mail-mta/qmail/files/1.03-r16/Makefile-relaymxlookup.patch b/mail-mta/qmail/files/1.03-r16/Makefile-relaymxlookup.patch
new file mode 100644
index 000000000000..0a71a554bacc
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r16/Makefile-relaymxlookup.patch
@@ -0,0 +1,38 @@
+--- qmail-1.03/Makefile.orig	2005-01-02 22:50:46.939208400 +0100
++++ qmail-1.03/Makefile	2005-01-02 22:54:48.066551472 +0100
+@@ -1454,7 +1454,8 @@
+ 	./load qmail-qmtpd rcpthosts.o control.o constmap.o \
+ 	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
+ 	datetime.a open.a getln.a sig.a case.a env.a stralloc.a \
+-	alloc.a substdio.a error.a str.a fs.a auto_qmail.o 
++	alloc.a substdio.a error.a fs.a auto_qmail.o dns.o \
++	`cat dns.lib` ip.o ipalloc.o ipme.o byte_diff.o str.a
+ 
+ qmail-qmtpd.0: \
+ qmail-qmtpd.8
+@@ -1617,13 +1618,13 @@
+ timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o received.o \
+ date822fmt.o now.o qmail.o cdb.a fd.a wait.a datetime.a getln.a \
+ open.a sig.a case.a env.a stralloc.a alloc.a strerr.a substdio.a error.a str.a \
+-fs.a auto_qmail.o base64.o socket.lib dns.lib
++fs.a auto_qmail.o base64.o socket.lib dns.lib dns.o ip.h ipalloc.h
+ 	./load qmail-smtpd qregex.o rcpthosts.o commands.o timeoutread.o \
+ 	timeoutwrite.o ip.o ipme.o ipalloc.o control.o constmap.o \
+ 	received.o date822fmt.o now.o qmail.o cdb.a fd.a wait.a \
+ 	datetime.a getln.a open.a sig.a case.a env.a stralloc.a \
+-	alloc.a strerr.a substdio.a error.a str.a fs.a auto_qmail.o base64.o  `cat \
+-	socket.lib` dns.o `cat dns.lib` -lssl -lcrypto
++	alloc.a strerr.a substdio.a error.a fs.a auto_qmail.o base64.o  `cat \
++	socket.lib` -lssl -lcrypto dns.o str.a `cat dns.lib`
+ 
+ qmail-smtpd.0: \
+ qmail-smtpd.8
+@@ -1760,7 +1761,7 @@
+ 
+ rcpthosts.o: \
+ compile rcpthosts.c cdb.h uint32.h byte.h open.h error.h control.h \
+-constmap.h stralloc.h gen_alloc.h rcpthosts.h
++constmap.h stralloc.h gen_alloc.h rcpthosts.h dns.h ipalloc.h ipme.h
+ 	./compile rcpthosts.c
+ 
+ qregex.o: \
diff --git a/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch b/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch
new file mode 100644
index 000000000000..e141ddc1abf7
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch
@@ -0,0 +1,18 @@
+--- qmail-1.03.orig/qmail-smtpd.c       2004-11-19 09:00:53.000000000 +0100
++++ qmail-1.03/qmail-smtpd.c    2004-12-11 19:06:23.185045688 +0100
+@@ -1006,7 +1006,6 @@
+   if (!stralloc_0(&pass)) die_nomem();
+   if (!stralloc_0(&resp)) die_nomem();
+
+-  if (fd_copy(2,1) == -1) return err_pipe();
+   //close(3);
+   if (pipe(pi) == -1) return err_pipe();
+   //if (pi[0] != 3) return err_pipe();
+@@ -1014,6 +1013,7 @@
+     case -1:
+       return err_fork();
+     case 0:
++      if (fd_copy(2,1) == -1) _exit(1);
+       close(pi[1]);
+       if (pi[0] != 3) {
+         close(3);
diff --git a/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch b/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch
new file mode 100644
index 000000000000..281b3df92727
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r16/gentoo-qmail-1.03-r16-logrelay.patch
@@ -0,0 +1,15 @@
+--- qmail-1.03.orig/qmail-smtpd.c	2004-11-14 00:55:37.069913288 +0100
++++ qmail-1.03/qmail-smtpd.c	2004-11-14 00:55:37.072912832 +0100
+@@ -728,7 +728,11 @@
+   }
+   else
+ #ifndef TLS
+-    if (!addrallowed()) { err_nogateway(); return; }
++    if (!addrallowed()) { 
++      strerr_warn6("qmail-smtpd: Attempted relay from ",mailfrom.s," at ",remoteip," to ",addr.s,0);
++      err_nogateway(); 
++      return; 
++    }
+ #else
+     if (!addrallowed())
+      {
diff --git a/mail-mta/qmail/files/1.03-r16/smtpplugins b/mail-mta/qmail/files/1.03-r16/smtpplugins
new file mode 100644
index 000000000000..db9df2647515
--- /dev/null
+++ b/mail-mta/qmail/files/1.03-r16/smtpplugins
@@ -0,0 +1,27 @@
+# smtpplugins sample file
+# none of these plugins is installed by default
+# Paths are relative to the qmail home dir.
+# #f you want your plugin to be executed by system shell, add ':' just before
+# plugin path. this is slightly slower than normal mode.
+#
+# you may disable qmail-spp by setting NOSPP environmental variable - for
+# example using tcprules
+#
+# see http://qmail-spp.sourceforge.net/doc/
+
+[auth]
+#plugins/onlycrammd5
+
+[helo]
+#:plugins/badhelo example.com spammers.com
+
+[mail]
+#:plugins/rbl relays.ordb.org
+#plugins/blacklisted
+#plugins/spf
+#plugins/dnsmx-check
+
+[rcpt]
+#plugins/exists
+#plugins/tarpit
+
diff --git a/mail-mta/qmail/files/digest-qmail-1.03-r16 b/mail-mta/qmail/files/digest-qmail-1.03-r16
new file mode 100644
index 000000000000..b93bb6e46960
--- /dev/null
+++ b/mail-mta/qmail/files/digest-qmail-1.03-r16
@@ -0,0 +1,27 @@
+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
+MD5 2bd191cca4e640e87cca79bc0405f97a qmail-1.03-moreipme-0.6pre1-gentoo.patch 13942
+MD5 d96455aaed208e9cd450d8874564781b qmail-relaymxlookup-0.3.diff 3856
+MD5 d898fbb2b4cb259b208dbb8c9d8c47a9 gentoo-qmail-1.03-r16-mfcheck.3.patch 4223
+MD5 95692f3a7574f258489943ca9d09981a gentoo-qmail-1.03-r16-spp.034.patch 34568
diff --git a/mail-mta/qmail/qmail-1.03-r10.ebuild b/mail-mta/qmail/qmail-1.03-r10.ebuild
index c190814e9f33..e0f8dc64705c 100644
--- a/mail-mta/qmail/qmail-1.03-r10.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r10.ebuild,v 1.5 2004/10/26 22:23:11 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r10.ebuild,v 1.6 2005/01/02 22:16:06 hansmi Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/mail-mta/qmail/qmail-1.03-r11.ebuild b/mail-mta/qmail/qmail-1.03-r11.ebuild
index c40e0c8696ef..06111c1fc372 100644
--- a/mail-mta/qmail/qmail-1.03-r11.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r11.ebuild,v 1.6 2004/10/26 22:23:11 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r11.ebuild,v 1.7 2005/01/02 22:16:06 hansmi Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/mail-mta/qmail/qmail-1.03-r12.ebuild b/mail-mta/qmail/qmail-1.03-r12.ebuild
index 3e307aed9a6f..092453fa8615 100644
--- a/mail-mta/qmail/qmail-1.03-r12.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r12.ebuild,v 1.6 2004/11/15 14:52:41 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r12.ebuild,v 1.7 2005/01/02 22:16:06 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
diff --git a/mail-mta/qmail/qmail-1.03-r13.ebuild b/mail-mta/qmail/qmail-1.03-r13.ebuild
index 8aa734829a8c..9db9e8ae33e4 100644
--- a/mail-mta/qmail/qmail-1.03-r13.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r13.ebuild,v 1.7 2004/11/15 14:52:41 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r13.ebuild,v 1.8 2005/01/02 22:16:06 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
diff --git a/mail-mta/qmail/qmail-1.03-r14.ebuild b/mail-mta/qmail/qmail-1.03-r14.ebuild
index 112b213e29b0..90aedd197f36 100644
--- a/mail-mta/qmail/qmail-1.03-r14.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r14.ebuild,v 1.7 2004/11/15 14:52:41 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r14.ebuild,v 1.8 2005/01/02 22:16:06 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
diff --git a/mail-mta/qmail/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild
index 426d8925ac0c..0b8e0201e22c 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
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.12 2004/12/15 22:15:45 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.13 2005/01/02 22:16:06 hansmi Exp $
 
 inherit toolchain-funcs eutils fixheadtails
 
diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild
new file mode 100644
index 000000000000..02d47550b534
--- /dev/null
+++ b/mail-mta/qmail/qmail-1.03-r16.ebuild
@@ -0,0 +1,538 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.1 2005/01/02 22:16:06 hansmi Exp $
+
+inherit toolchain-funcs 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
+	mirror://qmail/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
+	mirror://gentoo/qmail-1.03-moreipme-0.6pre1-gentoo.patch
+	http://hansmi.ch/download/qmail/qmail-relaymxlookup-0.3.diff
+	mirror://gentoo/gentoo-qmail-1.03-r16-mfcheck.3.patch
+	mirror://gentoo/gentoo-qmail-1.03-r16-spp.034.patch
+	"
+# broken stuffs
+#http://www.qcc.ca/~charlesc/software/misc/nullenvsender-recipcount.patch
+
+LICENSE="as-is"
+SLOT="0"
+#KEYWORDS="~x86 ~ppc ~sparc mips alpha arm hppa amd64 ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64"
+
+DEPEND="virtual/libc
+	sys-apps/groff
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	>=net-mail/queue-fix-1.4-r1"
+RDEPEND="!virtual/mta
+	virtual/libc
+	>=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
+	selinux? ( sec-policy/selinux-qmail )"
+
+PROVIDE="virtual/mta
+	 virtual/mda"
+
+#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}/${PV}-r15/qmail-pop3d-top-outputfix.patch
+
+	# Fix a compilation-error on Mac OS X
+	# qmail doesn't run yet on Mac OS X, but this will help in the future
+	test "${ARCH}" = ppc-macos && \
+		epatch ${FILESDIR}/${PV}-r15/qmail-macos-dns-fix.patch
+
+	# add SPP framework for future extensions. Once this has been tested, most
+	# other patches may be rewritten to add a SPP module instead of patching
+	# qmail-smtpd
+	EPATCH_SINGLE_MSG="Adding SPP framework for qmail-smtpd" \
+	epatch ${DISTDIR}/gentoo-qmail-${PVR}-spp.034.patch
+
+	# add mail from DNS check
+	EPATCH_SINGLE_MSG="check envelope sender's domain for validity" \
+	epatch ${DISTDIR}/gentoo-qmail-${PVR}-mfcheck.3.patch
+
+	# log relay attempts
+	EPATCH_SINGLE_MSG="log relay attempts" \
+	epatch ${FILESDIR}/${PVR}/gentoo-qmail-${PVR}-logrelay.patch
+
+	# 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
+
+	# Patch to look up the mx before relaying
+	# Look at http://hansmi.ch/software/qmail
+	epatch ${DISTDIR}/qmail-relaymxlookup-0.3.diff
+	epatch ${FILESDIR}/${PVR}/Makefile-relaymxlookup.patch
+
+	echo -n "$(tc-getCC) ${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 "$(tc-getCC) ${LDFLAGS}" > ${S}/conf-ld
+	echo -n "500" > ${S}/conf-spawn
+
+	# fix coreutils messup
+	ht_fix_file ${S}/Makefile
+
+	# fix bug #74124
+	EPATCH_SINGLE_MSG="fixing stderr logging for checkpassword to enable qmail-queue to continue logging" \
+	epatch ${FILESDIR}/${PVR}/gentoo-qmail-1.03-r16-logging-with-smtpauth.patch
+}
+
+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* AUTHORS* VERSION* \
+		${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-* ${FILESDIR}/${PVR}/smtpplugins
+	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
+
+	einfo "Enabling envelope sender's domain name check"
+	echo 1 > ${D}/var/qmail/control/mfcheck
+}
+
+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 "every mail was 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
+}
diff --git a/mail-mta/qmail/qmail-1.03-r8.ebuild b/mail-mta/qmail/qmail-1.03-r8.ebuild
index 8381c850b909..e2eae6dc0b95 100644
--- a/mail-mta/qmail/qmail-1.03-r8.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r8.ebuild,v 1.4 2004/07/14 16:53:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r8.ebuild,v 1.5 2005/01/02 22:16:06 hansmi Exp $
 
 DESCRIPTION="A modern replacement for sendmail which uses maildirs"
 HOMEPAGE="http://www.qmail.org/
diff --git a/mail-mta/qmail/qmail-1.03-r9.ebuild b/mail-mta/qmail/qmail-1.03-r9.ebuild
index 1e04566e1b12..52bdaf9b9d71 100644
--- a/mail-mta/qmail/qmail-1.03-r9.ebuild
+++ b/mail-mta/qmail/qmail-1.03-r9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r9.ebuild,v 1.5 2004/07/14 16:53:59 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r9.ebuild,v 1.6 2005/01/02 22:16:06 hansmi Exp $
 
 IUSE="ssl ldap"