masked for a reason

4 files changed, 360 insertions, 13 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 373883c68c2b..4ce3cbbc3791 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.22 2004/11/03 04:31:49 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.23 2004/11/16 08:47:46 swtaylor Exp $
+
+*courier-0.47.20041113 (16 Nov 2004)
+
+  16 Nov 2004; Scott W Taylor <swtaylor@gentoo.org>
+  +courier-0.47.20041113.ebuild:
+  now requires courier-authlib. work in progress.
 
   02 Nov 2004; Bret Curtis,,, <psi29a@gentoo.org> courier-0.47.ebuild:
   workes well on mips, but marked ~mips for now.
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 02d70f60f68b..adeb9fd6d2a9 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,22 +1,24 @@
-MD5 fc69669d502e1697adaf07939c524de4 ChangeLog 13838
-MD5 b8368687c56e9fa6d7efff0ddba8f848 courier-0.45.6.ebuild 9772
-MD5 d4687331805cb345c9a2d8a4e9d378c7 courier-0.46.ebuild 9771
+MD5 e55244a2764aa620f87c19b392e1e7ce courier-0.47.20041113.ebuild 9509
 MD5 b6f5e2a53855850e07291061a7f416ab courier-0.47.ebuild 10452
-MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
-MD5 2c9b2ac349116b05205ba423fc01ac15 courier-0.46.20040816.ebuild 10012
+MD5 d4687331805cb345c9a2d8a4e9d378c7 courier-0.46.ebuild 9771
 MD5 f5d9aedcd49226196f2c35273f45488f courier-0.46.20040825.ebuild 10012
+MD5 2c9b2ac349116b05205ba423fc01ac15 courier-0.46.20040816.ebuild 10012
 MD5 5463e630d0d43bed171473ae01d30dd4 courier-0.46.20040902.ebuild 10015
-MD5 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
+MD5 b8368687c56e9fa6d7efff0ddba8f848 courier-0.45.6.ebuild 9772
+MD5 02d786d2e9309caa64b056de9a7dec94 ChangeLog 14014
+MD5 b287829e2f9edbcf1ff7bb349055e77e metadata.xml 392
+MD5 52f032e570c6f5f9f69b4e4bdfa562a1 files/password.dist 247
 MD5 a546a21f960e4f921e71f614f719a2ce files/bofh 23
-MD5 b846c1b4897e1129dea2b08adfd6bb90 files/courier-init 5332
-MD5 006e9a4b15d7522f9af659ff660a606c files/digest-courier-0.45.6 68
 MD5 1c43ee40b3a67f8c6f30fa0f08293211 files/digest-courier-0.46 66
 MD5 8396693e821bf04e8382d047cc740b5e files/digest-courier-0.47 66
-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 d8967dea60963b1c0abaccbb2c57ea64 files/apache-sqwebmail.inc 347
 MD5 28eba6ea784530a54e83fd33ee9402d6 files/digest-courier-0.46.20040816 75
 MD5 04278164118b43ab59e28746fe957787 files/digest-courier-0.46.20040825 75
 MD5 eaa47d52c853b14f1cd8e287403b8e99 files/digest-courier-0.46.20040902 75
+MD5 d41d8cd98f00b204e9800998ecf8427e files/locallowercase 0
+MD5 006e9a4b15d7522f9af659ff660a606c files/digest-courier-0.45.6 68
+MD5 b846c1b4897e1129dea2b08adfd6bb90 files/courier-init 5332
+MD5 e3a4ab031bd750b7ce2c7b85fee83d8e files/set-mime 741
+MD5 69648b339eb8e8a7338c02dbab3a0403 files/digest-courier-0.47.20041113 75
+MD5 4eb96413bfbc91629bdf43526716cd1e files/dot_courier 26
diff --git a/mail-mta/courier/courier-0.47.20041113.ebuild b/mail-mta/courier/courier-0.47.20041113.ebuild
new file mode 100644
index 000000000000..a52fe1b478f2
--- /dev/null
+++ b/mail-mta/courier/courier-0.47.20041113.ebuild
@@ -0,0 +1,338 @@
+# 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.20041113.ebuild,v 1.1 2004/11/16 08:47:46 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"
+
+PROVIDE="virtual/mta
+	 virtual/mda
+	 virtual/imapd"
+
+DEPEND="virtual/libc
+	mail-mta/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 )
+	!virtual/mta
+	!virtual/mda
+	!virtual/imapd"
+
+RDEPEND="${DEPEND}
+	mail-mta/courier-authlib
+	app-admin/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`"
+
+	if use nls && [ ! -z "$ENABLE_UNICODE" ]; then
+		myconf="${myconf} --enable-unicode=$ENABLE_UNICODE"
+	else
+		myconf="${myconf} `use_enable nls unicode`"
+	fi
+
+	myconf="${myconf} debug=true"
+
+einfo "${myconf}"
+
+	./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
+}
+
+set_dollarmaildir() {
+	local files=$*
+
+	origmaildir='Maildir'
+	newmaildir='$MAILDIRPATH'
+
+	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
+	newexe ${FILESDIR}/courier-init courier
+	`grep DAEMONLIST /etc/init.d/courier >&/dev/null` && \
+		newexe ${FILESDIR}/courier courier-old
+
+	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
+	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}
+	use nls && cp unicode/README README.unicode
+	cp imap/README README.imap
+	dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO 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
+
+	# 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_dollarmaildir 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
+	einfo "expect was removed as a dependency due to it's limited usefulness."
+	einfo "If you need the ability to change passwords via webmail _while_ using AUTHPAM, you'll"
+	einfo "have to emerge expect manually. Other auth modules are unaffected."
+	ebeep 5
+}
+
+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.20041113 b/mail-mta/courier/files/digest-courier-0.47.20041113
new file mode 100644
index 000000000000..c4752496ce11
--- /dev/null
+++ b/mail-mta/courier/files/digest-courier-0.47.20041113
@@ -0,0 +1 @@
+MD5 15c6662f612355f4d0528d7334bd9f2e courier-0.47.20041113.tar.bz2 5872069