fix bugs #28257, #28258

5 files changed, 38 insertions, 33 deletions

diff --git a/net-mail/qmail/ChangeLog b/net-mail/qmail/ChangeLog
index 6791f5b95fb3..447fbc0310af 100644
--- a/net-mail/qmail/ChangeLog
+++ b/net-mail/qmail/ChangeLog
@@ -1,6 +1,10 @@
 # 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.41 2003/09/12 00:55:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/ChangeLog,v 1.42 2003/09/20 23:58:09 robbat2 Exp $
+
+  20 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild,
+  files/1.03-r12/dot_qmail, files/1.03-r12/rc:
+  fix bugs #28257, #28258
 
   11 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> qmail-1.03-r12.ebuild:
   fix bug #28256
diff --git a/net-mail/qmail/Manifest b/net-mail/qmail/Manifest
index de189eb9a22a..cc6f03465df9 100644
--- a/net-mail/qmail/Manifest
+++ b/net-mail/qmail/Manifest
@@ -1,3 +1,10 @@
+MD5 f2193d3a327e5328b066c43a85be6b16 qmail-1.03-r11.ebuild 11396
+MD5 9f63e83d10743897e07c25c28a6c57f3 qmail-1.03-r9.ebuild 9963
+MD5 a44e4287eb93476321e39985a7217b65 qmail-1.03-r10.ebuild 11152
+MD5 2e824ec277afa32dfbc8a5b796ecb15d qmail-1.03-r8.ebuild 8115
+MD5 da1c3da3da3f469440c023f12786fdc9 qmail-1.03-r12.ebuild 12596
+MD5 89d6bc18f38089193e2a7eb9b8361d82 ChangeLog 10151
+MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
 MD5 e0686e52df7f0c840a7ac2bfe1fd291a files/tcp.qmqp.sample 337
 MD5 946a715ffdd5e6d2d29c6fdfb29376dd files/tcp.smtp.sample 3726
 MD5 734ea9dfff4513984d2d69123ce54fb8 files/gencert.sh 224
@@ -17,7 +24,7 @@ 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 8ca0f00a5f3404506b70f8f4420cafc9 files/1.03-r8/qmail-control 809
+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
@@ -27,7 +34,7 @@ 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 0b5b699aaf38366692d70ac3aa3a51e9 files/1.03-r9/qmail-control 809
+MD5 8613299027c41cfcf7bab53417bbb270 files/1.03-r9/qmail-control 808
 MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r9/run-qmailsend 29
 MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r10/rc 108
 MD5 ec7a73ba2bca7d6dd54ba92cf13136c9 files/1.03-r10/run-qmailpop3d 223
@@ -41,7 +48,7 @@ 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 a33acd5b72a4390c9b0d599a7b170ee7 files/1.03-r10/qmail-control 810
+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
@@ -57,19 +64,19 @@ 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 1095fccd39b78e8534c0554c45d5b6f8 files/1.03-r11/conf-qmqpd 485
-MD5 d5d4a21a9048ec6dc580d3929e7dfd10 files/1.03-r11/conf-qmtpd 577
+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 f3ef132c6ead81c42cea91da37c4db73 files/1.03-r11/qmail-control 859
-MD5 64197a14228076ba92cd033bc4798130 files/1.03-r11/conf-common 837
+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 f42a779e5c708c2d7bf38de66dfb93f5 files/1.03-r12/rc 108
-MD5 4925f6854709734bf0e068060a6bdbfb files/1.03-r12/run-qmailpop3d 1177
-MD5 3ec92d93fe2d5557755ca83614f926ee files/1.03-r12/run-qmailqmqpd 1166
-MD5 b4f227fd286e0a3df4a9299c56753271 files/1.03-r12/run-qmailqmtpd 1166
-MD5 42b44c0e7dd6afc184d526cd90d7a3e0 files/1.03-r12/run-qmailsmtpd 1166
+MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r12/rc 117
+MD5 9661e311b06cf9e857e51554eb0d9467 files/1.03-r12/run-qmailpop3d 1176
+MD5 3de48c6d693f19bfeb464f823429e67e files/1.03-r12/run-qmailqmqpd 1165
+MD5 32fac368761cba2989d5aa49376f2846 files/1.03-r12/run-qmailqmtpd 1165
+MD5 ecf959be535f7207d82c06b7ae769114 files/1.03-r12/run-qmailsmtpd 1165
 MD5 180a513f34e3f00abc609672a190072c files/1.03-r12/99qmail 137
 MD5 c47d861aeef098d12d022d44c27386b5 files/1.03-r12/errno.patch 850
 MD5 598b04b6274ef4d946a60a5d30fd95ff files/1.03-r12/qmail-remote-auth-login.patch 7504
