version bump, fix for bug 42164, and an issue reported by hachre@dynaloop.net

5 files changed, 394 insertions, 16 deletions

diff --git a/net-mail/courier/ChangeLog b/net-mail/courier/ChangeLog
index de18d606c2c9..43eef9b60152 100644
--- a/net-mail/courier/ChangeLog
+++ b/net-mail/courier/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/courier
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/ChangeLog,v 1.45 2004/02/16 01:40:18 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier/ChangeLog,v 1.46 2004/03/08 04:58:22 iggy Exp $
+
+*courier-0.45.0 (07 Mar 2004)
+
+  07 Mar 2004; Brian Jackson <iggy@gentoo.org> courier-0.45.0.ebuild,
+  files/courier-init:
+  version bump, fix for bug 42164, and an issue reported by 
+  hachre@dynaloop.net
 
   15 Feb 2004; Brian Jackson <iggy@gentoo.org> courier-0.44.2.20040201.ebuild:
   a few cleanups, and fix bug 32878
diff --git a/net-mail/courier/Manifest b/net-mail/courier/Manifest
index 9c652bdd37d8..022b14f70ca0 100644
--- a/net-mail/courier/Manifest
+++ b/net-mail/courier/Manifest
@@ -1,28 +1,30 @@
 MD5 968aacf2860e8feafebae9bd08cfdce9 courier-0.44.0.ebuild 9990
 MD5 c86c37cfd33f0e5f2cfa0ffa60f4286b courier-0.44.2.20040201.ebuild 10094
 MD5 339d21e11d51b43207b08371c8dea20a courier-0.44.2.ebuild 10169
-MD5 73e08acc2bdc19cb6f7acf26c5a60e0d ChangeLog 7582
+MD5 5c47a0bb64b6d3606d8e7ed1187dc92f courier-0.45.0.ebuild 10411
+MD5 966a15185fd9d68402c0cbc1af968134 ChangeLog 7789
 MD5 891fa054ac6cfcaee491ccaae9b84a85 metadata.xml 463
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
-MD5 c90d29ee6fb093c3a57dd6085a8463b3 files/courier-imapd 431
-MD5 de7f91e6afb4d9b65a82157f1f805f3c files/courier-pop3d 431
-MD5 ef6e0853e5d668144f698c59c835d548 files/courier-ldapaliasd 452
-MD5 bf6d70e1911dad2eda0e07530afb0300 files/courier-filterd 509
-MD5 11b3d1dd7a351499fc244c9517ae9371 files/courier 691
-MD5 0410ef54ac603ee57686a191cffb6be5 files/courier-esmtpd 436
+MD5 4d8dd54549ec433b8f32f718a6237e34 files/courier-imapd 461
+MD5 8ca8b5ee0598cd17382e4f65c274ff5f files/courier-pop3d 461
+MD5 4158674068685d72d0aad76c6af90b77 files/courier-ldapaliasd 482
+MD5 b63309f2bf17be5cb075d672ec684328 files/courier-filterd 539
+MD5 5894752137269510abb058eae8378641 files/courier 721
+MD5 ec011cb2fe7e7aff93b9525995616576 files/courier-esmtpd 466
 MD5 aba961cc052d0c255f4e1deb65945153 files/gentoo.diff.bz2 378
-MD5 2ec2b05590afdf6d0e94e012baa44c4f files/courier-imapd-ssl 451
+MD5 9c3376db36063d978e30807d84a32cab files/courier-imapd-ssl 481
 MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 MD5 d41d8cd98f00b204e9800998ecf8427e files/locallowercase 0
 MD5 69a536abf75f11f8d362901f7979a780 files/digest-courier-0.44.0 68
 MD5 0b192e51cf2e6e24ffa844e7066e6f30 files/digest-courier-0.44.2 68
-MD5 d56f50088f63932fa659fe0f17c1a23e files/courier-init 4633
+MD5 c0233acf6e4b81d94b9cc983a84f25e1 files/digest-courier-0.45.0 68
+MD5 30d04ec54ec24553969b1d8feb935a0b files/courier-init 4863
 MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
