Bug #81540, implemented a workaround for upstream removing functionality that is still widely used. For all users wanting to use relay-ctrl-allow, remove it from your courier-authlib config, and put it in /etc/courier-imap/{pop3d,imapd} as LOGINRUN="relay-ctrl-allow" at the end.

(Portage version: 2.0.51.16)

10 files changed, 537 insertions, 24 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 308bc2b3bb3a..cea578f6b426 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.112 2005/02/07 03:53:04 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.113 2005/02/11 15:34:49 robbat2 Exp $
+
+*courier-imap-4.0.1-r1 (11 Feb 2005)
+
+  11 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/courier-imap-4.0.1-r1-courier-imapd.indirect,
+  +files/courier-imap-4.0.1-r1-courier-pop3d.indirect,
+  +files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc,
+  +files/courier-imap-4.0.1-r1-gentoo-imapd.rc,
+  +files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc,
+  +files/courier-imap-4.0.1-r1-gentoo-pop3d.rc,
+  +courier-imap-4.0.1-r1.ebuild:
+  Bug #81540, implemented a workaround for upstream removing functionality
+  that is still widely used. For all users wanting to use relay-ctrl-allow,
+  remove it from your courier-authlib config, and put it in
+  /etc/courier-imap/{pop3d,imapd} as LOGINRUN="relay-ctrl-allow" at the end.
 
   06 Feb 2005; Joshua Kinard <kumba@gentoo.org> courier-imap-4.0.1.ebuild:
   Marked stable on mips.
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 134c9a831ffc..3b7e8a7a0b2d 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,38 +1,46 @@
-MD5 e3ca2202f876db80b9bce2e33e2fdfe3 ChangeLog 21725
 MD5 51541e91419e6d1ab53c0f1baaefb014 courier-imap-3.0.7.ebuild 9232
-MD5 2cd59913c4f8b952aa21a904aba940c4 courier-imap-3.0.8.ebuild 9388
+MD5 f9421173c7bc33f3b9739870624d48bd courier-imap-4.0.1-r1.ebuild 10401
 MD5 b2fe608a59069d8411c01f97c2c87906 courier-imap-4.0.1.ebuild 10124
+MD5 2cd59913c4f8b952aa21a904aba940c4 courier-imap-3.0.8.ebuild 9388
+MD5 e3ca2202f876db80b9bce2e33e2fdfe3 ChangeLog 21725
 MD5 9d0c568ea32cf6b45797c6e7c82b4a67 metadata.xml 280
+MD5 d9d0cf2a19ee5b20039583b7cb4cffcc files/courier-pop3d-ssl.rc6-3.0.5 1204
+MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-4.0.1-disable-fam-configure.in.patch 654
+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 aebf119b54b485aa50571173566f4a09 files/courier-imap-gentoo.readme 2827
+MD5 65f527fa528cdb0231ccbf2d733bfdc1 files/digest-courier-imap-4.0.1-r1 72
 MD5 71a551a4f772f4299f9752f3d043b8c5 files/authdaemond-3.0.4-r1 1062
+MD5 3d13f9f6beaf191c71d47928542f1939 files/courier-imap-4.0.1-r1-gentoo-imapd.rc 1150
 MD5 7d5ddf4fa33c73befa0bd434a17022f9 files/authdaemond.conf-3.0.4-r1 544
-MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.7-db4-bdbobj_configure.in.patch 1263
-MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.7-db4-configure.in.patch 1337
+MD5 1709ef97052398ee74b0d7d7786d398a files/gentoo-pop3d-1.7.3-r1.rc 1020
+MD5 7f8b20d3f36ff4ce06d799a9e839fbea files/courier-imap-4.0.1-gentoo-pop3d.rc 1075
+MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-4.0.1-db4-bdbobj_configure.in.patch 1263
 MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.7-disable-fam-configure.in.patch 654
-MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263
-MD5 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.8-db4-configure.in.patch 1337
-MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-3.0.8-disable-fam-configure.in.patch 654
-MD5 57078b385da51012e269abad68ae77c9 files/courier-imap-4.0.1-courier-imapd-ssl.rc6 1215
-MD5 548295233ec5f1138bc73866c347d38d files/courier-imap-4.0.1-courier-imapd.rc6 970
 MD5 046a2e2cb69e8ccbad347f09ae471d91 files/courier-imap-4.0.1-courier-pop3d-ssl.rc6 1223
-MD5 ade1658d7afa89278ca7bf0523517926 files/courier-imap-4.0.1-courier-pop3d.rc6 978
-MD5 457d7f87a25f4f8f05af321130d846bf files/courier-imap-4.0.1-db4-bdbobj_configure.in.patch 1263
-MD5 809353b25074ad1ff5bf77ac1766f208 files/courier-imap-4.0.1-db4-configure.in.patch 1303
-MD5 06c960b3b160106abff0c0d3e84105d0 files/courier-imap-4.0.1-disable-fam-configure.in.patch 654
 MD5 4cd1795b3a939f0983982677ae045700 files/courier-imap-4.0.1-gentoo-imapd-ssl.rc 1092
