qmail-ldap update

32 files changed, 1085 insertions, 52 deletions

diff --git a/net-mail/qmail-ldap/ChangeLog b/net-mail/qmail-ldap/ChangeLog
index 3945d16eddc7..9f7b7e46fbd8 100644
--- a/net-mail/qmail-ldap/ChangeLog
+++ b/net-mail/qmail-ldap/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/qmail-ldap
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/ChangeLog,v 1.7 2004/03/14 00:40:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/ChangeLog,v 1.8 2004/04/06 21:56:10 sj7trunks Exp $
+
+  06 Apr 2004; Benjamin Coles <sj7trunks@gentoo.org>
+  A special thanks to these people:
+  Aiko Barz <aiko@chroot.de>
+  Christian Zoffoli <czoffoli@xmerlin.org>
+  Changes include the following: Compression, zlib, debug,
+  better supervise scripts, 99qmail fix, tcprules fix, rc perms
+  Clustering, ldapauth user creation fix, and naming convention fix.
+  Latest qmail-ldap patch as well.
 
   13 Mar 2004; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org>
   metadata.xml:
diff --git a/net-mail/qmail-ldap/Manifest b/net-mail/qmail-ldap/Manifest
index 5563815363c2..9857c7afb486 100644
--- a/net-mail/qmail-ldap/Manifest
+++ b/net-mail/qmail-ldap/Manifest
@@ -1,70 +1,99 @@
-MD5 44f0ea3c13cabc96782b1e26042865c4 files/control/defaultdelivery 11
-MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaultdomain 13
-MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaulthost 13
-MD5 4a4e6ef110d83f712d5df669e7ca3a0b files/control/dirmaker 24
+MD5 4c4df322b2f7f5b8bc860e6e8a60e3c6 qmail-ldap-1.03-r2.ebuild 11832
+MD5 2d3259e6fa61766d2fec464d08d71e99 qmail-ldap-1.03-r4.ebuild 11423
+MD5 6114076ed79364f71648fb6c74c17a97 qmail-ldap-1.03-r1.ebuild 11629
+MD5 c30991f520bee3736e7b28058a827b75 ChangeLog 2451
+MD5 4a171dbfed7df6a76dbddfc18db344d7 metadata.xml 490
+MD5 c69141e63bf6d4899f2cc8958ba93c41 qmail-ldap-1.03-r3.ebuild 10732
+MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/rc 108
+MD5 931b3ed00571e8e2a22b550fcd1d7137 files/qmail-queue.patch.bz2 722
+MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
+MD5 3866e15deb8a69d44cacb5b3680d1b61 files/qmail-linksync.patch.bz2 687
+MD5 cdeca5e6a3d82ed7b85e372433576bb2 files/samples.ldif 821
+MD5 820848b92884db5bdd3030e57bf21d07 files/gentoo.patch 1419
+MD5 e59223e5e1882318ecec8cc9eb9d43de files/tcp.smtp.sample 3777
+MD5 0078aede689ce77bc32e32124a5e7fbb files/homedir.patch.bz2 527
+MD5 1dcd3bb9666d5015bca6b7eb33478542 files/errno.patch.bz2 401
+MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
+MD5 b69ae80155ab4d0555b66a79ae5ab95d files/digest-qmail-ldap-1.03-r1 452
+MD5 d2f6c625c3a73be4262b616e0e2d132c files/digest-qmail-ldap-1.03-r2 337
+MD5 61a73bd4ce3f9bd360b73b791799f4d8 files/digest-qmail-ldap-1.03-r3 263
+MD5 1ed104f44042105b6382472be18e1a26 files/digest-qmail-ldap-1.03-r4 275
+MD5 c378c5845848ee31d70f0d05cbcf86be files/dot_qmail 12
+MD5 8af1f30a164fbdec0d51d11ef82dcaa9 files/tls.patch.bz2 406
+MD5 13bd1b1b40e0f20ce43d86d2f4b65e82 files/tcp.qmtp.sample 432
+MD5 1a590268c013010a19477f9eb7397972 files/qmail-control 805
+MD5 b66cf6234bb37ddd8731676b201fa7e4 files/qmail-link-sync-gentoo.patch 1532
 MD5 d24fa37b58967d2d8022c84c88148ed6 files/control/file 41
 MD5 04f43d57aee8dc0b8e2465eeb7035e2b files/control/ldapbasedn 19
-MD5 91929a0ba1be35ed2656fc733674c210 files/control/ldapgid 5
-MD5 897316929176464ebc9ad085f31e7284 files/control/ldaplocaldelivery 2
 MD5 f77794722007d48a2d7751684ac23580 files/control/ldaplogin 45
+MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaultdomain 13
 MD5 0dbac736b055522776d091c24a941b38 files/control/ldapmessagestore 21
 MD5 40d7e85fdd014acc169817b5dc1c43da files/control/ldappassword 26
-MD5 b8419160170a41ae01abab13a3b887df files/control/ldapserver 10
+MD5 91929a0ba1be35ed2656fc733674c210 files/control/ldapgid 5
 MD5 0ce18f24e2bb34b7680aaf80ab44ec56 files/control/ldapuid 6
-MD5 6d7fce9fee471194aa8b5b6e47267f03 files/control/qmail-pop3d-loglevel 2
+MD5 eb6ed326fe4b42303e2ff32aabe581ab files/control/defaulthost 13
+MD5 b8419160170a41ae01abab13a3b887df files/control/ldapserver 10
 MD5 7a046b4c43e5e5848d27420909e096c2 files/control/qmail-pop3d-softlimit 9
-MD5 0ae1000c6026575b9a847a9cfa0badb4 files/control/qmail-smtpd-softlimit 8
+MD5 4a4e6ef110d83f712d5df669e7ca3a0b files/control/dirmaker 24
+MD5 897316929176464ebc9ad085f31e7284 files/control/ldaplocaldelivery 2
+MD5 44f0ea3c13cabc96782b1e26042865c4 files/control/defaultdelivery 11
+MD5 6d7fce9fee471194aa8b5b6e47267f03 files/control/qmail-pop3d-loglevel 2
 MD5 6d7fce9fee471194aa8b5b6e47267f03 files/control/qmail-start-loglevel 2
-MD5 b69ae80155ab4d0555b66a79ae5ab95d files/digest-qmail-ldap-1.03-r1 452
-MD5 c378c5845848ee31d70f0d05cbcf86be files/dot_qmail 12
-MD5 1dcd3bb9666d5015bca6b7eb33478542 files/errno.patch.bz2 401
-MD5 0078aede689ce77bc32e32124a5e7fbb files/homedir.patch.bz2 527
-MD5 1a590268c013010a19477f9eb7397972 files/qmail-control 805
-MD5 3866e15deb8a69d44cacb5b3680d1b61 files/qmail-linksync.patch.bz2 687
-MD5 931b3ed00571e8e2a22b550fcd1d7137 files/qmail-queue.patch.bz2 722
-MD5 f42a779e5c708c2d7bf38de66dfb93f5 files/rc 108
-MD5 cdeca5e6a3d82ed7b85e372433576bb2 files/samples.ldif 821
-MD5 8af1f30a164fbdec0d51d11ef82dcaa9 files/tls.patch.bz2 406
+MD5 0ae1000c6026575b9a847a9cfa0badb4 files/control/qmail-smtpd-softlimit 8
 MD5 99265fec7ddb774069ae45afb9c010ca files/supervise/run-qmailpop3d 451
