Version bump + many more. See ChangeLog.

7 files changed, 467 insertions, 27 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 19ca831fce02..3c34ae56d18e 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.80 2004/08/19 22:24:08 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.81 2004/08/20 05:53:46 langthang Exp $
+
+*courier-imap-3.0.7 (19 Aug 2004)
+
+  19 Aug 2004; Tuan Van <langthang@gentoo.org>
+  +files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-3.0.7-db4-configure.in.patch,
+  +files/courier-imap-3.0.7-disable-fam-configure.in.patch,
+  +courier-imap-3.0.7.ebuild:
+  Version bump. Add patches to support db4. Add gdbm USE flag back.
+  Add logic to default to gdbm if both 'berkdb' and 'gdmb' USE flags present.
 
   20 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> courier-imap-3.0.5.ebuild:
   Marked stable on amd64.
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 8d09310f12fc..ead38fc39e2d 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,38 +1,43 @@
-MD5 4431202f9c9e29d68860218d9991c258 ChangeLog 13598
 MD5 e8c4fbff74fecbdd62bdbbd3c6fcf469 courier-imap-3.0.5.ebuild 8534
-MD5 5166baaed20ae8dfa45a810dbcb68a77 courier-imap-3.0.2.ebuild 7910
-MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
 MD5 4a1588363f00a055dabfe52c69a3a33d courier-imap-3.0.2-r1.ebuild 8135
-MD5 21d2afc701f2d9a8bab7e346544df87f courier-imap-3.0.4-r1.ebuild 8167
+MD5 04b870b9b2c94c36d940aa076ed28e52 courier-imap-3.0.7.ebuild 10027
+MD5 5166baaed20ae8dfa45a810dbcb68a77 courier-imap-3.0.2.ebuild 7910
 MD5 1a1abc40534a0d880c078c43018e3700 courier-imap-3.0.4.ebuild 8132
-MD5 f156e5a11ab06f0bee9c0b1e6e2c8887 files/authdaemond.conf 440
-MD5 92cd406de622a1cf2de2ffc0662349bc files/authdaemond.rc6 957
+MD5 21d2afc701f2d9a8bab7e346544df87f courier-imap-3.0.4-r1.ebuild 8167
+MD5 4431202f9c9e29d68860218d9991c258 ChangeLog 13598
+MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
+MD5 d9d0cf2a19ee5b20039583b7cb4cffcc files/courier-pop3d-ssl.rc6-3.0.5 1204
+MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch 1263
+MD5 5879bfc8c6b847d7ef364b4ca6b40880 files/courier-imapd-ssl.rc6-3.0.5 1196
+MD5 12ca0f1c57bbe3d8e8fd8cf56e5e3bc3 files/authdaemond-3.0.4-r1 1075
+MD5 7d5ddf4fa33c73befa0bd434a17022f9 files/authdaemond.conf-3.0.4-r1 544
+MD5 1709ef97052398ee74b0d7d7786d398a files/gentoo-pop3d-1.7.3-r1.rc 1020
 MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
-MD5 8518e782ded83266586160919806ec06 files/courier-imap-2.1.2-removerpm.patch 4308
-MD5 60552b53a15c049f8f490d454764315d files/courier-imap-2.1.2-res_query.patch 610
-MD5 dfe2c230fed9f3be8e27d5d0baeef193 files/courier-imap-3.0.2-db40vs41.patch 585
-MD5 ce975bfaa13118f7fcc463f2e0486277 files/courier-imap-3.0.2-removerpm.patch 4264
+MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
+MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.7-disable-fam-configure.in.patch 654
 MD5 c8836ccb71ec53cb7570308b10d9c247 files/courier-imapd-ssl.rc6 1200
 MD5 90bb778616a7c67658b9e78890d4b8fe files/courier-imapd.rc6 945
+MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
+MD5 a5029d4de95a9deca6254a889ed7fd0b files/gentoo-pop3d-ssl-1.7.3-r1.rc 1012
+MD5 60552b53a15c049f8f490d454764315d files/courier-imap-2.1.2-res_query.patch 610
+MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
+MD5 8518e782ded83266586160919806ec06 files/courier-imap-2.1.2-removerpm.patch 4308
+MD5 ce975bfaa13118f7fcc463f2e0486277 files/courier-imap-3.0.2-removerpm.patch 4264
+MD5 f156e5a11ab06f0bee9c0b1e6e2c8887 files/authdaemond.conf 440
+MD5 9e69a26cf7b3bf68338f701fece09a35 files/gentoo-imapd-ssl-1.7.3-r1.rc 1036
+MD5 d56218342e6b7d9e7aec913b9d44de87 files/digest-courier-imap-3.0.2-r1 72
+MD5 ccbd15ff6786ce62a52455ec5f02233e files/digest-courier-imap-3.0.4-r1 72
 MD5 d1bfa2a8019ebac0a33d3ef7a8945eeb files/courier-pop3d-ssl.rc6 1208
-MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
-MD5 cf0b34bc53717e49f0f75bd610a0fac9 files/digest-courier-imap-3.0.5 72
+MD5 73fffd635f45ec99ecf6a45a9d0e4516 files/courier-imap-3.0.2-disable-fam.diff 1996
+MD5 dfe2c230fed9f3be8e27d5d0baeef193 files/courier-imap-3.0.2-db40vs41.patch 585
 MD5 d56218342e6b7d9e7aec913b9d44de87 files/digest-courier-imap-3.0.2 72
+MD5 ccbd15ff6786ce62a52455ec5f02233e files/digest-courier-imap-3.0.4 72
+MD5 cf0b34bc53717e49f0f75bd610a0fac9 files/digest-courier-imap-3.0.5 72
+MD5 5d57e73c7593d5bb37135d3964d6d4c2 files/digest-courier-imap-3.0.7 72
+MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.7-db4-configure.in.patch 1337
 MD5 2399f4a660fd7149e3fe19f0bfc230e1 files/gentoo-imapd-1.7.3-r1.rc 1074
-MD5 9e69a26cf7b3bf68338f701fece09a35 files/gentoo-imapd-ssl-1.7.3-r1.rc 1036
 MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
-MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
-MD5 1709ef97052398ee74b0d7d7786d398a files/gentoo-pop3d-1.7.3-r1.rc 1020
-MD5 a5029d4de95a9deca6254a889ed7fd0b files/gentoo-pop3d-ssl-1.7.3-r1.rc 1012
-MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
 MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
-MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
+MD5 92cd406de622a1cf2de2ffc0662349bc files/authdaemond.rc6 957
+MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
-MD5 73fffd635f45ec99ecf6a45a9d0e4516 files/courier-imap-3.0.2-disable-fam.diff 1996
-MD5 d56218342e6b7d9e7aec913b9d44de87 files/digest-courier-imap-3.0.2-r1 72
-MD5 12ca0f1c57bbe3d8e8fd8cf56e5e3bc3 files/authdaemond-3.0.4-r1 1075
-MD5 7d5ddf4fa33c73befa0bd434a17022f9 files/authdaemond.conf-3.0.4-r1 544
-MD5 ccbd15ff6786ce62a52455ec5f02233e files/digest-courier-imap-3.0.4 72
-MD5 ccbd15ff6786ce62a52455ec5f02233e files/digest-courier-imap-3.0.4-r1 72
-MD5 5879bfc8c6b847d7ef364b4ca6b40880 files/courier-imapd-ssl.rc6-3.0.5 1196
-MD5 d9d0cf2a19ee5b20039583b7cb4cffcc files/courier-pop3d-ssl.rc6-3.0.5 1204
diff --git a/net-mail/courier-imap/courier-imap-3.0.7.ebuild b/net-mail/courier-imap/courier-imap-3.0.7.ebuild
new file mode 100644
index 000000000000..9e17bd2dbb45
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-3.0.7.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-3.0.7.ebuild,v 1.1 2004/08/20 05:53:46 langthang Exp $
+
+inherit eutils gnuconfig
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="fam berkdb gdbm debug ipv6 ldap mysql nls pam postgres selinux"
+PROVIDE="virtual/imapd"
+# not compatible with >=sys-libs/db-4
+RDEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.6
+	pam? ( >=sys-libs/pam-0.75 )
+	berkdb? ( >=sys-libs/db-3* )
+	gdbm ( >=sys-libs/gdbm-1.8.0 )
+	mysql? ( >=dev-db/mysql-3.23.36 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.2 )
+	>=dev-tcltk/expect-5.33.0
+	fam? ( app-admin/fam )
+	selinux? ( sec-policy/selinux-courier-imap )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	dev-lang/perl
+	sys-apps/procps"
+
+#userpriv breaks linking against vpopmail
+RESTRICT="nouserpriv nomirror"
+pkg_setup() {
+	if ! use berkdb && ! use gdbm; then
+		echo
+		eerror "either 'berkdb' or 'gdbm' USE flag is required."
+		eerror "please add it to '/etc/make.conf' or '/etc/portage/package.use'"
+		eerror "'man 5 portage' for correct syntax usage for '/etc/postage/package.use'"
+		echo
+		die "required USE flag is missing."
+	fi
+}
+
+vpopmail_setup() {
+	VPOPMAIL_INSTALLED=
+	VPOPMAIL_DIR=
+	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
+	VPOPMAIL_DIR=`grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6`
+	VPOPMAIL_INSTALLED=
+	if has_version 'net-mail/vpopmail' && [ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]; then
+		VPOPMAIL_INSTALLED=1
+	else
+		VPOPMAIL_DIR=
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# patch to fix db4.0 detection as db4.1
+	# bug #27517, patch was sent upstream, but was ignored :-(
+	# EPATCH_OPTS="${EPATCH_OPTS} -p1 -d ${S}" \
+	# epatch ${FILESDIR}/${PN}-3.0.2-db40vs41.patch
+
+	cd ${S}
+	# explicitly use db3 over db4
+	#if use berkdb; then
+	#	sed -i -e 's,-ldb,-ldb-3.2,g' configure
+	#	sed -i -e 's,-ldb,-ldb-3.2,g' bdbobj/configure
+	#	sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' configure
+	#	sed -i -e 's#s,@CFLAGS@,$CFLAGS,#s,@CFLAGS@,-I/usr/include/db3 $CFLAGS,#' bdbobj/configure
+	#fi
+
+	# Fix a bug with where the password change module is installed. Upstream bug in configure file.
+	#sed -i -e 's,--with-authchangepwdir=/var/tmp/dev/null,--with-authchangepwdir=$libexecdir/authlib,' configure
+
+	# epatch ${FILESDIR}/${PN}-3.0.2-removerpm.patch || die "patch failed."
+
+	# bug #48838 - make is possible to disable fam
+	# EPATCH_OPTS="${EPATCH_OPTS} -p1 -d ${S}" \
+	# epatch ${FILESDIR}/${P}-disable-fam.diff || die "patch failed."
+
+	#rm -f configure config.h.in saslauthd/configure
+	#cp ${FILESDIR}/configure.in . || die "failed copy configure.in"
+	epatch ${FILESDIR}/${P}-disable-fam-configure.in.patch || die "patch failed"
+	epatch ${FILESDIR}/${P}-db4-bdbobj_configure.in.patch || die "patch failed"
+	epatch ${FILESDIR}/${P}-db4-configure.in.patch || die "patch failed"
+	#cp ${FILESDIR}/bdbobj_configure.in bdbobj/configure.in || die "failed copy bdbobj/configure.in"
+
+	#cd ${S}
+	export WANT_AUTOCONF="2.5"
+	gnuconfig_update
+	ebegin "Recreating configure"
+	autoconf || \
+		die "recreate configure failed"
+	eend $?
+
+	#cd ${S}/authlib
+	#ebegin "Recreating authlib/configure"
+	#autoconf || \
+        #        die "recreate configure failed"
+	#eend $?
+
+	cd ${S}/maildir
+	ebegin "Recreating maildir/configure"
+	autoconf || \
+		die "recreate configure failed"
+	eend $?
+
+        cd ${S}/bdbobj
+        ebegin "Recreating bdbobj/configure"
+        autoconf || \
+                die "recreate configure failed"
+        eend $?
+	#elibtoolize
+}
+src_compile() {
+	vpopmail_setup
+
+	local myconf
+	myconf="${myconf} `use_with pam authpam`"
+	myconf="${myconf} `use_with ldap authldap`"
+	myconf="${myconf} `use_with mysql authmysql`"
+	myconf="${myconf} `use_with postgres authpostgresql`"
+	# the --with-ipv6 is broken
+	#myconf="${myconf} --with-ipv6"
+	use ipv6 || myconf="${myconf} --without-ipv6"
+	# default to gdbm if both berkdb and gdbm present. langthang@g.o 20040819
+	if use berkdb; then
+		if use gdbm; then
+			einfo "build with GDBM support."
+			myconf="${myconf} --with-db=gdbm"
+		else
+			einfo "build with Berkeley DB support."
+			myconf="${myconf} --with-db=db"
+		fi
+	else
+		einfo "build with GDBM support."
+		myconf="${myconf} --with-db=gdbm"
+	fi
+
+	if [ -n "${VPOPMAIL_INSTALLED}" ]; then
+		einfo "vpopmail found"
+		myconf="${myconf} --with-authvchkpw"
+		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
+		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
+		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
+	else
+		einfo "vpopmail not found"
+		myconf="${myconf} --without-authvchkpw"
+	fi
+
+	if use nls && [ -z "$ENABLE_UNICODE" ]; then
+		myconf="${myconf} --enable-unicode"
+	elif use nls; then
+		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
+	else
+		myconf="${myconf} --disable-unicode"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	local cachefile
+	cachefile=${WORKDIR}/config.cache
+	rm -f ${cachefile}
+
+	# fix for bug #21330
+	# CFLAGS="`echo ${CFLAGS} | xargs`"
+	# CXXFLAGS="`echo ${CXXFLAGS} | xargs`"
+	# LDFLAGS="`echo ${LDFLAGS} | xargs`"
+
+	# fix for bug #27528
+	# they really should use a better way to detect redhat
+	myconf="${myconf} --without-redhat"
+
+	# bug #29879 - FAM support
+	#if has_version 'app-admin/fam' && ! use fam; then
+	#	ewarn "FAM will be detected by the package and support will be enabled"
+	#	ewarn "The package presently provides no way to disable fam support if you don't want it"
+	#fi
+	myconf="${myconf} `use_with fam`"
+
+	# fix for non-x86 platforms, bug #38606
+	# courier-imap doesn't respect just --host=$CHOST without --build
+	[ -z "${CBUILD}" ] && export CBUILD="${CHOST}"
+
+	# Do the actual build now
+	LDFLAGS="${LDFLAGS} " econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier-imap \
+		--libexecdir=/usr/lib/courier-imap \
+		--localstatedir=/var/lib/courier-imap \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
+		--cache-file=${cachefile} \
+		${myconf} || die "econf failed"
+
+	# change the pem file location..
+	cp imap/imapd-ssl.dist imap/imapd-ssl.dist.old
+	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		imap/imapd-ssl.dist.old > imap/imapd-ssl.dist
+
+	cp imap/pop3d-ssl.dist imap/pop3d-ssl.dist.old
+	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		imap/pop3d-ssl.dist.old > imap/pop3d-ssl.dist
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	vpopmail_setup
+
+	dodir /var/lib/courier-imap /etc/pam.d
+	make install DESTDIR=${D} || die
+
+	# avoid name collisions in /usr/sbin wrt imapd and pop3d
+	cd ${D}/usr/sbin
+	for name in imapd pop3d
+	do
+		mv ${name} "courier-${name}"
+	done
+
+	# hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	cd ${D}/usr/lib/courier-imap
+	local service
+	for service in imapd pop3d
+	do
+		local type
+		for type in "" "-ssl"
+		do
+			local file
+			file="${service}${type}.rc"
+			cp ${file} ${file}.orig
+			sed -e 's/Maildir/${MAILDIR}/' \
+			    -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+				${file}.orig > ${file}
+		done
+	done
+
+	cd ${D}/etc/courier-imap
+	local x
+	for x in pop3d pop3d-ssl imapd imapd-ssl authdaemonrc
+	do
+		mv ${x}.dist ${x}
+	done
+
+	insinto /etc/courier-imap
+	newins ${FILESDIR}/authdaemond.conf-3.0.4-r1 authdaemond.conf
+
+	# add a value for ${MAILDIR} to /etc/courier-imap/imapd
+	for service in imapd pop3d
+	do
+		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
+		echo 'MAILDIR=.maildir' >> ${service}
+		echo -e '#Put any program for ${PRERUN} here' >> ${service}
+		echo 'PRERUN='>> ${service}
+	done
+
+	cd ${D}/usr/sbin
+	for x in *
+	do
+		if [ -L ${x} ]
+		then
+			rm ${x}
+		fi
+	done
+
+	cd ../share
+	mv * ../sbin
+	mv ../sbin/man .
+	cd ..
+
+	rm -f ${D}/usr/sbin/mkimapdcert ${D}/usr/sbin/mkpop3dcert
+	exeinto /usr/sbin
+		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert
+
+	dosym /usr/sbin/courierlogger /usr/lib/courier-imap/courierlogger
+
+	exeinto /etc/init.d
+		newexe ${FILESDIR}/authdaemond-3.0.4-r1 authdaemond
+		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
+		newexe ${FILESDIR}/courier-imapd-ssl.rc6-3.0.5 courier-imapd-ssl
+		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
+		newexe ${FILESDIR}/courier-pop3d-ssl.rc6-3.0.5 courier-pop3d-ssl
+
+	exeinto /usr/lib/courier-imap
+		newexe ${FILESDIR}/gentoo-imapd-1.7.3-r1.rc gentoo-imapd.rc
+		newexe ${FILESDIR}/gentoo-imapd-ssl-1.7.3-r1.rc gentoo-imapd-ssl.rc
+		newexe ${FILESDIR}/gentoo-pop3d-1.7.3-r1.rc gentoo-pop3d.rc
+		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.7.3-r1.rc gentoo-pop3d-ssl.rc
+
+	local authmods
+	authmods="authsystem.passwd authcram authshadow authuserdb authpwd authtest authinfo authmksock authcustom authdaemontest"
+	use mysql && authmods="${authmods} authmysql"
+	use postgres && authmods="${authmods} authpgsql"
+	use pam && authmods="${authmods} authpam"
+	use ldap && authmods="${authmods} authldap"
+	[ -n "${VPOPMAIL_INSTALLED}" ] && authmods="${authmods} authvchkpw"
+	exeinto /usr/lib/courier-imap/authlib
+	for i in ${authmods}; do
+		[ -f ${S}/authlib/${i} ] && doexe ${S}/authlib/${i}
+	done;
+
+	dodir /usr/bin
+	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake
+
+
+	keepdir /var/lib/courier-imap/authdaemon
+
+	# bug #42686, more docs
+	dodoc 00README.NOW.OR.SUFFER AUTHORS INSTALL NEWS NEWS.html README ChangeLog
+	docinto imap
+	dodoc ${S}/imap/{ChangeLog,BUGS,FAQ,FAQ.html,README,README.html,README.imapkeywords.html}
+	docinto maildir
+	dodoc ${S}/maildir/{AUTHORS,INSTALL,README.maildirfilter.html,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc ${S}/tcpd/README.couriertls
+
+}
+
+pkg_postinst() {
+	# rebuild init deps to include deps on authdaemond
+	/etc/init.d/depscan.sh
+	einfo "Make sure to change /etc/courier-imap/authdaemond.conf if"
+	einfo "you would like to use something other than the"
+	einfo "authdaemond.plain authenticator"
+}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch
new file mode 100644
index 000000000000..776fdc144483
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch
@@ -0,0 +1,31 @@
+--- courier-imap-3.0.7-orig/bdbobj/configure.in	2001-09-18 18:26:28.000000000 -0700
++++ courier-imap-3.0.7/bdbobj/configure.in	2004-08-14 16:15:08.469316646 -0700
+@@ -21,15 +21,19 @@
+ dnl Checks for libraries.
+ 
+ saveLIBS="$LIBS"
+-AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-	AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-	AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
+-
+-FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
++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_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++          AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++            AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
++
++  done
++FOUND_DB=0
++AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
++AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ 
+ LIBS="$saveLIBS"
+ 
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.7-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.7-db4-configure.in.patch
new file mode 100644
index 000000000000..d8ac46e2b5c9
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.7-db4-configure.in.patch
@@ -0,0 +1,39 @@
+--- courier-imap-3.0.7-orig/configure.in	2004-08-01 07:08:16.000000000 -0700
++++ courier-imap-3.0.7/configure.in	2004-08-14 16:02:03.856436728 -0700
+@@ -11,7 +11,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_SYSCONFTOOL
+ 
+ AC_PATH_PROGS(SETENV, env)
+ 
+@@ -132,16 +131,18 @@
+ 
+ if test "$db" != "gdbm"
+ then
+-
+-	AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-		AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-		AC_CHECK_LIB(db, db_env_create,
+-				[ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-	))
+-
+-	AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_open, HAVE_BDB=1)
+-	AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
++  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_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	  AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	    AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ 	      AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
++    done
++  AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++  AC_CHECK_FUNC(db_create, HAVE_BDB=1)
++
+ fi
+ 
+ LIBS="$saveLIBS"
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.7-disable-fam-configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.7-disable-fam-configure.in.patch
new file mode 100644
index 000000000000..7019d02a6af5
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.7-disable-fam-configure.in.patch
@@ -0,0 +1,23 @@
+--- courier-imap-3.0.7-orig/maildir/configure.in	2004-06-08 15:44:23.000000000 -0700
++++ courier-imap-3.0.7/maildir/configure.in	2004-08-14 15:28:20.525714876 -0700
+@@ -60,6 +60,12 @@
+ dnl Checks for library functions.
+ AC_CHECK_HEADER(fam.h, :, :)
+ AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
++AC_ARG_WITH(fam, [  --with-fam              Compile with FAM support],
++       fam="$withval",
++       fam="no")
++
++if test "$fam" != "no"
++then
+ AC_CHECK_LIB(fam, FAMOpen,  [
+ 			LIBFAM=-lfam
+ 			AC_DEFINE_UNQUOTED(HAVE_FAM,1,
+@@ -74,6 +80,7 @@
+ AC_MSG_ERROR([[FAM development libraries not found.]]) ]
+ 					)
+ 		  ])
++fi
+ 
+ AC_SUBST(LIBFAM)
+ 
diff --git a/net-mail/courier-imap/files/digest-courier-imap-3.0.7 b/net-mail/courier-imap/files/digest-courier-imap-3.0.7
new file mode 100644
index 000000000000..c8e494c05fa4
--- /dev/null
+++ b/net-mail/courier-imap/files/digest-courier-imap-3.0.7
@@ -0,0 +1 @@
+MD5 3177f4451d02b6380c5b45aa80d795a7 courier-imap-3.0.7.tar.bz2 1702769