version bump all around

8 files changed, 30 insertions, 390 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index e5f83e5cc59a..29196795e8e7 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/courier
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.2 2004/06/08 21:56:24 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.3 2004/06/12 21:29:01 swtaylor Exp $
+
+*courier-0.45.6 (12 Jun 2004)
+
+  12 Jun 2004; Scott W Taylor <swtaylor@gentoo.org> -courier-0.45.1.ebuild,
+  -courier-0.45.2.ebuild, courier-0.45.4.ebuild, +courier-0.45.6.ebuild:
+  new 45.6, stable 45.4, drop 45.1 and 45.2
 
 *courier-0.45.5.20040606 (08 Jun 2004)
 
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 9f285aee559d..7307f01c93b0 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,16 +1,14 @@
-MD5 32911e8287614709d73b25f7a44dc4f7 ChangeLog 10595
-MD5 8b79a4095f91cc564f497b2e24331ab8 courier-0.45.1.ebuild 10417
-MD5 3f39528d6cbb9e247c9173ee2c5c452a courier-0.45.2.ebuild 10452
+MD5 177428eb96fa2b0dceb6602be9a151c6 ChangeLog 10820
 MD5 7af6ae5b6f825d951f53c2e4a7e90e1b courier-0.45.3.ebuild 10593
-MD5 c808587a6773fcfcc7e10ecbbe4c5ee8 courier-0.45.4.ebuild 10597
+MD5 7af6ae5b6f825d951f53c2e4a7e90e1b courier-0.45.4.ebuild 10593
 MD5 998a12be29dc157df2b572c32afd5464 courier-0.45.5.ebuild 10694
 MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
 MD5 2440ceb0d5b910abf297c039a6f17214 courier-0.45.5.20040606.ebuild 10350
+MD5 bb0a1e64f30d69fcf169753fed7eb310 courier-0.45.6.ebuild 10350
 MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
 MD5 8041db031156342e93407a73a0ae75f5 files/courier-init 5206
-MD5 19f16c534bd7415495e705c2cea53232 files/digest-courier-0.45.1 68
-MD5 098744937a7da221c63e13d44eec5634 files/digest-courier-0.45.2 68
+MD5 006e9a4b15d7522f9af659ff660a606c files/digest-courier-0.45.6 68
 MD5 b33ce95a6a289678698a31aaf6d156d5 files/digest-courier-0.45.3 68
 MD5 e768202935622734d9020fe5d85ce079 files/digest-courier-0.45.4 68
 MD5 07b2658af088270c5cf410ea205a41cd files/digest-courier-0.45.5 68
diff --git a/mail-mta/courier/courier-0.45.1.ebuild b/mail-mta/courier/courier-0.45.1.ebuild
deleted file mode 100644
index 2aee306a0a39..000000000000
--- a/mail-mta/courier/courier-0.45.1.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# 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 ~alpha"
-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/mail-mta/courier/courier-0.45.4.ebuild b/mail-mta/courier/courier-0.45.4.ebuild
index 26b6630eb847..022c4a90aaba 100644
--- a/mail-mta/courier/courier-0.45.4.ebuild
+++ b/mail-mta/courier/courier-0.45.4.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.2.ebuild b/mail-mta/courier/courier-0.45.6.ebuild
index 41af10c80f27..d32984249010 100644
--- a/mail-mta/courier/courier-0.45.2.ebuild
+++ b/mail-mta/courier/courier-0.45.6.ebuild
@@ -2,6 +2,8 @@
 # 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"
@@ -9,10 +11,11 @@ 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"
+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/glibc
@@ -29,6 +32,7 @@ DEPEND="virtual/glibc
 	postgres? ( >=dev-db/postgresql-7.1.3 )
 	spell? ( virtual/aspell-dict )
 	!virtual/mta
+	!virtual/mda
 	!virtual/imapd"
 
 RDEPEND="${DEPEND}
@@ -39,10 +43,11 @@ RDEPEND="${DEPEND}
 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"
+#	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"
+	use norewrite && epatch ${FILESDIR}/norewrite.patch
 }
 
 src_compile() {
@@ -205,6 +210,10 @@ src_install() {
 	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
@@ -246,28 +255,18 @@ src_install() {
 	touch esmtproutes
 	touch backuprelay
 	touch maildroprc
-	chown mail:root ldapaliasrc
+	[ -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
+	set_maildir courierd imapd pop3d sqwebmaild
 }
 
 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
diff --git a/mail-mta/courier/files/digest-courier-0.45.1 b/mail-mta/courier/files/digest-courier-0.45.1
deleted file mode 100644
index 84c37f3a85e9..000000000000
--- a/mail-mta/courier/files/digest-courier-0.45.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 449b03a7d61e2174ad7dc65e4ddf57c6 courier-0.45.1.tar.bz2 4315822
diff --git a/mail-mta/courier/files/digest-courier-0.45.2 b/mail-mta/courier/files/digest-courier-0.45.2
deleted file mode 100644
index 0cf4b2884ce1..000000000000
--- a/mail-mta/courier/files/digest-courier-0.45.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6242d984744e1969db970ea798ecd564 courier-0.45.2.tar.bz2 4316064
diff --git a/mail-mta/courier/files/digest-courier-0.45.6 b/mail-mta/courier/files/digest-courier-0.45.6
new file mode 100644
index 000000000000..9e78b2a71277
--- /dev/null
+++ b/mail-mta/courier/files/digest-courier-0.45.6
@@ -0,0 +1 @@
+MD5 da08b5f7d2fc9f4a871a5584914011c6 courier-0.45.6.tar.bz2 4310616