-MD5 d587a072860886d2896d8b5a8c118951 files/courier-esmtpd-msa 438
-MD5 8be77f68229aebdc27b53660a6431e8c files/courier-esmtpd-ssl 456
+MD5 6969988ede46945517870edac1a5920b files/courier-esmtpd-msa 468
+MD5 d24325ec89578955cb86a8041ae86212 files/courier-esmtpd-ssl 486
 MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
-MD5 9da52a8e324cc8da121a87a607754e6d files/courier-pop3d-ssl 451
+MD5 f09c83519b337b7d9be0f04a70f1679e files/courier-pop3d-ssl 481
 MD5 b7f6a4e94f89d09acffc72555277043b files/digest-courier-0.44.2.20040201 77
-MD5 6ca0ee26b88804756f7918e42196304a files/courier-mta 427
-MD5 4cc259ba91efc1fd7885a6dd6e2291f1 files/courier-authdaemond 451
+MD5 c02de408ecf7bdd12569c61eca732e65 files/courier-mta 457
+MD5 5dd03eb2b099ecf757feef2c7d36dfd2 files/courier-authdaemond 481
diff --git a/net-mail/courier/courier-0.45.0.ebuild b/net-mail/courier/courier-0.45.0.ebuild
new file mode 100644
index 000000000000..dd4d8df516b9
--- /dev/null
+++ b/net-mail/courier/courier-0.45.0.ebuild
@@ -0,0 +1,362 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /home/cvsroot/gentoo-x86/net-mail/courier/courier-0.41.0.ebuild
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+#SRC_URI="http://www.courier-mta.org/beta/courier/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt"
+
+PROVIDE="virtual/mta
+	 virtual/imapd"
+
+DEPEND="virtual/glibc
+	>=dev-libs/openssl-0.9.6
+	>=sys-libs/gdbm-1.8.0
+	>=dev-tcltk/expect-5.33.0
+	crypt? ( >=app-crypt/gnupg-1.0.4 )
+	fax? (	>=media-libs/netpbm-9.12
+		virtual/ghostscript
+		>=net-dialup/mgetty-1.1.28 )
+	pam? ( >=sys-libs/pam-0.75 )
+	mysql? ( >=dev-db/mysql-3.23.36 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.1.3 )
+	spell? ( virtual/aspell-dict )
+	!virtual/imapd"
+
+RDEPEND="${DEPEND}
+	app-admin/fam
+	dev-lang/perl
+	sys-apps/procps"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's:\#define.*USER_DIR.*\"Maildir\":\#define\tUSER_DIR\t\".maildir\":' \
+		webmail/sqwebmail.h || die "failed to change maildir"
+	sed -i -e 's:maildir="Maildir";:maildir=".maildir";:' \
+		webmail/auth.c || die "failed to change maildir"
+}
+
+src_compile() {
+	local myconf
+	use pam || myconf="${myconf} --without-authpam"
+	use ldap || myconf="${myconf} --without-authldap"
+	use mysql || myconf="${myconf} --without-authmysql"
+	use postgres || myconf="${myconf} --without-authpostgresql"
+	use ipv6 || myconf="${myconf} --without-ipv6"
+	use spell \
+		&& myconf="${myconf} --with-ispell" \
+		|| myconf="${myconf} --without-ispell"
+
+	if [ -f /var/vpopmail/etc/lib_deps ]; then
+		myconf="${myconf} --with-authvchkpw"
+	else
+		myconf="${myconf} --without-authvchkpw"
+	fi
+
+	#
+	# 1. If nls is enabled and ENABLE_UNICODE is not empty...
+	#    enable the specified unicode sets
+	# 2. If nls is enabled and no unicode sets are specified,
+	#    enable them all
+	# 3. If nls is disabled, disable unicode sets
+	#
+	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
+		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
+	elif use nls; then
+		myconf="${myconf} --enable-unicode"
+	else
+		myconf="${myconf} --disable-unicode"
+	fi
+
+	myconf="${myconf} debug=true"
+
+	./configure \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--libexecdir=/usr/lib/courier \
+		--datadir=/usr/share/courier \
+		--sharedstatedir=/var/lib/courier/com \
+		--localstatedir=/var/lib/courier \
+		--with-piddir=/var/run/courier \
+		--with-authdaemonvar=/var/lib/courier/authdaemon \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-paranoid-smtpext \
+		--disable-autorenamesent \
+		--with-db=gdbm \
+		--enable-mimetypes=/etc/apache/conf/mime.types \
+		--enable-workarounds-for-imap-client-bugs \
+		--host=${CHOST} ${myconf} || die "bad ./configure"
+
+	emake || die "Compile problem"
+}
+
+chg_cfg() {
+	file=${1}
+	key=${2}
+	value=${3}
+
+	echo "changing ${file}: ${key} to ${value}"
+	sed -e "/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file} > ${file}.tmp && chmod --reference ${file} ${file}.tmp && mv ${file}.tmp ${file}
+	rm -f ${f}.tmp 1>/dev/null 2>&1
+}
+
+set_mime() {
+	local files=$*
+
+	chk_badmime='##NAME: BOFHBADMIME:0'
+	pos_badmime='##NAME: NOADDMSGID:0'
+	ins_badmime='\
+##NAME: BOFHBADMIME:0\
+#\
+# set BOFHBADMIME\
+#   to \"reject\" to return mail with invalid MIME header\
+#   to \"wrap\" to wrap mail with invalid MIME header in an attachmant\
+#   to \"accept\" to pass mail with invalid MIME header untouched\
+\
+BOFHBADMIME=accept\
+'
+
+	local f
+	for f in ${files}
+	do
+		if ! grep -q "${chk_badmime}" ${f}
+		then
+			echo "adding parameter ${chk_badmime} to ${f}"
+			sed -e"/${pos_badmime}/ i ${ins_badmime}" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
+			rm -f ${f}.tmp 1>/dev/null 2>&1
+		fi
+	done
+}
+
+set_maildir() {
+	local files=$*
+
+	origmaildir='Maildir'
+	newmaildir='.maildir'
+
+	local f
+	for f in ${files}
+	do
+		echo "changing ${origmaildir} in ${f} to ${newmaildir}"
+		sed -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f} > ${f}.tmp && chmod --reference ${f} ${f}.tmp && mv -f ${f}.tmp ${f}
+		rm -f ${f}.tmp 1> /dev/null 2>&1
+	done
+}
+
+src_install() {
+	dodir /var/lib/courier
+	dodir /etc/pam.d
+	make install DESTDIR=${D} || die
+	# fix bug #15873 bad owner on /var/run/courier
+	diropts -o mail -g mail
+	for dir2keep in `(cd ${D} && find . -type d)` ; do
+		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
+	done
+
+	local f
+	cd ${D}/etc/courier
+	mv imapd.authpam imap.authpam
+	mv pop3d.authpam pop3.authpam
+	for f in *.authpam
+	do
+		cp "${f}" "${D}/etc/pam.d/${f%%.authpam}"
+	done
+
+	exeinto /etc/init.d
+	# we install the new single init script as courier
+	newexe ${FILESDIR}/courier-init courier
+	# and install the old main init script as courier-old if the old one
+	# is installed which it will be now, but for the future...
+	`grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
+		newexe ${FILESDIR}/courier courier-old
+	# the rest of them don't need to be installed
+
+	einfo "Setting up maildirs by default in the account skeleton ..."
+	diropts -m 755 -o root -g root
+	keepdir /etc/skel
+	${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
+	# we're going to try this out for a while -20031107
+	#newins ${FILESDIR}/dot_courier .courier
+	#fperms 644 /etc/skel/.courier
+	keepdir /var/spool/mail
+	${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
+	insinto /etc/courier
+	newins ${FILESDIR}/bofh bofh
+	newins ${FILESDIR}/locallowercase locallowercase
+	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
+	echo 0 > ${D}/etc/courier/sizelimit
+
+	cd ${S}
+	dodoc AUTHORS BENCHMARKS ChangeLog* NEWS README TODO
+	dodoc authlib/README.authmysql.myownquery authlib/README.ldap courier/doc/*.txt
+	echo "See /usr/share/courier/htmldoc/index.html for docs in html format" \
+		>>${D}/usr/share/doc/${P}/README.htmldocs
+
+	# See bug #10574
+	# file which describes the webadmin password file
+	insinto /etc/courier/webadmin
+	insopts -m 400 -o mail -g mail
+	doins ${FILESDIR}/password.dist
+
+	# fixes bug #25028 courier doesn't symlink sendmail to /usr/sbin
+	dosym /usr/bin/sendmail /usr/sbin/sendmail
+
+	echo "MAILDIR=\$HOME/.maildir" >> ${D}/etc/courier/courierd
+
+	# we change the names of the binaries, but webadmin is still looking
+	# for the old names
+	sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+		-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+		${D}/usr/share/courier/courierwebadmin/admin-40imap.pl \
+		|| ewarn "failed to fix webadmin"
+	sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+		-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+		${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl \
+		|| ewarn "failed to fix webadmin"
+
+}
+
+pkg_preinst() {
+	# avoid name collisions in /usr/sbin
+	local y
+	cd ${D}/usr/share/courier
+	set_maildir imapd imapd-ssl pop3d pop3d-ssl
+
+	cd ${D}/usr/sbin
+	for y in imapd imapd-ssl pop3d pop3d-ssl
+	do
+		mv ${y} courier-${y}
+	done
+
+	cd ${D}/etc/courier
+	for y in *.dist
+	do
+		cp ${y} ${y%%.dist}
+	done
+	touch esmtproutes
+	touch backuprelay
+	touch maildroprc
+	chown mail:root ldapaliasrc
+	chg_cfg imapd-ssl COURIERTLS /usr/bin/couriertls
+	chg_cfg authdaemonrc authmodulelist authpam
+	chg_cfg authdaemonrc version authdaemond.plain
+	set_mime esmtpd esmtpd-ssl esmtpd-msa
+	set_maildir courierd
+}
+
+pkg_postinst() {
+	cd ${S}
+	make install-configure
+
+	# fixes bug #15873 for upgrades, should be able to yank this sometime in
+	# the future
+	chown --recursive mail:mail ${ROOT}/var/run/courier
+
+	# need to do this for new installs to be able to start courier
+	# without having to run rc-update ...
+	# NOTE: not needed with new portages, but I'll leave it for a while for
+	# old portages
+	/etc/init.d/depscan.sh
+
+	einfo "The following command will setup courier for your system:"
+	einfo "ebuild /var/db/pkg/${CATEGORY}/${PN}-${PV}/${PN}-${PV}.ebuild config"
+	echo
+	einfo "To enable webmail/webadmin, run the following commands:"
+	einfo "$ echo \"Include /etc/courier/apache-sqwebmail.inc\" >> /etc/apache*/conf/apache.conf"
+	einfo "$ chmod a+rx /usr/lib/courier/courier/webmail"
+	einfo "Then visit: http(s)://localhost/courier/webmail"
+	echo
+	einfo "imap behavior has changed, you may need to have your imap clients logoff"
+	einfo "and back on again"
+	echo
+	echo
+	ewarn "The init scripts for courier have changed."
+	ewarn "There is now one init script (/etc/init.d/courier). The rest"
+	ewarn "are obsolete. You can remove /etc/init.d/courier-*. You also"
+	ewarn "need to edit the following files in /etc/courier to enable"
+	ewarn "the different services:"
+	ewarn "imapd"
+	ewarn "imapd-ssl"
+	ewarn "pop3d"
+	ewarn "pop3d-ssl"
+	ewarn "esmtpd"
+	ewarn "esmtpd-msa"
+	ewarn "esmtpd-ssl"
+	ewarn "hint: look for a line at the bottom of the file that looks like so"
+	ewarn "ESMTPDSTART=NO"
+	ewarn "and change it to YES for the services that you use"
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 1
+	echo -ne "\a" ; sleep 1
+}
+
+pkg_config() {
+	mailhost=`hostname`
+	export mailhost
+
+	domainname=`domainname`
+	if [ "x$domainname" = "x(none)" ] ; then
+		domainname=`echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/"`
+	fi
+	export domainname
+
+
+	if [ ${ROOT} = "/" ] ; then
+		file=${ROOT}/etc/courier/locals
+		if [ ! -f ${file} ] ; then
+			echo "localhost" > ${file};
+			echo ${domainname} >> ${file};
+		fi
+		file=${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}
+		if [ ! -f ${file} ] ; then
+			echo ${domainname} > ${file}
+			/usr/sbin/makeacceptmailfor
+		fi
+
+		file=${ROOT}/etc/courier/smtpaccess/${domainname}
+		if [ ! -f ${file} ]
+		then
+			netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+			do
+				i=1
+				net=""
+				TIFS=${IFS}
+				IFS="."
+				for o in ${netmask}
+				do
+					if [ ${o} == "255" ]
+					then
+						[ "_${net}" == "_" ] || net="${net}."
+						t=`echo ${network} | cut -d " " -f ${i}`
+						net="${net}${t}"
+					fi
+					i=$((${i} + 1))
+				done
+				IFS=${TIFS}
+				echo "doing configuration - relay control for the network ${net} !"
+				echo "${net}	allow,RELAYCLIENT" >> ${file}
+			done
+			/usr/sbin/makesmtpaccess
+		fi
+	fi
+
+	echo "creating cert for esmtpd-ssl:"
+	/usr/sbin/mkesmtpdcert
+	echo "creating cert for imapd-ssl:"
+	/usr/sbin/mkpop3dcert
+	echo "creating cert for pop3d-ssl:"
+	/usr/sbin/mkimapdcert
+}
diff --git a/net-mail/courier/files/courier-init b/net-mail/courier/files/courier-init
index 171988f3a9d7..62876af37be1 100644
--- a/net-mail/courier/files/courier-init
+++ b/net-mail/courier/files/courier-init
@@ -32,6 +32,12 @@ checkconfig() {
 	[ ! -f ${datadir}/imapd.pem ] && \
 	ebegin " generating-IMAP-SSL-certificate..." && "${sbindir}/mkimapdcert"
 
+	[ -f ${sysconfdir}/esmtpd-ssl ] && . ${sysconfdir}/esmtpd-ssl
+
+	# If we do not have a certificate, make one up.
+	[ ! -f ${datadir}/esmtpd.pem ] && \
+	ebegin " generating-ESMTP-SSL-certificate..." && "${sbindir}/mkesmtpdcert"
+
 	# First time after install create aliases.dat and smtpaccess.dat
 
 	[ -f ${sysconfdir}/aliases.dat ] || ${sbindir}/makealiases
@@ -90,7 +96,7 @@ start() {
 
 	# start esmtpd-ssl if so written
 	[ -f ${sysconfdir}/esmtpd-ssl ] && source ${sysconfdir}/esmtpd-ssl
-	case x$ESMTPDSTART in
+	case x$ESMTPDSSLSTART in
 	x[yY]*)
 		ebegin " Starting esmtpd-ssl"
 		${sbindir}/esmtpd-ssl start
diff --git a/net-mail/courier/files/digest-courier-0.45.0 b/net-mail/courier/files/digest-courier-0.45.0
new file mode 100644
index 000000000000..1967d073999d
--- /dev/null
+++ b/net-mail/courier/files/digest-courier-0.45.0
@@ -0,0 +1 @@
+MD5 e823505ecb139680836ce14072446951 courier-0.45.0.tar.bz2 4317047