version bump, fix ipv6 bug, another attempted tcltk fix

4 files changed, 229 insertions, 7 deletions

diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 728be43073ac..9e084c069264 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -2,14 +2,12 @@ MD5 bb9fc1d0628d1a719bbf4f52bbe59fcd courier-imap-1.7.1.ebuild 5262
 MD5 fb165fc2d4178bc45ab1c41600196098 courier-imap-1.7.3-r1.ebuild 6869
 MD5 c6bc519510721ac4af838457798367e3 courier-imap-1.6.2-r1.ebuild 4813
 MD5 e399aedb51a23ab288d5f2d2d2be868c courier-imap-1.7.3.ebuild 6856
-MD5 fec05da6d35205b535fbe3f25fffba27 courier-imap-2.0.0-r1.ebuild 6714
 MD5 7a974af8a51e0f760d3fcb108f349fdb courier-imap-1.7.0.ebuild 4954
 MD5 3ceeec6646001e4da5a2e32051f19267 courier-imap-1.7.2.ebuild 6696
-MD5 3af1188ca8ee8811edaf2b175800bfac courier-imap-2.1.1.ebuild 6697
-MD5 40a2b7d03331f15a0b264519b2ade11a ChangeLog 6941
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 d0a5bec5417f35c4961e5e9661e75559 courier-imap-2.1.1.ebuild 6571
+MD5 cfd741d09b6ea8102640c00e975bd2b4 ChangeLog 7117
+MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
 MD5 fba567e34491b014536e1ee20da7bdc9 courier-imap-2.0.0.ebuild 6598
-MD5 d76de3c27c501ddaf14a8e3128bc6336 files/courier-imap-2.0.0-removetcldepend.patch 1930
 MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
 MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
 MD5 6eabb1afe28900b3ed92bc9889116303 files/courier-imapd-ssl.rc6 1207
@@ -35,7 +33,6 @@ MD5 c7fcdd240762eddd559da4a56028d167 files/digest-courier-imap-2.1.1 72
 MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
 MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
 MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
-MD5 2c48420faba16395e99faa48d098414a files/digest-courier-imap-2.0.0-r1 72
 MD5 12b60a6d075d607adf99f90af1a300e3 files/authdaemond.rc6 976
 MD5 70a104ae9721e2f5d86a8f7c326d9f1d files/courier-pop3d.rc6 960
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
diff --git a/net-mail/courier-imap/courier-imap-2.1.1.ebuild b/net-mail/courier-imap/courier-imap-2.1.1.ebuild
new file mode 100644
index 000000000000..6e5a5b488494
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-2.1.1.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-2.1.1.ebuild,v 1.1 2003/08/28 22:32:17 robbat2 Exp $
+
+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 ~arm"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gdbm ldap berkdb mysql pam nls postgres"
+PROVIDE="virtual/imapd"
+# not compatible with >=sys-libs/db-4
+RDEPEND="virtual/glibc
+	>=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 "
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	dev-lang/perl
+	sys-apps/procps"
+
+#userpriv breaks linking against vpopmail
+RESTRICT="nouserpriv"
+VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
+VPOPMAIL_INSTALLED=
+[ -n "${VPOPMAIL_DIR}" ] && [ -f "${VPOPMAIL_DIR}/etc/lib_deps" ] && VPOPMAIL_INSTALLED=1
+
+src_unpack() {
+	unpack ${A}
+	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
+}
+
+src_compile() {
+
+	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`"
+	myconf="${myconf} --with-ipv6"
+	use berkdb \
+		&& myconf="${myconf} --with-db=db" \
+		|| myconf="${myconf} --with-db=gdbm"
+
+	if [ -n "${VPOPMAIL_INSTALLED}" ]; then
+		myconf="${myconf} --with-authvchkpw"
+		tmpLDFLAGS="`cat ${VPOPMAIL_DIR}/etc/lib_deps`"
+		LDFLAGS="${LDFLAGS} ${tmpLDFLAGS}"
+		CFLAGS="${CFLAGS} `cat ${VPOPMAIL_DIR}/etc/inc_deps`"
+	else
+		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`
+
+	# 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}
+
+	# 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() {
+	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
+	doins ${FILESDIR}/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
+
+ 	exeinto /etc/init.d
+		newexe ${FILESDIR}/authdaemond.rc6 authdaemond
+		newexe ${FILESDIR}/courier-imapd.rc6 courier-imapd
+		newexe ${FILESDIR}/courier-imapd-ssl.rc6 courier-imapd-ssl
+		newexe ${FILESDIR}/courier-pop3d.rc6 courier-pop3d
+		newexe ${FILESDIR}/courier-pop3d-ssl.rc6 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
+
+	dodoc ${S}/imap/ChangeLog
+
+	keepdir /var/lib/courier-imap/authdaemon
+
+}
+
+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/digest-courier-imap-2.1.1 b/net-mail/courier-imap/files/digest-courier-imap-2.1.1
new file mode 100644
index 000000000000..58272e9b4885
--- /dev/null
+++ b/net-mail/courier-imap/files/digest-courier-imap-2.1.1
@@ -0,0 +1 @@
+MD5 71d9e88053351dbf7df04943189ec1cd courier-imap-2.1.1.tar.bz2 1304426
diff --git a/net-mail/courier-imap/metadata.xml b/net-mail/courier-imap/metadata.xml
index 51f94e3fbe0e..7772825cfdbe 100644
--- a/net-mail/courier-imap/metadata.xml
+++ b/net-mail/courier-imap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+    <herd>net-mail</herd>
+    <maintainer>
+        <email>robbat2@gentoo.org</email>
+    </maintainer>
 </pkgmetadata>