bump

4 files changed, 287 insertions, 26 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index bb5a5da69995..55af3efbabd6 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,12 @@
 # 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.30 2004/11/29 22:54:38 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.31 2004/12/01 11:21:27 swtaylor Exp $
+
+*courier-0.47.20041129 (01 Dec 2004)
+
+  01 Dec 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-0.47.20041129.ebuild:
+  bump
 
   29 Nov 2004; Andrej Kacian <ticho@gentoo.org> courier-0.45.6.ebuild,
   courier-0.46.20040816.ebuild, courier-0.46.20040825.ebuild,
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 1cffec14e73d..b84e1ad1dcbd 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,36 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 dc1fdae09c0e0f686668d1874cd5062c courier-0.47.20041120.ebuild 8501
-MD5 2d81232a939038e8173a90112ffa8199 ChangeLog 15087
-MD5 7428e4492712d927ef9d824ed3e21d85 courier-0.46.20040902.ebuild 10010
 MD5 f1c79af8c8d27a040aa7d3b2e300220f courier-0.47.20041113.ebuild 8501
-MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
-MD5 535cffcb048d8826f40b7d115f511ae1 courier-0.45.6.ebuild 9768
 MD5 af7b91ede7e2795f877c23b908704d28 courier-0.47.ebuild 10449
+MD5 dc1fdae09c0e0f686668d1874cd5062c courier-0.47.20041129.ebuild 8501
 MD5 9482696d470d858a2e9331aed21191fa courier-0.46.ebuild 9766
-MD5 196c7b05683fb0dc849c7e49d6c5553f courier-0.46.20040816.ebuild 10008
 MD5 8169e6bebff6d078a1c11fad92e6ffbe courier-0.46.20040825.ebuild 10008
-MD5 8396693e821bf04e8382d047cc740b5e files/digest-courier-0.47 66
+MD5 196c7b05683fb0dc849c7e49d6c5553f courier-0.46.20040816.ebuild 10008
+MD5 dc1fdae09c0e0f686668d1874cd5062c courier-0.47.20041120.ebuild 8501
+MD5 7428e4492712d927ef9d824ed3e21d85 courier-0.46.20040902.ebuild 10010
+MD5 535cffcb048d8826f40b7d115f511ae1 courier-0.45.6.ebuild 9768
+MD5 4b0b1aaff5128c95787cbdb28d8fbdd5 ChangeLog 15218
+MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
 MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
-MD5 69648b339eb8e8a7338c02dbab3a0403 files/digest-courier-0.47.20041113 75
-MD5 006e9a4b15d7522f9af659ff660a606c files/digest-courier-0.45.6 68
+MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
+MD5 1c43ee40b3a67f8c6f30fa0f08293211 files/digest-courier-0.46 66
+MD5 8396693e821bf04e8382d047cc740b5e files/digest-courier-0.47 66
+MD5 098e16e61446aceb242735b1ca70509a files/norewrite.patch 489
 MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 MD5 28eba6ea784530a54e83fd33ee9402d6 files/digest-courier-0.46.20040816 75
-MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
+MD5 04278164118b43ab59e28746fe957787 files/digest-courier-0.46.20040825 75
 MD5 eaa47d52c853b14f1cd8e287403b8e99 files/digest-courier-0.46.20040902 75
 MD5 d41d8cd98f00b204e9800998ecf8427e files/locallowercase 0
-MD5 1c43ee40b3a67f8c6f30fa0f08293211 files/digest-courier-0.46 66
+MD5 006e9a4b15d7522f9af659ff660a606c files/digest-courier-0.45.6 68
 MD5 7bd4625b319ee834c65e73ec927cd2ff files/courier-init 5414
-MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
-MD5 04278164118b43ab59e28746fe957787 files/digest-courier-0.46.20040825 75
-MD5 098e16e61446aceb242735b1ca70509a files/norewrite.patch 489
-MD5 8df7a3c2e79b090de4822698adda09ab files/digest-courier-0.47.20041120 75
 MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBq6i/10xuJSrg3/sRAvDAAJ96gmbaDPqJvRsH06ELEd5/JOkm7QCaA8VA
-VH0vI1KgI1uuDnIBibds4Bg=
-=7MWA
------END PGP SIGNATURE-----
+MD5 69648b339eb8e8a7338c02dbab3a0403 files/digest-courier-0.47.20041113 75
+MD5 8df7a3c2e79b090de4822698adda09ab files/digest-courier-0.47.20041120 75
+MD5 548c02d9627ea67bf8109dcf960a60c8 files/digest-courier-0.47.20041129 75
+MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
diff --git a/mail-mta/courier/courier-0.47.20041129.ebuild b/mail-mta/courier/courier-0.47.20041129.ebuild
new file mode 100644
index 000000000000..7416fcc9b25b
--- /dev/null
+++ b/mail-mta/courier/courier-0.47.20041129.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.47.20041129.ebuild,v 1.1 2004/12/01 11:21:27 swtaylor Exp $
+
+inherit eutils
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" || SRC_URI="http://www.courier-mta.org/beta/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+#KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~mips"
+KEYWORDS="-*"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite uclibc mailwrapper"
+
+PROVIDE="virtual/mta
+	 virtual/mda
+	 virtual/imapd"
+
+DEPEND="virtual/libc
+	net-libs/courier-authlib
+	>=dev-libs/openssl-0.9.6
+	>=sys-libs/gdbm-1.8.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 )
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	!mailwrapper? ( !virtual/mta )
+	!virtual/mda
+	!virtual/imapd"
+
+RDEPEND="${DEPEND}
+	virtual/fam
+	dev-lang/perl
+	sys-apps/procps"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use norewrite && epatch ${FILESDIR}/norewrite.patch
+	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+}
+
+src_compile() {
+	local myconf
+	myconf="`use_with spell ispell` `use_with ipv6` \
+			`use_with ldap ldapaliasd` `use_enable ldap maildropldap` \
+			`use_enable nls` `use_enable nls unicode ${ENABLE_UNICODE}`"
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+	[ -e /etc/apache/conf/mime.types ] && \
+		myconf="${myconf} --enable-mimetypes=/etc/apache/conf/mime.types"
+	[ -e /etc/apache2/conf/mime.types ] && \
+		myconf="${myconf} --enable-mimetypes=/etc/apache2/conf/mime.types"
+
+	einfo "Configuring courier: `echo ${myconf} | xargs echo`"
+	./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 \
+		--with-db=gdbm \
+		--disable-autorenamesent \
+		--cache-file=${S}/configuring.cache \
+		--host=${CHOST} ${myconf} debug=true || die "./configure"
+	emake || die "Compile problem"
+}
+
+etc_courier() {
+	# Import existing /etc/courier/file if it exists.
+	# Add option only if it was not already set or even commented out
+	file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
+	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+	grep -q "${word}" "${D}/etc/courier/${file}" || \
+		echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+	file="${1}" ; key="${2}" ; value="${3}"
+	grep -q "${key}" "${file}" && einfo "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+	#sed -i.x -e"/\#\#NAME: ${key}/,+20 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+	#diff "${file}.x" "${file}" ; rm "${file}.x"
+}
+
+set_maildir() {
+	local f ; local files=$*
+	origmaildir='Maildir'
+	newmaildir='.maildir'
+	for f in ${files} ; do
+		grep -q "${origmaildir}" "${f}" && \
+			einfo "Changing ${origmaildir} in ${f} to ${newmaildir}"
+		sed -i -e"/^[^\#]/ s/${origmaildir}/${newmaildir}/g" ${f}
+	done
+}
+
+src_install() {
+	local f
+	dodir /etc/pam.d
+	dodir /var/lib/courier
+	dodir /var/run/courier
+	make install DESTDIR=${D} || die "install"
+	make install-configure || die "install-configure"
+	diropts -o mail -g mail
+	for dir2keep in `(cd ${D} && find . -type d)` ; do
+		keepdir $dir2keep || die "failed running keepdir: $dir2keep"
+	done
+
+	einfo "Setting up maildirs in the account skeleton ..."
+	diropts -m 755 -o root -g root
+	keepdir /etc/skel
+	${D}/usr/bin/maildirmake ${D}/etc/skel/.maildir
+	keepdir /var/spool/mail
+	${D}/usr/bin/maildirmake ${D}/var/spool/mail/.maildir
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/courier-init courier
+	`grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
+		newexe ${FILESDIR}/courier courier-old
+
+	cd ${D}/etc/courier
+	insinto /etc/courier
+	newins ${FILESDIR}/apache-sqwebmail.inc apache-sqwebmail.inc
+	mv imapd.authpam imap.authpam ; mv pop3d.authpam pop3.authpam
+	for f in *.authpam ; do mv "${f}" "${D}/etc/pam.d/${f%%.authpam}" ; done
+	for f in *.dist ; do cp ${f} ${f%%.dist} ; done
+	[ -e ldapaliasrc ] && chown mail:root ldapaliasrc
+	set_maildir courierd imapd imapd-ssl pop3d pop3d-ssl sqwebmaild *.dist
+
+	( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+		> ${D}/etc/courier/sizelimit
+	etc_courier maildroprc ""
+	etc_courier esmtproutes ""
+	etc_courier backuprelay ""
+	etc_courier locallowercase ""
+	etc_courier bofh "opt BOFHBADMIME=accept"
+	etc_courier bofh "opt BOFHSPFTRUSTME=1"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+	etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+	etc_courier bofh "opt BOFHSPFFROM=all"
+	etc_courier bofh "opt BOFHSPFMAILFROM=all"
+	etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+	etc_courier esmtpd "BOFHBADMIME=accept"
+	etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+	etc_courier esmtpd-msa "BOFHBADMIME=accept"
+	etc_courier_chg esmtpd ESMTPDSTART YES
+	etc_courier_chg esmtpd-msa ESMTPDSTART YES
+	etc_courier_chg esmtpd-ssl ESMTPDSSLSTART YES
+	etc_courier_chg imapd IMAPDSTART YES
+	etc_courier_chg imapd-ssl IMAPDSSLSTART YES
+	etc_courier_chg pop3d POP3DSTART YES
+	etc_courier_chg pop3d-ssl POP3DSSLSTART YES
+
+	cd ${S}
+	cp imap/README README.imap
+	use nls && cp unicode/README README.unicode
+	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+	dodoc tcpd/README.couriertls
+	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
+	insinto /etc/courier/webadmin
+	insopts -m 400 -o mail -g mail
+	doins ${FILESDIR}/password.dist
+
+	# avoid name collisions in /usr/sbin, make webadmin match
+	cd ${D}/usr/sbin
+	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv ${f} courier-${f} ; done
+	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"
+
+	if use mailwrapper ; then
+		mv ${D}/usr/bin/sendmail ${D}/usr/bin/sendmail.courier
+		rm ${D}/usr/bin/rmail
+		insinto /etc/mail
+		doins ${FILESDIR}/mailer.conf
+	else
+		dosym /usr/bin/sendmail /usr/sbin/sendmail
+	fi
+}
+
+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.47.20041129 b/mail-mta/courier/files/digest-courier-0.47.20041129
new file mode 100644
index 000000000000..24887fc2b1bf
--- /dev/null
+++ b/mail-mta/courier/files/digest-courier-0.47.20041129
@@ -0,0 +1 @@
+MD5 a2b33f46145c039f0e91c4f2240be7de courier-0.47.20041129.tar.bz2 5873444