Bump version to 2.2.3. Major cleanup/rewrite: quote variables where possible; whitespace consistancy use more ebuild semantics (use_with, use_enable); drop creation of cyrus user; move all binaries to /usr/lib/cyrus from /usr/cyrus; make tcpd support optional, based on tcpd USE flag; add optional DRAC support, based on local drac USE flag; vastly simplified install procedure; move ssl files to /etc/ssl/cyrus from /etc/cyrusimapd; IMAP spool hashing fixes; startup script fixes; make PAM optional. Generate server.pem along with server.key and server.crt if USE=ssl. Depend on sed-4. Migrate to ssl-cert.eclass.

17 files changed, 328 insertions, 36 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index a687bb65c8a2..9721ca85ca7a 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for net-mail/cyrus-imapd
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.34 2003/12/14 22:52:15 spider Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.35 2004/01/20 18:00:43 max Exp $
+
+*cyrus-imapd-2.2.3 (20 Jan 2004)
+
+  20 Jan 2004; Max Kalika <max@gentoo.org> cyrus-imapd-2.1.11-r1.ebuild,
+  cyrus-imapd-2.1.12.ebuild, cyrus-imapd-2.1.13.ebuild,
+  cyrus-imapd-2.1.14.ebuild, cyrus-imapd-2.1.15-r1.ebuild,
+  cyrus-imapd-2.1.15.ebuild, cyrus-imapd-2.2.3.ebuild, files/2.1.14-db4.patch,
+  files/2.1.15-db4.patch, files/cyrus-imapd-2.1.12-libwrap.patch,
+  files/cyrus-imapd-2.1.14-db4.patch, files/cyrus-imapd-2.1.15-db4.patch,
+  files/cyrus-imapd-2.2.3-db4.patch, files/cyrus-imapd-libwrap.patch,
+  files/cyrus.conf, files/cyrus.rc6, files/imap.pam, files/imapd.conf:
+  Bump version to 2.2.3. Major cleanup/rewrite: quote variables where possible;
+  whitespace consistancy use more ebuild semantics (use_with, use_enable);
+  drop creation of cyrus user; move all binaries to /usr/lib/cyrus from
+  /usr/cyrus; make tcpd support optional, based on tcpd USE flag; add optional
+  DRAC support, based on local drac USE flag; vastly simplified install
+  procedure; move ssl files to /etc/ssl/cyrus from /etc/cyrusimapd; IMAP spool
+  hashing fixes; startup script fixes; make PAM optional. Generate server.pem
+  along with server.key and server.crt if USE=ssl. Depend on sed-4. Migrate to
+  ssl-cert.eclass.
 
   14 Dec 2003; <spider@gentoo.org> cyrus-imapd-2.1.11-r1.ebuild,
   cyrus-imapd-2.1.12.ebuild, cyrus-imapd-2.1.13.ebuild,
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild
index e188b0fb70c0..301e1f04a70e 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild,v 1.5 2003/12/14 22:52:15 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.11-r1.ebuild,v 1.6 2004/01/20 18:00:43 max Exp $
 
 DESCRIPTION="The Cyrus IMAP Server"
 HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild
index 9ee489d5ae3d..2d2e365bda9e 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild,v 1.9 2003/12/14 22:52:15 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild,v 1.10 2004/01/20 18:00:43 max Exp $
 
 inherit eutils
 