-MD5 34f7022d4bda6c19752a878f8da7289b files/supervise/run-qmailpop3dlog 100
-MD5 23a2babf3049fe012de21c17e550b3e5 files/supervise/run-qmailsend 29
-MD5 834dad5113515d0f00981fdc1d07fa84 files/supervise/run-qmailsendlog 96
 MD5 cc0cf4631ac9d86397660f91c62332b2 files/supervise/run-qmailsmtpd 270
 MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/supervise/run-qmailsmtpdlog 97
+MD5 834dad5113515d0f00981fdc1d07fa84 files/supervise/run-qmailsendlog 96
+MD5 23a2babf3049fe012de21c17e550b3e5 files/supervise/run-qmailsend 29
+MD5 34f7022d4bda6c19752a878f8da7289b files/supervise/run-qmailpop3dlog 100
 MD5 9fc8ba8582cf5e04f67ee32ad9c8a967 files/1.03-r2/samples.ldif 1215
-MD5 d2f6c625c3a73be4262b616e0e2d132c files/digest-qmail-ldap-1.03-r2 337
-MD5 61a73bd4ce3f9bd360b73b791799f4d8 files/digest-qmail-ldap-1.03-r3 263
-MD5 820848b92884db5bdd3030e57bf21d07 files/gentoo.patch 1419
-MD5 b66cf6234bb37ddd8731676b201fa7e4 files/qmail-link-sync-gentoo.patch 1532
-MD5 d779786aab66f97f6e7e4785ca89a636 files/tcp.pop3.sample 335
-MD5 b7e7c96254dabacdec5bf5904957c7b2 files/tcp.qmqp.sample 399
-MD5 13bd1b1b40e0f20ce43d86d2f4b65e82 files/tcp.qmtp.sample 432
-MD5 e59223e5e1882318ecec8cc9eb9d43de files/tcp.smtp.sample 3777
-MD5 365335121f0d295b692a2a8dc4aa51fb files/1.03-r3/conf-common 1099
+MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r3/rc 117
+MD5 ed93b2517343466b3e9b75daf27a3cf1 files/1.03-r3/run-qmailpop3d 1181
+MD5 b4296e095587cb1731ce99773a6ae51d files/1.03-r3/run-qmailqmqpd 1170
+MD5 6a6a2d279a550901f5422dadc2ef6e45 files/1.03-r3/run-qmailqmtpd 1170
+MD5 cb466823c888de86f24dff6bd2125e4e files/1.03-r3/run-qmailsmtpd 1170
 MD5 180a513f34e3f00abc609672a190072c files/1.03-r3/99qmail 137
+MD5 249138d56492deb0f856849bc002e46a files/1.03-r3/run-qmailqmqpdlog 97
+MD5 795f633858c0919b6e201cf2b845779e files/1.03-r3/run-qmailqmtpdlog 97
+MD5 ce52ec46fb01af55f91a90393f6e4be4 files/1.03-r3/qmail-genrsacert.sh 1175
+MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r3/dot_qmail 82
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r3/run-qmailsmtpdlog 97
 MD5 2746f544fb96ed8e7730dede35e0865c files/1.03-r3/conf-pop3d 1076
 MD5 5eddb71f9b87820c176da057f8573a41 files/1.03-r3/conf-qmqpd 475
 MD5 bf9d56a9555a51efe565d619024057ab files/1.03-r3/conf-qmtpd 567
+MD5 89472096ef6a18c79ace44ed9b258a59 files/1.03-r3/servercert.cnf 1108
 MD5 c859b0fad30a3ca993af6c440f23ef78 files/1.03-r3/conf-smtpd 1712
-MD5 b5a56fffc6663e4fc2ef8aa30306ca7e files/1.03-r3/config-sanity-check 819
-MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r3/dot_qmail 82
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r3/run-qmailsendlog 96
 MD5 8f8ec082a389584c0d84f431e5b97f0d files/1.03-r3/mkservercert 1439
 MD5 3a393f3fdf7739cbc77fb8aa8e1ccfea files/1.03-r3/qmail-control 863
-MD5 ce52ec46fb01af55f91a90393f6e4be4 files/1.03-r3/qmail-genrsacert.sh 1175
-MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r3/rc 117
-MD5 ed93b2517343466b3e9b75daf27a3cf1 files/1.03-r3/run-qmailpop3d 1181
-MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r3/run-qmailpop3dlog 97
-MD5 b4296e095587cb1731ce99773a6ae51d files/1.03-r3/run-qmailqmqpd 1170
-MD5 249138d56492deb0f856849bc002e46a files/1.03-r3/run-qmailqmqpdlog 97
-MD5 6a6a2d279a550901f5422dadc2ef6e45 files/1.03-r3/run-qmailqmtpd 1170
-MD5 795f633858c0919b6e201cf2b845779e files/1.03-r3/run-qmailqmtpdlog 97
+MD5 365335121f0d295b692a2a8dc4aa51fb files/1.03-r3/conf-common 1099
+MD5 b5a56fffc6663e4fc2ef8aa30306ca7e files/1.03-r3/config-sanity-check 819
 MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r3/run-qmailsend 29
-MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r3/run-qmailsendlog 96
-MD5 cb466823c888de86f24dff6bd2125e4e files/1.03-r3/run-qmailsmtpd 1170
-MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r3/run-qmailsmtpdlog 97
-MD5 89472096ef6a18c79ace44ed9b258a59 files/1.03-r3/servercert.cnf 1108
-MD5 3cfeeafdee730114ebad39bba20c2cb0 ChangeLog 2060
-MD5 6114076ed79364f71648fb6c74c17a97 qmail-ldap-1.03-r1.ebuild 11629
-MD5 9c67d13fcf08d76affcf67b19afb2d48 metadata.xml 509
-MD5 4c4df322b2f7f5b8bc860e6e8a60e3c6 qmail-ldap-1.03-r2.ebuild 11832
-MD5 c69141e63bf6d4899f2cc8958ba93c41 qmail-ldap-1.03-r3.ebuild 10732
+MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r3/run-qmailpop3dlog 97
+MD5 6c0f741d2f9a7cc5e6b346d435ab0e64 files/1.03-r4/rc 117
+MD5 ee94d2054e0545546e333a3d95d5b101 files/1.03-r4/run-qmailpop3d 1218
+MD5 07edde10eff203b76f044a29c24e214c files/1.03-r4/run-qmailqmqpd 1205
+MD5 e897a6c953f634ffb8672b3a0f29f735 files/1.03-r4/run-qmailqmtpd 1205
+MD5 03edc254f67ade578e53e82d863a73f5 files/1.03-r4/run-qmailsmtpd 1205
+MD5 180a513f34e3f00abc609672a190072c files/1.03-r4/99qmail 137
+MD5 f8d9b2ba720f81dfbc8bd3b25cd90b75 files/1.03-r4/gentoo.patch 2204
+MD5 249138d56492deb0f856849bc002e46a files/1.03-r4/run-qmailqmqpdlog 97
+MD5 795f633858c0919b6e201cf2b845779e files/1.03-r4/run-qmailqmtpdlog 97
+MD5 bdc2e438c21a9efb9ed0506118d1ac0d files/1.03-r4/pipehack.patch.bz2 372
+MD5 cfe1dc035513d76d51855b359a5b7f17 files/1.03-r4/qmail-genrsacert.sh 1177
+MD5 c369664bce0646b3d323d08f9ba5b8ce files/1.03-r4/dot_qmail 82
+MD5 f43900d79a0aacb5e0d71b0bb6c06fea files/1.03-r4/run-qmailsmtpdlog 97
+MD5 6fe49f687176d1b55efb79e5de5b1903 files/1.03-r4/conf-pop3d 1135
+MD5 267d2653001fcd5b6a789aea93bca273 files/1.03-r4/conf-qmqpd 530
+MD5 3c45a3e6f96694bba9f6c3027b026dbe files/1.03-r4/conf-qmtpd 622
+MD5 4cc2721811382f1966de60aef3bf1e9e files/1.03-r4/servercert.cnf 1110
+MD5 e54e5dc810b656c0bba5576897fe91a7 files/1.03-r4/conf-smtpd 1804
+MD5 834dad5113515d0f00981fdc1d07fa84 files/1.03-r4/run-qmailsendlog 96
+MD5 b8d9b7212aa8b0d3dadf492fb23339c6 files/1.03-r4/tls.patch.bz2 479
+MD5 bf069f1a97277962fa10831292d28bd6 files/1.03-r4/mkservercert 1441
+MD5 34b9db6570c7f0960f53f30506ccb1db files/1.03-r4/qmail.schema 3545
+MD5 b20151cc7b6711081b610885fd815fd2 files/1.03-r4/qmail-control 865
+MD5 d19e2a5d1b958d67da4e3be1c8cef3b3 files/1.03-r4/conf-common 1162
+MD5 7488598f237cd8f088644798c4b2c309 files/1.03-r4/config-sanity-check 821
+MD5 23a2babf3049fe012de21c17e550b3e5 files/1.03-r4/run-qmailsend 29
+MD5 0e97c0b031776f40cacdfbf3114af574 files/1.03-r4/run-qmailpop3dlog 97
diff --git a/net-mail/qmail-ldap/files/1.03-r4/99qmail b/net-mail/qmail-ldap/files/1.03-r4/99qmail
new file mode 100644
index 000000000000..d9d929e4892b
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/99qmail
@@ -0,0 +1,4 @@
+PATH="/var/qmail/bin"
+ROOTPATH="/var/qmail/bin"
+CONFIG_PROTECT="/var/qmail/control /var/qmail/alias"
+QMAIL_CONTROLDIR=/var/qmail/control
diff --git a/net-mail/qmail-ldap/files/1.03-r4/conf-common b/net-mail/qmail-ldap/files/1.03-r4/conf-common
new file mode 100644
index 000000000000..94c4ecda6f42
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/conf-common
@@ -0,0 +1,32 @@
+# Common Configuration file for all qmail daemons
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/conf-common,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+
+# Qmail User IDS to run daemons as
+QMAILDUID=`id -u qmaild`
+NOFILESGID=`id -g qmaild`
+
+# Qmail Control Dir (this is actually set in /etc/env.d/99qmail)
+#QMAIL_CONTROLDIR=/var/qmail/control
+
+# Host and port to listen on
+# We listen on the IPv4 local ip by default
+TCPSERVER_HOST=0.0.0.0
+TCPSERVER_PORT=${SERVICE}
+
+# you do not need to specify -x, -c, -u or -g in this variable as those are
+# added later
+TCPSERVER_OPTS="-p -v"
+
+# 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=""
+
+# Change default maildir to new format
+MAILDIR="./.maildir"
+
+# tcpserver maximum concurrency, defaults to 40 in tcpserver
+# this controls the maximum number of incoming connections that it will accept
+[ -e ${QMAIL_CONTROLDIR}/concurrencyincoming ] && MAXCONN=$(<${QMAIL_CONTROLDIR}/concurrencyincoming) || MAXCONN=40
diff --git a/net-mail/qmail-ldap/files/1.03-r4/conf-pop3d b/net-mail/qmail-ldap/files/1.03-r4/conf-pop3d
new file mode 100644
index 000000000000..2f2736c2e5e9
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/conf-pop3d
@@ -0,0 +1,28 @@
+# Configuration file for qmail-pop3d
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/conf-pop3d,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+
+# Stuff to run before tcpserver
+#QMAIL_TCPSERVER_PRE=""
+# Stuff to run before the authenticator
+#QMAIL_POP3_PREAUTH=""
+# Stuff to run after the user has authenticated successfully
+#QMAIL_POP3_POSTAUTH=""
+
+# this should contain the FQDN of your server
+# by default it pulls the value from qmail
+# which should be correct
+QMAIL_POP3_POP3HOST="$(<${QMAIL_CONTROLDIR}/me)"
+
+# If you want POP3 before SMTP, and you are using this POP3 daemon
+# uncomment the next two lines
+#QMAIL_TCPSERVER_PRE="${QMAIL_TCPSERVER_PRE} envdir /etc/relay-ctrl relay-ctrl-chdir"
+#QMAIL_POP3_POSTAUTH="${QMAIL_POP3_POSTAUTH} /usr/bin/relay-ctrl-allow"
+
+# This controls what password authentication tool POP3 uses
+# It must support DJB's checkpassword interface (http://cr.yp.to/checkpwd.html)
+QMAIL_POP3_CHECKPASSWORD="/var/qmail/bin/auth_pop"
+# cmd5checkpw only validates passwords from /etc/poppasswd
+#QMAIL_POP3_CHECKPASSWORD="/bin/cmd5checkpw"
+
+#Set the debug level for this service
+LOGLEVEL="0"
diff --git a/net-mail/qmail-ldap/files/1.03-r4/conf-qmqpd b/net-mail/qmail-ldap/files/1.03-r4/conf-qmqpd
new file mode 100644
index 000000000000..fd768624aa60
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/conf-qmqpd
@@ -0,0 +1,19 @@
+# Configuration file for qmail-qmqpd
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/conf-qmqpd,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+
+# Stuff to run before tcpserver
+#QMAIL_TCPSERVER_PRE=""
+# Stuff to run qmail-qmqpd
+#QMAIL_QMQP_PRE=""
+# Stuff to after qmail-qmqpd
+#QMAIL_QMQP_POST=""
+
+# this turns off the IDENT grab attempt on connecting
+TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
+
+# I don't trust /etc/services to have obscure ports
+TCPSERVER_PORT=628
+
+#Set the debug level for this service
+LOGLEVEL="0"
+
diff --git a/net-mail/qmail-ldap/files/1.03-r4/conf-qmtpd b/net-mail/qmail-ldap/files/1.03-r4/conf-qmtpd
new file mode 100644
index 000000000000..84dc3b5e1c1f
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/conf-qmtpd
@@ -0,0 +1,22 @@
+# Configuration file for qmail-qmtpd
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/conf-qmtpd,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+
+# For more information on making your servers talk QMTP
+# see http://cr.yp.to/im/mxps.html
+
+# Stuff to run before tcpserver
+#QMAIL_TCPSERVER_PRE=""
+# Stuff to run qmail-qmtpd
+#QMAIL_QMTP_PRE=""
+# Stuff to after qmail-qmtpd
+#QMAIL_QMTP_POST=""
+
+# this turns off the IDENT grab attempt on connecting
+TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
+
+# I don't trust /etc/services to have obscure ports
+TCPSERVER_PORT=209
+
+#Set the debug level for this service
+LOGLEVEL="0"
+
diff --git a/net-mail/qmail-ldap/files/1.03-r4/conf-smtpd b/net-mail/qmail-ldap/files/1.03-r4/conf-smtpd
new file mode 100644
index 000000000000..c2a53013742e
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/conf-smtpd
@@ -0,0 +1,41 @@
+# Configuration file for qmail-smtpd
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/conf-smtpd,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+
+# Stuff to run before tcpserver
+#QMAIL_TCPSERVER_PRE=""
+# Stuff to run qmail-smtpd
+#QMAIL_SMTP_PRE=""
+# Stuff to after qmail-smtpd
+QMAIL_SMTP_POST="/var/qmail/bin/auth_smtp /usr/bin/true"
+
+# this turns off the IDENT grab attempt on connecting
+TCPSERVER_OPTS="${TCPSERVER_OPTS} -R"
+
+# You might want to use rblsmtpd with this, but you need to fill in a RBL server here first
+# see http://cr.yp.to/ucspi-tcp/rblsmtpd.html for more details
+#QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} rblsmtpd -r RBL-SERVER"
+
+# If you are interested in providing POP or IMAP before SMTP type relaying,
+# emerge relay-ctrl, then uncomment the next 2 lines
+#QMAIL_TCPSERVER_PRE="${QMAIL_TCPSERVER_PRE} envdir /etc/relay-ctrl relay-ctrl-chdir"
+#QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} relay-ctrl-check"
+# In /etc/courier-imap/authdaemonrc add the next line to the end:
+#authmodulelist="${authmodulelist} relay-ctrl-allow"
+# Then in /etc/courier-imap/{imapd,imapd-ssl,pop3d,pop3d-ssl}
+# Add this at the end
+#PRERUN="${PRERUN} envdir /etc/relay-ctrl relay-ctrl-chdir"
+
+# This next block is for SMTP-AUTH 
+# This provides the LOGIN, PLAIN and CRAM-MD5 types
+# the 'cmd5checkpw' used in $QMAIL_SMTP_AUTHCHECKPASSWORD supports CRAM-MD5
+# and reads it's data from /etc/poppasswd
+# see the manpage for cmd5checkpw for details on the passwords
+# uncomment the next four lines to enable SMTP-AUTH
+#QMAIL_SMTP_AUTHHOST=$(<${QMAIL_CONTROLDIR}/me)
+#[ -z "${QMAIL_SMTP_POST}" ] && QMAIL_SMTP_POST=/bin/true
+#QMAIL_SMTP_CHECKPASSWORD="/bin/cmd5checkpw"
+#QMAIL_SMTP_POST="${QMAIL_SMTP_AUTHHOST} ${QMAIL_SMTP_CHECKPASSWORD} ${QMAIL_SMTP_POST}"
+
+#Set the debug level for this service
+LOGLEVEL="0"
+
diff --git a/net-mail/qmail-ldap/files/1.03-r4/config-sanity-check b/net-mail/qmail-ldap/files/1.03-r4/config-sanity-check
new file mode 100644
index 000000000000..b5ca9b6576ec
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/config-sanity-check
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Configuration Sanity Checking for qmail
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/config-sanity-check,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+# This is intended solely to stop qmail eating up all your hard disk space with logs
+
+CONFIG_SANITY_GOOD=1
+
+# check simple stuff first
+if [ -z "${QMAILDUID}" -o -z "${NOFILESGID}" -o -z "${SERVICE}" ]; then
+    echo "SERVICE(${SERVICE}), QMAILDUID(${QMAILDUID}) or NOFILESGID(${NOFILESGID}) is unset in $0"
+    CONFIG_SANITY_GOOD=0
+fi
+
+# now make sure we are are on a port that is resolable to a port number
+if [ -z "`getent services ${TCPSERVER_PORT}`" ]; then
+    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-ldap/files/1.03-r4/dot_qmail b/net-mail/qmail-ldap/files/1.03-r4/dot_qmail
new file mode 100644
index 000000000000..81a15fc5c50c
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/dot_qmail
@@ -0,0 +1,3 @@
+# Uncomment the next line for .forward support
+#|dot-forward .forward
+./.maildir/
diff --git a/net-mail/qmail-ldap/files/1.03-r4/gentoo.patch b/net-mail/qmail-ldap/files/1.03-r4/gentoo.patch
new file mode 100644
index 000000000000..820b7fd97a95
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/gentoo.patch
@@ -0,0 +1,56 @@
+--- Makefile2	2004-04-06 12:29:07.000000000 -0700
++++ Makefile	2004-04-06 12:36:02.099022746 -0700
+@@ -19,12 +19,12 @@
+ # -DQMQP_COMPRESS to use the QMQP on the fly compression (for clusters)
+ # -DQUOTATRASH to include the Trash in the quota calculation (normaly it is not)
+ # -DSMTPEXECCHECK to enable smtp DOS/Windows executable detection
+-#LDAPFLAGS=-DQLDAP_CLUSTER -DEXTERNAL_TODO -DDASH_EXT -DDATA_COMPRESS -DQMQP_COMPRESS
++LDAPFLAGS=-DQLDAP_CLUSTER -DEXTERNAL_TODO -DBIGTODO -DDASH_EXT -DDATA_COMPRESS -DQMQP_COMPRESS -DALTQUEUE
+ 
+ # Perhaps you have different ldap libraries, change them here
+-LDAPLIBS=-L/usr/local/lib -lldap -llber
++LDAPLIBS=-L/usr/lib -lldap -llber
+ # and change the location of the include files here
+-LDAPINCLUDES=-I/usr/local/include
++LDAPINCLUDES=-I/usr/include
+ # on Slowaris you need -lresolv and probably a LD_RUN_PATH added like this:
+ #LDAPLIBS=-L/opt/OpenLDAP/lib -lldap -llber -lresolv -R/opt/OpenLDAP/lib
+ # for example on my Linux box I use:
+@@ -33,7 +33,7 @@
+ #LDAPINCLUDES=-I/opt/OpenLDAP/include
+ 
+ # ZLIB needed for -DDATA_COMPRESS and -DQMQP_COMPRESS
+-#ZLIB=-lz
++ZLIB=-lz
+ # or you installed zlib in a different path you can use something like this
+ #ZLIB=-L/opt/zlib/lib -lz
+ #ZINCLUDES=-I/opt/zlib/include
+@@ -57,23 +57,23 @@
+ MNW=-DMAKE_NETSCAPE_WORK 
+ 
+ # to enable the auto-maildir-make feature uncomment the next line
+-#MDIRMAKE=-DAUTOMAILDIRMAKE
++MDIRMAKE=-DAUTOMAILDIRMAKE
+ 
+ # to enable the auto-homedir-make feature uncomment the next line
+-#HDIRMAKE=-DAUTOHOMEDIRMAKE
++HDIRMAKE=-DAUTOHOMEDIRMAKE
+ 
+ # on most systems we need this to make auth_pop and auth_imap
+ #SHADOWLIBS=-lcrypt
+ # OpenBSD and other Systems do not have libcrypt, so comment the line out
+ # if you get linking problems.
+ # To use shadow passwords under some Linux OS, uncomment the next two lines.
+-#SHADOWLIBS=-lcrypt -lshadow
+-#SHADOWOPTS=-DPW_SHADOW
++SHADOWLIBS=-lcrypt -lshadow
++SHADOWOPTS=-DPW_SHADOW
+ # To use shadow passwords under Solaris, uncomment the SHADOWOPTS line.
+ 
+ # to enable the possibility to log and debug imap and pop uncoment the
+ # next line
+-#DEBUG=-DDEBUG
++DEBUG=-DDEBUG
+ # WARNING: you need a NONE DEBUG auth_* to run with inetd
+ 
+ # for profiling ...
diff --git a/net-mail/qmail-ldap/files/1.03-r4/mkservercert b/net-mail/qmail-ldap/files/1.03-r4/mkservercert
new file mode 100644
index 000000000000..be2b5f073384
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/mkservercert
@@ -0,0 +1,55 @@
+#! /bin/sh
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/mkservercert,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+# Self-signed certificate generator for Qmail under Gentoo
+# Robin H. Johnson <robbat2@gentoo.org> - October 17, 2003
+# Based on mkimapdcert from courier-imap.
+
+test -x /usr/bin/openssl || exit 0
+source /sbin/functions.sh
+
+filedir="/var/qmail/control"
+pemfile="${filedir}/servercert.pem"
+randfile="${filedir}/servercert.rand"
+conffile="${filedir}/servercert.cnf"
+
+# file details for pemfile
+mode="0640"
+uid="qmaild"
+gid="qmail"
+
+# expire on certifcate
+days="365"
+
+if test -f $pemfile
+then
+	eerror "$pemfile already exists."
+	exit 1
+fi
+
+ewarn "Please customize ${conffile} before continuing!"
+einfo "Press ENTER to continue, or CTRL-C to stop now."
+read
+
+# setup the temp file
+cp /dev/null $pemfile
+chmod 600 $pemfile
+chown root $pemfile
+
+cleanup() {
+	rm -f $pemfile
+	rm -f $randfile
+	exit 1
+}
+
+dd if=/dev/urandom of=${randfile} bs=64 count=1 2>/dev/null
+chmod 600 ${randfile}
+einfo "Creating self-signed certificate"
+/usr/bin/openssl req -new -x509 -days ${days} -nodes \
+	-config ${conffile} -out $pemfile -keyout $pemfile -rand ${randfile} || cleanup
+einfo "Certificate details"
+/usr/bin/openssl x509 -subject -dates -fingerprint -noout -in $pemfile || cleanup
+chown ${uid}:${gid} ${pemfile}
+chmod ${mode} ${pemfile}
+#qmail needs an extra item
+ln -s ${pemfile} ${filedir}/clientcert.pem
+rm -f $randfile
diff --git a/net-mail/qmail-ldap/files/1.03-r4/pipehack.patch.bz2 b/net-mail/qmail-ldap/files/1.03-r4/pipehack.patch.bz2
new file mode 100644
index 000000000000..a10f9cfe810e
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/pipehack.patch.bz2
diff --git a/net-mail/qmail-ldap/files/1.03-r4/qmail-control b/net-mail/qmail-ldap/files/1.03-r4/qmail-control
new file mode 100644
index 000000000000..300db6d0cb4c
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/qmail-control
@@ -0,0 +1,30 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/qmail-control,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+
+opts="start stop restart reload"
+
+start() {
+    ebegin "Starting qmail mta ..."
+    svc -u /service/qmail-{smtpd,send,qmqp,qmtp}
+    eend $?
+    ebegin "Starting qmail mta logging ..."
+    svc -u /service/qmail-{smtpd,send,qmqp,qmtp}/log
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping qmail mta ..."
+    svc -d /service/qmail-{smtpd,send,qmqp,qmtp}
+    eend $?
+    ebegin "Stopping qmail mta logging ..."
+    svc -d /service/qmail-{smtpd,send,qmqp,qmtp}/log
+    eend $?
+}
+
+reload() {
+    ebegin "Reloading 'locals' and 'virtualdomains' control files."
+    svc -h /service/qmail-send
+    eend $?
+}
diff --git a/net-mail/qmail-ldap/files/1.03-r4/qmail-genrsacert.sh b/net-mail/qmail-ldap/files/1.03-r4/qmail-genrsacert.sh
new file mode 100644
index 000000000000..f68d93877674
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/qmail-genrsacert.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/qmail-genrsacert.sh,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+# Robin H. Johnson <robbat2@gentoo.org> - October 17, 2003
+# This file generates the static temporary RSA keys needed for qmail to encrypt messages
+# It should be run from a crontab, once a day is ok on low load machines, but
+# if you do lots of mail, once per hour is more reasonable
+# if you do NOT create the rsa512.pem, qmail will generate it on the fly for
+# each connection, which can be VERY slow.
+
+if [ -z "${ROOT}" -o "${ROOT}" = "/" ]; then
+confdir=/var/qmail/control
+else
+confdir=${ROOT}/var/qmail/control
+fi
+pemfile="${confdir}/rsa512.pem"
+tmpfile="${confdir}/rsa512.pem.tmp"
+
+# this is the number of bits in the key
+# it should be a power of 2 ideally
+# and it must be more than 64!
+bits="512"
+
+# the key should be 0600
+# which is readable by qmaild only!
+umaskvalue="0077"
+uid="qmaild"
+gid="qmail"
+
+umask ${umaskvalue} ; 
+# we need to make sure that all of the operations succeed
+/usr/bin/openssl genrsa -out ${tmpfile} ${bits} 2>/dev/null && \
+/bin/chown ${uid}:${gid} ${tmpfile} && \
+/bin/mv -f ${tmpfile} ${pemfile}
diff --git a/net-mail/qmail-ldap/files/1.03-r4/qmail.schema b/net-mail/qmail-ldap/files/1.03-r4/qmail.schema
new file mode 100644
index 000000000000..6afac87fd13a
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/qmail.schema
@@ -0,0 +1,103 @@
+#
+# qmail-ldap v3 directory schema
+#
+# The offical qmail-ldap OID assigned by IANA is 7914
+#
+# Created by: David E. Storey <dave@tamos.net>
+# Modified and included into qmail-ldap by Andre Oppermann <opi@nrg4u.com>
+#
+# I've gone through this schema and I think it is now correct but I'm
+# not 100% certain. The next release will clear it up.
+#
+# This schema depends on:
+#	- core.schema
+#	- cosine.schema
+#	- nis.schema
+#
+
+# Attribute Type Definitions
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.1 NAME 'qmailUID'
+	DESC 'UID of the user on the mailsystem'
+	EQUALITY numericStringMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.2 NAME 'qmailGID'
+	DESC 'GID of the user on the mailsystem'
+	EQUALITY numericStringMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.3 NAME 'mailMessageStore'
+	DESC 'Path to the maildir/mbox on the mail system'
+	EQUALITY caseExactIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.4 NAME 'mailAlternateAddress'
+	DESC 'Secondary (alias) mailaddresses for the same user'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.5 NAME 'mailQuota'
+	DESC 'The amount of space the user can use until all further messages get bounced.'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.44
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.6 NAME 'mailHost'
+	DESC 'On which qmail server the messagestore of this user is located.'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.7 NAME 'mailForwardingAddress'
+	DESC 'Address(es) to forward all incoming messages to.'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.8 NAME 'deliveryProgramPath'
+	DESC 'Program to execute for all incoming mails.'
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.9 NAME 'qmailDotMode'
+	DESC 'Interpretation of .qmail files: both, dotonly, ldaponly, ldapwithprog, none'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.10 NAME 'deliveryMode'
+	DESC 'multi field entries of: normal, forwardonly, nombox, localdelivery, reply, echo'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.11 NAME 'mailReplyText'
+	DESC 'A reply text for every incoming message'
+	SUBSTR caseIgnoreSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096}
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.12 NAME 'accountStatus'
+	DESC 'The status of a user account: active, nopop, disabled, deleted'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+	SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.7914.1.2.1.14 NAME 'qmailAccountPurge'
+        DESC 'The earliest date when a mailMessageStore will be purged'
+        EQUALITY caseIgnoreIA5Match
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
+        SINGLE-VALUE )
+
+# Object Class Definitions
+
+objectclass ( 1.3.6.1.4.1.7914.1.2.2.1 NAME 'qmailUser'
+	DESC 'QMail-LDAP User' SUP top AUXILIARY
+	MUST ( mail $ uid )
+	MAY ( mailMessageStore $ homeDirectory $ userPassword $
+	      mailAlternateAddress $ qmailUID $ qmailGID $ mailQuota $
+	      mailHost $ mailForwardingAddress $ deliveryProgramPath $
+	      qmailDotMode $ deliveryMode $ mailReplyText $
+	      accountStatus $ qmailAccountPurge ) )
+
diff --git a/net-mail/qmail-ldap/files/1.03-r4/rc b/net-mail/qmail-ldap/files/1.03-r4/rc
new file mode 100644
index 000000000000..74b00778dc60
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/rc
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec env - PATH="/var/qmail/bin:$PATH" \
+	qmail-start "`grep -v '^#' /var/qmail/control/defaultdelivery`"
diff --git a/net-mail/qmail-ldap/files/1.03-r4/run-qmailpop3d b/net-mail/qmail-ldap/files/1.03-r4/run-qmailpop3d
new file mode 100644
index 000000000000..a94d491368d6
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/run-qmailpop3d
@@ -0,0 +1,27 @@
+#!/bin/sh
+# Gentoo Startup script for qmail's POP3 daemon
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/run-qmailpop3d,v 1.1 2004/04/06 21:56:10 sj7trunks 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
+# probably file a bug on the bugzilla saying what you wanted to change so that
+# modification can be make possible via the configuration files
+
+# This is to make life easier
+SERVICE=pop3
+
+# this is to inherit QMAIL_CONTROLDIR
+. /etc/profile
+
+[ -s ${QMAIL_CONTROLDIR}/conf-common ] && source ${QMAIL_CONTROLDIR}/conf-common
+[ -s ${QMAIL_CONTROLDIR}/conf-${SERVICE}d ] && source ${QMAIL_CONTROLDIR}/conf-${SERVICE}d
+[ -s /var/qmail/bin/config-sanity-check ] && source /var/qmail/bin/config-sanity-check
+
+exec env - LOGLEVEL=${LOGLEVEL} \
+    /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
+    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x /etc/tcp.${SERVICE}.cdb -c ${MAXCONN} \
+    ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
+    ${QMAIL_POP3_PREAUTH} /var/qmail/bin/qmail-popup ${QMAIL_POP3_POP3HOST} \
+    ${QMAIL_POP3_CHECKPASSWORD} ${QMAIL_POP3_POSTAUTH} \
+    /var/qmail/bin/qmail-pop3d ${MAILDIR} 2>&1
+
diff --git a/net-mail/qmail-ldap/files/1.03-r4/run-qmailpop3dlog b/net-mail/qmail-ldap/files/1.03-r4/run-qmailpop3dlog
new file mode 100644
index 000000000000..b1fcb8f4af22
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/run-qmailpop3dlog
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-pop3d
diff --git a/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmqpd b/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmqpd
new file mode 100644
index 000000000000..afcdcbbffdef
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmqpd
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Gentoo Startup script for qmail's QMQP daemon
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmqpd,v 1.1 2004/04/06 21:56:10 sj7trunks 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
+# probably file a bug on the bugzilla saying what you wanted to change so that
+# modification can be make possible via the configuration files
+
+# This is to make life easier
+SERVICE=qmqp
+
+# this is to inherit QMAIL_CONTROLDIR
+. /etc/profile
+
+[ -s ${QMAIL_CONTROLDIR}/conf-common ] && source ${QMAIL_CONTROLDIR}/conf-common
+[ -s ${QMAIL_CONTROLDIR}/conf-${SERVICE}d ] && source ${QMAIL_CONTROLDIR}/conf-${SERVICE}d
+[ -s /var/qmail/bin/config-sanity-check ] && source /var/qmail/bin/config-sanity-check
+
+# Now run it all
+exec env - LOGLEVEL=${LOGLEVEL} \
+    /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
+    ${QMAIL_TCPSERVER_PRE} \
+    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x /etc/tcp.${SERVICE}.cdb \
+    -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \
+    ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
+    ${QMAIL_QMQP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_QMQP_POST} \
+    2>&1
diff --git a/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmqpdlog b/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmqpdlog
new file mode 100644
index 000000000000..d759fbcbcfe1
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmqpdlog
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-qmqpd
diff --git a/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmtpd b/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmtpd
new file mode 100644
index 000000000000..c3623a62c5f7
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmtpd
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Gentoo Startup script for qmail's QMTP daemon
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmtpd,v 1.1 2004/04/06 21:56:10 sj7trunks 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
+# probably file a bug on the bugzilla saying what you wanted to change so that
+# modification can be make possible via the configuration files
+
+# This is to make life easier
+SERVICE=qmtp
+
+# this is to inherit QMAIL_CONTROLDIR
+. /etc/profile
+
+[ -s ${QMAIL_CONTROLDIR}/conf-common ] && source ${QMAIL_CONTROLDIR}/conf-common
+[ -s ${QMAIL_CONTROLDIR}/conf-${SERVICE}d ] && source ${QMAIL_CONTROLDIR}/conf-${SERVICE}d
+[ -s /var/qmail/bin/config-sanity-check ] && source /var/qmail/bin/config-sanity-check
+
+# Now run it all
+exec env - LOGLEVEL=${LOGLEVEL} \
+    /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
+    ${QMAIL_TCPSERVER_PRE} \
+    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x /etc/tcp.${SERVICE}.cdb \
+    -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \
+    ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
+    ${QMAIL_QMTP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_QMTP_POST} \
+    2>&1
diff --git a/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmtpdlog b/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmtpdlog
new file mode 100644
index 000000000000..413a217d7de6
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/run-qmailqmtpdlog
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-qmtpd
diff --git a/net-mail/qmail-ldap/files/1.03-r4/run-qmailsend b/net-mail/qmail-ldap/files/1.03-r4/run-qmailsend
new file mode 100644
index 000000000000..8dbd3adf524f
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/run-qmailsend
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /var/qmail/rc
diff --git a/net-mail/qmail-ldap/files/1.03-r4/run-qmailsendlog b/net-mail/qmail-ldap/files/1.03-r4/run-qmailsendlog
new file mode 100644
index 000000000000..5ff50d1e7711
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/run-qmailsendlog
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-send
diff --git a/net-mail/qmail-ldap/files/1.03-r4/run-qmailsmtpd b/net-mail/qmail-ldap/files/1.03-r4/run-qmailsmtpd
new file mode 100644
index 000000000000..16b0d5033f42
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/run-qmailsmtpd
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Gentoo Startup script for qmail's SMTP daemon
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/run-qmailsmtpd,v 1.1 2004/04/06 21:56:10 sj7trunks 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
+# probably file a bug on the bugzilla saying what you wanted to change so that
+# modification can be make possible via the configuration files
+
+# This is to make life easier
+SERVICE=smtp
+
+# this is to inherit QMAIL_CONTROLDIR
+. /etc/profile
+
+[ -s ${QMAIL_CONTROLDIR}/conf-common ] && source ${QMAIL_CONTROLDIR}/conf-common
+[ -s ${QMAIL_CONTROLDIR}/conf-${SERVICE}d ] && source ${QMAIL_CONTROLDIR}/conf-${SERVICE}d
+[ -s /var/qmail/bin/config-sanity-check ] && source /var/qmail/bin/config-sanity-check
+
+# Now run it all
+exec env - LOGLEVEL=${LOGLEVEL} \
+    /usr/bin/softlimit ${SOFTLIMIT_OPTS} \
+    ${QMAIL_TCPSERVER_PRE} \
+    /usr/bin/tcpserver ${TCPSERVER_OPTS} -x /etc/tcp.${SERVICE}.cdb \
+    -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \
+    ${TCPSERVER_HOST} ${TCPSERVER_PORT} \
+    ${QMAIL_SMTP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_SMTP_POST} \
+    2>&1
diff --git a/net-mail/qmail-ldap/files/1.03-r4/run-qmailsmtpdlog b/net-mail/qmail-ldap/files/1.03-r4/run-qmailsmtpdlog
new file mode 100644
index 000000000000..2d9546146583
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/run-qmailsmtpdlog
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-smtpd
diff --git a/net-mail/qmail-ldap/files/1.03-r4/servercert.cnf b/net-mail/qmail-ldap/files/1.03-r4/servercert.cnf
new file mode 100644
index 000000000000..4c395e493f64
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/servercert.cnf
@@ -0,0 +1,37 @@
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-ldap/files/1.03-r4/servercert.cnf,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+# Robin H. Johnson <robbat2@gentoo.org> - October 17, 2003
+# This is the openssl config file to generate keys for qmail
+# It is read by mkservercert
+
+[ req ]
+# you can increase this value, but be aware that it will make things much slower
+# this should be a power of 2!
+default_bits = 1024
+# leave the rest of these alone!
+encrypt_key = yes
+distinguished_name = req_dn
+x509_extensions = cert_type
+prompt = no
+
+[ req_dn ]
+# 2-Letter ISO country code
+C=US
+# FULL name of state/province/district
+# NO abbreviations!
+ST=Alabama
+# FULL name of city
+# NO abbreviations!
+L=Mobile
+# Full Name of your organization
+# NO abbreviations!
+O=Foobar Systems
+# Leave this alone unless specifically need to change it!
+OU=Automatically-generated Qmail SMTP SSL key
+# This should be a FQDN that resolves to the IP of your server
+CN=localhost
+# This should be the email address for the administrator of the server
+emailAddress=postmaster@localhost
+
+# Leave this alone!
+[ cert_type ]
+nsCertType = server
diff --git a/net-mail/qmail-ldap/files/1.03-r4/tls.patch.bz2 b/net-mail/qmail-ldap/files/1.03-r4/tls.patch.bz2
new file mode 100644
index 000000000000..28caa7d31124
--- /dev/null
+++ b/net-mail/qmail-ldap/files/1.03-r4/tls.patch.bz2
diff --git a/net-mail/qmail-ldap/files/digest-qmail-ldap-1.03-r4 b/net-mail/qmail-ldap/files/digest-qmail-ldap-1.03-r4
new file mode 100644
index 000000000000..770bc0409cf5
--- /dev/null
+++ b/net-mail/qmail-ldap/files/digest-qmail-ldap-1.03-r4
@@ -0,0 +1,4 @@
+MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668
+MD5 8edda59102180973dd1bb546da7de160 qmail-0.0.0.0.patch 450
+MD5 cf849630c95167b2636eddd8a0b0c8dd qmail-ldap-1.03-20040401.patch.gz 243399
+MD5 f4579bf5e099ab973252f168f47af203 qmail-ldap-1.03-r2-tls.patch.bz2 737
diff --git a/net-mail/qmail-ldap/metadata.xml b/net-mail/qmail-ldap/metadata.xml
index 14e2e7f11aa7..9160697739bc 100644
--- a/net-mail/qmail-ldap/metadata.xml
+++ b/net-mail/qmail-ldap/metadata.xml
@@ -4,7 +4,7 @@
     <herd>net-mail</herd>
     <maintainer>
         <email>sj7trunks@gentoo.org</email>
