version bump, bug #51306. severe problem found in 3.0.2.

4 files changed, 313 insertions, 26 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 53964f4139eb..5651fa986d20 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/courier-imap
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.67 2004/04/27 20:52:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.68 2004/05/18 01:33:45 robbat2 Exp $
+
+*courier-imap-3.0.4 (17 May 2004)
+
+  17 May 2004; Robin H. Johnson <robbat2@gentoo.org>
+  courier-imap-3.0.4.ebuild:
+  version bump, bug #51306. severe problem found in 3.0.2.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
   courier-imap-2.1.2-r1.ebuild, courier-imap-2.1.2-r2.ebuild,
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index f19fca5dc158..f8a45a9715ba 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,32 +1,34 @@
-MD5 fcd3731e24829d77a6533e0734fa65a1 ChangeLog 11252
-MD5 f6566bed6d864254ac84cb8ded6681e1 courier-imap-3.0.2.ebuild 7920
-MD5 ef05d9a0b92d457af4f82e829566c6d4 courier-imap-2.1.2-r2.ebuild 7902
-MD5 35c27f40411f315c0c3c43d70a3e2339 courier-imap-3.0.2-r1.ebuild 8145
+MD5 85284fe01bb3fe973544671e2cd69459 courier-imap-3.0.2-r1.ebuild 8144
+MD5 3368e91ad2b5da2a4a1af1dbb037769d courier-imap-2.1.2-r1.ebuild 7747
+MD5 cb363efa1adb26a68688073a195e92db courier-imap-3.0.2.ebuild 7919
+MD5 5eb71f3eba057864fcc42c17072dbf48 courier-imap-3.0.4.ebuild 8140
+MD5 7159296d30dd5246f418b7de2bd34ad0 courier-imap-2.1.2-r2.ebuild 7901
+MD5 56b295ee799f7b0d038d4ad04e28968f ChangeLog 11427
 MD5 6b964abdc013cf2bb64040e8e33215ae metadata.xml 242
-MD5 ecac80d64dfe3b22ded898ef3b6faa94 courier-imap-2.1.2-r1.ebuild 7748
-MD5 75f9598c5aca89a4aa533beb920c001c files/authdaemond.conf 448
-MD5 56cc308283ae98e263ed4ee6f4be9c58 files/authdaemond.rc6 965
-MD5 3ad8d4fb48e010b1341c7d5eb1728d7c files/courier-imapd-ssl.rc6 1209
-MD5 6277c1c5821e3ec19f8b183a70f86527 files/courier-imapd.rc6 954
-MD5 c08939fe9b4753192b750ea30bdd96c7 files/courier-pop3d-ssl.rc6 1217
-MD5 364b18c8c3c8499ee79c0ac2e4b9c752 files/courier-pop3d.rc6 962
-MD5 60552b53a15c049f8f490d454764315d files/courier-imap-2.1.2-res_query.patch 610
-MD5 dfe2c230fed9f3be8e27d5d0baeef193 files/courier-imap-3.0.2-db40vs41.patch 585
-MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r2 72
-MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
+MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
+MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
 MD5 e448df5fdbc088132766b33d27f27073 files/gentoo-imapd.rc 1006
-MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
-MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
+MD5 656c056a87579f0a1fa2baa4f8bfb705 files/courier-imapd-ssl.rc6 1208
+MD5 5e18b59b0057b23a2dc94dab487b1c29 files/courier-imapd.rc6 953
 MD5 40deca440b71ed8d78e39968fb5a30e9 files/mkimapdcert 996
-MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
+MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
+MD5 60552b53a15c049f8f490d454764315d files/courier-imap-2.1.2-res_query.patch 610
+MD5 a2d52d98e3f5b3241e1ed40943d5a4a8 files/gentoo-pop3d-ssl.rc 989
+MD5 8518e782ded83266586160919806ec06 files/courier-imap-2.1.2-removerpm.patch 4308
 MD5 ce975bfaa13118f7fcc463f2e0486277 files/courier-imap-3.0.2-removerpm.patch 4264
-MD5 d56218342e6b7d9e7aec913b9d44de87 files/digest-courier-imap-3.0.2 72
-MD5 73fffd635f45ec99ecf6a45a9d0e4516 files/courier-imap-3.0.2-disable-fam.diff 1996
+MD5 34fd568907a3ac25a568218739bfdc98 files/authdaemond.conf 447
+MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
 MD5 d56218342e6b7d9e7aec913b9d44de87 files/digest-courier-imap-3.0.2-r1 72