@@ -36,7 +36,7 @@ src_unpack() {
 	# remove spurious -I/usr/includes
 	epatch ${FILESDIR}/${P}-includepath.patch
 	# add libwrap defines as we don't have a dynamicly linked library.
-	epatch ${FILESDIR}/${P}-libwrap.patch
+	epatch ${FILESDIR}/${PN}-libwrap.patch
 	# when linking with rpm, you need to link with more libraries.
 	cp configure configure.orig
 	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" \
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild
index 05c8b8f3fa70..2ba22d18fc18 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild,v 1.5 2003/12/14 22:52:15 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.13.ebuild,v 1.6 2004/01/20 18:00:43 max Exp $
 
 inherit eutils
 
@@ -34,9 +34,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	# remove spurious -I/usr/includes
-	epatch ${FILESDIR}/cyrus-imapd-2.1.12-includepath.patch
+	epatch ${FILESDIR}/${PN}-2.1.12-includepath.patch
 	# add libwrap defines as we don't have a dynamicly linked library.
-	epatch ${FILESDIR}/cyrus-imapd-2.1.12-libwrap.patch
+	epatch ${FILESDIR}/${PN}-libwrap.patch
 	# when linking with rpm, you need to link with more libraries.
 	cp configure configure.orig
 	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" \
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
index 9545b521f335..a759c5238d9f 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild,v 1.6 2003/12/14 22:52:15 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild,v 1.7 2004/01/20 18:00:43 max Exp $
 
 inherit eutils
 IPV6_P="${P}-ipv6-20030703"
@@ -40,10 +40,10 @@ src_unpack() {
 	cd ${S}
 
 	# patch for db4 detection and their respective versioned symbols
-	epatch ${FILESDIR}/2.1.14-db4.patch
+	epatch ${FILESDIR}/${P}-db4.patch
 
 	# add libwrap defines as we don't have a dynamicly linked library.
-	epatch ${FILESDIR}/cyrus-imapd-2.1.12-libwrap.patch
+	epatch ${FILESDIR}/${PN}-libwrap.patch
 
 	# Does running autoconf squash any of this?
 	use ipv6 && epatch ${WORKDIR}/${IPV6_P}.diff
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
index 6f73a6a75327..7b981b14db86 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild,v 1.2 2003/12/14 22:52:15 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild,v 1.3 2004/01/20 18:00:43 max Exp $
 
 inherit eutils fixheadtails
 IPV6_P="${P}-ipv6-20030819"
@@ -40,10 +40,10 @@ src_unpack() {
 	cd ${S}
 
 	# patch for db4 detection and their respective versioned symbols
-	epatch ${FILESDIR}/2.1.15-db4.patch
+	epatch ${FILESDIR}/${P}-db4.patch
 
 	# add libwrap defines as we don't have a dynamicly linked library.
-	epatch ${FILESDIR}/cyrus-imapd-2.1.12-libwrap.patch
+	epatch ${FILESDIR}/${PN}-libwrap.patch
 
 	# Does running autoconf squash any of this?
 	use ipv6 && epatch ${WORKDIR}/${IPV6_P}.diff
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild
index 84a324a7c196..196d3c923420 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild,v 1.3 2003/12/14 22:52:15 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15.ebuild,v 1.4 2004/01/20 18:00:43 max Exp $
 
 inherit eutils
 IPV6_P="${P}-ipv6-20030819"
@@ -40,10 +40,10 @@ src_unpack() {
 	cd ${S}
 
 	# patch for db4 detection and their respective versioned symbols
-	epatch ${FILESDIR}/2.1.15-db4.patch
+	epatch ${FILESDIR}/${P}-db4.patch
 
 	# add libwrap defines as we don't have a dynamicly linked library.
-	epatch ${FILESDIR}/cyrus-imapd-2.1.12-libwrap.patch
+	epatch ${FILESDIR}/${PN}-libwrap.patch
 
 	# Does running autoconf squash any of this?
 	use ipv6 && epatch ${WORKDIR}/${IPV6_P}.diff
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild
new file mode 100644
index 000000000000..a91a4c81061e
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.3.ebuild,v 1.1 2004/01/20 18:00:43 max Exp $
+
+inherit eutils ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server."
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="afs drac kerberos pam snmp ssl tcpd"
+
+PROVIDE="virtual/imapd"
+DEPEND="virtual/glibc
+	sys-devel/libtool
+	sys-devel/autoconf
+	sys-devel/automake
+	>=sys-apps/sed-4
+	>=sys-libs/db-3.2
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( >=net-fs/openafs-1.2.2 )
+	pam? ( >=sys-libs/pam-0.75 )
+	kerberos? ( virtual/krb5 )
+	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	drac? ( >=net-mail/drac-1.12-r1 )"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# Add drac database support.
+	if [ "`use drac`" ] ; then
+		epatch "${S}/contrib/drac_auth.patch"
+	fi
+
+	# Add libwrap defines as we don't have a dynamicly linked library.
+	if [ "`use tcpd`" ] ; then
+		epatch "${FILESDIR}/${PN}-libwrap.patch"
+	fi
+
+	# DB4 detection and versioned symbols.
+	epatch "${FILESDIR}/${P}-db4.patch"
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			-i "${i}" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8
+	sed -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		-i man/cyrusmaster.8 || die "sed failed"
+
+	# Recreate configure.
+	export WANT_AUTOCONF="2.5"
+	rm -f configure config.h.in
+	ebegin "Recreating configure"
+	sh SMakefile &>/dev/null || die "SMakefile failed"
+	eend $?
+
+	# When linking with rpm, you need to link with more libraries.
+	sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
+}
+
+src_compile() {
+	local myconf
+	myconf="${myconf} `use_with afs`"
+	myconf="${myconf} `use_with drac`"
+	myconf="${myconf} `use_with ssl openssl`"
+	myconf="${myconf} `use_with snmp ucdsnmp`"
+	myconf="${myconf} `use_with tcpd libwrap`"
+	myconf="${myconf} `use_enable kerberos gssapi`"
+
+	econf \
+		--enable-murder \
+		--enable-listext \
+		--enable-netscapehack \
+		--with-extraident=Gentoo \
+		--with-service-path=/usr/lib/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-auth=unix \
+		--without-perl \
+		--disable-cyradm \
+		${myconf}
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/bin /usr/lib
+	for subdir in master imap imtest timsieved notifyd ; do
+		make -C "${subdir}" DESTDIR="${D}" install || die "make install failed"
+	done
+
+	# Link master to cyrusmaster (postfix has a master too)
+	dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster
+
+	doman man/*.[0-8]
+	dodoc COPYRIGHT README*
+	dohtml doc/*.html doc/murder.png
+	cp doc/cyrusv2.mc "${D}/usr/share/doc/${PF}/html"
+	cp -r contrib tools "${D}/usr/share/doc/${PF}"
+	find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf
+
+	insinto /etc
+	newins "${FILESDIR}/imapd.conf" imapd.conf
+	newins "${FILESDIR}/cyrus.conf" cyrus.conf
+
+	exeinto /etc/init.d
+	newexe "${FILESDIR}/cyrus.rc6" cyrus
+
+	if [ "`use pam`" ] ; then
+		insinto /etc/pam.d
+		newins "${FILESDIR}/imap.pam" imap
+	fi
+
+	if [ "`use ssl`" ] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMAP Server}"
+		insinto /etc/ssl/cyrus
+		docert server
+		fowners cyrus:mail /etc/ssl/cyrus/server.{key,pem}
+	fi
+
+	for subdir in imap/{,db,log,msg,proc,socket} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	ewarn "*****NOTE*****"
+	ewarn "If you're upgrading from versions prior to 2.2.2_BETA"
+	ewarn "be sure to read the following thoroughly:"
+	ewarn "http://asg.web.cmu.edu/cyrus/download/imapd/install-upgrade.html"
+	ewarn "*****NOTE*****"
+	echo
+
+	ewarn "If you change the fs-type of /var/imap or"
+	ewarn "/var/spool/imap you should read step 9 of"
+	ewarn "/usr/share/doc/${P}/html/install-configure.html."
+	echo
+
+	if df -T /var/imap | grep -q ' ext[23] ' ; then
+		ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
+		chattr +S /var/imap/{user,quota}{,/*}
+		eend $?
+	fi
+
+	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
+		ebegin "Making /var/spool/imap/* synchronous."
+		chattr +S /var/spool/imap{,/*}
+		eend $?
+	fi
+
+	ewarn "If the queue directory of the mail daemon resides on an ext2"
+	ewarn "or ext3 filesystem you need to set it manually to update"
+	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
+	echo
+
+	einfo "For correct logging add the following to /etc/syslog.conf:"
+	einfo "    local6.*         /var/log/imapd.log"
+	einfo "    auth.debug       /var/log/auth.log"
+	echo
+
+	ewarn "You have to add user cyrus to the sasldb2. Do this with:"
+	ewarn "    saslpasswd2 cyrus"
+}
diff --git a/net-mail/cyrus-imapd/files/2.1.14-db4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.14-db4.patch
index 78578f3a0969..78578f3a0969 100644
--- a/net-mail/cyrus-imapd/files/2.1.14-db4.patch
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.14-db4.patch
diff --git a/net-mail/cyrus-imapd/files/2.1.15-db4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.15-db4.patch
index 9ad444fa985c..9ad444fa985c 100644
--- a/net-mail/cyrus-imapd/files/2.1.15-db4.patch
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.15-db4.patch
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch
new file mode 100644
index 000000000000..ace2f28ea8e1
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.2.3-db4.patch
@@ -0,0 +1,28 @@
+diff -urN cyrus-imapd-2.2.3/cmulocal/berkdb.m4 cyrus-imapd-2.2.3/cmulocal/berkdb.m4
+--- cyrus-imapd-2.2.3/cmulocal/berkdb.m4	2003-04-15 17:25:41.000000000 -0500
++++ cyrus-imapd-2.2.3/cmulocal/berkdb.m4	2003-07-09 03:17:48.000000000 -0500
+@@ -211,12 +211,21 @@
+ 	    BDB_LIBADD=""
+ 	fi
+ 
+-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
+           do
+-            AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
+-              dblib="berkeley"; break, dblib="no")
++            AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++              dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++               dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4002, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++                dblib="berkeley"; break, dblib="no")))
+           done
+         if test "$dblib" = "no"; then
++          for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
++            do
++              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
++                dblib="berkeley"; break, dblib="no")
++            done
++       fi
++        if test "$dblib" = "no"; then
+           AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
+             dblib="berkeley"; dbname=db,
+             dblib="no")
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-libwrap.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-libwrap.patch
index ee800779f5e4..ee800779f5e4 100644
--- a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-libwrap.patch
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-libwrap.patch
diff --git a/net-mail/cyrus-imapd/files/cyrus.conf b/net-mail/cyrus-imapd/files/cyrus.conf
index d4fd6dd5f2d8..d795322c8d2f 100644
--- a/net-mail/cyrus-imapd/files/cyrus.conf
+++ b/net-mail/cyrus-imapd/files/cyrus.conf
@@ -1,41 +1,43 @@
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.conf,v 1.2 2002/09/23 17:29:34 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.conf,v 1.3 2004/01/20 18:00:43 max Exp $
 
-# standard standalone server implementation
+# Standard standalone server configuration.
 
 START {
-  # do not delete this entry!
+  # Do not delete this entry!
   recover	cmd="ctl_cyrusdb -r"
 
-  # this is only necessary if using idled for IMAP IDLE
-#  idled		cmd="idled"
+  # This is only necessary if using idled for IMAP IDLE.
+  #idled		cmd="idled"
 }
 
-# UNIX sockets start with a slash and are put into /var/imap/socket
+# UNIX sockets start with a slash and are put into /var/imap/socket.
 SERVICES {
-  # add or remove based on preferences
+  # Add or remove based on preferences.
   imap		cmd="imapd" listen="imap2" prefork=0
   pop3		cmd="pop3d" listen="pop-3" prefork=0
+
   # Don't forget to generate the needed keys for SSL or TLS
-  # (see doc/html/install-configure.html)
+  # (see doc/html/install-configure.html).
   #imaps		cmd="imapd -s" listen="imaps" prefork=0
   #pop3s		cmd="pop3d -s" listen="pop3s" prefork=0
+
   sieve		cmd="timsieved" listen="sieve" prefork=0
 
   # at least one LMTP is required for delivery
-#  lmtp		cmd="lmtpd" listen="lmtp" prefork=0
+  #lmtp		cmd="lmtpd" listen="lmtp" prefork=0
   lmtpunix	cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0
 
   # this is only necessary if using notifications
-#  notify	cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
+  #notify	cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
 }
 
 EVENTS {
-  # this is required
+  # This is required.
   checkpoint	cmd="ctl_cyrusdb -c" period=30
 
-  # this is only necessary if using duplicate delivery suppression
+  # This is only necessary if using duplicate delivery suppression.
   delprune	cmd="ctl_deliver -E 3" period=1440
 
-  # this is only necessary if caching TLS sessions
+  # This is only necessary if caching TLS sessions.
   tlsprune	cmd="tls_prune" period=1440
 }
diff --git a/net-mail/cyrus-imapd/files/cyrus.rc6 b/net-mail/cyrus-imapd/files/cyrus.rc6
new file mode 100644
index 000000000000..3599b91e7aa7
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus.rc6
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/cyrus.rc6,v 1.4 2004/01/20 18:00:43 max Exp $
+
+depend() {
+	need net
+	use dns logger
+	after drac saslauthd
+}
+
+start() {
+	ebegin "Starting cyrus imapd"
+	start-stop-daemon --start --quiet --background \
+		--exec /usr/lib/cyrus/master
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping cyrus imapd"
+	start-stop-daemon --stop --quiet --pidfile /var/run/cyrus-master.pid
+	eend $?
+}
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.3 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.3
new file mode 100644
index 000000000000..68980bd5b063
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.3
@@ -0,0 +1 @@
+MD5 32888c5120edeb2867d6283fedbdb7d5 cyrus-imapd-2.2.3.tar.gz 1887717
diff --git a/net-mail/cyrus-imapd/files/imap.pam b/net-mail/cyrus-imapd/files/imap.pam
new file mode 100644
index 000000000000..17ddb9f466d0
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/imap.pam
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth       required	/lib/security/pam_nologin.so
+auth       required	/lib/security/pam_stack.so service=system-auth
+
+account    required	/lib/security/pam_stack.so service=system-auth
diff --git a/net-mail/cyrus-imapd/files/imapd.conf b/net-mail/cyrus-imapd/files/imapd.conf
new file mode 100644
index 000000000000..334f3cfaf05a
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/imapd.conf
@@ -0,0 +1,29 @@
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/files/imapd.conf,v 1.3 2004/01/20 18:00:43 max Exp $
+
+# Don't forget to use chattr +S (if you are using ext[23]) 
+# when you change these directories (read the docs).
+configdirectory:	/var/imap
+partition-default:	/var/spool/imap
+sievedir:		/var/imap/sieve
+
+tls_ca_path:            /etc/ssl/certs
+tls_cert_file:		/etc/ssl/cyrus/server.crt
+tls_key_file:		/etc/ssl/cyrus/server.key
+
+# Don't use an everyday user as admin.
+admins:			cyrus
+
+hashimapspool:		yes
+allowanonymouslogin:	no
+allowplaintext:		no
+
+# Allow renaming of top-level mailboxes.
+#allowusermoves:         yes
+
+# Use this if sieve-scripts could be in ~user/.sieve.
+#sieveusehomedir:	yes
+
+# Use saslauthd if you want to use pam for imap.
+# But be warned: login with DIGEST-MD5 or CRAM-MD5 
+# is not possible using pam.
+#sasl_pwcheck_method:	saslauthd