Version bump, ebuild contributions by Hanno Meyer-Thurow <h.mth@web.de>, Conrad Kostecki <ConiKost@gmx.de>, "Nicola" <n.murino@theorematica.it> and James Colannino <james@colannino.org>. Fixes bugs 124985 and 160037.

(Portage version: 2.1.2-r10)

4 files changed, 329 insertions, 3 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 150b983ca3d2..f890ae9d8f67 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.140 2007/02/03 01:20:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.141 2007/02/23 15:59:32 chutzpah Exp $
+
+*courier-imap-4.1.2 (23 Feb 2007)
+
+  23 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
+  +courier-imap-4.1.2.ebuild:
+  Version bump, ebuild contributions by Hanno Meyer-Thurow <h.mth@web.de>,
+  Conrad Kostecki <ConiKost@gmx.de>, "Nicola" <n.murino@theorematica.it> and
+  James Colannino <james@colannino.org>. Fixes bugs 124985 and 160037.
 
 *courier-imap-4.0.6-r1 (03 Feb 2007)
 
diff --git a/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild b/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild
index 10ac73547d26..5a8276647fa7 100644
--- a/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.6-r1.ebuild,v 1.1 2007/02/03 01:20:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.0.6-r1.ebuild,v 1.2 2007/02/23 15:59:32 chutzpah Exp $
 
 inherit eutils multilib
 IUSE="fam berkdb gdbm debug ipv6 nls selinux"
@@ -252,7 +252,7 @@ src_install() {
 
 	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/courier-imap/courierlogger || \
 			die "dosym failed"
-	
+
 	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
 	for initd in {imapd,pop3d}{,-ssl} ; do
 		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${INITD_VER}-courier-${initd}.rc6 > \
diff --git a/net-mail/courier-imap/courier-imap-4.1.2.ebuild b/net-mail/courier-imap/courier-imap-4.1.2.ebuild
new file mode 100644
index 000000000000..2206609fcc93
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.1.2.ebuild
@@ -0,0 +1,315 @@
+# Copyright 1999-2007 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.1.2.ebuild,v 1.1 2007/02/23 15:59:32 chutzpah Exp $
+
+inherit autotools eutils multilib
+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.57
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	fam? ( virtual/fam )
+	selinux? ( sec-policy/selinux-courier-imap )
+	>=net-mail/mailbase-0.00-r8"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	userland_GNU? ( sys-process/procps )
+	!mail-mta/courier"
+PROVIDE="virtual/imapd"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+#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/portage/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}/${PN}-4.0.1-disable-fam-configure.in.patch
+
+	# These patches should fix problem detecting Berkeley DB.
+	# We now can compile with db4 support.
+	if use berkdb; then
+		epatch ${FILESDIR}/${PN}-4.0.6-db4-bdbobj_configure.in.patch
+		epatch ${FILESDIR}/${PN}-4.0.6-db4-tcpd_configure.in.patch
+		epatch ${FILESDIR}/${PN}-4.0.6-db4-configure.in.patch
+	fi
+
+	export WANT_AUTOCONF="2.5"
+	ebegin "Recreating configure"
+	AT_NO_RECURSIVE="true" eautoreconf || die "autoconf on . failed"
+	eend $?
+
+	cd ${S}/maildir
+	ebegin "Recreating maildir/configure"
+	eautoreconf || die "autoconf on maildir failed"
+	eend $?
+
+	cd ${S}/bdbobj
+	ebegin "Recreating bdbobj/configure"
+	eautoreconf || die "autoconf on bdbobj failed"
+	eend $?
+
+	cd ${S}/tcpd
+	ebegin "Recreating tcpd/configure"
+	eautoreconf || die "autoconf on bdbobj failed"
+	eend $?
+}
+
+src_compile() {
+	vpopmail_setup
+
+	local myconf
+
+	# 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, building with all available character sets"
+		myconf="${myconf} --enable-unicode"
+	elif use nls; then
+		einfo "ENABLE_UNICODE is set, building with unicode=$ENABLE_UNICODE"
+		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
+	else
+		einfo "disabling unicode support"
+		myconf="${myconf} --disable-unicode"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# fix for bug #21330
+	CFLAGS="$(echo ${CFLAGS} | xargs)"
+	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
+	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
+
+	# 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 \
+		$(use_with ipv6) \
+		$(use_with fam) \
+		${myconf} || die "econf failed"
+
+	# change the pem file location..
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		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
+	rm -rf ${D}/etc/pam.d
+
+	# 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"
+			sed -i -e 's/Maildir/${MAILDIR}/' ${file} || die "sed failed"
+			sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+				${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"
+
+	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
+	for initd in {imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${INITD_VER}-courier-${initd}.rc6 > \
+			courier-${initd} || die "libdir-sed failed"
+		doinitd courier-${initd} || die "doinitd courier-${initd} failed"
+	done
+	exeinto /usr/$(get_libdir)/courier-imap
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g"	${FILESDIR}/${PN}-${RC_VER}-${exe} > \
+			${exe} || die "libdir-sed 2 failed"
+		doexe ${exe} || die "doexe ${exe} failed"
+	done
+
+	#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"
+	# some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	chmod 755 ${ROOT}/usr/$(get_libdir)/courier-imap || die "Failed to ensure sane permissions"
+}
+
+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/digest-courier-imap-4.1.2 b/net-mail/courier-imap/files/digest-courier-imap-4.1.2
new file mode 100644
index 000000000000..d2803af34fc5
--- /dev/null
+++ b/net-mail/courier-imap/files/digest-courier-imap-4.1.2
@@ -0,0 +1,3 @@
+MD5 e4a1c75992cc85ba10f719e98f6df0ff courier-imap-4.1.2.tar.bz2 3257311
+RMD160 56546e90fc16f92daab6d7540154bc5f7ad06e27 courier-imap-4.1.2.tar.bz2 3257311
+SHA256 37c3530b31e0b9b5a5bcd639ac3db4862f12e77ec39d8d67f19e630d76853d71 courier-imap-4.1.2.tar.bz2 3257311