many fixes. see Changelog.

8 files changed, 249 insertions, 11 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 33f856de6d64..80786719e17f 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.31 2003/04/30 11:30:40 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.32 2003/05/20 01:40:06 robbat2 Exp $
+
+*courier-imap-1.7.2 (19 May 2003)
+
+  19 May 2003; Robin Johnson <robbat2@gentoo.org> courier-imap-1.7.2.ebuild, 
+  files/gentoo-imapd-ssl.rc, files/gentoo-imapd.rc, files/gentoo-pop3d-ssl.rc,
+  files/gentoo-pop3d.rc:
+  Version bump. Fixed DB3/DB4 stuff properly (minor bug in sed-foo).  Install
+  all auth modules. Added prerun support for some other mail stuff.  Fix
+  SRC_URI. Fix Vpopmail support. Other misc cleanups.
 
 *courier-imap-1.7.1 (30 Apr 2003)
 
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 9c266e83dc1b..80cd27d8a339 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -2,14 +2,14 @@ MD5 4fae5c9c0f9f0a82f93d420e4df8d8dc courier-imap-1.7.1.ebuild 5276
 MD5 0f2fe7dc983167c8cd31d66ce0da88de courier-imap-1.6.2-r1.ebuild 4841
 MD5 f66e3273fe19d36ac280c4b20939a10b courier-imap-1.6.2.ebuild 4757
 MD5 4d5c26dbee1a905b79bd58157b98cb4b courier-imap-1.7.0.ebuild 4982
-MD5 f3d95baf85920621b29b6b63afac0537 courier-imap-1.7.2.ebuild 5984
-MD5 bb591f864518bd623ac374ba1fbb3ed6 ChangeLog 5478
-MD5 1b70045583cc8d9ea4a5765793c63248 files/gentoo-imapd.rc 1004
+MD5 4d87a9b720d128fb866be451c55013bd courier-imap-1.7.2.ebuild 6758
+MD5 6a0d6527cda797c8b344b8680f25b261 ChangeLog 5901
+MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
 MD5 c5993255c6be57914cb943789f59931e files/courier-imapd-ssl.rc6 1208
 MD5 fc75e6af35eeaecec10d7276e9b61747 files/courier-imapd.rc6 953
 MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
 MD5 8ec16f9f2d26e30684d8ddbd327e9556 files/gentoo-imapd-1.6.1.rc 1007
-MD5 8d85bcff9c570d5d077d7b0ad7491e55 files/gentoo-pop3d-ssl.rc 987
+MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
 MD5 4f24c08767f06ab12e572bb0236064bb files/digest-courier-imap-1.6.2-r1 72
 MD5 e2b026fe60176521e97df76389366955 files/authdaemond.conf 457
 MD5 c13a4bcb06660f1e589e95709b7a3f01 files/gentoo-pop3d-ssl-1.6.1.rc 990
@@ -20,8 +20,8 @@ MD5 4f24c08767f06ab12e572bb0236064bb files/digest-courier-imap-1.6.2 72
 MD5 f287a12e157d9a3280951ab876b5159b files/digest-courier-imap-1.7.0 72
 MD5 f8379da2c3af9757896cf51719923edd files/digest-courier-imap-1.7.1 72
 MD5 517c7b900eb23152a59d3054f98431e8 files/digest-courier-imap-1.7.2 72
-MD5 a64a3ec5ce5ba566f8838ffb00ff7db9 files/gentoo-imapd-ssl.rc 1011
-MD5 745a8c4fd3f1bec60226e09a35bb3f47 files/gentoo-pop3d.rc 995
+MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
+MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
 MD5 9249739b006f7f0daa345dd8ac6e6b5b files/authdaemond.rc6 977
 MD5 572530bc373ee70a6f524d554b1d139c files/courier-pop3d.rc6 961
 MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