@@ -78,25 +85,18 @@ MD5 bed3133c1737dd9bc3c67e07f8bc65d8 files/1.03-r12/smtp-auth-close3.patch 728
 MD5 249138d56492deb0f856849bc002e46a files/1.03-r12/run-qmailqmqpdlog 97
 MD5 a993cab8b077162680bb09fa8e5ed896 files/1.03-r12/bad-rcpt-noisy-patch 10388
 MD5 795f633858c0919b6e201cf2b845779e files/1.03-r12/run-qmailqmtpdlog 97
-MD5 b24f4dbd450d2d4eddc75ba19cebb915 files/1.03-r12/dot_qmail 34
+MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r12/dot_qmail 82
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r12/run-qmailsmtpdlog 97
-MD5 34f7596fc9a7dd82ac15d3219d530650 files/1.03-r12/conf-pop3d 1072
-MD5 e79f7c227fc10d6d653850d36abe319a files/1.03-r12/conf-qmqpd 471
-MD5 657bd64b1e3e9b9c784e60f3c41a7e91 files/1.03-r12/conf-qmtpd 563
-MD5 97dcc908045855f4615851c230c1d4c1 files/1.03-r12/conf-smtpd 1710
+MD5 98c5a7c23416baf7c086b93ed586eb81 files/1.03-r12/conf-pop3d 1071
+MD5 53f8a798a9a11ef0352581244a7c1ad4 files/1.03-r12/conf-qmqpd 470
+MD5 7e3617ddb00abaa780f29cfdb838fd16 files/1.03-r12/conf-qmtpd 562
+MD5 1d7e48b17ef49117c4f975adf4757bf1 files/1.03-r12/conf-smtpd 1709
 MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r12/run-qmailsendlog 96
 MD5 2a725c31201c59077cd389486407624f files/1.03-r12/qmail-smtpd-esmtp-size-gentoo.patch 2131
-MD5 9d4267c5dd8af7bc1a095a644368201c files/1.03-r12/qmail-control 859
+MD5 fc7391f02934a9c75a92dce36229d590 files/1.03-r12/qmail-control 858
 MD5 dda736a7fb5a56209abead6e840252e8 files/1.03-r12/badrcptto-morebadrcptto-accdias-gentoo 19322
-MD5 3a6ceb001139b6c9e8fd7477602c4165 files/1.03-r12/conf-common 1095
-MD5 75d59722b51a097bb3c09b5b5d5b5874 files/1.03-r12/config-sanity-check 815
+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 b6ae3b220911cf9ed686d76bacb6c96e qmail-1.03-r11.ebuild 11397
-MD5 d7b75510b470696601c9f36f89a9eae4 qmail-1.03-r9.ebuild 9964
-MD5 c883ca07b054f8d1b0785699041fefd2 qmail-1.03-r10.ebuild 11153
-MD5 0eb29b49378fee3fb4559d30d09a0163 qmail-1.03-r8.ebuild 8116
-MD5 207274725d7de0936c4cd104a0899112 qmail-1.03-r12.ebuild 12583
-MD5 8adc1a5d8a4af52c0d6cecf35eb98f3e ChangeLog 10002
-MD5 ff596e74b015e067a180fc78855aa87a metadata.xml 360
diff --git a/net-mail/qmail/files/1.03-r12/dot_qmail b/net-mail/qmail/files/1.03-r12/dot_qmail
index d0ef7de8b590..81a15fc5c50c 100644
--- a/net-mail/qmail/files/1.03-r12/dot_qmail
+++ b/net-mail/qmail/files/1.03-r12/dot_qmail
@@ -1,2 +1,3 @@
-|dot-forward .forward
+# Uncomment the next line for .forward support
+#|dot-forward .forward
 ./.maildir/
diff --git a/net-mail/qmail/files/1.03-r12/rc b/net-mail/qmail/files/1.03-r12/rc
index a7bbdc986766..74b00778dc60 100644
--- a/net-mail/qmail/files/1.03-r12/rc
+++ b/net-mail/qmail/files/1.03-r12/rc
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 exec env - PATH="/var/qmail/bin:$PATH" \
-	qmail-start "`cat /var/qmail/control/defaultdelivery`"
+	qmail-start "`grep -v '^#' /var/qmail/control/defaultdelivery`"
diff --git a/net-mail/qmail/qmail-1.03-r12.ebuild b/net-mail/qmail/qmail-1.03-r12.ebuild
index 30ae6adeebfa..0b59e176d98e 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.
 # 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.10 2003/09/12 00:55:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail/qmail-1.03-r12.ebuild,v 1.11 2003/09/20 23:58:09 robbat2 Exp $
 
 inherit eutils
 
@@ -233,9 +233,9 @@ src_install() {
 	einfo "Setting up maildirs by default in the account skeleton ..."
 	diropts -m 755 -o root -g root
 	insinto /etc/skel
+	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail.sample
+	fperms 644 /etc/skel/.qmail.sample
 	${MAILDIRMAKE} ${D}/etc/skel/.maildir
-	newins ${FILESDIR}/${PV}-${PR}/dot_qmail .qmail
-	fperms 644 /etc/skel/.qmail
 	# for good measure
 	keepdir /etc/skel/.maildir/{cur,new,tmp}