+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 53a77ab6130405d60c7821025dcce892 files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc 1113
+MD5 ade1658d7afa89278ca7bf0523517926 files/courier-imap-4.0.1-courier-pop3d.rc6 978
+MD5 9e69a26cf7b3bf68338f701fece09a35 files/gentoo-imapd-ssl-1.7.3-r1.rc 1036
 MD5 63f6b6d07917fa80babb4896b5882b72 files/courier-imap-4.0.1-gentoo-imapd.rc 1129
+MD5 8c8e7d046250cd268ce7de7047686cd8 files/courier-imap-4.0.1-r1-courier-imapd.indirect 124
+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 39e2ec0f1212612a99f443d6e6275139 files/courier-imap-3.0.8-db4-configure.in.patch 1337
 MD5 b88ef558f121709972be71d76c2305d7 files/courier-imap-4.0.1-gentoo-pop3d-ssl.rc 1067
-MD5 7f8b20d3f36ff4ce06d799a9e839fbea files/courier-imap-4.0.1-gentoo-pop3d.rc 1075
-MD5 aebf119b54b485aa50571173566f4a09 files/courier-imap-gentoo.readme 2827
-MD5 5879bfc8c6b847d7ef364b4ca6b40880 files/courier-imapd-ssl.rc6-3.0.5 1196
-MD5 90bb778616a7c67658b9e78890d4b8fe files/courier-imapd.rc6 945
-MD5 d9d0cf2a19ee5b20039583b7cb4cffcc files/courier-pop3d-ssl.rc6-3.0.5 1204
-MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
 MD5 5d57e73c7593d5bb37135d3964d6d4c2 files/digest-courier-imap-3.0.7 72
 MD5 140a2653b4e3e2b7c9967d691da7a9ea files/digest-courier-imap-3.0.8 72
+MD5 548295233ec5f1138bc73866c347d38d files/courier-imap-4.0.1-courier-imapd.rc6 970
+MD5 344a95b8dd62a348dcd42c3e4ee0797b files/courier-imap-4.0.1-r1-courier-pop3d.indirect 116
 MD5 65f527fa528cdb0231ccbf2d733bfdc1 files/digest-courier-imap-4.0.1 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 1709ef97052398ee74b0d7d7786d398a files/gentoo-pop3d-1.7.3-r1.rc 1020
