diff options
author | Benedikt Boehm <hollow@gentoo.org> | 2007-06-16 13:48:10 +0000 |
---|---|---|
committer | Benedikt Boehm <hollow@gentoo.org> | 2007-06-16 13:48:10 +0000 |
commit | eb78df86f0176003d0136c525a3429287a489aad (patch) | |
tree | a4b68b4fcc85711562e38c92b04b6c7640ee766d /mail-mta | |
parent | Stable on amd64 wrt bug 160067 (diff) | |
download | gentoo-2-eb78df86f0176003d0136c525a3429287a489aad.tar.gz gentoo-2-eb78df86f0176003d0136c525a3429287a489aad.tar.bz2 gentoo-2-eb78df86f0176003d0136c525a3429287a489aad.zip |
sync with netqmail-1.05-r8 ebuild; fix #62734, #65456, #82089, #97957, #125162 and hopefully #83092; old versions are completely broken, therefore removed
(Portage version: 2.1.2.9)
Diffstat (limited to 'mail-mta')
113 files changed, 1077 insertions, 2869 deletions
diff --git a/mail-mta/qmail-ldap/ChangeLog b/mail-mta/qmail-ldap/ChangeLog index fefdcb421238..3937fc178e12 100644 --- a/mail-mta/qmail-ldap/ChangeLog +++ b/mail-mta/qmail-ldap/ChangeLog @@ -1,6 +1,64 @@ # ChangeLog for mail-mta/qmail-ldap # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/ChangeLog,v 1.15 2007/04/28 16:53:42 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/ChangeLog,v 1.16 2007/06/16 13:48:10 hollow Exp $ + +*qmail-ldap-1.03-r5 (16 Jun 2007) + + 16 Jun 2007; Benedikt Böhm <hollow@gentoo.org> + -files/1.03-r2/samples.ldif, -files/1.03-r4/qmail.schema, + -files/1.03-r3/99qmail, -files/1.03-r4/qmail-genrsacert.sh, + -files/1.03-r3/conf-common, -files/1.03-r4/rc, -files/1.03-r3/conf-pop3d, + -files/1.03-r4/run-qmailpop3d, -files/1.03-r3/conf-qmqpd, + -files/1.03-r3/conf-qmtpd, -files/1.03-r3/conf-smtpd, + -files/1.03-r3/config-sanity-check, -files/1.03-r3/dot_qmail, + -files/1.03-r3/mkservercert, -files/1.03-r3/qmail-control, + -files/1.03-r3/qmail-genrsacert.sh, -files/1.03-r3/rc, + -files/1.03-r3/run-qmailpop3d, -files/1.03-r3/run-qmailpop3dlog, + -files/1.03-r3/run-qmailqmqpd, -files/1.03-r3/run-qmailqmqpdlog, + -files/1.03-r3/run-qmailqmtpd, -files/1.03-r3/run-qmailqmtpdlog, + -files/1.03-r3/run-qmailsend, -files/1.03-r3/run-qmailsendlog, + -files/1.03-r3/run-qmailsmtpd, -files/1.03-r3/run-qmailsmtpdlog, + -files/1.03-r3/servercert.cnf, -files/1.03-r4/99qmail, + -files/1.03-r4/conf-common, -files/1.03-r4/conf-pop3d, + -files/1.03-r4/conf-qmqpd, -files/1.03-r4/conf-qmtpd, + -files/1.03-r4/conf-smtpd, -files/1.03-r4/config-sanity-check, + -files/1.03-r4/dot_qmail, -files/1.03-r4/gentoo.patch, + -files/1.03-r4/mkservercert, -files/1.03-r4/pipehack.patch.bz2, + -files/1.03-r4/qmail-control, -files/1.03-r4/run-qmailpop3dlog, + -files/1.03-r4/run-qmailqmqpd, -files/1.03-r4/run-qmailqmqpdlog, + -files/1.03-r4/run-qmailqmtpd, -files/1.03-r4/run-qmailqmtpdlog, + -files/1.03-r4/run-qmailsend, -files/1.03-r4/run-qmailsendlog, + -files/1.03-r4/run-qmailsmtpd, -files/1.03-r4/run-qmailsmtpdlog, + -files/1.03-r4/servercert.cnf, -files/1.03-r4/tls.patch.bz2, + +files/99qmail, +files/conf-common, +files/conf-pop3d, +files/conf-qmqpd, + +files/conf-qmtpd, +files/conf-send, +files/conf-smtpd, + -files/control/defaultdelivery, -files/control/defaultdomain, + -files/control/defaulthost, -files/control/dirmaker, -files/control/file, + -files/control/ldapbasedn, -files/control/ldapgid, + -files/control/ldaplocaldelivery, -files/control/ldaplogin, + -files/control/ldapmessagestore, -files/control/ldappassword, + -files/control/ldapserver, -files/control/ldapuid, +files/dot-qmail, + -files/dot_qmail, -files/errno.patch, -files/gentoo.patch, + -files/homedir.patch, +files/mailer.conf, +files/mkservercert, + +files/qmail-config-system, -files/qmail-control, + +files/qmail-genrsacert.sh, -files/qmail-link-sync-gentoo.patch, + -files/qmail-linksync.patch, -files/qmail-queue.patch, -files/rc, + +files/run-qmail-pop3d, +files/run-qmail-pop3d-log, + +files/run-qmail-qmqpd, +files/run-qmail-qmqpd-log, + +files/run-qmail-qmtpd, +files/run-qmail-qmtpd-log, +files/run-qmail-send, + +files/run-qmail-send-log, +files/run-qmail-smtpd, + +files/run-qmail-smtpd-log, +files/servercert.cnf, +files/smtpplugins, + -files/supervise/run-qmailpop3d, -files/supervise/run-qmailpop3dlog, + -files/supervise/run-qmailsend, -files/supervise/run-qmailsendlog, + -files/supervise/run-qmailsmtpd, -files/supervise/run-qmailsmtpdlog, + files/tcp.pop3.sample, files/tcp.qmqp.sample, files/tcp.qmtp.sample, + files/tcp.smtp.sample, +files/tcprules.d-Makefile.qmail, -files/tls.patch, + -qmail-ldap-1.03-r1.ebuild, -qmail-ldap-1.03-r2.ebuild, + -qmail-ldap-1.03-r3.ebuild, -qmail-ldap-1.03-r4.ebuild, + +qmail-ldap-1.03-r5.ebuild: + sync with netqmail-1.05-r8 ebuild; fix #62734, #65456, #82089, #97957, + #125162 and hopefully #83092; old versions are completely broken, therefore + removed 28 Apr 2007; Sven Wegener <swegener@gentoo.org> qmail-ldap-1.03-r4.ebuild: Fix *initd, *confd and *envd calls (#17388, #174266) diff --git a/mail-mta/qmail-ldap/files/1.03-r2/samples.ldif b/mail-mta/qmail-ldap/files/1.03-r2/samples.ldif deleted file mode 100644 index 74f805c9b86a..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r2/samples.ldif +++ /dev/null @@ -1,46 +0,0 @@ -#ldapauth, better to use this than your rootdn for security reasons -dn: uid=ldapauth,ou=People,dc=yhourhost,dc=net -uid: ldapauth -cn: ldapuath -objectClass: account -objectClass: posixAccount -objectClass: top -objectClass: shadowAccount -shadowLastChange: 12116 -loginShell: /bin/true -uidNumber: 11184 -gidNumber: 2110 -homeDirectory: /var/qmail/maildirs/ -gecos: ldap authorization,,, -userPassword: libcrypt_format - -#sample user dn #NOTE YOU CANNOT HAVE mailMessageStore -dn: uid=denverj ,ou=people,dc=yourhost,dc=net -objectClass: top -objectClass: inetOrgPerson -objectClass: qmailUser -objectClass: person -cn: John Denver -givenName: denverj -sn: denverj -uid: denverj -mail: denverj@yourhost.net -homeDirectory: /var/qmail/maildirs/denverj/ -mailAlternateAddress: denverj@alias.host.net -userPassword: libcrypt_format - -#sample virtual user dn # NOTE YOU CANNOT HAVE homeDirectory -dn: uid=denverj ,ou=people,dc=yourhost,dc=net -objectClass: top -objectClass: inetOrgPerson -objectClass: qmailUser -objectClass: person -cn: John Denver -givenName: denverj -sn: denverj -uid: denverj -mail: denverj@yourhost.net -mailMessageStore: /var/qmail/maildirs/denverj/Maildir/ -mailAlternateAddress: denverj@alias.host.net -userPassword: libcrypt_format - diff --git a/mail-mta/qmail-ldap/files/1.03-r3/conf-common b/mail-mta/qmail-ldap/files/1.03-r3/conf-common deleted file mode 100644 index d502e4d37b90..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/conf-common +++ /dev/null @@ -1,29 +0,0 @@ -# Common Configuration file for all qmail daemons -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/conf-common,v 1.2 2004/07/18 03:27:44 dragonheart 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="" - -# 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/mail-mta/qmail-ldap/files/1.03-r3/conf-pop3d b/mail-mta/qmail-ldap/files/1.03-r3/conf-pop3d deleted file mode 100644 index 4f51646f353e..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/conf-pop3d +++ /dev/null @@ -1,25 +0,0 @@ -# Configuration file for qmail-pop3d -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/conf-pop3d,v 1.2 2004/07/18 03:27:44 dragonheart 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="/bin/checkpassword" -# cmd5checkpw only validates passwords from /etc/poppasswd -#QMAIL_POP3_CHECKPASSWORD="/bin/cmd5checkpw" diff --git a/mail-mta/qmail-ldap/files/1.03-r3/conf-smtpd b/mail-mta/qmail-ldap/files/1.03-r3/conf-smtpd deleted file mode 100644 index f7f0412697c0..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/conf-smtpd +++ /dev/null @@ -1,37 +0,0 @@ -# Configuration file for qmail-smtpd -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/conf-smtpd,v 1.2 2004/07/18 03:27:44 dragonheart 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="" - -# 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}" diff --git a/mail-mta/qmail-ldap/files/1.03-r3/config-sanity-check b/mail-mta/qmail-ldap/files/1.03-r3/config-sanity-check deleted file mode 100644 index be1828ad1000..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/config-sanity-check +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Configuration Sanity Checking for qmail -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/config-sanity-check,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r3/mkservercert b/mail-mta/qmail-ldap/files/1.03-r3/mkservercert deleted file mode 100644 index c5ba2e7d799e..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/mkservercert +++ /dev/null @@ -1,55 +0,0 @@ -#! /bin/sh -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/mkservercert,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r3/qmail-control b/mail-mta/qmail-ldap/files/1.03-r3/qmail-control deleted file mode 100644 index de54c6fd8a61..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/qmail-control +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/qmail-control,v 1.2 2004/07/14 22:34:32 agriffis 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/mail-mta/qmail-ldap/files/1.03-r3/qmail-genrsacert.sh b/mail-mta/qmail-ldap/files/1.03-r3/qmail-genrsacert.sh deleted file mode 100644 index c62422224c61..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/qmail-genrsacert.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/qmail-genrsacert.sh,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r3/rc b/mail-mta/qmail-ldap/files/1.03-r3/rc deleted file mode 100644 index 74b00778dc60..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/rc +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -exec env - PATH="/var/qmail/bin:$PATH" \ - qmail-start "`grep -v '^#' /var/qmail/control/defaultdelivery`" diff --git a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailpop3d b/mail-mta/qmail-ldap/files/1.03-r3/run-qmailpop3d deleted file mode 100644 index c868c02e7eaa..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailpop3d +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# Gentoo Startup script for qmail's POP3 daemon -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/run-qmailpop3d,v 1.2 2004/07/18 03:27:44 dragonheart 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 /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/mail-mta/qmail-ldap/files/1.03-r3/run-qmailpop3dlog b/mail-mta/qmail-ldap/files/1.03-r3/run-qmailpop3dlog deleted file mode 100644 index b1fcb8f4af22..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailpop3dlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-pop3d diff --git a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmqpd b/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmqpd deleted file mode 100644 index 2cb45c60aeba..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmqpd +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Gentoo Startup script for qmail's QMQP daemon -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmqpd,v 1.2 2004/07/18 03:27:44 dragonheart 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 /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/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmqpdlog b/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmqpdlog deleted file mode 100644 index d759fbcbcfe1..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmqpdlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-qmqpd diff --git a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmtpd b/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmtpd deleted file mode 100644 index f02ebfe868c0..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmtpd +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Gentoo Startup script for qmail's QMTP daemon -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmtpd,v 1.2 2004/07/18 03:27:44 dragonheart 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 /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/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmtpdlog b/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmtpdlog deleted file mode 100644 index 413a217d7de6..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailqmtpdlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-qmtpd diff --git a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsend b/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsend deleted file mode 100644 index 8dbd3adf524f..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsend +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /var/qmail/rc diff --git a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsendlog b/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsendlog deleted file mode 100644 index 5ff50d1e7711..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsendlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-send diff --git a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsmtpd b/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsmtpd deleted file mode 100644 index 2d672770b62e..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsmtpd +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Gentoo Startup script for qmail's SMTP daemon -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsmtpd,v 1.2 2004/07/18 03:27:44 dragonheart 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 /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/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsmtpdlog b/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsmtpdlog deleted file mode 100644 index 2d9546146583..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/run-qmailsmtpdlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-smtpd diff --git a/mail-mta/qmail-ldap/files/1.03-r3/servercert.cnf b/mail-mta/qmail-ldap/files/1.03-r3/servercert.cnf deleted file mode 100644 index aedee9228fd9..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r3/servercert.cnf +++ /dev/null @@ -1,37 +0,0 @@ -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/servercert.cnf,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/99qmail b/mail-mta/qmail-ldap/files/1.03-r4/99qmail deleted file mode 100644 index d9d929e4892b..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/99qmail +++ /dev/null @@ -1,4 +0,0 @@ -PATH="/var/qmail/bin" -ROOTPATH="/var/qmail/bin" -CONFIG_PROTECT="/var/qmail/control /var/qmail/alias" -QMAIL_CONTROLDIR=/var/qmail/control diff --git a/mail-mta/qmail-ldap/files/1.03-r4/conf-common b/mail-mta/qmail-ldap/files/1.03-r4/conf-common deleted file mode 100644 index f6dabd4b6b0f..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/conf-common +++ /dev/null @@ -1,32 +0,0 @@ -# Common Configuration file for all qmail daemons -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/conf-common,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/conf-qmqpd b/mail-mta/qmail-ldap/files/1.03-r4/conf-qmqpd deleted file mode 100644 index 1936f264dc58..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/conf-qmqpd +++ /dev/null @@ -1,19 +0,0 @@ -# Configuration file for qmail-qmqpd -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/conf-qmqpd,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/conf-qmtpd b/mail-mta/qmail-ldap/files/1.03-r4/conf-qmtpd deleted file mode 100644 index 39b7edb133f9..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/conf-qmtpd +++ /dev/null @@ -1,22 +0,0 @@ -# Configuration file for qmail-qmtpd -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/conf-qmtpd,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/conf-smtpd b/mail-mta/qmail-ldap/files/1.03-r4/conf-smtpd deleted file mode 100644 index 22564ca0c9e4..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/conf-smtpd +++ /dev/null @@ -1,41 +0,0 @@ -# Configuration file for qmail-smtpd -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/conf-smtpd,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/config-sanity-check b/mail-mta/qmail-ldap/files/1.03-r4/config-sanity-check deleted file mode 100644 index eb0745cc05e1..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/config-sanity-check +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Configuration Sanity Checking for qmail -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/config-sanity-check,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/dot_qmail b/mail-mta/qmail-ldap/files/1.03-r4/dot_qmail deleted file mode 100644 index 81a15fc5c50c..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/dot_qmail +++ /dev/null @@ -1,3 +0,0 @@ -# Uncomment the next line for .forward support -#|dot-forward .forward -./.maildir/ diff --git a/mail-mta/qmail-ldap/files/1.03-r4/gentoo.patch b/mail-mta/qmail-ldap/files/1.03-r4/gentoo.patch deleted file mode 100644 index 820b7fd97a95..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/gentoo.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- 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/mail-mta/qmail-ldap/files/1.03-r4/pipehack.patch.bz2 b/mail-mta/qmail-ldap/files/1.03-r4/pipehack.patch.bz2 Binary files differdeleted file mode 100644 index a10f9cfe810e..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/pipehack.patch.bz2 +++ /dev/null diff --git a/mail-mta/qmail-ldap/files/1.03-r4/qmail-control b/mail-mta/qmail-ldap/files/1.03-r4/qmail-control deleted file mode 100644 index 712a40d861f4..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/qmail-control +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/qmail-control,v 1.2 2004/07/14 22:34:32 agriffis 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/mail-mta/qmail-ldap/files/1.03-r4/qmail-genrsacert.sh b/mail-mta/qmail-ldap/files/1.03-r4/qmail-genrsacert.sh deleted file mode 100644 index 8d1df785309e..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/qmail-genrsacert.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/qmail-genrsacert.sh,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/qmail.schema b/mail-mta/qmail-ldap/files/1.03-r4/qmail.schema deleted file mode 100644 index 6afac87fd13a..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/qmail.schema +++ /dev/null @@ -1,103 +0,0 @@ -# -# 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/mail-mta/qmail-ldap/files/1.03-r4/rc b/mail-mta/qmail-ldap/files/1.03-r4/rc deleted file mode 100644 index 74b00778dc60..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/rc +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -exec env - PATH="/var/qmail/bin:$PATH" \ - qmail-start "`grep -v '^#' /var/qmail/control/defaultdelivery`" diff --git a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailpop3d b/mail-mta/qmail-ldap/files/1.03-r4/run-qmailpop3d deleted file mode 100644 index 97d6a8383a32..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailpop3d +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Gentoo Startup script for qmail's POP3 daemon -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/run-qmailpop3d,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/run-qmailpop3dlog b/mail-mta/qmail-ldap/files/1.03-r4/run-qmailpop3dlog deleted file mode 100644 index b1fcb8f4af22..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailpop3dlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-pop3d diff --git a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmqpd b/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmqpd deleted file mode 100644 index 61860a501ea5..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmqpd +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Gentoo Startup script for qmail's QMQP daemon -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmqpd,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmqpdlog b/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmqpdlog deleted file mode 100644 index d759fbcbcfe1..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmqpdlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-qmqpd diff --git a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmtpd b/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmtpd deleted file mode 100644 index 679cd84efa33..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmtpd +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Gentoo Startup script for qmail's QMTP daemon -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmtpd,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmtpdlog b/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmtpdlog deleted file mode 100644 index 413a217d7de6..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailqmtpdlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-qmtpd diff --git a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsend b/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsend deleted file mode 100644 index 8dbd3adf524f..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsend +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /var/qmail/rc diff --git a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsendlog b/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsendlog deleted file mode 100644 index 5ff50d1e7711..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsendlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-send diff --git a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsmtpd b/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsmtpd deleted file mode 100644 index 55408ffa6584..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsmtpd +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Gentoo Startup script for qmail's SMTP daemon -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsmtpd,v 1.2 2004/07/18 03:27:44 dragonheart 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/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsmtpdlog b/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsmtpdlog deleted file mode 100644 index 2d9546146583..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/run-qmailsmtpdlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-smtpd diff --git a/mail-mta/qmail-ldap/files/1.03-r4/tls.patch.bz2 b/mail-mta/qmail-ldap/files/1.03-r4/tls.patch.bz2 Binary files differdeleted file mode 100644 index 28caa7d31124..000000000000 --- a/mail-mta/qmail-ldap/files/1.03-r4/tls.patch.bz2 +++ /dev/null diff --git a/mail-mta/qmail-ldap/files/1.03-r3/99qmail b/mail-mta/qmail-ldap/files/99qmail index d9d929e4892b..d9d929e4892b 100644 --- a/mail-mta/qmail-ldap/files/1.03-r3/99qmail +++ b/mail-mta/qmail-ldap/files/99qmail diff --git a/mail-mta/qmail-ldap/files/conf-common b/mail-mta/qmail-ldap/files/conf-common new file mode 100644 index 000000000000..ecb5f7b6279d --- /dev/null +++ b/mail-mta/qmail-ldap/files/conf-common @@ -0,0 +1,67 @@ +#!/bin/bash +# Common Configuration file for all qmail daemons +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/conf-common,v 1.1 2007/06/16 13:48:10 hollow Exp $ + +# Qmail User IDS to run daemons as +QMAILDUID=$(id -u qmaild) +NOFILESGID=$(id -g qmaild) +QMAILLUID=$(id -u qmaill) + +# 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" + +# This tells tcpserver where to file the rules cdb file +[[ -d /etc/tcprules.d/ ]] && \ + TCPSERVER_RULESCDB=/etc/tcprules.d/tcp.qmail-${SERVICE}.cdb +[[ ! -f "${TCPSERVER_RULESCDB}" ]] && \ + TCPSERVER_RULESCDB=/etc/tcp.${SERVICE}.cdb + +# we limit data and stack segments to 8mbytes, you may need to raise this if +# you are using a filter in QMAILQUEUE +SOFTLIMIT_OPTS="-m 16000000" + +# We don't have anything to set QMAILQUEUE to at the moment, so we leave it +# alone. Generally it is best to add this in your appropriate (usually SMTP) +# cdb files at /etc/tcprules.d/tcp.qmail-*.cdb instead of on a global basis, as +# otherwise outgoing mail will be checked (because qmail-queue is used for most +# parts of qmail). You can also enable this per-server by just placing it into +# the other configuration files by placing the line there instead. Please note +# that the export part is important. +#export QMAILQUEUE="" + +# tcpserver maximum concurrency, defaults to 40 in tcpserver +# this controls the maximum number of incoming connections that it will accept +if [[ -e ${QMAIL_CONTROLDIR}/concurrencyincoming ]] +then + MAXCONN=$(head -n 1 ${QMAIL_CONTROLDIR}/concurrencyincoming) +else + MAXCONN=40 +fi + +# logging directives +LOG_OPTS="t" # 't' is for timestamp +LOG_MAXSIZE=2500000 # defalts to '99999' if empty +LOG_MAXCOUNT=10 # defaults to '10' if empty + +# build LOG_OPTS from this +[[ -n "${LOG_MAXSIZE}" ]] && \ + LOG_OPTS="${LOG_OPTS} s${LOG_MAXSIZE}" +[[ -n "${LOG_MAXCOUNT}" ]] && \ + LOG_OPTS="${LOG_OPTS} n${LOG_MAXCOUNT}" + +# directory to log to +LOG_DEST=/var/log/qmail/qmail-${SERVICE}d + +# BIG FAT WARNING: +# If you disable this by uncommenting it you will turn _off_ the configuration +# sanity check do so at your own risk! +#QMAIL_DISABLE_SANITY_CHECK=1 diff --git a/mail-mta/qmail-ldap/files/1.03-r4/conf-pop3d b/mail-mta/qmail-ldap/files/conf-pop3d index e546872e1cf0..5bd06e13c9af 100644 --- a/mail-mta/qmail-ldap/files/1.03-r4/conf-pop3d +++ b/mail-mta/qmail-ldap/files/conf-pop3d @@ -1,5 +1,5 @@ # Configuration file for qmail-pop3d -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/conf-pop3d,v 1.2 2004/07/18 03:27:44 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/conf-pop3d,v 1.1 2007/06/16 13:48:10 hollow Exp $ # Stuff to run before tcpserver #QMAIL_TCPSERVER_PRE="" @@ -24,5 +24,6 @@ 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" +# The name of the maildir in each user's directory. +# This should be the same thing that defaultdelivery points to +QMAIL_MAILDIR=".maildir" diff --git a/mail-mta/qmail-ldap/files/1.03-r3/conf-qmqpd b/mail-mta/qmail-ldap/files/conf-qmqpd index 10c56661898d..1d9e5a7745aa 100644 --- a/mail-mta/qmail-ldap/files/1.03-r3/conf-qmqpd +++ b/mail-mta/qmail-ldap/files/conf-qmqpd @@ -1,5 +1,5 @@ # Configuration file for qmail-qmqpd -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/conf-qmqpd,v 1.2 2004/07/18 03:27:44 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/conf-qmqpd,v 1.1 2007/06/16 13:48:10 hollow Exp $ # Stuff to run before tcpserver #QMAIL_TCPSERVER_PRE="" diff --git a/mail-mta/qmail-ldap/files/1.03-r3/conf-qmtpd b/mail-mta/qmail-ldap/files/conf-qmtpd index 712ff70deecf..65992b7b74e9 100644 --- a/mail-mta/qmail-ldap/files/1.03-r3/conf-qmtpd +++ b/mail-mta/qmail-ldap/files/conf-qmtpd @@ -1,5 +1,5 @@ # Configuration file for qmail-qmtpd -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r3/conf-qmtpd,v 1.2 2004/07/18 03:27:44 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/conf-qmtpd,v 1.1 2007/06/16 13:48:10 hollow Exp $ # For more information on making your servers talk QMTP # see http://cr.yp.to/im/mxps.html diff --git a/mail-mta/qmail-ldap/files/conf-send b/mail-mta/qmail-ldap/files/conf-send new file mode 100644 index 000000000000..8ec5d5666e39 --- /dev/null +++ b/mail-mta/qmail-ldap/files/conf-send @@ -0,0 +1,6 @@ +# Configuration file for qmail-send +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/conf-send,v 1.1 2007/06/16 13:48:10 hollow Exp $ + +# directory to log to +# override conf-common on this +LOG_DEST=/var/log/qmail/qmail-send diff --git a/mail-mta/qmail-ldap/files/conf-smtpd b/mail-mta/qmail-ldap/files/conf-smtpd new file mode 100644 index 000000000000..a8c95655eec9 --- /dev/null +++ b/mail-mta/qmail-ldap/files/conf-smtpd @@ -0,0 +1,54 @@ +# Configuration file for qmail-smtpd +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/conf-smtpd,v 1.1 2007/06/16 13:48:10 hollow 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="" + +# this turns off the IDENT grab attempt on connecting +TCPSERVER_OPTS="${TCPSERVER_OPTS} -R" + +# fixcrio inserts missing CRs at the ends of lines. See: +# http://cr.yp.to/ucspi-tcp/fixcrio.html +# http://cr.yp.to/docs/smtplf.html +# DO NOT enable this when you are using SSL/TLS (USE=ssl)! +#QMAIL_SMTP_PRE="${QMAIL_SMTP_PRE} fixcrio" + +# 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 + +# WARNING: If you've installed qmail with USE=noauthcram, and you want to use +# the following programs, you proably need to install them. + +# Example using cmd5checkpw +# See the manpage for cmd5checkpw for details on the passwords +#QMAIL_SMTP_CHECKPASSWORD="/bin/cmd5checkpw" + +# Example for checkpassword-pam (emerge checkpassword-pam) +# Don't forget to make /usr/bin/checkpassword-pam sticky (see README.auth) +#QMAIL_SMTP_CHECKPASSWORD="/usr/bin/checkpassword-pam -s system-auth" + +# LDAP SMTP AUTH +QMAIL_SMTP_CHECKPASSWORD="/var/qmail/bin/auth_smtp" + +[[ -n "${QMAIL_SMTP_CHECKPASSWORD}" ]] && { + [[ -z "${QMAIL_SMTP_POST}" ]] && QMAIL_SMTP_POST=/bin/true + QMAIL_SMTP_POST="${QMAIL_SMTP_CHECKPASSWORD} ${QMAIL_SMTP_POST}" +} diff --git a/mail-mta/qmail-ldap/files/control/defaultdelivery b/mail-mta/qmail-ldap/files/control/defaultdelivery deleted file mode 100644 index 22c2d5b860a1..000000000000 --- a/mail-mta/qmail-ldap/files/control/defaultdelivery +++ /dev/null @@ -1 +0,0 @@ -./maildir/ diff --git a/mail-mta/qmail-ldap/files/control/defaultdomain b/mail-mta/qmail-ldap/files/control/defaultdomain deleted file mode 100644 index fb4e1b47f2c9..000000000000 --- a/mail-mta/qmail-ldap/files/control/defaultdomain +++ /dev/null @@ -1 +0,0 @@ -yourhost.net diff --git a/mail-mta/qmail-ldap/files/control/defaulthost b/mail-mta/qmail-ldap/files/control/defaulthost deleted file mode 100644 index fb4e1b47f2c9..000000000000 --- a/mail-mta/qmail-ldap/files/control/defaulthost +++ /dev/null @@ -1 +0,0 @@ -yourhost.net diff --git a/mail-mta/qmail-ldap/files/control/dirmaker b/mail-mta/qmail-ldap/files/control/dirmaker deleted file mode 100644 index f3809bd04dd8..000000000000 --- a/mail-mta/qmail-ldap/files/control/dirmaker +++ /dev/null @@ -1 +0,0 @@ -/var/qmail/bin/dirmaker diff --git a/mail-mta/qmail-ldap/files/control/file b/mail-mta/qmail-ldap/files/control/file deleted file mode 100644 index 222061e8ea80..000000000000 --- a/mail-mta/qmail-ldap/files/control/file +++ /dev/null @@ -1 +0,0 @@ -127.0.0.1:allow,RELAYCLIENT=,RBLSMTPD="" diff --git a/mail-mta/qmail-ldap/files/control/ldapbasedn b/mail-mta/qmail-ldap/files/control/ldapbasedn deleted file mode 100644 index f2dbbcd12554..000000000000 --- a/mail-mta/qmail-ldap/files/control/ldapbasedn +++ /dev/null @@ -1 +0,0 @@ -dc=yourhost,dc=net diff --git a/mail-mta/qmail-ldap/files/control/ldapgid b/mail-mta/qmail-ldap/files/control/ldapgid deleted file mode 100644 index 281e3d99811c..000000000000 --- a/mail-mta/qmail-ldap/files/control/ldapgid +++ /dev/null @@ -1 +0,0 @@ -2110 diff --git a/mail-mta/qmail-ldap/files/control/ldaplocaldelivery b/mail-mta/qmail-ldap/files/control/ldaplocaldelivery deleted file mode 100644 index 573541ac9702..000000000000 --- a/mail-mta/qmail-ldap/files/control/ldaplocaldelivery +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/mail-mta/qmail-ldap/files/control/ldaplogin b/mail-mta/qmail-ldap/files/control/ldaplogin deleted file mode 100644 index d17943365b6d..000000000000 --- a/mail-mta/qmail-ldap/files/control/ldaplogin +++ /dev/null @@ -1 +0,0 @@ -uid=ldapauth, ou=people, dc=host, dc=net diff --git a/mail-mta/qmail-ldap/files/control/ldapmessagestore b/mail-mta/qmail-ldap/files/control/ldapmessagestore deleted file mode 100644 index 25491ac6a392..000000000000 --- a/mail-mta/qmail-ldap/files/control/ldapmessagestore +++ /dev/null @@ -1 +0,0 @@ -/var/qmail/maildirs/ diff --git a/mail-mta/qmail-ldap/files/control/ldappassword b/mail-mta/qmail-ldap/files/control/ldappassword deleted file mode 100644 index 3e86aa02bfcd..000000000000 --- a/mail-mta/qmail-ldap/files/control/ldappassword +++ /dev/null @@ -1 +0,0 @@ -your_ldapauth_dn_password diff --git a/mail-mta/qmail-ldap/files/control/ldapserver b/mail-mta/qmail-ldap/files/control/ldapserver deleted file mode 100644 index 2fbb50c4a8dc..000000000000 --- a/mail-mta/qmail-ldap/files/control/ldapserver +++ /dev/null @@ -1 +0,0 @@ -localhost diff --git a/mail-mta/qmail-ldap/files/control/ldapuid b/mail-mta/qmail-ldap/files/control/ldapuid deleted file mode 100644 index 8a0094da9a0b..000000000000 --- a/mail-mta/qmail-ldap/files/control/ldapuid +++ /dev/null @@ -1 +0,0 @@ -11184 diff --git a/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r1 b/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r1 deleted file mode 100644 index 0e02c2df0f9d..000000000000 --- a/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r1 +++ /dev/null @@ -1,21 +0,0 @@ -MD5 2ff58c3570870a8ff9a1d9eb9aec05a6 big-concurrency.patch 9331 -RMD160 51dd7ac6cec884f402fbc7f4b78e2b11a903f73d big-concurrency.patch 9331 -SHA256 0322991955878e86af495f7317c3a4bd2e60640f9a6dd70ad501fff27242ac2f big-concurrency.patch 9331 -MD5 39b6f70f65056472ff97ab40c1dba7b4 big-todo.103.patch 5546 -RMD160 a16a429796d869b8217e42b7ddb607c95d9bbcd8 big-todo.103.patch 5546 -SHA256 afa0a249e3271badd442f0bdae39997d9fe536157d8a0d62b6706f3dfcd11a72 big-todo.103.patch 5546 -MD5 8edda59102180973dd1bb546da7de160 qmail-0.0.0.0.patch 450 -RMD160 c02a16d30bc4890be83bf30ae8b5033ea14e1c6e qmail-0.0.0.0.patch 450 -SHA256 e4278c9f926523c77023ca4997612c3c1892dca14ee21069fec51a041c0c331a qmail-0.0.0.0.patch 450 -MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668 -RMD160 b851f273f1d365d38efd949b1efcf35768ffa30f qmail-1.03.tar.gz 220668 -SHA256 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88 qmail-1.03.tar.gz 220668 -MD5 9140ad2b03017145cd7963c84bb24f16 qmail-103.patch 2104 -RMD160 437f8b3063438bbd82c59557333b3566214afa9c qmail-103.patch 2104 -SHA256 4cad53c7a6628a600c74c36bfee327db5052ca24c222d4013e4dfcd7f427653d qmail-103.patch 2104 -MD5 48d2761e9ae44bb4d2812a19634f1a5b qmail-ldap-1.03-20020901.patch.gz 130655 -RMD160 c995aa773cf372e889a45e8710b8e702e71f748b qmail-ldap-1.03-20020901.patch.gz 130655 -SHA256 63110ad481f887e504b84e1b1451dbda7f5e165fc31db82869b1f521a394976d qmail-ldap-1.03-20020901.patch.gz 130655 -MD5 3259bdfd80dc89708116c786f8cb9007 smtp-auth-20030301.patch 33998 -RMD160 e1493b0ad03ece0d8c69f568f876ed496e643715 smtp-auth-20030301.patch 33998 -SHA256 9abefc586963834f326fa059ac58eea49fb6322d3d641bbd0d763093ad43a238 smtp-auth-20030301.patch 33998 diff --git a/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r2 b/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r2 deleted file mode 100644 index 13291f6007de..000000000000 --- a/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r2 +++ /dev/null @@ -1,15 +0,0 @@ -MD5 8edda59102180973dd1bb546da7de160 qmail-0.0.0.0.patch 450 -RMD160 c02a16d30bc4890be83bf30ae8b5033ea14e1c6e qmail-0.0.0.0.patch 450 -SHA256 e4278c9f926523c77023ca4997612c3c1892dca14ee21069fec51a041c0c331a qmail-0.0.0.0.patch 450 -MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668 -RMD160 b851f273f1d365d38efd949b1efcf35768ffa30f qmail-1.03.tar.gz 220668 -SHA256 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88 qmail-1.03.tar.gz 220668 -MD5 0c9ea59691ad08440e927a600b0bb5fd qmail-ldap-1.03-20040101.patch.gz 224532 -RMD160 4593ad4744dca594a1db3721c9a281109c08044f qmail-ldap-1.03-20040101.patch.gz 224532 -SHA256 90058a7d018f6da1c7a7bf40c09b77c02a434e1acf1a8f8bc4d701335fd259ed qmail-ldap-1.03-20040101.patch.gz 224532 -MD5 f4579bf5e099ab973252f168f47af203 qmail-ldap-1.03-r2-tls.patch.bz2 737 -RMD160 560abd9a23d99ec3798d7f3aa4496ed2a2747543 qmail-ldap-1.03-r2-tls.patch.bz2 737 -SHA256 6d8c532089c6e8e263b1241d47e6b88d3d5aef2e02f3fcbcc19717aeb1150d99 qmail-ldap-1.03-r2-tls.patch.bz2 737 -MD5 4e1f2d8315e7e2a5482798c9d19fac4d sendmail-flagf.patch 863 -RMD160 8930f7c89937f9fd60b17cf355377bb9bcc8ea4e sendmail-flagf.patch 863 -SHA256 9b3951c22b98c0e5a6ebfa793f052d91dfe01d68a0ad8dc83b8e0bd60c01802e sendmail-flagf.patch 863 diff --git a/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r3 b/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r3 deleted file mode 100644 index a3bbf3cb554c..000000000000 --- a/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r3 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 8edda59102180973dd1bb546da7de160 qmail-0.0.0.0.patch 450 -RMD160 c02a16d30bc4890be83bf30ae8b5033ea14e1c6e qmail-0.0.0.0.patch 450 -SHA256 e4278c9f926523c77023ca4997612c3c1892dca14ee21069fec51a041c0c331a qmail-0.0.0.0.patch 450 -MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668 -RMD160 b851f273f1d365d38efd949b1efcf35768ffa30f qmail-1.03.tar.gz 220668 -SHA256 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88 qmail-1.03.tar.gz 220668 -MD5 0c9ea59691ad08440e927a600b0bb5fd qmail-ldap-1.03-20040101.patch.gz 224532 -RMD160 4593ad4744dca594a1db3721c9a281109c08044f qmail-ldap-1.03-20040101.patch.gz 224532 -SHA256 90058a7d018f6da1c7a7bf40c09b77c02a434e1acf1a8f8bc4d701335fd259ed qmail-ldap-1.03-20040101.patch.gz 224532 -MD5 4e1f2d8315e7e2a5482798c9d19fac4d sendmail-flagf.patch 863 -RMD160 8930f7c89937f9fd60b17cf355377bb9bcc8ea4e sendmail-flagf.patch 863 -SHA256 9b3951c22b98c0e5a6ebfa793f052d91dfe01d68a0ad8dc83b8e0bd60c01802e sendmail-flagf.patch 863 diff --git a/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r4 b/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r4 deleted file mode 100644 index 8ff7100ec624..000000000000 --- a/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r4 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 8edda59102180973dd1bb546da7de160 qmail-0.0.0.0.patch 450 -RMD160 c02a16d30bc4890be83bf30ae8b5033ea14e1c6e qmail-0.0.0.0.patch 450 -SHA256 e4278c9f926523c77023ca4997612c3c1892dca14ee21069fec51a041c0c331a qmail-0.0.0.0.patch 450 -MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668 -RMD160 b851f273f1d365d38efd949b1efcf35768ffa30f qmail-1.03.tar.gz 220668 -SHA256 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88 qmail-1.03.tar.gz 220668 -MD5 cf849630c95167b2636eddd8a0b0c8dd qmail-ldap-1.03-20040401.patch.gz 243399 -RMD160 6ac20c3aa510056db46f70714227c626d6ada51b qmail-ldap-1.03-20040401.patch.gz 243399 -SHA256 695548903723b7edbb6a1e63ff3559821a9b5cf24e04e5620a52679a396f0db8 qmail-ldap-1.03-20040401.patch.gz 243399 -MD5 f4579bf5e099ab973252f168f47af203 qmail-ldap-1.03-r2-tls.patch.bz2 737 -RMD160 560abd9a23d99ec3798d7f3aa4496ed2a2747543 qmail-ldap-1.03-r2-tls.patch.bz2 737 -SHA256 6d8c532089c6e8e263b1241d47e6b88d3d5aef2e02f3fcbcc19717aeb1150d99 qmail-ldap-1.03-r2-tls.patch.bz2 737 diff --git a/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r5 b/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r5 new file mode 100644 index 000000000000..017af98e17dc --- /dev/null +++ b/mail-mta/qmail-ldap/files/digest-qmail-ldap-1.03-r5 @@ -0,0 +1,9 @@ +MD5 622f65f982e380dbe86e6574f3abcb7c qmail-1.03.tar.gz 220668 +RMD160 b851f273f1d365d38efd949b1efcf35768ffa30f qmail-1.03.tar.gz 220668 +SHA256 21ed6c562cbb55092a66197c35c8222b84115d1acab0854fdb1ad1f301626f88 qmail-1.03.tar.gz 220668 +MD5 55fa135415ee011f3f4234d7d52a3565 qmail-ldap-1.03-20060201.patch.gz 270788 +RMD160 c5702f1e4ddc9b5c4bd7d9960d6bab8514ef9d97 qmail-ldap-1.03-20060201.patch.gz 270788 +SHA256 92ba895df1957109ad856cc1d1554ece4d25d59017e77127dd52d76afd05525a qmail-ldap-1.03-20060201.patch.gz 270788 +MD5 a5d9c4ba5a7b8c858341cc4ef8ebd447 qmail-ldap-1.03-spp-0.42.patch 13618 +RMD160 508570102eea891b09bcf7e26c33ebe9c19526b3 qmail-ldap-1.03-spp-0.42.patch 13618 +SHA256 0f673a5944347d5e46c7beffd5d9fa760cecb2e61a3291c3392ffa6777cee8c8 qmail-ldap-1.03-spp-0.42.patch 13618 diff --git a/mail-mta/qmail-ldap/files/1.03-r3/dot_qmail b/mail-mta/qmail-ldap/files/dot-qmail index 81a15fc5c50c..81a15fc5c50c 100644 --- a/mail-mta/qmail-ldap/files/1.03-r3/dot_qmail +++ b/mail-mta/qmail-ldap/files/dot-qmail diff --git a/mail-mta/qmail-ldap/files/dot_qmail b/mail-mta/qmail-ldap/files/dot_qmail deleted file mode 100644 index 7c9e5d08f067..000000000000 --- a/mail-mta/qmail-ldap/files/dot_qmail +++ /dev/null @@ -1 +0,0 @@ -./.maildir/ diff --git a/mail-mta/qmail-ldap/files/errno.patch b/mail-mta/qmail-ldap/files/errno.patch deleted file mode 100644 index f9b77b91e065..000000000000 --- a/mail-mta/qmail-ldap/files/errno.patch +++ /dev/null @@ -1,38 +0,0 @@ -% diff -u3 error.h.orig error.h ---- error.h.orig 1998-06-15 06:53:16.000000000 -0400 -+++ error.h 2002-12-24 20:28:40.000000000 -0500 -@@ -1,7 +1,7 @@ - #ifndef ERROR_H - #define ERROR_H - --extern int errno; -+#include <errno.h> - - extern int error_intr; - extern int error_nomem; - - -% diff -u3 dns.c.orig dns.c ---- dns.c.orig 2002-08-09 19:20:48.000000000 -0400 -+++ dns.c 2002-12-24 20:42:46.000000000 -0500 -@@ -7,8 +7,6 @@ - #include <errno.h> - extern int res_query(); - extern int res_search(); --extern int errno; --extern int h_errno; - #include "ip.h" - #include "ipalloc.h" - #include "fmt.h" - - -% diff -u3 cdb_seek.c.orig cdb_seek.c ---- cdb_seek.c.orig 1998-06-15 06:53:16.000000000 -0400 -+++ cdb_seek.c 2002-12-24 20:42:52.000000000 -0500 -@@ -1,6 +1,5 @@ - #include <sys/types.h> - #include <errno.h> --extern int errno; - #include "cdb.h" - - #ifndef SEEK_SET diff --git a/mail-mta/qmail-ldap/files/gentoo.patch b/mail-mta/qmail-ldap/files/gentoo.patch deleted file mode 100644 index 2a81b4d716e2..000000000000 --- a/mail-mta/qmail-ldap/files/gentoo.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- Makefile.old 2004-01-08 19:03:20.288589831 -0800 -+++ Makefile 2004-01-08 19:07:26.942655958 -0800 -@@ -17,7 +17,7 @@ - # -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=-DEXTERNAL_TODO -DBIGTODO -DDASH_EXT -DALTQUEUE - - # Perhaps you have different ldap libraries, change them here - LDAPLIBS=-L/usr/local/lib -lldap -llber -@@ -55,18 +55,18 @@ - 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 diff --git a/mail-mta/qmail-ldap/files/homedir.patch b/mail-mta/qmail-ldap/files/homedir.patch deleted file mode 100644 index 32c08542a3f6..000000000000 --- a/mail-mta/qmail-ldap/files/homedir.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- Makefile.orig 2003-07-19 19:19:24.000000000 -0700 -+++ Makefile 2003-07-19 19:21:20.000000000 -0700 -@@ -10,7 +10,7 @@ - # systems) - # -DEXTERNAL_TODO to use the external high-performance todo processing (this - # avoids the silly qmail syndrome with high injection rates) --#LDAPFLAGS=-DQLDAP_CLUSTER -DEXTERNAL_TODO -+LDAPFLAGS=-DQLDAP_CLUSTER - #LDAPFLAGS=-DQLDAP_CLUSTER -DEXTERNAL_TODO -DDASH_EXT - - # Perhaps you have different ldap libraries, change them here -@@ -41,10 +41,10 @@ - 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 checkpassword - SHADOWLIBS=-lcrypt diff --git a/mail-mta/qmail-ldap/files/mailer.conf b/mail-mta/qmail-ldap/files/mailer.conf new file mode 100644 index 000000000000..cd4f4cdbece0 --- /dev/null +++ b/mail-mta/qmail-ldap/files/mailer.conf @@ -0,0 +1,6 @@ +# Execute the real programs from qmail +# +sendmail /var/qmail/bin/sendmail +send-mail /var/qmail/bin/sendmail +mailq /var/qmail/bin/qmail-qread +newaliases /var/qmail/bin/newaliases diff --git a/mail-mta/qmail-ldap/files/1.03-r4/mkservercert b/mail-mta/qmail-ldap/files/mkservercert index 51683fded0c0..f98aee48bffd 100644 --- a/mail-mta/qmail-ldap/files/1.03-r4/mkservercert +++ b/mail-mta/qmail-ldap/files/mkservercert @@ -1,11 +1,11 @@ -#! /bin/sh -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/mkservercert,v 1.2 2004/07/18 03:27:44 dragonheart Exp $ +#!/bin/bash +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/mkservercert,v 1.1 2007/06/16 13:48:10 hollow 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 +source /etc/init.d/functions.sh || exit 1 filedir="/var/qmail/control" pemfile="${filedir}/servercert.pem" diff --git a/mail-mta/qmail-ldap/files/qmail-config-system b/mail-mta/qmail-ldap/files/qmail-config-system new file mode 100644 index 000000000000..5d433931a9d2 --- /dev/null +++ b/mail-mta/qmail-ldap/files/qmail-config-system @@ -0,0 +1,72 @@ +#!/bin/bash +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/qmail-config-system,v 1.1 2007/06/16 13:48:10 hollow Exp $ + +# This is a configuration system to make using and controlling the interesting +# parts of the qmail behavior simple. The only variable that needs to be set +# before running this is $SERVICE. + +# this is to inherit QMAIL_CONTROLDIR +. /etc/profile + +# now run +# grab the common configuration +[[ -s ${QMAIL_CONTROLDIR}/conf-common ]] && \ + . ${QMAIL_CONTROLDIR}/conf-common + +# grab the per-service configuration +[[ -s ${QMAIL_CONTROLDIR}/conf-${SERVICE}d ]] && \ + . ${QMAIL_CONTROLDIR}/conf-${SERVICE}d + +# special case for qmail-send +[[ "${SERVICE}" = send && -s ${QMAIL_CONTROLDIR}/conf-send ]] && \ + . ${QMAIL_CONTROLDIR}/conf-send + +# you may want to disable this at some point, so I give you the choice here +if [[ -z "${QMAIL_DISABLE_SANITY_CHECK}" ]] +then + # This is intended solely to stop qmail eating up all your hard disk space with logs + + CONFIG_SANITY_GOOD= + + # check simple stuff first + if [[ -z "${QMAILDUID}" || -z "${NOFILESGID}" || -z "${SERVICE}" || -z "${QMAILLUID}" ]] + then + echo "SERVICE(${SERVICE}), QMAILDUID(${QMAILDUID}), NOFILESGID(${NOFILESGID}) or "\ + "QMAILLUID(${QMAILLUID}) is unset in $0" + CONFIG_SANITY_GOOD=0 + fi + + if [[ -z "${LOG_OPTS}" || -z "${LOG_DEST}" ]] + then + echo "LOG_OPTS: ${LOG_OPTS}" + echo "LOG_DEST: ${LOG_DEST}" + echo "Error in logging setup!" + CONFIG_SANITY_GOOD=0 + fi + + if [[ "${SERVICE}" = smtp && + ! -f ${QMAIL_CONTROLDIR}/rcpthosts && + -z "${QMAIL_DISABLE_SANITY_CHECK}" ]] + then + echo "No /var/qmail/control/rcpthosts!" + echo "Refusing to start SMTP listener because it'll create an open relay" + CONFIG_SANITY_GOOD=0 + fi + + if [[ "${SERVICE}" != send && ! -f "${TCPSERVER_RULESCDB}" ]] + then + echo "No CDB file found (${TCPSERVER_RULESCDB})" + CONFIG_SANITY_GOOD=0 + fi + + if [[ -n "${CONFIG_SANITY_GOOD}" ]] + then + echo "Some error detected in ${SERVICE}, sleeping for 90 seconds for safety" + sleep 90s + exit 1 + fi +else + echo "Failed to find sanity checker!" + sleep 30s + exit 1 +fi diff --git a/mail-mta/qmail-ldap/files/qmail-control b/mail-mta/qmail-ldap/files/qmail-control deleted file mode 100644 index 11240ab0c5df..000000000000 --- a/mail-mta/qmail-ldap/files/qmail-control +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/qmail-control,v 1.2 2004/07/14 22:34:32 agriffis Exp $ - -opts="start stop restart reload" - -start() { - ebegin "Starting qmail mta ..." - svc -u /var/qmail/supervise/* - eend $? - ebegin "Starting qmail mta logging ..." - svc -u /var/qmail/supervise/*/log - eend $? -} - -stop() { - ebegin "Stopping qmail mta ..." - svc -d /var/qmail/supervise/* - eend $? - ebegin "Stopping qmail mta logging ..." - svc -d /var/qmail/supervise/*/log - eend $? -} - -reload() { - ebegin "Reloading 'locals' and 'virtualdomains' control files." - svc -h /var/qmail/supervise/qmail-send - eend $? -} diff --git a/mail-mta/qmail-ldap/files/qmail-genrsacert.sh b/mail-mta/qmail-ldap/files/qmail-genrsacert.sh new file mode 100644 index 000000000000..5c0ccd3717f6 --- /dev/null +++ b/mail-mta/qmail-ldap/files/qmail-genrsacert.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/qmail-genrsacert.sh,v 1.1 2007/06/16 13:48:10 hollow 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. + +confdir=${ROOT}/var/qmail/control + +# the key should be 0600 +# which is readable by qmaild only! +umaskvalue="0077" +uid="qmaild" +gid="qmail" + +umask ${umaskvalue} + +# If you want to renice this process, uncomment the following line: +# renice +15 "$$" >/dev/null + +# This is a list with bits of the generated keys. They should +# be a power of 2 ideally and must be more than 64. +keys="512 1024" + +for bits in ${keys} +do + pemfile="${confdir}/rsa${bits}.pem" + tmpfile="${confdir}/rsa${bits}.pem.tmp" + + # 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} || exit 1 + + dhfile="${confdir}/dh${bits}.pem" + dtmpfile="${confdir}/dh${bits}.pem.tmp" + + /usr/bin/openssl dhparam -2 -out ${dtmpfile} ${bits} 2>/dev/null && \ + /bin/chown ${uid}:${gid} ${dtmpfile} && \ + /bin/mv -f ${dtmpfile} ${dhfile} || exit 1 +done diff --git a/mail-mta/qmail-ldap/files/qmail-link-sync-gentoo.patch b/mail-mta/qmail-ldap/files/qmail-link-sync-gentoo.patch deleted file mode 100644 index ec67d553c73e..000000000000 --- a/mail-mta/qmail-ldap/files/qmail-link-sync-gentoo.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -u qmail-1.03/qmail-local.c qmail-1.03-linksync/qmail-local.c ---- qmail-1.03/qmail-local.c 2004-01-09 13:48:14.000000000 -0800 -+++ qmail-1.03-linksync/qmail-local.c 2004-01-09 13:54:25.041334954 -0800 -@@ -1,5 +1,6 @@ - #include <sys/types.h> - #include <sys/stat.h> -+#include <fcntl.h> - #include <unistd.h> - #include "readwrite.h" - #include "sig.h" -@@ -159,6 +160,9 @@ - } - - if (link(fntmptph,fnnewtph) == -1) goto fail; -+ if ((fd = open(fnnewtph, O_RDONLY)) < 0 || -+ fsync(fd) < 0 || close(fd) < 0) goto fail; -+ - /* if it was error_exist, almost certainly successful; i hate NFS */ - tryunlinktmp(); _exit(0); - -diff -u qmail-1.03/qmail-queue.c qmail-1.03-linksync/qmail-queue.c ---- qmail-1.03/qmail-queue.c 2004-01-09 13:48:14.000000000 -0800 -+++ qmail-1.03-linksync/qmail-queue.c 2004-01-09 13:53:10.766069219 -0800 -@@ -1,5 +1,6 @@ - #include <sys/types.h> - #include <sys/stat.h> -+#include <fcntl.h> - #include <unistd.h> - #include "readwrite.h" - #include "sig.h" -@@ -172,6 +173,7 @@ - { - unsigned int len; - char ch; -+ int fd; - #ifdef BIGBROTHER - unsigned int xlen, n; - char *x; -@@ -222,6 +224,7 @@ - #endif - - if (link(pidfn,messfn) == -1) die(64); -+ if ((fd = open(messfn, O_RDONLY)) < 0 || fsync(fd) < 0 || close(fd) < 0) die(64); - if (unlink(pidfn) == -1) die(63); - flagmademess = 1; - -@@ -312,6 +315,8 @@ - if (fsync(intdfd) == -1) die_write(); - - if (link(intdfn,todofn) == -1) die(66); -+ if ((fd = open(todofn, O_RDONLY)) < 0 || -+ fsync(fd) < 0 || close(fd) < 0) die(66); - - triggerpull(); - return 0; diff --git a/mail-mta/qmail-ldap/files/qmail-linksync.patch b/mail-mta/qmail-ldap/files/qmail-linksync.patch deleted file mode 100644 index 1b35f12aaa1f..000000000000 --- a/mail-mta/qmail-ldap/files/qmail-linksync.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- ../qmail-1.03.orig/qmail-local.c Mon Jun 15 12:53:16 1998 -+++ qmail-local.c Sun Jul 16 16:19:04 2000 -@@ -1,5 +1,6 @@ - #include <sys/types.h> - #include <sys/stat.h> -+#include <fcntl.h> - #include "readwrite.h" - #include "sig.h" - #include "env.h" -@@ -128,6 +129,9 @@ - if (close(fd) == -1) goto fail; /* NFS dorks */ - - if (link(fntmptph,fnnewtph) == -1) goto fail; -+ if ((fd = open(fnnewtph, O_RDONLY)) < 0 || -+ fsync(fd) < 0 || close(fd) < 0) goto fail; -+ - /* if it was error_exist, almost certainly successful; i hate NFS */ - tryunlinktmp(); _exit(0); - ---- ../qmail-1.03.orig/qmail-queue.c Mon Jun 15 12:53:16 1998 -+++ qmail-queue.c Sun Jul 16 16:19:33 2000 -@@ -1,5 +1,6 @@ - #include <sys/types.h> - #include <sys/stat.h> -+#include <fcntl.h> - #include "readwrite.h" - #include "sig.h" - #include "exit.h" -@@ -155,6 +156,7 @@ - { - unsigned int len; - char ch; -+ int fd; - - sig_blocknone(); - umask(033); -@@ -183,7 +185,7 @@ - todofn = fnnum("todo/",0); - intdfn = fnnum("intd/",0); - -- if (link(pidfn,messfn) == -1) die(64); -+ if (link(pidfn,messfn) == -1) die(64); - if (unlink(pidfn) == -1) die(63); - flagmademess = 1; - -@@ -248,6 +250,8 @@ - if (fsync(intdfd) == -1) die_write(); - - if (link(intdfn,todofn) == -1) die(66); -+ if ((fd = open(todofn, O_RDONLY)) < 0 || -+ fsync(fd) < 0 || close(fd) < 0) die(66); - - triggerpull(); - die(0); diff --git a/mail-mta/qmail-ldap/files/qmail-queue.patch b/mail-mta/qmail-ldap/files/qmail-queue.patch deleted file mode 100644 index 4edd5fad86e5..000000000000 --- a/mail-mta/qmail-ldap/files/qmail-queue.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -u qmail-1.03-orig/Makefile qmail-1.03/Makefile ---- qmail-1.03-orig/Makefile Mon Jun 15 04:53:16 1998 -+++ Makefile Tue Jan 19 10:52:24 1999 -@@ -1483,12 +1483,12 @@ - trigger.o fmtqfn.o quote.o now.o readsubdir.o qmail.o date822fmt.o \ - datetime.a case.a ndelay.a getln.a wait.a seek.a fd.a sig.a open.a \ - lock.a stralloc.a alloc.a substdio.a error.a str.a fs.a auto_qmail.o \ --auto_split.o -+auto_split.o env.a - ./load qmail-send qsutil.o control.o constmap.o newfield.o \ - prioq.o trigger.o fmtqfn.o quote.o now.o readsubdir.o \ - qmail.o date822fmt.o datetime.a case.a ndelay.a getln.a \ - wait.a seek.a fd.a sig.a open.a lock.a stralloc.a alloc.a \ -- substdio.a error.a str.a fs.a auto_qmail.o auto_split.o -+ substdio.a error.a str.a fs.a auto_qmail.o auto_split.o env.a - - qmail-send.0: \ - qmail-send.8 -diff -u qmail-1.03-orig/qmail.c qmail-1.03/qmail.c ---- qmail-1.03-orig/qmail.c Mon Jun 15 04:53:16 1998 -+++ qmail.c Tue Jan 19 09:57:36 1999 -@@ -6,14 +6,25 @@ - #include "fd.h" - #include "qmail.h" - #include "auto_qmail.h" -+#include "env.h" - --static char *binqqargs[2] = { "bin/qmail-queue", 0 } ; -+static char *binqqargs[2] = { 0, 0 } ; -+ -+static void setup_qqargs() -+{ -+ if(!binqqargs[0]) -+ binqqargs[0] = env_get("QMAILQUEUE"); -+ if(!binqqargs[0]) -+ binqqargs[0] = "bin/qmail-queue"; -+} - - int qmail_open(qq) - struct qmail *qq; - { - int pim[2]; - int pie[2]; -+ -+ setup_qqargs(); - - if (pipe(pim) == -1) return -1; - if (pipe(pie) == -1) { close(pim[0]); close(pim[1]); return -1; } - diff --git a/mail-mta/qmail-ldap/files/rc b/mail-mta/qmail-ldap/files/rc deleted file mode 100644 index a7bbdc986766..000000000000 --- a/mail-mta/qmail-ldap/files/rc +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -exec env - PATH="/var/qmail/bin:$PATH" \ - qmail-start "`cat /var/qmail/control/defaultdelivery`" diff --git a/mail-mta/qmail-ldap/files/run-qmail-pop3d b/mail-mta/qmail-ldap/files/run-qmail-pop3d new file mode 100644 index 000000000000..c182fa4a3b9d --- /dev/null +++ b/mail-mta/qmail-ldap/files/run-qmail-pop3d @@ -0,0 +1,19 @@ +#!/bin/bash +# Gentoo Startup script for qmail's POP3 daemon +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/run-qmail-pop3d,v 1.1 2007/06/16 13:48:10 hollow 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 +# modifications can be made possible via the configuration files. + +SERVICE=pop3 +. /var/qmail/bin/qmail-config-system && \ +exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \ + ${QMAIL_TCPSERVER_PRE} \ + /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \ + -c ${MAXCONN} \ + ${TCPSERVER_HOST} ${TCPSERVER_PORT} \ + ${QMAIL_POP3_PREAUTH} /var/qmail/bin/qmail-popup ${QMAIL_POP3_POP3HOST} \ + ${QMAIL_POP3_CHECKPASSWORD} ${QMAIL_POP3_POSTAUTH} \ + /var/qmail/bin/qmail-pop3d ${QMAIL_MAILDIR} 2>&1 diff --git a/mail-mta/qmail-ldap/files/run-qmail-pop3d-log b/mail-mta/qmail-ldap/files/run-qmail-pop3d-log new file mode 100644 index 000000000000..129831d0eb58 --- /dev/null +++ b/mail-mta/qmail-ldap/files/run-qmail-pop3d-log @@ -0,0 +1,7 @@ +#!/bin/bash +# Gentoo Startup script for qmail's POP3 daemon (logging) +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/run-qmail-pop3d-log,v 1.1 2007/06/16 13:48:10 hollow Exp $ + +SERVICE=pop3 +. /var/qmail/bin/qmail-config-system && \ +eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST} diff --git a/mail-mta/qmail-ldap/files/run-qmail-qmqpd b/mail-mta/qmail-ldap/files/run-qmail-qmqpd new file mode 100644 index 000000000000..613f9139d142 --- /dev/null +++ b/mail-mta/qmail-ldap/files/run-qmail-qmqpd @@ -0,0 +1,18 @@ +#!/bin/bash +# Gentoo Startup script for qmail's QMQP daemon +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/run-qmail-qmqpd,v 1.1 2007/06/16 13:48:10 hollow 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 +# modifications can be made possible via the configuration files. + +SERVICE=qmqp +. /var/qmail/bin/qmail-config-system && \ +exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \ + ${QMAIL_TCPSERVER_PRE} \ + /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \ + -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \ + ${TCPSERVER_HOST} ${TCPSERVER_PORT} \ + ${QMAIL_QMQP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_QMQP_POST} \ + 2>&1 diff --git a/mail-mta/qmail-ldap/files/run-qmail-qmqpd-log b/mail-mta/qmail-ldap/files/run-qmail-qmqpd-log new file mode 100644 index 000000000000..7383a349d593 --- /dev/null +++ b/mail-mta/qmail-ldap/files/run-qmail-qmqpd-log @@ -0,0 +1,7 @@ +#!/bin/bash +# Gentoo Startup script for qmail's QMQP daemon (logging) +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/run-qmail-qmqpd-log,v 1.1 2007/06/16 13:48:10 hollow Exp $ + +SERVICE=qmqp +. /var/qmail/bin/qmail-config-system && \ +eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST} diff --git a/mail-mta/qmail-ldap/files/run-qmail-qmtpd b/mail-mta/qmail-ldap/files/run-qmail-qmtpd new file mode 100644 index 000000000000..69b4cceea637 --- /dev/null +++ b/mail-mta/qmail-ldap/files/run-qmail-qmtpd @@ -0,0 +1,18 @@ +#!/bin/bash +# Gentoo Startup script for qmail's QMTP daemon +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/run-qmail-qmtpd,v 1.1 2007/06/16 13:48:10 hollow 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 +# modifications can be made possible via the configuration files. + +SERVICE=qmtp +. /var/qmail/bin/qmail-config-system && \ +exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \ + ${QMAIL_TCPSERVER_PRE} \ + /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \ + -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \ + ${TCPSERVER_HOST} ${TCPSERVER_PORT} \ + ${QMAIL_QMTP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_QMTP_POST} \ + 2>&1 diff --git a/mail-mta/qmail-ldap/files/run-qmail-qmtpd-log b/mail-mta/qmail-ldap/files/run-qmail-qmtpd-log new file mode 100644 index 000000000000..0c42ecc7f6ae --- /dev/null +++ b/mail-mta/qmail-ldap/files/run-qmail-qmtpd-log @@ -0,0 +1,7 @@ +#!/bin/bash +# Gentoo Startup script for qmail's QMTP daemon (logging) +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/run-qmail-qmtpd-log,v 1.1 2007/06/16 13:48:10 hollow Exp $ + +SERVICE=qmtp +. /var/qmail/bin/qmail-config-system && \ +eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST} diff --git a/mail-mta/qmail-ldap/files/run-qmail-send b/mail-mta/qmail-ldap/files/run-qmail-send new file mode 100644 index 000000000000..986b10c13c5e --- /dev/null +++ b/mail-mta/qmail-ldap/files/run-qmail-send @@ -0,0 +1,6 @@ +#!/bin/sh +# Init script for qmail-send +# Copied from LWQ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/run-qmail-send,v 1.1 2007/06/16 13:48:10 hollow Exp $ +exec env - PATH="/var/qmail/bin:$PATH" \ + qmail-start "`cat /var/qmail/control/defaultdelivery`" diff --git a/mail-mta/qmail-ldap/files/run-qmail-send-log b/mail-mta/qmail-ldap/files/run-qmail-send-log new file mode 100644 index 000000000000..bc0879e0933b --- /dev/null +++ b/mail-mta/qmail-ldap/files/run-qmail-send-log @@ -0,0 +1,7 @@ +#!/bin/bash +# Gentoo Startup script for qmail's send daemon (logging) +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/run-qmail-send-log,v 1.1 2007/06/16 13:48:10 hollow Exp $ + +SERVICE=send +. /var/qmail/bin/qmail-config-system && \ +eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST} diff --git a/mail-mta/qmail-ldap/files/run-qmail-smtpd b/mail-mta/qmail-ldap/files/run-qmail-smtpd new file mode 100644 index 000000000000..f964505b34bc --- /dev/null +++ b/mail-mta/qmail-ldap/files/run-qmail-smtpd @@ -0,0 +1,18 @@ +#!/bin/bash +# Gentoo Startup script for qmail's SMTP daemon +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/run-qmail-smtpd,v 1.1 2007/06/16 13:48:10 hollow 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 +# modifications can be made possible via the configuration files. + +SERVICE=smtp +. /var/qmail/bin/qmail-config-system && \ +exec /usr/bin/softlimit ${SOFTLIMIT_OPTS} \ + ${QMAIL_TCPSERVER_PRE} \ + /usr/bin/tcpserver ${TCPSERVER_OPTS} -x ${TCPSERVER_RULESCDB} \ + -c ${MAXCONN} -u ${QMAILDUID} -g ${NOFILESGID} \ + ${TCPSERVER_HOST} ${TCPSERVER_PORT} \ + ${QMAIL_SMTP_PRE} /var/qmail/bin/qmail-${SERVICE}d ${QMAIL_SMTP_POST} \ + 2>&1 diff --git a/mail-mta/qmail-ldap/files/run-qmail-smtpd-log b/mail-mta/qmail-ldap/files/run-qmail-smtpd-log new file mode 100644 index 000000000000..311867648c94 --- /dev/null +++ b/mail-mta/qmail-ldap/files/run-qmail-smtpd-log @@ -0,0 +1,7 @@ +#!/bin/bash +# Gentoo Startup script for qmail's SMTP daemon (logging) +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/run-qmail-smtpd-log,v 1.1 2007/06/16 13:48:10 hollow Exp $ + +SERVICE=smtp +. /var/qmail/bin/qmail-config-system && \ +eval exec /usr/bin/setuidgid qmaill /usr/bin/multilog ${LOG_OPTS} ${LOG_DEST} diff --git a/mail-mta/qmail-ldap/files/1.03-r4/servercert.cnf b/mail-mta/qmail-ldap/files/servercert.cnf index 9e2683daf318..cf2397db23c2 100644 --- a/mail-mta/qmail-ldap/files/1.03-r4/servercert.cnf +++ b/mail-mta/qmail-ldap/files/servercert.cnf @@ -1,7 +1,5 @@ -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/1.03-r4/servercert.cnf,v 1.2 2004/07/18 03:27:44 dragonheart Exp $ -# Robin H. Johnson <robbat2@gentoo.org> - October 17, 2003 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/files/servercert.cnf,v 1.1 2007/06/16 13:48:10 hollow Exp $ # 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 diff --git a/mail-mta/qmail-ldap/files/smtpplugins b/mail-mta/qmail-ldap/files/smtpplugins new file mode 100644 index 000000000000..c3261e2c678e --- /dev/null +++ b/mail-mta/qmail-ldap/files/smtpplugins @@ -0,0 +1,27 @@ +# +# qmail-spp configuration file +# + +# plugins to execute on client's connection +[connection] + + +# plugins to execute on HELO/EHLO commands +[helo] + + +# plugins to execute on MAIL command +[mail] + + +# plugins to execute on RCPT command +[rcpt] + + +# plugins to execute on DATA command +[data] + + +## NOTE: use below section only if your installation supports it +# plugins to execute on AUTH command +#[auth] diff --git a/mail-mta/qmail-ldap/files/supervise/run-qmailpop3d b/mail-mta/qmail-ldap/files/supervise/run-qmailpop3d deleted file mode 100644 index f744746def37..000000000000 --- a/mail-mta/qmail-ldap/files/supervise/run-qmailpop3d +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -LL=`head -n1 /var/qmail/control/qmail-pop3d-loglevel` -SL=`head -n1 /var/qmail/control/qmail-pop3d-softlimit` -HOSTNAME=`head -n1 /var/qmail/control/me` -exec \ - env MAILDIR=Maildir \ - env LOGLEVEL=$LL \ - /usr/bin/softlimit -m $SL \ - /usr/bin/softlimit -m 20000000 \ - /usr/bin/tcpserver -H -R -c100 0 110 \ - /var/qmail/bin/qmail-popup \ - $HOSTNAME /var/qmail/bin/auth_pop \ - /var/qmail/bin/qmail-pop3d $MAILDIR 2>&1 diff --git a/mail-mta/qmail-ldap/files/supervise/run-qmailpop3dlog b/mail-mta/qmail-ldap/files/supervise/run-qmailpop3dlog deleted file mode 100644 index 9c279a32d55f..000000000000 --- a/mail-mta/qmail-ldap/files/supervise/run-qmailpop3dlog +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s10000000 \ -/var/log/qmail/qmail-pop3d diff --git a/mail-mta/qmail-ldap/files/supervise/run-qmailsend b/mail-mta/qmail-ldap/files/supervise/run-qmailsend deleted file mode 100644 index 8dbd3adf524f..000000000000 --- a/mail-mta/qmail-ldap/files/supervise/run-qmailsend +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /var/qmail/rc diff --git a/mail-mta/qmail-ldap/files/supervise/run-qmailsendlog b/mail-mta/qmail-ldap/files/supervise/run-qmailsendlog deleted file mode 100644 index 5ff50d1e7711..000000000000 --- a/mail-mta/qmail-ldap/files/supervise/run-qmailsendlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-send diff --git a/mail-mta/qmail-ldap/files/supervise/run-qmailsmtpd b/mail-mta/qmail-ldap/files/supervise/run-qmailsmtpd deleted file mode 100644 index b9ddd77050ec..000000000000 --- a/mail-mta/qmail-ldap/files/supervise/run-qmailsmtpd +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -QMAILDUID=`id -u qmaild` -NOFILESGID=`id -g qmaild` -exec /usr/bin/softlimit -m 8000000 \ - /usr/bin/tcpserver -H -R -v -p -x /etc/tcp.smtp.cdb \ - -u $QMAILDUID -g $NOFILESGID 0 smtp rblsmtpd /var/qmail/bin/qmail-smtpd /var/qmail/bin/auth_smtp /usr/bin/true 2>&1 diff --git a/mail-mta/qmail-ldap/files/supervise/run-qmailsmtpdlog b/mail-mta/qmail-ldap/files/supervise/run-qmailsmtpdlog deleted file mode 100644 index 2d9546146583..000000000000 --- a/mail-mta/qmail-ldap/files/supervise/run-qmailsmtpdlog +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/setuidgid qmaill /usr/bin/multilog t s2500000 /var/log/qmail/qmail-smtpd diff --git a/mail-mta/qmail-ldap/files/tcp.pop3.sample b/mail-mta/qmail-ldap/files/tcp.pop3.sample index 55df788cf074..d6a0f69245a7 100644 --- a/mail-mta/qmail-ldap/files/tcp.pop3.sample +++ b/mail-mta/qmail-ldap/files/tcp.pop3.sample @@ -1,6 +1,12 @@ # to update the database after changing this file, run: # tcprules /etc/tcprules.d/tcp.qmail-pop3.cdb /etc/tcprules.d/.tcp.qmail-pop3.tmp < /etc/tcprules.d/tcp.qmail-pop3 -# Allow any client to connect to us via POP3 -# If people are abusing POP3 such as denial-of-service on POP3, -# you can add their ips here to block them out + +# For the full documentation on the format of this file, +# see http://cr.yp.to/ucspi-tcp/tcprules.html + +#---------------------------------------------------------------- + +# Allow any client to connect to us via POP3. If people are abusing POP3 such +# as denial-of-service on POP3, you can add their IP addresses here to block +# them out. :allow diff --git a/mail-mta/qmail-ldap/files/tcp.qmqp.sample b/mail-mta/qmail-ldap/files/tcp.qmqp.sample index da21632c950e..83d715df1bdb 100644 --- a/mail-mta/qmail-ldap/files/tcp.qmqp.sample +++ b/mail-mta/qmail-ldap/files/tcp.qmqp.sample @@ -1,8 +1,14 @@ # to update the database after changing this file, run: # tcprules /etc/tcprules.d/tcp.qmail-qmqp.cdb /etc/tcprules.d/.tcp.qmail-qmqp.tmp < /etc/tcprules.d/tcp.qmail-qmqp -# QMQP is a bulk protocol -# and we don't want spam to ever come by it -# and it is intended to go between a few servers only -# so we don't trust any default people with it + +# For the full documentation on the format of this file, +# see http://cr.yp.to/ucspi-tcp/tcprules.html + +#---------------------------------------------------------------- + +# QMQP is a bulk protocol and we don't want spam to ever come by it and it is +# intended to go between a few servers only so we don't trust any default +# people with it. # see /etc/tcprules.d/tcp.qmail-smtp for more info + :deny diff --git a/mail-mta/qmail-ldap/files/tcp.qmtp.sample b/mail-mta/qmail-ldap/files/tcp.qmtp.sample index d72ac985ac9f..ab8101590808 100644 --- a/mail-mta/qmail-ldap/files/tcp.qmtp.sample +++ b/mail-mta/qmail-ldap/files/tcp.qmtp.sample @@ -1,8 +1,23 @@ # to update the database after changing this file, run: # tcprules /etc/tcprules.d/tcp.qmail-qmtp.cdb /etc/tcprules.d/.tcp.qmail-qmtp.tmp < /etc/tcprules.d/tcp.qmail-qmtp -# We trust QMTP connections just as SMTP by default -# see /etc/tcprules.d/tcp.qmail-smtp for more info + +# For the full documentation on the format of this file, +# see http://cr.yp.to/ucspi-tcp/tcprules.html + +#---------------------------------------------------------------- + +# We trust QMTP connections just as SMTP by default. See +# /etc/tcprules.d/tcp.qmail-smtp for more info. + # allow relaying from localhost 127.0.0.1:allow,RELAYCLIENT="",RBLSMTPD="" + # everybody else is not allowed to relay, and is subject to RBLSMTPD checks :allow + +# If you are using qmail-scanner, this line here is the correct one to use +# instead (comment out the above ':allow' line FIRST) and applies that script +# to any mail coming in that is not from a host allowed to relay. You can +# change the value of the variable to any other value you desire to use custom +# scripts for example. +#:allow,QMAILQUEUE="/var/qmail/bin/qmail-scanner-queue.pl" diff --git a/mail-mta/qmail-ldap/files/tcp.smtp.sample b/mail-mta/qmail-ldap/files/tcp.smtp.sample index a8e8d7a75fca..bc386ad91c3c 100644 --- a/mail-mta/qmail-ldap/files/tcp.smtp.sample +++ b/mail-mta/qmail-ldap/files/tcp.smtp.sample @@ -1,83 +1,79 @@ # to update the database after changing this file, run: # tcprules /etc/tcprules.d/tcp.qmail-smtp.cdb /etc/tcprules.d/.tcp.qmail-smtp.tmp < /etc/tcprules.d/tcp.qmail-smtp -#------------------------------------------------------ -# DESCRIPTION OF THE RULES TO REMIND ME OF HOW THIS FILE WORKS -# -# If you set 'allow', this means that our mail server will allow -# the specified IP range to make a TCP connection to our server -# -# If you set 'deny', this means that our mail server will not allow -# the specified IP range to make a TCP connection to our server -# -# If you set RELAYCLIENT="", this means that the listed IP range is -# allowed to relay mail through our server -# -# If you dont set RELAYCLIENT="", this means that the listed IP range -# will not be able to relay mail through our server -# -# If you set RBLSMTPD="", this means that the listed IP ranges will -# not be checked against any of the RBL databases -# -# If you set RBLSMTPD="some text here", this means that an RBL lookup -# wont be performed, but the mail will be rejected with the specified -# text as a 4xx temp error message -# -# If you set RBLSMTPD="-some text here", this means that an RBL lookup -# wont be performed, but the mail will be rejected with the specified -# text as a 5xx perm error message -# -# If you do not set RBLSMTPD="" or ="some text", then an RBL lookup -# will be performed. If the lookup is successful, then RBLSMTPD will -# return your custom error message (as specified in the -r parameter -# in smtpd supervise script) -# -#----------------------------------------------------- -# HERE ARE THE RULES! : -#----------------------------------------------------- -# BYPASS OPEN RELAY CHECKING FOR THESE IPS : -# -# These IPs are ones that we have setup so that they arent RBL checked. -# We have done this because these particular servers are RBL listed, -# and for whatever reason they can't/won't fix their open relay problem, -# and we still want to be able to receive mail from them. -# + +# For the full documentation on the format of this file, +# see http://cr.yp.to/ucspi-tcp/tcprules.html + +#----------------------------------------------------------------- +# Short description of the rules + +# If you set 'allow', this means that our mail server will allow the specified +# IP address range to make a TCP connection to our server. + +# If you set 'deny', this means that our mail server will not allow the +# specified IP address range to make a TCP connection to our server. + +# If you set RELAYCLIENT="", this means that the listed IP address range is +# allowed to relay mail through our server. + +# If you don't set RELAYCLIENT="", this means that the listed IP address range +# will not be able to relay mail through our server. + +# If you set RBLSMTPD="", this means that the listed IP address ranges will not +# be checked against any of the RBL databases. + +# If you set RBLSMTPD="some text here", this means that an RBL lookup won't be +# performed, but the mail will be rejected with the specified text as a 4xx +# temp error message. + +# If you set RBLSMTPD="-some text here", this means that an RBL lookup won't be +# performed, but the mail will be rejected with the specified text as a 5xx +# permanent error message. + +# If you do not set RBLSMTPD="" or ="some text", then an RBL lookup will be +# performed. If the lookup is successful, then RBLSMTPD will return your custom +# error message (as specified in the -r parameter in smtpd supervise script). + +#----------------------------------------------------------------- +# Bypass open relay checking for these IP addresses: + +# These IP addresses are ones that we have setup so that they aren't RBL +# checked. We have done this because these particular servers are RBL listed, +# and for whatever reason they can't/won't fix their open relay problem, and we +# still want to be able to receive mail from them. + # reminder text goes here for this entry so we know the story... #111.111.111.111:allow,RBLSMTPD="" -# reminder text goes here for this entry so we know the story... -#222.222.222.222:allow,RBLSMTPD="" -# + #----------------------------------------------------------------- -# DONT ALLOW THESE IPS TO SEND MAIL TO US : -# -# mailXX.offermail.net connecting regularly and sending invalid -# format messages causing exit with status 256 (bare linefeed normally) -# entry added 15/12/2001 -# after looking at the mail coming from these servers it was found to be spam -#216.242.75.100-116:allow,RBLSMTPD="-Connections from this IP have been banned." -# -# heaps of spam from replyto of *@freeamateurhotties.com dec2001 -#64.228.127.:allow,RBLSMTPD="-Connections refused due to spam from freeamateurhotties.com" -#154.20.94.:allow,RBLSMTPD="-Connections refused due to spam from freeamateurhotties.com" -#209.151.132.:allow,RBLSMTPD="-Connections refused due to spam from freeamateurhotties.com" -#216.18.85.:allow,RBLSMTPD="-Connections refused due to spam from freeamateurhotties.com" -# +# Do not allow these IP addresses to send e-mails to us: + +#1.2.3.:allow,RBLSMTPD="-Connections refused due to spam from domain.tld" +#4.5.6.7:allow,RBLSMTPD="-Connections refused due to spam from domain2.tld" +#8.9.10.11-100:allow,RBLSMTPD="-Connections from this IP have been banned" + #----------------------------------------------------------------- -# ALLOW THESE IPS TO RELAY MAIL THROUGH OUR SERVER -# -# Local class-c's from our LAN are allowed to relay, -# and we wont bother doing any RBL checking. -#123.123.123.:allow,RELAYCLIENT="",RBLSMTPD="" -#123.111.111.:allow,RELAYCLIENT="",RBLSMTPD="" -# -# Connections from localhost are allowed to relay -# (because the WebMail server runs on localhost), -# and obviously there is no point trying to perform an RBL check. +# Allow these IP addresses to relay mail trough our server + +# IP addresses from our LAN are allowed to relay, and we won't bother doing any +# RBL checking. +#192.168.1.:allow,RELAYCLIENT="",RBLSMTPD="" + +# Connections from localhost are allowed to relay (because the Webmail server +# runs on localhost), and obviously there is no point trying to perform an RBL +# check. 127.0.0.1:allow,RELAYCLIENT="",RBLSMTPD="" -# + #----------------------------------------------------------------- -# ALLOW EVERYONE ELSE TO SEND US MAIL -# -# Everyone else can make connections to our server, -# but not allowed to relay -# RBL lookups are performed +# Allow everyone else to send us e-mails: + +# Everyone else can make connections to our server, but not allowed to relay. +# RBL lookups are performed. :allow + +# If you are using qmail-scanner, this line here is the correct one to use +# instead (comment out the above ':allow' line FIRST) and applies that script +# to any mail coming in that is not from a host allowed to relay. You can +# change the value of the variable to any other value you desire to use custom +# scripts for example. +#:allow,QMAILQUEUE="/var/qmail/bin/qmail-scanner-queue.pl" diff --git a/mail-mta/qmail-ldap/files/tcprules.d-Makefile.qmail b/mail-mta/qmail-ldap/files/tcprules.d-Makefile.qmail new file mode 100644 index 000000000000..d10be0f3a87b --- /dev/null +++ b/mail-mta/qmail-ldap/files/tcprules.d-Makefile.qmail @@ -0,0 +1,3 @@ +QMAIL_CDBS = tcp.qmail-pop3.cdb tcp.qmail-qmqp.cdb tcp.qmail-qmtp.cdb tcp.qmail-smtp.cdb +CDBS += $(QMAIL_CDBS) +qmail: $(QMAIL_CDBS) diff --git a/mail-mta/qmail-ldap/files/tls.patch b/mail-mta/qmail-ldap/files/tls.patch deleted file mode 100644 index c7cb30377976..000000000000 --- a/mail-mta/qmail-ldap/files/tls.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- Makefile.orig 2003-07-19 19:40:10.000000000 -0700 -+++ Makefile 2003-07-19 19:41:12.000000000 -0700 -@@ -27,13 +27,13 @@ - # TLS (SMTP encryption) in qmail-smtpd and qmail-remote, see TLS.readme - # You need OpenSSL for this - # TLS enable --#TLSON=-DTLS -+TLSON=-DTLS - # Path to OpenSSL includes --#TLSINCLUDES=-I/usr/local/include -+TLSINCLUDES=-I/usr/include - # Path to OpenSSL libraries --#TLSLIBS=-L/usr/local/lib -lssl -lcrypto -+TLSLIBS=-L/usr/lib -lssl -lcrypto - # Path to OpenSSL binary --#OPENSSLBIN=/usr/local/bin/openssl -+OPENSSLBIN=/usr/bin/openssl - #OPENSSLBIN=openssl - - # to make the Netscape download progress bar work with qmail-pop3d diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild deleted file mode 100644 index 6ef9ea18d013..000000000000 --- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild +++ /dev/null @@ -1,350 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r1.ebuild,v 1.11 2007/03/18 06:07:51 genone Exp $ - -IUSE="ssl" - -inherit eutils - -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="http://cr.yp.to/software/qmail-1.03.tar.gz - mirror://qmail/big-todo.103.patch - mirror://qmail/big-concurrency.patch - http://www.ckdhr.com/ckd/qmail-103.patch - http://www.lifewithqmail.org/ldap/patches/smtp-auth/smtp-auth-20030301.patch - http://www.suspectclass.com/~sgifford/qmail/qmail-0.0.0.0.patch - http://www.nrg4u.com/qmail/qmail-ldap-1.03-20020901.patch.gz" - -DEPEND="virtual/libc - net-nds/openldap - sys-apps/groff - >=sys-apps/ucspi-tcp-0.88 - >=net-mail/checkpassword-0.90 - >=net-nds/openldap-2.0.25-r2 - ssl? ( >=dev-libs/openssl-0.9.6e )" - -RDEPEND="!virtual/mta - virtual/libc - sys-apps/groff - >=net-nds/openldap-2.0.25-r2 - >=sys-apps/ucspi-tcp-0.88 - >=sys-process/daemontools-0.76-r1 - >=net-mail/checkpassword-0.90 - >=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-20020901.patch.gz - - cd ${S} - - # a patch for faster queue processing - epatch ${DISTDIR}/big-todo.103.patch || die "big-todo patch failed" - - #Suppprt for XFS and reiserfs - epatch ${FILESDIR}/qmail-linksync.patch || die "linksync patch failed" - - #used for plugging in qmail-scanner with SpamAssasin - epatch ${FILESDIR}/qmail-queue.patch || die "qmail queue patch failed" - - #main ldap patch - epatch ${WORKDIR}/qmail-ldap-1.03-20020901.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" - - # Let the system decide how to define errno - epatch ${FILESDIR}/errno.patch - - # AUTOHOME DIR MAKE PATCH - epatch ${FILESDIR}/homedir.patch || die "Homedir patch did not apply" - - #SMTP_AUTH PATCH - epatch ${DISTDIR}/smtp-auth-20030301.patch || die "SMTP_AUTH patch did not apply" - - if use ssl; then - use ssl && { epatch ${FILESDIR}/tls.patch || die "tls+auth patch failed"; } - fi - - echo "gcc ${CFLAGS}" > conf-cc - echo "gcc" > conf-ld - echo "500" > conf-spawn - -} - -src_compile() { - - cd ${S} - emake it man qldap|| 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 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 - - into /usr - for i in *.1 *.5 *.8 - do - doman $i - done - - 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 - if [ ! -d ${ROOT}/var/qmail/alias/.maildir ] ; then - dodir /var/qmail/alias/.maildir - for i in cur new tmp - do - dodir /var/qmail/alias/.maildir/$i - done - fi - - for i in mailer-daemon postmaster root - do - touch ${D}/var/qmail/alias/.qmail-${i} - fowners alias.qmail /var/qmail/alias/.qmail-${i} - done - - einfo "Setting up maildirs by default in the account skeleton ..." - diropts -m 755 -o root -g root - insinto /etc/skel - ${D}/var/qmail/bin/maildirmake ${D}/etc/skel/.maildir - newins ${FILESDIR}/dot_qmail .qmail - fperms 644 /etc/skel/.qmail - insinto /root - ${D}/var/qmail/bin/maildirmake ${D}/root/.maildir - newins ${FILESDIR}/dot_qmail .qmail - fperms 644 /root/.qmail - - einfo "Setting up daemontools ..." - insopts -o root -g root -m 755 - diropts -m 755 -o root -g root - dodir /var/qmail/supervise - dodir /var/qmail/supervise/qmail-send - dodir /var/qmail/supervise/qmail-send/log - dodir /var/qmail/supervise/qmail-smtpd - dodir /var/qmail/supervise/qmail-smtpd/log - dodir /var/qmail/supervise/qmail-pop3d - dodir /var/qmail/supervise/qmail-pop3d/log - chmod +t ${D}/var/qmail/supervise/qmail-send - chmod +t ${D}/var/qmail/supervise/qmail-smtpd - chmod +t ${D}/var/qmail/supervise/qmail-pop3d - diropts -m 755 -o qmaill - keepdir /var/log/qmail /var/log/qmail/qmail-send /var/log/qmail/qmail-smtpd /var/log/qmail/qmail-pop3d - - insinto /var/qmail/supervise/qmail-send - newins ${FILESDIR}/supervise/run-qmailsend run - insinto /var/qmail/supervise/qmail-send/log - newins ${FILESDIR}/supervise/run-qmailsendlog run - insinto /var/qmail/supervise/qmail-smtpd - newins ${FILESDIR}/supervise/run-qmailsmtpd run - insinto /var/qmail/supervise/qmail-smtpd/log - newins ${FILESDIR}/supervise/run-qmailsmtpdlog run - insinto /var/qmail/supervise/qmail-pop3d - newins ${FILESDIR}/supervise/run-qmailpop3d run - insinto /var/qmail/supervise/qmail-pop3d/log - newins ${FILESDIR}/supervise/run-qmailpop3dlog run - - einfo "Installing the qmail control file ..." - exeinto /var/qmail/bin - doexe ${FILESDIR}/qmail-control - - einfo "Installing the qmail startup file ..." - insinto /var/qmail - doins ${FILESDIR}/rc \ - ${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 -} - -pkg_postinst() { - - einfo "Setting up the message queue hierarchy ..." - - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo - install -d -m 700 -o qmailq -g qmail ${ROOT}/var/qmail/queue/pid - install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/bounce - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess - - for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 - do - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess/${i} - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo/${i} - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/intd/${i} - done - - for i in info local remote - do - install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/${i} - done - - for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 - do - install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/info/${i} - install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/local/${i} - install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/remote/${i} - done - - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/lock - - dd if=/dev/zero of=${ROOT}/var/qmail/queue/lock/tcpto bs=1024 count=1 - chmod 644 ${ROOT}/var/qmail/queue/lock/tcpto - chown qmailr:qmail ${ROOT}/var/qmail/queue/lock/tcpto - - touch ${ROOT}/var/qmail/queue/lock/sendmutex - chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex - chown qmails:qmail ${ROOT}/var/qmail/queue/lock/sendmutex - - if [ ! -p ${ROOT}/var/qmail/queue/lock/trigger ] ; then - mkfifo ${ROOT}/var/qmail/queue/lock/trigger - chmod 622 ${ROOT}/var/qmail/queue/lock/trigger - chown qmails:qmail ${ROOT}/var/qmail/queue/lock/trigger - fi - - if [ `getent passwd ldapauth | cut -d: -f1` != ldapauth ]; then - useradd -g ldapauth -d /var/qmail/maildirs -s /bin/true -u 11184 ldapauth - fi - - if [ `getent group ldapauth | cut -d: -f1` != ldapauth ]; then - groupadd ldapauth &>/dev/null - fi - - elog "Please do not forget to run, the following syntax:" - elog "emerge --config =${PF}" - elog "This will setup qmail to run out-of-the-box on your system." - elog - elog "To start qmail at boot you have to enable the /etc/init.d/svscan rc file" - elog "and create the following links :" - elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send" - elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd" - elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d" - elog - elog "NOTE: Please check your /var/qmail/control/ldap* files to match your local" - elog "ldap settings and add the qmail.schema to your slapd.conf. For sample ldifs,\033[0m" - elog "please check /usr/share/doc/${PF}/samples.ldif.gz" - - if use ssl; then - einfo "Creating a self-signed ssl-cert:" - /usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem - chmod 640 /var/qmail/control/servercert.pem - chown qmaild:qmail /var/qmail/control/servercert.pem - ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem - - elog "If You want to have a signed cert, do the following:" - elog "openssl req -new -nodes -out req.pem \\" - elog "-keyout /var/qmail/control/servercert.pem" - elog "chmod 640 /var/qmail/control/servercert.pem" - elog "chown qmaild:qmail /var/qmail/control/servercert.pem" - elog "ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem" - elog "Send req.pem to your CA to obtain signed_req.pem, and do:" - elog "cat signed_req.pem >> /var/qmail/control/servercert.pem" - fi - -} - -pkg_config() { - -export qhost=`hostname` - if [ ${ROOT} = "/" ] ; then - if [ ! -f ${ROOT}/var/qmail/control/me ] ; then - ${ROOT}/var/qmail/bin/config-fast $qhost - fi - fi - - echo "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` - for ip in $LOCALIPS; do - echo "$ip:allow,RELAYCLIENT=\"\",RBLSMTPD=\"\"" >> /etc/tcp.smtp - done - echo "127.0.0.1:allow,RELAYCLIENT=\"\",RBLSMTPD=\"\"" >> /etc/tcp.smtp - - tcprules /etc/tcp.smtp.cdb /etc/tcp.smtp.tmp < /etc/tcp.smtp - -} diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild deleted file mode 100644 index 5329da427453..000000000000 --- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild +++ /dev/null @@ -1,355 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r2.ebuild,v 1.9 2007/03/18 06:07:51 genone Exp $ - -IUSE="ssl" - -inherit eutils - -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-1.03.tar.gz - http://www.suspectclass.com/~sgifford/qmail/qmail-0.0.0.0.patch - http://david.acz.org/software/sendmail-flagf.patch - http://www.nrg4u.com/qmail/qmail-ldap-1.03-20040101.patch.gz - mirror://gentoo/${P}-r2-tls.patch.bz2" - -DEPEND="virtual/libc - net-nds/openldap - sys-apps/groff - >=sys-apps/ucspi-tcp-0.88 - >=net-mail/checkpassword-0.90 - >=net-nds/openldap-2.0.25-r2 - ssl? ( >=dev-libs/openssl-0.9.6e )" - -RDEPEND="!virtual/mta - virtual/libc - sys-apps/groff - >=net-nds/openldap-2.0.25-r2 - >=sys-apps/ucspi-tcp-0.88 - >=sys-process/daemontools-0.76-r1 - >=net-mail/checkpassword-0.90 - >=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-20040101.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-20040101.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" - - #FIXNE - # AUTOHOME DIR MAKE AND FEATURES PATCH - epatch ${FILESDIR}/gentoo.patch || die "Homedir patch did not apply" - - # Account for Linux filesystems lack of a synchronus link() - epatch ${FILESDIR}/qmail-link-sync-gentoo.patch - - # make the qmail 'sendmail' binary behave like sendmail's for -f - 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 - - if use ssl; then - epatch ${DISTDIR}/${P}-r2-tls.patch.bz2 || die "tls+auth patch failed" - fi - - echo "gcc ${CFLAGS}" > conf-cc - echo "gcc" > 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}/${PV}-${PR}/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 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 "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 - if [ ! -d ${ROOT}/var/qmail/alias/.maildir ] ; then - dodir /var/qmail/alias/.maildir - for i in cur new tmp - do - dodir /var/qmail/alias/.maildir/$i - done - fi - - for i in mailer-daemon postmaster root - do - touch ${D}/var/qmail/alias/.qmail-${i} - fowners alias.qmail /var/qmail/alias/.qmail-${i} - done - - einfo "Setting up maildirs by default in the account skeleton ..." - diropts -m 755 -o root -g root - insinto /etc/skel - ${D}/var/qmail/bin/maildirmake ${D}/etc/skel/.maildir - newins ${FILESDIR}/dot_qmail .qmail - fperms 644 /etc/skel/.qmail - insinto /root - ${D}/var/qmail/bin/maildirmake ${D}/root/.maildir - newins ${FILESDIR}/dot_qmail .qmail - fperms 644 /root/.qmail - - einfo "Setting up daemontools ..." - insopts -o root -g root -m 755 - diropts -m 755 -o root -g root - dodir /var/qmail/supervise - dodir /var/qmail/supervise/qmail-send - dodir /var/qmail/supervise/qmail-send/log - dodir /var/qmail/supervise/qmail-smtpd - dodir /var/qmail/supervise/qmail-smtpd/log - dodir /var/qmail/supervise/qmail-pop3d - dodir /var/qmail/supervise/qmail-pop3d/log - chmod +t ${D}/var/qmail/supervise/qmail-send - chmod +t ${D}/var/qmail/supervise/qmail-smtpd - chmod +t ${D}/var/qmail/supervise/qmail-pop3d - diropts -m 755 -o qmaill - keepdir /var/log/qmail /var/log/qmail/qmail-send /var/log/qmail/qmail-smtpd /var/log/qmail/qmail-pop3d - - insinto /var/qmail/supervise/qmail-send - newins ${FILESDIR}/supervise/run-qmailsend run - insinto /var/qmail/supervise/qmail-send/log - newins ${FILESDIR}/supervise/run-qmailsendlog run - insinto /var/qmail/supervise/qmail-smtpd - newins ${FILESDIR}/supervise/run-qmailsmtpd run - insinto /var/qmail/supervise/qmail-smtpd/log - newins ${FILESDIR}/supervise/run-qmailsmtpdlog run - insinto /var/qmail/supervise/qmail-pop3d - newins ${FILESDIR}/supervise/run-qmailpop3d run - insinto /var/qmail/supervise/qmail-pop3d/log - newins ${FILESDIR}/supervise/run-qmailpop3dlog run - - einfo "Installing the qmail control file ..." - exeinto /var/qmail/bin - doexe ${FILESDIR}/qmail-control - - einfo "Installing the qmail startup file ..." - insinto /var/qmail - doins ${FILESDIR}/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 -} - -pkg_postinst() { - - einfo "Setting up the message queue hierarchy ..." - - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo - install -d -m 700 -o qmailq -g qmail ${ROOT}/var/qmail/queue/pid - install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/bounce - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess - - for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 - do - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/mess/${i} - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/todo/${i} - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/intd/${i} - done - - for i in info local remote - do - install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/${i} - done - - for i in 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 - do - install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/info/${i} - install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/local/${i} - install -d -m 700 -o qmails -g qmail ${ROOT}/var/qmail/queue/remote/${i} - done - - install -d -m 750 -o qmailq -g qmail ${ROOT}/var/qmail/queue/lock - - dd if=/dev/zero of=${ROOT}/var/qmail/queue/lock/tcpto bs=1024 count=1 - chmod 644 ${ROOT}/var/qmail/queue/lock/tcpto - chown qmailr:qmail ${ROOT}/var/qmail/queue/lock/tcpto - - touch ${ROOT}/var/qmail/queue/lock/sendmutex - chmod 600 ${ROOT}/var/qmail/queue/lock/sendmutex - chown qmails:qmail ${ROOT}/var/qmail/queue/lock/sendmutex - - if [ ! -p ${ROOT}/var/qmail/queue/lock/trigger ] ; then - mkfifo ${ROOT}/var/qmail/queue/lock/trigger - chmod 622 ${ROOT}/var/qmail/queue/lock/trigger - chown qmails:qmail ${ROOT}/var/qmail/queue/lock/trigger - fi - - if [ `getent passwd ldapauth | cut -d: -f1` != ldapauth ]; then - useradd -g ldapauth -d /var/qmail/maildirs -s /bin/true -u 11184 ldapauth - fi - - if [ `getent group ldapauth | cut -d: -f1` != ldapauth ]; then - groupadd ldapauth &>/dev/null - fi - - elog "Please do not forget to run, the following syntax :\033[0m" - elog "emerge --config =${PF}" - elog "This will setup qmail to run out-of-the-box on your system." - elog - elog "To start qmail at boot you have to enable the /etc/init.d/svscan rc file" - elog "and create the following links :" - elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send" - elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd" - elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d" - elog - elog "NOTE: Please check your /var/qmail/control/ldap* files to match your local" - elog "ldap settings and add the qmail.schema along with \"allow bind_v2\" to your" - elog "slapd.conf. For sample ldifs, please check" - elog "/usr/share/doc/${PF}/samples.ldif.gz" - - if use ssl; then - einfo "Creating a self-signed ssl-cert:" - /usr/bin/openssl req -new -x509 -nodes -out /var/qmail/control/servercert.pem -days 366 -keyout /var/qmail/control/servercert.pem - chmod 640 /var/qmail/control/servercert.pem - chown qmaild:qmail /var/qmail/control/servercert.pem - ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem - - elog "If You want to have a signed cert, do the following:" - elog "openssl req -new -nodes -out req.pem \\" - elog "-keyout /var/qmail/control/servercert.pem" - elog "chmod 640 /var/qmail/control/servercert.pem" - elog "chown qmaild:qmail /var/qmail/control/servercert.pem" - elog "ln -s /var/qmail/control/servercert.pem /var/qmail/control/clientcert.pem" - elog "Send req.pem to your CA to obtain signed_req.pem, and do:" - elog "cat signed_req.pem >> /var/qmail/control/servercert.pem" - fi - -} - -pkg_config() { - -export qhost=`hostname` - if [ ${ROOT} = "/" ] ; then - if [ ! -f ${ROOT}/var/qmail/control/me ] ; then - ${ROOT}/var/qmail/bin/config-fast $qhost - fi - fi - - echo "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` - for ip in $LOCALIPS; do - echo "$ip:allow,RELAYCLIENT=\"\",RBLSMTPD=\"\"" >> /etc/tcp.smtp - done - echo "127.0.0.1:allow,RELAYCLIENT=\"\",RBLSMTPD=\"\"" >> /etc/tcp.smtp - - tcprules /etc/tcp.smtp.cdb /etc/tcp.smtp.tmp < /etc/tcp.smtp - -} diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild deleted file mode 100644 index 40beabf7f7fe..000000000000 --- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild +++ /dev/null @@ -1,354 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r3.ebuild,v 1.9 2007/03/18 06:07:51 genone Exp $ - -IUSE="ssl" - -inherit eutils toolchain-funcs - -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://david.acz.org/software/sendmail-flagf.patch - http://www.nrg4u.com/qmail/qmail-ldap-1.03-20040101.patch.gz" - -DEPEND="virtual/libc - sys-apps/groff - >=net-nds/openldap-2.0.25-r2 - >=sys-apps/ucspi-tcp-0.88 - >=net-mail/checkpassword-0.90 - ssl? ( >=dev-libs/openssl-0.9.6e )" - -RDEPEND="!virtual/mta - ${DEPEND} - >=sys-process/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-20040101.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-20040101.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" - - #FIXNE - # AUTOHOME DIR MAKE AND FEATURES PATCH - epatch ${FILESDIR}/gentoo.patch || die "Homedir patch did not apply" - - # Account for Linux filesystems lack of a synchronus link() - epatch ${FILESDIR}/qmail-link-sync-gentoo.patch - - # make the qmail 'sendmail' binary behave like sendmail's for -f - 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 - - if use ssl; then - epatch ${DISTDIR}/${P}-r2-tls.patch.bz2 || die "tls+auth patch failed"; - fi - - echo -n "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc - echo -n "$(tc-getCC) ${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}/1.03-r2/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 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 "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}/${PV}-${PR}/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}/${PV}-${PR}/run-qmail${i} run - insinto /var/qmail/supervise/qmail-${i}/log - newins ${FILESDIR}/${PV}-${PR}/run-qmail${i}log run - insinto /etc - done - - for i in smtp qmtp qmqp pop3; do - if [ -f ${FILESDIR}/tcp.${i}.sample ]; then - newins ${FILESDIR}/tcp.${i}.sample /etc/tcp.${i} - fi - 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}/qmail-control - - einfo "Installing the qmail startup file ..." - insinto /var/qmail - doins ${FILESDIR}/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 - elog "Previously the qmail ebuilds created /root/.maildir/ but not" - elog "mail was every delivered there. If the directory does not" - elog "contain any mail, please delete it and run:" - elog "${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 passwd ldapauth | cut -d: -f1` != ldapauth ]; then - useradd -g ldapauth -d /var/qmail/maildirs -s /bin/true -u 11184 ldapauth - fi - - if [ `getent group ldapauth | cut -d: -f1` != ldapauth ]; then - groupadd ldapauth &>/dev/null - fi - - elog "Please do not forget to run, the following syntax :" - elog "emerge --config =${PF} " - elog "This will setup qmail to run out-of-the-box on your system including SSL. " - elog - elog "To start qmail at boot you have to enable the /etc/init.d/svscan rc file " - elog "and create the following links : " - elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send " - elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd " - elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d " - elog - elog "NOTE: Please check your /var/qmail/control/ldap* files to match your local " - elog "ldap settings and add the qmail.schema along with \"allow bind_v2\" to your " - elog "slapd.conf. For sample ldifs, please check " - elog "/usr/share/doc/${PF}/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` - TCPSTRING=":allow,RELAYCLIENT=\"\",RBLSMTPD=\"\"" - 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 -} diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild deleted file mode 100644 index eb5f3a802596..000000000000 --- a/mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild +++ /dev/null @@ -1,374 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r4.ebuild,v 1.11 2007/04/28 23:17:35 swegener Exp $ - -IUSE="ssl" - -inherit eutils fixheadtails toolchain-funcs - -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/libc - 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-process/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 "$(tc-getCC) ${CFLAGS}" >${S}/conf-cc - echo -n "$(tc-getCC) ${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" - doenvd ${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 - elog "Previously the qmail ebuilds created /root/.maildir/ but not" - elog "mail was every delivered there. If the directory does not" - elog "contain any mail, please delete it and run:" - elog "${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 - - - elog "Please do not forget to run, the following syntax :" - elog "emerge --config =${PF} " - elog "This will setup qmail to run out-of-the-box on your system including SSL. " - elog - elog "To start qmail at boot you have to enable the /etc/init.d/svscan rc file " - elog "and create the following links : " - elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send " - elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd " - elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d " - elog - elog "NOTE: Please check your /var/qmail/control/ldap* files to match your local " - elog "ldap settings and add the qmail.schema along with \"allow bind_v2\" to your " - elog "slapd.conf. For sample ldifs, please check " - elog "/usr/share/doc/${PF}/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 -} diff --git a/mail-mta/qmail-ldap/qmail-ldap-1.03-r5.ebuild b/mail-mta/qmail-ldap/qmail-ldap-1.03-r5.ebuild new file mode 100644 index 000000000000..864a002a18e8 --- /dev/null +++ b/mail-mta/qmail-ldap/qmail-ldap-1.03-r5.ebuild @@ -0,0 +1,500 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail-ldap/qmail-ldap-1.03-r5.ebuild,v 1.1 2007/06/16 13:48:10 hollow Exp $ + +inherit eutils toolchain-funcs fixheadtails flag-o-matic + +QMAIL_LDAP_PATCH=20060201 +QMAIL_SPP_PATCH=0.42 + +DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent" +HOMEPAGE=" + http://www.qmail-ldap.org + http://cr.yp.to/qmail.html + http://qmail.org/ +" +SRC_URI=" + mirror://qmail/qmail-${PV}.tar.gz + http://www.nrg4u.com/qmail/${P}-${QMAIL_LDAP_PATCH}.patch.gz + !vanilla? ( + qmail-spp? ( mirror://gentoo/${P}-spp-${QMAIL_SPP_PATCH}.patch ) + ) +" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="cluster gencertdaily highvolume mailwrapper qmail-spp ssl vanilla zlib" +RESTRICT="test" + +DEPEND=" + !mail-mta/qmail + sys-apps/groff + net-mail/queue-repair + ssl? ( dev-libs/openssl ) + net-nds/openldap +" +RDEPEND=" + mailwrapper? ( net-mail/mailwrapper ) + !mailwrapper? ( !virtual/mta ) + sys-apps/ucspi-tcp + sys-process/daemontools + net-mail/dot-forward + ${DEPEND} +" +PROVIDE=" + virtual/mta + virtual/mda +" + +# Important: QMAIL_CONF_SPLIT should always be a prime number! +MY_CONF_SPLIT="${QMAIL_CONF_SPLIT:-23}" + +MY_S="${WORKDIR}"/qmail-${PV} +TCPRULES_DIR=/etc/tcprules.d + +if use gencertdaily; then + CRON_FOLDER=cron.daily +else + CRON_FOLDER=cron.hourly +fi + + +src_unpack() { + unpack qmail-${PV}.tar.gz + + cd "${MY_S}" + + # main ldap patch + # includes: netqmail-1.05, EXTTODO, BIGTODO, TLS/SMTPAUTH, 0.0.0.0 fix + epatch ${DISTDIR}/${P}-${QMAIL_LDAP_PATCH}.patch.gz || die "ldap patch failed" + + local LDAPFLAGS="-DALTQUEUE -DEXTERNAL_TODO -DDASH_EXT" + + if ! use vanilla; then + use cluster && LDAPFLAGS="${LDAPFLAGS} -DQLDAP_CLUSTER" + use highvolume && LDAPFLAGS="${LDAPFLAGS} -DBIGTODO" + use zlib && LDAPFLAGS="${LDAPFLAGS} -DDATA_COMPRESS -D QMQP_COMPRESS" + + if use qmail-spp; then + epatch ${DISTDIR}/${P}-spp-${QMAIL_SPP_PATCH}.patch + fi + + # a lot of sed magic to get Makefile right + sed -i \ + -e "s:^#LDAPFLAGS=.*:LDAPFLAGS=${LDAPFLAGS}:" \ + -e 's:^LDAPLIBS=.*:LDAPLIBS=-L/usr/lib -lldap -llber:' \ + -e 's:^LDAPINCLUDES=.*:LDAPINCLUDES=-I/usr/include:' \ + Makefile || die "could not enable OpenLDAP" + + sed -i -e 's:^#SHADOWLIBS=.*:SHADOWLIBS=-lcrypt:' \ + Makefile || die "could not enable shadow passwords" + + sed -i \ + -e 's:^#\(MDIRMAKE=.*\):\1:' \ + -e 's:^#\(HDIRMAKE=.*\):\1:' \ + Makefile || die "could not enabled automaildirmake" + + if use zlib; then + sed -i -e 's:^#ZLIB=.*:ZLIB=-lz:' \ + Makefile || die "could not enable zlib" + fi + + if use ssl; then + sed -i \ + -e 's:^#\(TLS=.*\):\1:g' \ + -e 's:^#TLSINCLUDES=.*:TLSINCLUDES=/usr/include:' \ + -e 's:^#TLSLIBS=.*:TLSLIBS=-L/usr/lib -lssl -lcrypto:' \ + -e 's:^#OPENSSLBIN=.*:OPENSSLBIN=/usr/bin/openssl:' \ + Makefile || die "could not enable TLS" + fi + fi + + if [[ -n "${QMAIL_PATCH_DIR}" && -d "${QMAIL_PATCH_DIR}" ]] + then + echo + ewarn "You enabled custom patches from ${QMAIL_PATCH_DIR}." + ewarn "Be warned that you won't get any support when using " + ewarn "this feature. You're on your own from now!" + ebeep + epatch "${QMAIL_PATCH_DIR}/"* + echo + fi + + is_prime ${MY_CONF_SPLIT} || die 'QMAIL_CONF_SPLIT is not a prime number.' + einfo "Using conf-split value of ${MY_CONF_SPLIT}." + + ht_fix_file Makefile* + append-ldflags $(bindnow-flags) + + # The following commands patch the conf-{cc,ld} files to use the user's + # specified CFLAGS and LDFLAGS. These rather complex commands are needed + # because a user supplied patch might apply changes to these files, too. + # Fixes Bug #165981. + echo "$(head -n 1 "${MY_S}/conf-cc" | sed -e "s#^g\?cc\s\+\(-O2\)\?#$(tc-getCC) #")" \ + "${CFLAGS}" > "${MY_S}/conf-cc.tmp" && + mv "${MY_S}/conf-cc.tmp" "${MY_S}/conf-cc" || die 'Patching conf-cc failed.' + + echo "$(head -n 1 "${MY_S}/conf-ld" | sed -e "s#^g\?cc\s\+\(-s\)\?#$(tc-getCC) #")" \ + "${LDLAGS}" > "${MY_S}/conf-ld.tmp" && + mv "${MY_S}/conf-ld.tmp" "${MY_S}/conf-ld" || die 'Patching conf-ld failed.' + + echo -n "${MY_CONF_SPLIT}" > "${MY_S}/conf-split" +} + +src_compile() { + cd "${MY_S}" + emake it man ldap || die "make failed" +} + +src_install() { + cd "${MY_S}" + + einfo "Setting up directory hierarchy ..." + + diropts -m 755 -o root -g qmail + dodir /var/qmail/{,bin,boot,control} + + 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 + + insinto /var/qmail/bin + + insopts -o qmailq -g qmail -m 4711 + doins qmail-queue + + insopts -o root -g qmail -m 700 + doins qmail-{lspawn,start,newu,newmrh} + + insopts -o root -g qmail -m 711 + doins qmail-{getpw,local,remote,rspawn,clean,send,pw2u} splogger + + insopts -o root -g qmail -m 755 + doins bouncesaying condredirect config-fast datemail elq \ + except forward maildir2mbox maildirmake maildirwatch \ + mailsubj pinq predate preline qail qbiff \ + qmail-{inject,pop3d,popup,qmqpc,qmqpd,qmtpd,qread} \ + qmail-{qstat,showctl,smtpd,tcpok,tcpto} \ + qreceipt qsmhook sendmail tcp-env + doins auth_{imap,pop,smtp} condwrite digest dirmaker \ + pbs{add,check,dbd} qmail-{cdb,forward,group} \ + qmail-{ldaplookup,quotawarn,reply,secretary,todo,verify} + + einfo "Installing manpages" + into /usr + doman *.[1-8] + + dodoc BLURB* CHANGES FAQ INSTALL* PIC* README* REMOVE* SECURITY \ + SENDMAIL SYSDEPS TARGETS TEST* THANKS* THOUGHTS TODO* \ + UPGRADE VERSION* \ + QLDAP* ${FILESDIR}/samples.ldif + + # 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" + insopts -m 644 + doenvd ${FILESDIR}/99qmail + + einfo "Creating sendmail replacement ..." + diropts -m 755 + dodir /usr/sbin /usr/lib + + if use mailwrapper + then + insinto /etc/mail + doins ${FILESDIR}/mailer.conf + else + dosym /var/qmail/bin/sendmail /usr/sbin/sendmail + dosym /var/qmail/bin/sendmail /usr/lib/sendmail + fi + + einfo "Setting up the default aliases ..." + diropts -m 700 -o alias -g qmail + ${MAILDIRMAKE} ${D}/var/qmail/alias/.maildir + keepdir /var/qmail/alias/.maildir/{cur,new,tmp} + + for i in /var/qmail/alias/.qmail-{mailer-daemon,postmaster,root} + do + if [[ ! -f ${i} ]]; then + touch ${D}${i} + fowners 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 + 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} + 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 + diropts -m 755 -o qmaill + keepdir /var/log/qmail/qmail-${i} + done + + dodir ${TCPRULES_DIR} + insinto ${TCPRULES_DIR} + newins ${FILESDIR}/tcprules.d-Makefile.qmail Makefile.qmail + for i in smtp qmtp qmqp pop3; do + newins ${FILESDIR}/tcp.${i}.sample tcp.qmail-${i} + done + + einfo "Installing OpenLDAP schema ..." + insinto /etc/openldap/schema + doins qmail.schema + + einfo "Installing some stock configuration files" + insinto /var/qmail/control + insopts -o root -g root -m 644 + doins ${FILESDIR}/conf-{common,send,qmtpd,qmqpd,pop3d} + newins ${FILESDIR}/conf-smtpd conf-smtpd + 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}/qmail-config-system + + if use qmail-spp; then + einfo "Installing files for qmail-spp" + insinto /var/qmail/control/ + doins ${FILESDIR}/smtpplugins + keepdir /var/qmail/plugins/ + fi + + if use ssl; then + einfo "SSL Certificate creation script" + dobin ${FILESDIR}/mkservercert + einfo "RSA key generation cronjob" + insinto /etc/${CRON_FOLDER} + doins ${FILESDIR}/qmail-genrsacert.sh + chmod +x ${D}/etc/${CRON_FOLDER}/qmail-genrsacert.sh + + # for some files + keepdir /var/qmail/control/tlshosts/ + fi +} + +rootmailfixup() { + # so you can check mail as root easily + local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir" + if [[ -d "${ROOT}/root/.maildir" && ! -L "${ROOT}/root/.maildir" ]] ; then + elog "Previously the qmail ebuilds created /root/.maildir/ but not" + elog "every mail was delivered there. If the directory does not" + elog "contain any mail, please delete it and run:" + elog "${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 + [[ -e ${src} ]] && tcprules ${cdb} ${tmp} < ${src} + done +} + +pkg_postinst() { + einfo "Setting up the message queue hierarchy ..." + /usr/bin/queue-repair.py \ + --create --split "${MY_CONF_SPLIT}" \ + $(use highvolume && echo '--bigtodo' || echo '--no-bigtodo') \ + ${ROOT}/var/qmail >/dev/null || \ + die 'queue-repair failed' + + rootmailfixup + buildtcprules + + # for good measure + env-update + + elog "To setup qmail to run out-of-the-box on your system, run:" + elog "emerge --config =${CATEGORY}/${PF}" + elog + elog "To start qmail at boot you have to add svscan to your startup" + elog "and create the following links:" + elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send" + elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd" + elog + elog "To start the pop3 server as well, create the following link:" + elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d" + elog + elog "Additionally, the QMTP and QMQP protocols are supported, " + elog "and can be started as:" + elog "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd" + elog "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd" + elog + elog "Additionally, if you wish to run qmail right now, you should " + elog "run this before anything else:" + elog "source /etc/profile" + elog + elog "If you are looking for documentation, check those links:" + elog "http://www.lifewithqmail.com/ldap/" + elog " -- Life with qmail-ldap" + elog + elog "For sample ldifs, please check" + elog "/usr/share/doc/${PF}/samples.ldif.gz" +} + +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" && ! -f "$new" ]]; then + einfo "Moving $old to $new" + cp $old $new || fail=1 + else + fail=1 + fi + if [[ "${fail}" = 1 && -f ${old} ]]; 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 +} + +# Candidate for eclass +pkg_setup() { + # keep in sync with mini-qmail pkg + einfo "Creating groups and users" + enewgroup qmail 201 + enewuser alias 200 -1 /var/qmail/alias 200 + enewuser qmaild 201 -1 /var/qmail 200 + enewuser qmaill 202 -1 /var/qmail 200 + enewuser qmailp 203 -1 /var/qmail 200 + enewuser qmailq 204 -1 /var/qmail 201 + enewuser qmailr 205 -1 /var/qmail 201 + enewuser qmails 206 -1 /var/qmail 201 +} + +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 + ebegin "Generating RSA keys for SSL/TLS, this can take some time" + ${ROOT}/etc/${CRON_FOLDER}/qmail-genrsacert.sh + eend $? + einfo "Creating a self-signed ssl-certificate:" + ${ROOT}/var/qmail/bin/mkservercert + einfo "If you want to have a properly signed certificate " + einfo "instead, do the following:" + # space at the end of the string because of the current implementation + # of einfo + 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 +} + +# --- TODO: The following code can be moved to prime.eclass -- +# Original Author: Michael Hanselmann <hansmi@gentoo.org> +# Purpose: Functions for prime numbers + +# Prints a list of primes between min and max inclusive +# +# Note: this functions gets very slow when used with large numbers. +# +# Syntax: primes <min> <max> +primes() { + local min=${1} max=${2} + local result= primelist=2 i p + + [[ ${min} -le 2 ]] && result="${result} 2" + + for ((i = 3; i <= max; i += 2)) + do + for p in ${primelist} + do + [[ $[i % p] == 0 || $[p * p] -gt ${i} ]] && \ + break + done + if [[ $[i % p] != 0 ]] + then + primelist="${primelist} ${i}" + [[ ${i} -ge ${min} ]] && \ + result="${result} ${i}" + fi + done + + echo ${result} +} + +# Checks wether a number is a prime number +# +# Syntax: is_prime <number> +is_prime() { + local number=${1} i + for i in $(primes ${number} ${number}) + do + [[ ${i} == ${number} ]] && return 0 + done + return 1 +} +# --- end of prime.eclass --- |