beta. do not use.

15 files changed, 752 insertions, 12 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 66dacf0586d0..3e90768e54ae 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,23 @@
 # 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.98 2004/11/16 17:29:55 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.99 2004/11/19 06:26:16 langthang Exp $
+
+*courier-imap-3.0.8.20041116 (18 Nov 2004)
+
+  18 Nov 2004; Tuan Van <langthang@gentoo.org>
+  +files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6,
+  +files/courier-imap-3.0.8.20041116-courier-imapd.rc6,
+  +files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6,
+  +files/courier-imap-3.0.8.20041116-courier-pop3d.rc6,
+  +files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch,
+  +files/courier-imap-3.0.8.20041116-db4-configure.in.patch,
+  +files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch,
+  +files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc,
+  +files/courier-imap-3.0.8.20041116-gentoo-imapd.rc,
+  +files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc,
+  +courier-imap-3.0.8.20041116.ebuild:
+  Commit for testing only. Do not use.
 
   16 Nov 2004; Tuan Van <langthang@gentoo.org> courier-imap-3.0.8.ebuild:
   Add virtual/imapd blocking. Bug #55309.
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 6d98b8e16e39..4cc0b9197a18 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,34 +1,37 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ef51bf8c56f3b35171934dc4af99452d courier-imap-3.0.7.ebuild 9236
+MD5 724ddbc6cde00ddf3bac73cf76fd2701 courier-imap-3.0.8.20041116.ebuild 9943
 MD5 d9ae9c6a982e6ac9195eb90d531b4508 courier-imap-3.0.8.ebuild 9394
-MD5 0988fd683cf3abf398cc5aa9e4a0e538 ChangeLog 16422
+MD5 8d4f63bdc96b8252d911b07ec82bf59a ChangeLog 17246
 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 2a97f1311b8ca152f6eba801bb5c0137 files/courier-imap-3.0.8.20041116-gentoo-imapd.rc 1138
 MD5 71a551a4f772f4299f9752f3d043b8c5 files/authdaemond-3.0.4-r1 1062
+MD5 32146f7906e4113b67c6a0721e949ce8 files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc 1076
+MD5 7b63692757164cd5533b4091e49a72a7 files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6 1228
 MD5 7d5ddf4fa33c73befa0bd434a17022f9 files/authdaemond.conf-3.0.4-r1 544
 MD5 1709ef97052398ee74b0d7d7786d398a files/gentoo-pop3d-1.7.3-r1.rc 1020
 MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.7-disable-fam-configure.in.patch 654
+MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch 654
+MD5 5755dc40bcbd013096627980e8c2ce23 files/courier-imap-3.0.8.20041116-courier-imapd.rc6 975
 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 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch 1263
 MD5 9e69a26cf7b3bf68338f701fece09a35 files/gentoo-imapd-ssl-1.7.3-r1.rc 1036
 MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263
 MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.8-disable-fam-configure.in.patch 654
+MD5 acd9c484e6ee4d45dc81cb22ede09837 files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc 1101
+MD5 809353b25074ad1ff5bf77ac1766f208 files/courier-imap-3.0.8.20041116-db4-configure.in.patch 1303
 MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.8-db4-configure.in.patch 1337
+MD5 17099166e97d401e84270e6604b08e6e files/digest-courier-imap-3.0.8.20041116 81
 MD5 5d57e73c7593d5bb37135d3964d6d4c2 files/digest-courier-imap-3.0.7 72
 MD5 140a2653b4e3e2b7c9967d691da7a9ea files/digest-courier-imap-3.0.8 72
 MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.7-db4-configure.in.patch 1337
+MD5 2de8e85e16590fb39a7b7a440de73f0a files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc 1084
 MD5 2399f4a660fd7149e3fe19f0bfc230e1 files/gentoo-imapd-1.7.3-r1.rc 1074
+MD5 a62b9cfcf4c0c67b515eb90e6422233c files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6 1220
+MD5 41b0b05702438e6f56fa885f2d6ef00e files/courier-imap-3.0.8.20041116-courier-pop3d.rc6 983
 MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBmjju5FrxP71izLARAnoXAJ97YTgk3Dt3A7fD+p96Tni+t0tjKgCgsOhE