-        <description>qmail-ldap maintainer for the ldap stuff</description>
+        <description>qmail-ldap maintainer</description>
     </maintainer>
     <maintainer>
         <email>robbat2@gentoo.org</email>
diff --git a/net-mail/qmail-ldap/qmail-ldap-1.03-r4.ebuild b/net-mail/qmail-ldap/qmail-ldap-1.03-r4.ebuild
new file mode 100644
index 000000000000..50199d0d05ad
--- /dev/null
+++ b/net-mail/qmail-ldap/qmail-ldap-1.03-r4.ebuild
@@ -0,0 +1,378 @@
+# 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-ldap/qmail-ldap-1.03-r4.ebuild,v 1.1 2004/04/06 21:56:10 sj7trunks Exp $
+
+IUSE="ssl"
+
+inherit eutils fixheadtails
+
+S=${WORKDIR}/qmail-${PV}
+
+DESCRIPTION="A modern replacement for sendmail which uses maildirs"
+HOMEPAGE="http://www.qmail.org/
+	http://www.jedi.claranet.fr/qmail-tuning.html
+	http://iain.cx/unix/qmail/mysql.php
+	http://www.nrg4u.com/"
+SRC_URI="mirror://qmail/qmail-${PV}.tar.gz
+	http://www.suspectclass.com/~sgifford/qmail/qmail-0.0.0.0.patch
+	http://www.nrg4u.com/qmail/qmail-ldap-1.03-20040401.patch.gz
+	mirror://gentoo/${P}-r2-tls.patch.bz2"
+
+DEPEND="virtual/glibc
+	sys-libs/zlib
+	sys-apps/groff
+	>=net-nds/openldap-2.1.23
+	>=sys-apps/ucspi-tcp-0.88
+	>=net-mail/checkpassword-0.90
+	ssl? ( >=dev-libs/openssl-0.9.6e )
+	>=net-mail/queue-fix-1.4-r1"
+	
+
+RDEPEND="!virtual/mta
+	${DEPEND}
+	>=sys-apps/daemontools-0.76-r1
+	>=net-mail/dot-forward-0.71"
+
+PROVIDE="virtual/mta
+	 virtual/mda"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+src_unpack() {
+	unpack qmail-1.03.tar.gz
+	unpack qmail-ldap-1.03-20040401.patch.gz
+
+	cd ${S}
+
+	#main ldap patch
+	#includes : qmail-queue patch | big todo | errno
+	#qmail-103.patch | qmail-local-tabs.patch | big-concurrency.patch
+	epatch ${WORKDIR}/qmail-ldap-1.03-20040401.patch || die "ldap patch failed"
+
+	#define 0.0.0.0 as local system/network
+	epatch ${DISTDIR}/qmail-0.0.0.0.patch || die "0.0.0.0 patch did not apply"
+
+	# AUTOHOME DIR MAKE AND FEATURES PATCH
+	epatch ${FILESDIR}/${PV}-${PR}/gentoo.patch || die "Homedir patch did not apply"
+
+	# Account for Linux filesystems lack of a synchronus link()
+	epatch ${FILESDIR}/qmail-link-sync-gentoo.patch || die "linksync patch did not apply"
+
+	# Lets make Aiko Barz very happy with his patch, this allows you to use a
+	# pipe in deliverpath.
+	epatch ${FILESDIR}/${PV}-${PR}/pipehack.patch.bz2 || die "pipehack did not apply correctly"
+	
+	# make the qmail 'sendmail' binary behave like sendmail's for -f
+	#BROKEN
+	#epatch ${DISTDIR}/sendmail-flagf.patch
+
+	# 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 || die "qmail-date-localtime.patch did not apply"
+
+	if use ssl; then
+		epatch ${FILESDIR}/${PV}-${PR}/tls.patch.bz2 || die "tls+auth patch failed";
+	fi
+
+	echo -n "${CC} ${CFLAGS}" >${S}/conf-cc
+	echo -n "${CC} ${LDFLAGS}" > ${S}/conf-ld
+	echo "500" > conf-spawn
+
+}
+
+src_compile() {
+	cd ${S}
+	emake it man ldap|| die
+}
+
+
+
+src_install() {
+	cd ${S}
+
+	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
+
+	into /usr
+	dodoc ${FILESDIR}/samples.ldif
+	dodoc FAQ UPGRADE SENDMAIL INSTALL* TEST* REMOVE* PIC* SECURITY
+	dodoc SYSDEPS TARGETS THANKS THOUGHTS TODO VERSION
+
+	insopts -o qmailq -g qmail -m 4711
+	insinto /var/qmail/bin
+	doins qmail-queue
+
+	insopts -o root -g qmail -m 700
+	insinto /var/qmail/bin
+	doins qmail-lspawn qmail-start qmail-newu qmail-newmrh
+
+	insopts -o root -g qmail -m 711
+	insinto /var/qmail/bin
+	doins qmail-getpw qmail-local qmail-remote qmail-rspawn \
+	qmail-clean qmail-send splogger qmail-pw2u
+
+	insopts -o root -g qmail -m 755
+	insinto /var/qmail/bin
+	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 auth_imap auth_pop \
+	auth_smtp dirmaker qmail-ldaplookup qmail-todo
+
+	into /usr
+	for i in *.1 *.5 *.8
+	do
+		doman $i
+	done
+
+	einfo "Adding env.d entry for qmail"
+	dodir /etc/env.d
+	insinto /etc/env.d
+	doins ${FILESDIR}/${PV}-${PR}/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
+	${D}/var/qmail/bin/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}/${PV}-${PR}/dot_qmail .qmail.sample
+	fperms 644 /etc/skel/.qmail.sample
+	${D}/var/qmail/bin/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}/${PV}-${PR}/run-qmail${i} run
+		insinto /var/qmail/supervise/qmail-${i}/log
+		newins ${FILESDIR}/${PV}-${PR}/run-qmail${i}log run
+	done
+
+	for i in smtp qmtp qmqp pop3; do
+		insopts -o root -groot -m 644
+		diropts -m 755 -o root -g root
+		dodir /etc
+		insinto /etc
+	if [ -f ${FILESDIR}/tcp.${i}.sample ]; then
+			newins ${FILESDIR}/tcp.${i}.sample tcp.${i}
+		fi
+		if [ -f ${D}/etc/tcp.${i} ]; then
+			tcprules ${D}/etc/tcp.${i}.cdb ${D}/etc/.tcp.${i}.tmp \
+			< ${D}/etc/tcp.${i}
+		fi
+	done
+
+	einfo "Installing the qmail control file ..."
+	exeinto /var/qmail/bin
+	doexe ${FILESDIR}/${PV}-${PR}/qmail-control
+
+	einfo "Installing the qmail startup file ..."
+	insopts -o root -g root -m 755
+	insinto /var/qmail
+	doins ${FILESDIR}/${PV}-${PR}/rc \
+
+	einfo "Installing the qmail configuration file ..."
+	insinto /var/qmail/control
+	insopts -o root -g root -m 644
+	doins ${FILESDIR}/control/defaultdomain \
+	${FILESDIR}/control/defaulthost \
+	${FILESDIR}/control/dirmaker \
+	${FILESDIR}/control/ldapbasedn \
+	${FILESDIR}/control/ldapgid \
+	${FILESDIR}/control/ldaplocaldelivery \
+	${FILESDIR}/control/ldaplogin \
+	${FILESDIR}/control/ldapmessagestore \
+	${FILESDIR}/control/ldapserver \
+	${FILESDIR}/control/ldapuid \
+	${FILESDIR}/control/qmail-pop3d-loglevel \
+	${FILESDIR}/control/qmail-pop3d-softlimit \
+	${FILESDIR}/control/qmail-smtpd-softlimit \
+	${FILESDIR}/control/qmail-start-loglevel
+
+	insopts -o qmaild -g root -m 600
+	insinto /var/qmail/control
+	doins ${FILESDIR}/control/ldappassword
+
+	einfo "Installing the qmail.schema ..."
+	insinto /etc/openldap/schema
+	doins qmail.schema
+
+	einfo "Insalling some stock configuration files"
+	insinto /var/qmail/control
+	insopts -o root -g root -m 644
+	doins ${FILESDIR}/${PV}-${PR}/conf-*
+	newins ${FILESDIR}/${PV}-${PR}/dot_qmail defaultdelivery
+	use ssl && doins ${FILESDIR}/${PV}-${PR}/servercert.cnf
+
+	einfo "Configuration sanity checker"
+	into /var/qmail
+	insopts -o root -g root -m 644
+	dobin ${FILESDIR}/${PV}-${PR}/config-sanity-check
+
+	if use ssl; then
+		einfo "SSL Certificate creation script"
+		dobin ${FILESDIR}/${PV}-${PR}/mkservercert
+		einfo "RSA key generation cronjob"
+		insinto /etc/cron.daily
+		doins ${FILESDIR}/${PV}-${PR}/qmail-genrsacert.sh
+		chmod +x ${D}/etc/cron.daily/qmail-genrsacert.sh
+	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!
+		cat ${ROOT}etc/tcp.${i} 2>/dev/null | tcprules ${ROOT}etc/tcp.${i}.cdb ${ROOT}etc/.tcp.${i}.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
+
+	if [ "`getent group ldapauth | cut -d: -f1`" != "ldapauth" ]; then
+		groupadd ldapauth &>/dev/null
+	fi
+
+	if [ "`getent passwd ldapauth | cut -d: -f1`" != "ldapauth" ]; then
+		useradd -g ldapauth -d /var/qmail/maildirs -s /bin/true -u 11184 ldapauth
+	fi
+				
+
+	einfo "Please do not forget to run, the following syntax :"
+	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}-${PR}/${PN}-${PV}-${PR}.ebuild config "
+	einfo "This will setup qmail to run out-of-the-box on your system including SSL. "
+	echo
+	einfo "To start qmail at boot you have to enable the /etc/init.d/svscan rc file "
+	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 "
+	einfo "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d "
+	echo
+	einfo "NOTE: Please check your /var/qmail/control/ldap* files to match your local "
+	einfo "ldap settings and add the qmail.schema along with \"allow bind_v2\" to your "
+	einfo "slapd.conf. For sample ldifs, please check "
+	einfo "/usr/share/doc/${PN}-${PV}-${PR}/samples.ldif.gz "
+
+
+}
+
+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`
+	if use ssl; then
+	TCPSTRING=":allow,SMTPAUTH=\"TLSREQUIRED\"";
+	else
+	TCPSTRING=":allow,RELAYCLIENT=\"\",RBLSMTPD=\"\""
+	fi
+	for ip in $LOCALIPS; do
+		myline="${ip}${TCPSTRING}"
+		for proto in smtp qmtp qmqp; do
+			f="${ROOT}etc/tcp.${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
+}