bump and promote

6 files changed, 371 insertions, 8 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 31e00ea4607e..de7f8d28329b 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for mail-mta/courier
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.11 2004/07/29 14:34:26 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.12 2004/08/01 19:28:28 swtaylor Exp $
+
+*courier-0.46 (01 Aug 2004)
+
+  01 Aug 2004; Scott W Taylor <swtaylor@gentoo.org>
+  courier-0.45.6.20040618.ebuild, courier-0.45.6.ebuild, +courier-0.46.ebuild:
+  mark 0.45.6.* stable
+
+*courier-0.46 (01 Aug 2004)
+
+  01 Aug 2004; Scott W Taylor <swtaylor@gentoo.org> +courier-0.46.ebuild:
+  courier 0.46 released today
 
   29 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   courier-0.45.6.20040618.ebuild:
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 374b61b31455..fc5f640cbb4f 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,20 +1,22 @@
-MD5 a69536858e37b1d80cc71d208be77bba ChangeLog 11712
-MD5 18ab0c5a59588ac3efd359dcdfb2147c courier-0.45.6.ebuild 9853
+MD5 b9c0b01c5986504cad242eb1da6f1bc0 ChangeLog 12030
+MD5 dfb96036debf9854a8f83dd2295f11b1 courier-0.45.6.20040618.ebuild 9849
+MD5 18ab0c5a59588ac3efd359dcdfb2147c courier-0.46.ebuild 9853
 MD5 57e645b49da83f3ea04d985cc044a003 courier-0.45.4.ebuild 10584
-MD5 a0706b9eeb116339eec4213e311797fd courier-0.45.5.20040606.ebuild 10341
 MD5 eb543b129e4195f08f51e1e54147bb28 courier-0.45.5.ebuild 10681
 MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
-MD5 f37a1c7c2929f8b2b4c44a68858bbffc courier-0.45.6.20040618.ebuild 9852
+MD5 a0706b9eeb116339eec4213e311797fd courier-0.45.5.20040606.ebuild 10341
+MD5 596ad37ec14be07ebe4dd1fa67bf2b92 courier-0.45.6.ebuild 9849
 MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
 MD5 8041db031156342e93407a73a0ae75f5 files/courier-init 5206
 MD5 006e9a4b15d7522f9af659ff660a606c files/digest-courier-0.45.6 68
+MD5 1c43ee40b3a67f8c6f30fa0f08293211 files/digest-courier-0.46 66
 MD5 e768202935622734d9020fe5d85ce079 files/digest-courier-0.45.4 68
 MD5 07b2658af088270c5cf410ea205a41cd files/digest-courier-0.45.5 68
-MD5 6550f1ee0d47e1339c92bf28f694ae91 files/digest-courier-0.45.5.20040606 77
 MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
 MD5 d41d8cd98f00b204e9800998ecf8427e files/locallowercase 0
 MD5 098e16e61446aceb242735b1ca70509a files/norewrite.patch 489
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
 MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
+MD5 6550f1ee0d47e1339c92bf28f694ae91 files/digest-courier-0.45.5.20040606 77
 MD5 7205bd51c183eedf99d16f8df5e01ef9 files/digest-courier-0.45.6.20040618 77
diff --git a/mail-mta/courier/courier-0.45.6.20040618.ebuild b/mail-mta/courier/courier-0.45.6.20040618.ebuild
index 4c1eccfd7ee4..fe01aa1dbfe8 100644
--- a/mail-mta/courier/courier-0.45.6.20040618.ebuild
+++ b/mail-mta/courier/courier-0.45.6.20040618.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~ppc sparc"
+KEYWORDS="x86 alpha ppc sparc"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite"
 
 PROVIDE="virtual/mta
diff --git a/mail-mta/courier/courier-0.45.6.ebuild b/mail-mta/courier/courier-0.45.6.ebuild
index b4e5d59114d8..30f2baf5026e 100644
--- a/mail-mta/courier/courier-0.45.6.ebuild
+++ b/mail-mta/courier/courier-0.45.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.courier-mta.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ppc sparc"
 IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite"
 
 PROVIDE="virtual/mta
diff --git a/mail-mta/courier/courier-0.46.ebuild b/mail-mta/courier/courier-0.46.ebuild
new file mode 100644
index 000000000000..b4e5d59114d8
--- /dev/null
+++ b/mail-mta/courier/courier-0.46.ebuild
@@ -0,0 +1,349 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /home/cvsroot/gentoo-x86/net-mail/courier/courier-0.41.0.ebuild
+
+inherit eutils
+
+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 ~alpha ~ppc ~sparc"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite"
+
+PROVIDE="virtual/mta
+	 virtual/mda
+	 virtual/imapd"
+
+DEPEND="virtual/libc
+	>=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/mta
+	!virtual/mda
+	!virtual/imapd"
+
+RDEPEND="${DEPEND}
+	app-admin/fam
+	dev-lang/perl
+	sys-apps/procps"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use norewrite && epatch ${FILESDIR}/norewrite.patch
+}
+
+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
+	mkdir -p ${D}/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
+
+	insinto /usr/lib/courier/courier
+	insopts -m  755 -o mail -g mail
+	doins ${S}/courier/webmaild
+
+	# 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"
+
+	# 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
+	[ -e ldapaliasrc ] && 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 imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
+}
+
+pkg_postinst() {
+	cd ${S}
+	make install-configure
+
+	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
+	ewarn "There is one init script (/etc/init.d/courier)."
+	ewarn "Each component is activated by a line in its config"
+	ewarn "which is in /etc/courier:"
+	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/mail-mta/courier/files/digest-courier-0.46 b/mail-mta/courier/files/digest-courier-0.46
new file mode 100644
index 000000000000..55d6d5937c4e
--- /dev/null
+++ b/mail-mta/courier/files/digest-courier-0.46
@@ -0,0 +1 @@
+MD5 f49eb33ee9853541471cdff2cba0f9a7 courier-0.46.tar.bz2 4231972