diff --git a/net-mail/courier-imap/courier-imap-1.7.2.ebuild b/net-mail/courier-imap/courier-imap-1.7.2.ebuild
new file mode 100644
index 000000000000..6e2893078dae
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-1.7.2.ebuild
@@ -0,0 +1,224 @@
+# 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-1.7.2.ebuild,v 1.1 2003/05/20 01:40:06 robbat2 Exp $
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+#SRC_URI="http://twtelecom.dl.sourceforge.net/sourceforge/courier/${P}.tar.bz2"
+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="ipv6 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} 
+	dev-lang/perl 
+	sys-apps/procps"
+
+inherit flag-o-matic
+filter-flags -funroll-loops
+filter-flags -fomit-frame-pointer
+
+#sandbox breaks linking against vpopmail 
+VPOPMAIL_DIR=`cat /etc/passwd | grep ^vpopmail | cut -d: -f6`
+if [ -n "${VPOPMAIL_DIR}" ]; then
+	VPOPMAIL_ERROR=
+	if [ "`has userpriv ${FEATURES}`" ]; then 
+		VPOPMAIL_ERROR=1
+	fi
+fi
+
+src_unpack() {
+	[ -n "${VPOPMAIL_ERROR}" ]  && die "FEATURES=\"userpriv\" breaks the compile with vpopmail. For the moment, the only workaround is 'FEATURES=\"-userpriv -usersandbox\" emerge ${PN}'"
+
+	unpack ${A}
+	cd ${S}
+	
+	# explicitly use db3 over db4
+	if [ -n "`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} `use_with ipv6`"
+	myconf="${myconf} "
+	use berkdb \
+		&& myconf="${myconf} --with-db=db" \
+		|| myconf="${myconf} --with-db=gdbm"
+
+	if [ -f ${VPOPMAIL_DIR}/etc/lib_deps ]; 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
+
+	myconf="${myconf} debug=true"
+
+	local cachefile
+	cachefile=${WORKDIR}/config.cache
+	rm -f ${cachefile}
+
+	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.6.1.rc gentoo-imapd.rc
+		newexe ${FILESDIR}/gentoo-imapd-ssl-1.6.1.rc gentoo-imapd-ssl.rc
+		newexe ${FILESDIR}/gentoo-pop3d-1.6.1.rc gentoo-pop3d.rc
+		newexe ${FILESDIR}/gentoo-pop3d-ssl-1.6.1.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_DIR}" ] && 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-1.7.2 b/net-mail/courier-imap/files/digest-courier-imap-1.7.2
new file mode 100644
index 000000000000..7eddea3aaafb
--- /dev/null
+++ b/net-mail/courier-imap/files/digest-courier-imap-1.7.2
@@ -0,0 +1 @@
+MD5 6b407d7f62636a7926ee79b6e86cbbb1 courier-imap-1.7.2.tar.bz2 1233969
diff --git a/net-mail/courier-imap/files/gentoo-imapd-ssl.rc b/net-mail/courier-imap/files/gentoo-imapd-ssl.rc
index 42f267e3b2ed..5360d97660e0 100644
--- a/net-mail/courier-imap/files/gentoo-imapd-ssl.rc
+++ b/net-mail/courier-imap/files/gentoo-imapd-ssl.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: gentoo-imapd-ssl.rc,v 1.2 2002/06/15 00:30:23 nitro Exp $
+# $Id: gentoo-imapd-ssl.rc,v 1.3 2003/05/20 01:40:06 robbat2 Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -25,6 +25,7 @@ eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 
+$PRERUN \
 /usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
 	-stderrlogger=/usr/lib/courier-imap/logger \
 	-stderrloggername=imapd-ssl \
diff --git a/net-mail/courier-imap/files/gentoo-imapd.rc b/net-mail/courier-imap/files/gentoo-imapd.rc
index 690bd48e041d..163d83bf3767 100644
--- a/net-mail/courier-imap/files/gentoo-imapd.rc
+++ b/net-mail/courier-imap/files/gentoo-imapd.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: gentoo-imapd.rc,v 1.3 2003/02/18 10:20:24 raker Exp $
+# $Id: gentoo-imapd.rc,v 1.4 2003/05/20 01:40:06 robbat2 Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -26,6 +26,7 @@ eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd | \
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/imapd-ssl | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 
+$PRERUN \
 /usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
 	-stderrlogger=/usr/lib/courier-imap/logger \
 	-stderrloggername=imapd \
diff --git a/net-mail/courier-imap/files/gentoo-pop3d-ssl.rc b/net-mail/courier-imap/files/gentoo-pop3d-ssl.rc
index a72bed977e9b..dde2b3875731 100644
--- a/net-mail/courier-imap/files/gentoo-pop3d-ssl.rc
+++ b/net-mail/courier-imap/files/gentoo-pop3d-ssl.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: gentoo-pop3d-ssl.rc,v 1.2 2002/06/15 01:39:57 nitro Exp $
+# $Id: gentoo-pop3d-ssl.rc,v 1.3 2003/05/20 01:40:06 robbat2 Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -24,6 +24,7 @@ eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 
+$PRERUN \
 /usr/lib/courier-imap/couriertcpd -address=$SSLADDRESS \
 	-stderrlogger=/usr/lib/courier-imap/logger \
 	-stderrloggername=pop3d-ssl \
diff --git a/net-mail/courier-imap/files/gentoo-pop3d.rc b/net-mail/courier-imap/files/gentoo-pop3d.rc
index 6cb3e9fbcca3..34785665449f 100644
--- a/net-mail/courier-imap/files/gentoo-pop3d.rc
+++ b/net-mail/courier-imap/files/gentoo-pop3d.rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: gentoo-pop3d.rc,v 1.4 2003/02/18 10:20:24 raker Exp $
+# $Id: gentoo-pop3d.rc,v 1.5 2003/05/20 01:40:06 robbat2 Exp $
 #
 # Copyright 1998 - 2000 Double Precision, Inc.
 # See COPYING for distribution information.
@@ -25,6 +25,7 @@ eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d | \
 eval `sed -n '/^#/d;/=/p' </etc/courier-imap/pop3d-ssl | \
 	sed 's/=.*//;s/^/export /;s/$/;/'`
 
+$PRERUN \
 /usr/lib/courier-imap/couriertcpd -address=$ADDRESS \
 	-stderrlogger=/usr/lib/courier-imap/logger \
 	-stderrloggername=pop3d \