-RMyXJeKO6LOm9V77DV9zDXo=
-=WXfN
------END PGP SIGNATURE-----
diff --git a/net-mail/courier-imap/courier-imap-3.0.8.20041116.ebuild b/net-mail/courier-imap/courier-imap-3.0.8.20041116.ebuild
new file mode 100644
index 000000000000..390b3e4becfa
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-3.0.8.20041116.ebuild
@@ -0,0 +1,322 @@
+# 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.8.20041116.ebuild,v 1.1 2004/11/19 06:26:17 langthang Exp $
+
+inherit eutils gnuconfig
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="http://www.courier-mta.org/"
+#SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+SRC_URI=""http://www.courier-mta.org/beta/imap/${P}.tar.bz2""
+
+LICENSE="GPL-2"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="-*"
+IUSE="fam berkdb gdbm debug ipv6 nls selinux"
+#userpriv breaks linking against vpopmail
+RESTRICT="nouserpriv"
+
+RDEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.6
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=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
+	>=mail-mta/courier-authlib-0.50
+	!virtual/imapd"
+PROVIDE="virtual/imapd"
+
+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}
+
+	cd ${S}
+	# bug #48838. Patch to enable/disable FAM support.
+	# 20 Aug 2004; langthang@gentoo.org.
+	# This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
+	epatch ${FILESDIR}/${P}-disable-fam-configure.in.patch || die "patch failed"
+
+	# These patches should fix problem detecting Berkeley DB.
+	# We now can compile with db4 support.
+	if use berkdb; then
+		epatch ${FILESDIR}/${P}-db4-bdbobj_configure.in.patch || die "patch failed"
+		epatch ${FILESDIR}/${P}-db4-configure.in.patch || die "patch failed"
+	fi
+
+	export WANT_AUTOCONF="2.5"
+	gnuconfig_update
+	ebegin "Recreating 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 $?
+}
+src_compile() {
+	vpopmail_setup
+
+	local myconf
+	myconf="$(use_with ipv6)"
+
+	# 19 Aug 2004; langthang@gentoo.org
+	# default to gdbm if both berkdb and gdbm present.
+	if use gdbm; then
+		einfo "build with GDBM support."
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb; then
+		einfo "build with Berkeley DB support."
+		myconf="${myconf} --with-db=db"
+	fi
+
+	# This check should be in courier-authlib.
+	# But I am not sure so I commented here
+	# If you are using vpopmail and everything work,
+	# please remove this section.
+	#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
+
+	# The default character set is ISO-8859-1/US-ASCII.
+	# use nls will enable all available charater sets.
+	# set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
+	# to include only specified translation table.
+	if use nls && [ -z "$ENABLE_UNICODE" ]; then
+		einfo "ENABLE_UNICODE is not set build with all availbale charater sets"
+		myconf="${myconf} --enable-unicode"
+	elif use nls; then
+		einfo "ENABLE_UNICODE is not set build with unicode=$ENABLE_UNICODE"
+		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
+	else
+		einfo "disable unicode support"
+		myconf="${myconf} --disable-unicode"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# fix for bug #27528
+	# they really should use a better way to detect redhat
+	myconf="${myconf} --without-redhat"
+
+	# bug #29879 - FAM support
+	myconf="${myconf} $(use_with fam)"
+
+	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 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} \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		${myconf} || die "econf failed"
+
+	# change the pem file location..
+	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		-i.orig imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		-i.orig imap/pop3d-ssl.dist || \
+		die "sed failed"
+
+	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
+	local name
+	for name in imapd pop3d; do
+		mv ${name} "courier-${name}" || \
+			die "failed to mv $name to 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}
+			sed -e 's/Maildir/${MAILDIR}/' \
+				-e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+				-i.orig ${file} || die "sed failed"
+		done
+	done
+
+	local x
+	for x in pop3d pop3d-ssl imapd imapd-ssl; do
+		mv -v ${D}/etc/courier-imap/${x}.dist \
+			${D}/etc/courier-imap/${x} || \
+			die "failed to mv ${x}.dist to ${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
+	cd ${D}/etc/courier-imap
+	for service in imapd pop3d; do
+		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
+		echo 'MAILDIR=.maildir' >> ${service}
+		echo 'MAILDIRPATH=.maildir' >> ${service}
+		echo -e '#Put any program for ${PRERUN} here' >> ${service}
+		echo 'PRERUN='>> ${service}
+	done
+	# upstream has an extra setting of MAILDIRPATH (it's already in the base files)
+	for service in imapd-ssl pop3d-ssl; do
+		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
+		echo 'MAILDIRPATH=.maildir' >> ${service}
+	done
+
+	cd ${D}/usr/sbin
+	for x in *; do
+		if [ -L ${x} ]; then
+			rm -v ${x} || die "failed to rm ${x}"
+		fi
+	done
+
+	cd ../share
+	mv -v * ../sbin
+	mv -v ../sbin/man .
+	cd ..
+
+	for x in mkimapdcert mkpop3dcert; do
+		mv ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}.orig || \
+			die "failed to rm ${D}/usr/sbin/${x} ${D}/usr/sbin/${x}"
+	done
+
+	exeinto /usr/sbin
+		doexe ${FILESDIR}/mkimapdcert ${FILESDIR}/mkpop3dcert || \
+			die "doexe failed"
+
+	dosym /usr/sbin/courierlogger /usr/lib/courier-imap/courierlogger || \
+			die "dosym failed"
+
+	exeinto /etc/init.d
+		newexe ${FILESDIR}/${P}-courier-imapd.rc6 courier-imapd || die "newexe failed"
+		newexe ${FILESDIR}/${P}-courier-imapd-ssl.rc6 courier-imapd-ssl || die "newexe failed"
+		newexe ${FILESDIR}/${P}-courier-pop3d.rc6 courier-pop3d || die "newexe failed"
+		newexe ${FILESDIR}/${P}-courier-pop3d-ssl.rc6 courier-pop3d-ssl || die "newexe failed"
+
+	exeinto /usr/lib/courier-imap
+		newexe ${FILESDIR}/${P}-gentoo-imapd.rc gentoo-imapd.rc || die "newexe failed"
+		newexe ${FILESDIR}/${P}-gentoo-imapd-ssl.rc gentoo-imapd-ssl.rc || die "newexe failed"
+		newexe ${FILESDIR}/${P}-gentoo-pop3d.rc gentoo-pop3d.rc || die "newexe failed"
+		newexe ${FILESDIR}/${P}-gentoo-pop3d-ssl.rc gentoo-pop3d-ssl.rc || die "newexe failed"
+
+	#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} || die "doexe failed"
+	#done;
+
+	dodir /usr/bin
+	mv ${D}/usr/sbin/maildirmake ${D}/usr/bin/maildirmake || \
+		die "mv failed"
+
+	# bug #45953, more docs
+	cd ${S}
+	dohtml -r ${S}/*
+	dodoc ${S}/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog}
+	docinto imap
+	dodoc ${S}/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc ${S}/maildir/{AUTHORS,INSTALL,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"
+}
+
+src_test() {
+	ewarn "make check not supported by package due to"
+	ewarn "--enable-workarounds-for-imap-client-bugs option."
+}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6
new file mode 100644
index 000000000000..753796ca40bd
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# 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/files/courier-imap-3.0.8.20041116-courier-imapd-ssl.rc6,v 1.1 2004/11/19 06:26:17 langthang Exp $
+
+depend() {
+	need net authdaemond
+	use famd
+}
+
+source /etc/courier-imap/imapd-ssl
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/imapd-ssl ] ; then
+		eerror "You need an /etc/courier-imap/imapd-ssl file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd-ssl"
+		eerror "Please correct them before trying to start imapd-ssl"
+		return 3
+	}
+	if [ ! -e "${TLS_CERTFILE}" ] ; then
+		eerror "You need to create a SSL certificate to use IMAP over SSL"
+		eerror "Edit /etc/courier-imap/imapd.cnf, then run: mkimapdcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd over SSL"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-imapd-ssl.rc \
+		--pid=$SSLPIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd over SSL"
+	start-stop-daemon --quiet --stop --pid=$SSLPIDFILE
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd.rc6 b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd.rc6
new file mode 100644
index 000000000000..32e00c3b24ed
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-imapd.rc6
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# 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/files/courier-imap-3.0.8.20041116-courier-imapd.rc6,v 1.1 2004/11/19 06:26:17 langthang Exp $
+
+depend() {
+	need net authdaemond
+	use famd
+}
+
+source /etc/courier-imap/imapd
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/imapd ] ; then
+		eerror "You need an /etc/courier-imap/imapd file to run courier-imapd"
+		return 1
+	fi
+	source /etc/courier-imap/imapd || {
+		eerror "There are syntax errors in /etc/courier-imap/imapd"
+		eerror "Please correct them before trying to start imapd"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-imapd"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-imapd.rc \
+		--pid=$PIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-imapd"
+	start-stop-daemon --quiet --stop --pid=$PIDFILE
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6 b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6
new file mode 100644
index 000000000000..a69ae2b9c85d
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# 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/files/courier-imap-3.0.8.20041116-courier-pop3d-ssl.rc6,v 1.1 2004/11/19 06:26:17 langthang Exp $
+
+depend() {
+	need net authdaemond
+	use famd
+}
+
+source /etc/courier-imap/pop3d-ssl
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/pop3d-ssl ] ; then
+		eerror "You need an /etc/courier-imap/pop3d-ssl file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d-ssl || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d-ssl"
+		eerror "Please correct them before trying to start pop3d-ssl"
+		return 3
+	}
+	if [ ! -e "${TLS_CERTFILE}" ] ; then
+		eerror "You need to create a SSL certificate to use POP3 over SSL"
+		eerror "Edit /etc/courier-imap/pop3d.cnf, then run: mkpop3dcert"
+		return 2
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d over SSL"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d-ssl.rc \
+		--pidfile $SSLPIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d over SSL"
+	start-stop-daemon --quiet --stop --pidfile $SSLPIDFILE
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d.rc6 b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d.rc6
new file mode 100644
index 000000000000..55f1e8e7087c
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-courier-pop3d.rc6
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# 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/files/courier-imap-3.0.8.20041116-courier-pop3d.rc6,v 1.1 2004/11/19 06:26:17 langthang Exp $
+
+depend() {
+	need net authdaemond
+	use famd
+}
+
+source /etc/courier-imap/pop3d
+
+checkconfig() {
+	if [ ! -e /etc/courier-imap/pop3d ] ; then
+		eerror "You need an /etc/courier-imap/pop3d file to run courier-pop3d"
+		return 1
+	fi
+	source /etc/courier-imap/pop3d || {
+		eerror "There are syntax errors in /etc/courier-imap/pop3d"
+		eerror "Please correct them before trying to start pop3d"
+		return 2
+	}
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting courier-pop3d"
+	start-stop-daemon --quiet --start --exec /usr/bin/env - /usr/lib/courier-imap/gentoo-pop3d.rc \
+		--pidfile $PIDFILE
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping courier-pop3d"
+	start-stop-daemon --quiet --stop --pidfile $PIDFILE
+	eend $?
+}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-db4-bdbobj_configure.in.patch
new file mode 100644
index 000000000000..776fdc144483
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-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.8.20041116-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-db4-configure.in.patch
new file mode 100644
index 000000000000..400b746a233a
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-db4-configure.in.patch
@@ -0,0 +1,38 @@
+--- configure.in.orig	2004-11-16 16:02:11.045791896 -0800
++++ configure.in	2004-11-16 16:03:06.743324584 -0800
+@@ -11,7 +11,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_SYSCONFTOOL
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+ 
+@@ -150,16 +150,18 @@
+ 
+ if test "$db" != "gdbm"
+ 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
++    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)
+ 
+-	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)
+ fi
+ 
+ LIBS="$saveLIBS"
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-disable-fam-configure.in.patch
new file mode 100644
index 000000000000..7019d02a6af5
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-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/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc
new file mode 100644
index 000000000000..0c153bde60e3
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc
@@ -0,0 +1,37 @@
+#!/bin/bash
+# $Id: courier-imap-3.0.8.20041116-gentoo-imapd-ssl.rc,v 1.1 2004/11/19 06:26:17 langthang Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/imapd
+source /etc/courier-imap/imapd-ssl
+
+# the new courier-authlib doesn't usee these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+ulimit -d $IMAP_ULIMITD
+export IMAP_TLS=1
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=imapd-ssl \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$SSLPIDFILE $TCPDOPTS \
+	$SSLPORT $COURIERTLS -server -tcpd \
+	${exec_prefix}/sbin/imaplogin \
+		/usr/sbin/courier-imapd ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-imapd.rc b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-imapd.rc
new file mode 100644
index 000000000000..1d2ea9bb18cf
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-imapd.rc
@@ -0,0 +1,38 @@
+#!/bin/bash
+# $Id: courier-imap-3.0.8.20041116-gentoo-imapd.rc,v 1.1 2004/11/19 06:26:17 langthang Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/imapd-ssl
+source /etc/courier-imap/imapd
+
+# The new courier-authlib doesn't use these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+ulimit -d $IMAP_ULIMITD
+IMAP_STARTTLS="$IMAPDSTARTTLS"
+export IMAPDSTARTTLS IMAP_STARTTLS
+TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=imapd \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$PIDFILE $TCPDOPTS \
+	$PORT ${exec_prefix}/sbin/imaplogin \
+		/usr/sbin/courier-imapd ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc
new file mode 100644
index 000000000000..761fc49deb8a
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc
@@ -0,0 +1,36 @@
+#!/bin/bash
+# $Id: courier-imap-3.0.8.20041116-gentoo-pop3d-ssl.rc,v 1.1 2004/11/19 06:26:17 langthang Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/pop3d
+source /etc/courier-imap/pop3d-ssl
+
+# The new courier-authlib doesn't use these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+export POP3_TLS=1
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=pop3d-ssl \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$SSLPIDFILE $TCPDOPTS \
+	$SSLPORT $COURIERTLS -server -tcpd \
+	${exec_prefix}/sbin/pop3login \
+		/usr/sbin/courier-pop3d ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc
new file mode 100644
index 000000000000..b858f20c4cd8
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-3.0.8.20041116-gentoo-pop3d.rc
@@ -0,0 +1,36 @@
+#!/bin/bash
+# $Id: courier-imap-3.0.8.20041116-gentoo-pop3d.rc,v 1.1 2004/11/19 06:26:17 langthang Exp $
+#
+# Copyright 1998 - 2000 Double Precision, Inc.
+# See COPYING for distribution information.
+
+prefix=/usr
+exec_prefix=/usr
+bindir=/usr/sbin
+libexecdir=/usr/lib/courier-imap
+
+source /etc/courier-imap/pop3d-ssl
+source /etc/courier-imap/pop3d
+
+# The new courier-authlib doesn't use these settings.
+#LIBAUTHMODULES=""
+#for f in `echo $AUTHMODULES`
+#do
+#	LIBAUTHMODULES="$LIBAUTHMODULES /usr/lib/courier-imap/authlib/$f"
+#done
+
+export POP3DSTARTTLS=$POP3_STARTTLS
+TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
+	sed 's/=.*//;s/^/export /;s/$/;/'`
+
+eval $PRERUN \
+/usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
+	-stderrlogger=/usr/lib/courier-imap/courierlogger \
+	-stderrloggername=pop3d \
+	-maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
+	-pid=$PIDFILE $TCPDOPTS \
+	$PORT ${exec_prefix}/sbin/pop3login \
+		/usr/sbin/courier-pop3d ${MAILDIR}
diff --git a/net-mail/courier-imap/files/digest-courier-imap-3.0.8.20041116 b/net-mail/courier-imap/files/digest-courier-imap-3.0.8.20041116
new file mode 100644
index 000000000000..07f59de3eb92
--- /dev/null
+++ b/net-mail/courier-imap/files/digest-courier-imap-3.0.8.20041116
@@ -0,0 +1 @@
+MD5 0f5c41ffb2e755c2ff9a61c6c97dcbda courier-imap-3.0.8.20041116.tar.bz2 3029309