+MD5 e7896a8a408e549c618fb0d97db414b8 files/courier-pop3d-ssl.rc6 1216
+MD5 73fffd635f45ec99ecf6a45a9d0e4516 files/courier-imap-3.0.2-disable-fam.diff 1996
+MD5 dfe2c230fed9f3be8e27d5d0baeef193 files/courier-imap-3.0.2-db40vs41.patch 585
+MD5 d56218342e6b7d9e7aec913b9d44de87 files/digest-courier-imap-3.0.2 72
+MD5 ccbd15ff6786ce62a52455ec5f02233e files/digest-courier-imap-3.0.4 72
 MD5 a949b3b821df42c3cfee300c25a53750 files/gentoo-imapd-1.7.3-r1.rc 1027
-MD5 58631496675a58dbb19ccd058088c6e1 files/gentoo-imapd-ssl-1.7.3-r1.rc 1034
-MD5 f959e38175d1fd8f8e7a977a14f7265f files/gentoo-pop3d-1.7.3-r1.rc 1018
-MD5 3dd72120d20476368b64811318e0b721 files/gentoo-pop3d-ssl-1.7.3-r1.rc 1010
-MD5 ff6234859377e6e830592de36bc84797 files/courier-imap-2.1.1-db40vs41.patch 559
+MD5 9626da27b0e11f495ea062e6166e11d3 files/gentoo-imapd-ssl.rc 1013
+MD5 70a999ccc2bc13e7df65b72959fa6f7d files/gentoo-pop3d.rc 997
 MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r1 72
-MD5 8518e782ded83266586160919806ec06 files/courier-imap-2.1.2-removerpm.patch 4308
+MD5 de1f0b8685ecebe3d859167530f53e84 files/digest-courier-imap-2.1.2-r2 72
+MD5 bd4b555f9ce4c637f4d683182b596cdc files/authdaemond.rc6 964
+MD5 550901e019a6aab49111f0960237d419 files/courier-pop3d.rc6 961
+MD5 7b677e761c000af45fa7a37635b0c5c8 files/mkpop3dcert 996
diff --git a/net-mail/courier-imap/courier-imap-3.0.4.ebuild b/net-mail/courier-imap/courier-imap-3.0.4.ebuild
new file mode 100644
index 000000000000..a68e5318207e
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-3.0.4.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2004 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-3.0.4.ebuild,v 1.1 2004/05/18 01:33:45 robbat2 Exp $
+
+inherit eutils
+
+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 ~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gdbm ldap berkdb mysql pam nls postgres fam selinux"
+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
+	fam? ( app-admin/fam )
+	selinux? ( sec-policy/selinux-courier-imap )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	dev-lang/perl
+	sys-apps/procps"
+
+#userpriv breaks linking against vpopmail
+RESTRICT="nouserpriv nomirror"
+
+VPOPMAIL_INSTALLED=
+VPOPMAIL_DIR=
+export VPOPMAIL_INSTALLED VPOPMAIL_DIR
+
+vpopmail_setup() {
+	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}
+
+	# patch to fix db4.0 detection as db4.1
+	# bug #27517, patch was sent upstream, but was ignored :-(
+	EPATCH_OPTS="${EPATCH_OPTS} -p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-3.0.2-db40vs41.patch
+
+	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
+
+	epatch ${FILESDIR}/${PN}-3.0.2-removerpm.patch
+
+	# bug #48838 - make is possible to disable fam
+	EPATCH_OPTS="${EPATCH_OPTS} -p1 -d ${S}" \
+	epatch ${FILESDIR}/${PN}-3.0.2-disable-fam.diff
+
+	cd ${S}/authlib
+	aclocal
+	autoconf
+	cd ${S}/maildir
+	aclocal
+	autoconf
+}
+
+src_compile() {
+	vpopmail_setup
+
+	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`"
+	# the --with-ipv6 is broken
+	#myconf="${myconf} --with-ipv6"
+	use ipv6 || myconf="${myconf} --without-ipv6"
+	use berkdb \
+		&& myconf="${myconf} --with-db=db" \
+		|| myconf="${myconf} --with-db=gdbm"
+
+	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
+
+	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`"
+
+	# fix for bug #27528
+	# they really should use a better way to detect redhat
+	myconf="${myconf} --without-redhat"
+
+	# bug #29879 - FAM support
+	#if has_version 'app-admin/fam' && [ -z "`use fam`" ]; then
+	#	ewarn "FAM will be detected by the package and support will be enabled"
+	#	ewarn "The package presently provides no way to disable fam support if you don't want it"
+	#fi
+	myconf="${myconf} `use_with fam`"
+
+	# 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} \
+		${myconf} || die "econf failed"
+
+	# 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() {
+	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
+	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
+
+	dosym /usr/sbin/courierlogger /usr/lib/courier-imap/courierlogger
+
+	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-3.0.4 b/net-mail/courier-imap/files/digest-courier-imap-3.0.4
new file mode 100644
index 000000000000..ffd86ed0dbfd
--- /dev/null
+++ b/net-mail/courier-imap/files/digest-courier-imap-3.0.4
@@ -0,0 +1 @@
+MD5 a98e8a0c6fd05636c87267df882592a3 courier-imap-3.0.4.tar.bz2 1641551