-MD5 a5029d4de95a9deca6254a889ed7fd0b files/gentoo-pop3d-ssl-1.7.3-r1.rc 1012
-MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
+MD5 809353b25074ad1ff5bf77ac1766f208 files/courier-imap-4.0.1-db4-configure.in.patch 1303
+MD5 cc8f286b812247b22a9a358294334a1f files/courier-imap-4.0.1-r1-gentoo-pop3d.rc 1096
+MD5 26dc84aa233e8b606030e0a193a37ba1 files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc 1088
+MD5 9f46519bb9780f36b21727a008545b89 files/courier-pop3d.rc6 953
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
+MD5 57078b385da51012e269abad68ae77c9 files/courier-imap-4.0.1-courier-imapd-ssl.rc6 1215
diff --git a/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild b/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..808464648f9e
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.1-r1.ebuild,v 1.1 2005/02/11 15:34:49 robbat2 Exp $
+
+inherit eutils gnuconfig
+IUSE="fam berkdb gdbm debug ipv6 nls selinux"
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+#MY_PV=${PV/_rc*/}
+#SRC_URI=""http://www.courier-mta.org/beta/imap/${PN}-${MY_PV}.tar.bz2""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+#userpriv breaks linking against vpopmail
+RESTRICT="nouserpriv"
+
+RDEPEND="virtual/libc
+	>=dev-libs/openssl-0.9.6
+	>=net-libs/courier-authlib-0.50
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	fam? ( virtual/fam )
+	selinux? ( sec-policy/selinux-courier-imap )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	dev-lang/perl
+	sys-apps/procps
+	!mail-mta/courier"
+PROVIDE="virtual/imapd"
+
+#S=${WORKDIR}/${PN}-${MY_PV}
+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
+	libtoolize --copy --force
+	ebegin "Recreating configure"
+	autoconf || \
+		die "recreate configure failed"
+	eend $?
+
+	cd ${S}/maildir
+	libtoolize --copy --force
+	ebegin "Recreating maildir/configure"
+	autoconf || \
+		die "recreate configure failed"
+	eend $?
+
+	cd ${S}/bdbobj
+	libtoolize --copy --force
+	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)"
+
+	# bug #76592
+	# configure cache confuses the configure script. 
+	#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/$(get_libdir)/courier-imap \
+		--localstatedir=/var/lib/courier-imap \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-authdaemonvar=/var/lib/courier-imap/authdaemon \
+		--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/$(get_libdir)/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
+	# upstream has an extra setting of MAILDIRPATH (it's already in the base files)
+	for service in imapd-ssl pop3d-ssl imapd pop3d; do
+		echo -e '\n#Hardwire a value for ${MAILDIR}' >> ${service}
+		echo 'MAILDIR=.maildir' >> ${service}
+		echo 'MAILDIRPATH=.maildir' >> ${service}
+	done
+	for service in imapd pop3d; do
+		echo -e '#Put any program for ${PRERUN} here' >> ${service}
+		echo 'PRERUN=' >> ${service}
+		echo -e '#Put any program for ${LOGINRUN} here' >> ${service}
+		echo -e '#this is for relay-ctrl-allow in 4*' >> ${service}
+		echo 'LOGINRUN=' >> ${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/$(get_libdir)/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/$(get_libdir)/courier-imap
+		newexe ${FILESDIR}/${P}-r1-gentoo-imapd.rc gentoo-imapd.rc || die "newexe failed"
+		newexe ${FILESDIR}/${P}-r1-gentoo-imapd-ssl.rc gentoo-imapd-ssl.rc || die "newexe failed"
+		newexe ${FILESDIR}/${P}-r1-gentoo-pop3d.rc gentoo-pop3d.rc || die "newexe failed"
+		newexe ${FILESDIR}/${P}-r1-gentoo-pop3d-ssl.rc gentoo-pop3d-ssl.rc || die "newexe failed"
+		newexe ${FILESDIR}/${P}-r1-courier-imapd.indirect courier-imapd.indirect || die "newexe failed"
+		newexe ${FILESDIR}/${P}-r1-courier-pop3d.indirect courier-pop3d.indirect || 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} \
+		${FILESDIR}/courier-imap-gentoo.readme
+	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() {
+	einfo "Authdaemond is no longer provided this package."
+	einfo "athentication libraries are from courier-authlib"
+	einfo "for a quick start please refer to"
+	einfo "/usr/share/doc/${P}/courier-imap-gentoo.readme.gz"
+}
+
+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-4.0.1-r1-courier-imapd.indirect b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-imapd.indirect
new file mode 100644
index 000000000000..77f79a778eed
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-imapd.indirect
@@ -0,0 +1,7 @@
+#!/bin/bash
+XMAILDIR="$1"
+source /etc/courier-imap/imapd
+#eval \
+eval ${LOGINRUN} \
+	/usr/sbin/courier-imapd \
+	${XMAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-pop3d.indirect b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-pop3d.indirect
new file mode 100644
index 000000000000..3b3d99633ae0
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-courier-pop3d.indirect
@@ -0,0 +1,6 @@
+#!/bin/bash
+XMAILDIR="$1"
+source /etc/courier-imap/pop3d
+eval ${LOGINRUN} \
+	/usr/sbin/courier-pop3d \
+	${XMAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc
new file mode 100644
index 000000000000..e3d0476c5ea1
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc
@@ -0,0 +1,37 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-r1-gentoo-imapd-ssl.rc,v 1.1 2005/02/11 15:34:49 robbat2 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/lib/courier-imap/courier-imapd.indirect ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd.rc
new file mode 100644
index 000000000000..72bc708c71ea
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-imapd.rc
@@ -0,0 +1,38 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-r1-gentoo-imapd.rc,v 1.1 2005/02/11 15:34:49 robbat2 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/lib/courier-imap/courier-imapd.indirect ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc
new file mode 100644
index 000000000000..5b1dd5d235cc
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc
@@ -0,0 +1,36 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-r1-gentoo-pop3d-ssl.rc,v 1.1 2005/02/11 15:34:49 robbat2 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/lib/courier-imap/courier-pop3d.indirect ${MAILDIR}
diff --git a/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d.rc b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d.rc
new file mode 100644
index 000000000000..7e5cb7db9b10
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.0.1-r1-gentoo-pop3d.rc
@@ -0,0 +1,36 @@
+#!/bin/bash
+# $Id: courier-imap-4.0.1-r1-gentoo-pop3d.rc,v 1.1 2005/02/11 15:34:49 robbat2 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/lib/courier-imap/courier-pop3d.indirect ${MAILDIR}
diff --git a/net-mail/courier-imap/files/digest-courier-imap-4.0.1-r1 b/net-mail/courier-imap/files/digest-courier-imap-4.0.1-r1
new file mode 100644
index 000000000000..66eda8d592e8
--- /dev/null
+++ b/net-mail/courier-imap/files/digest-courier-imap-4.0.1-r1
@@ -0,0 +1 @@
+MD5 f8578d1a3d04ffdb99c75b550dd190a7 courier-imap-4.0.1.tar.bz2 3032350