courier bump

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 328 insertions, 7 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 3b858b19da2c..50f8d56ec82b 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/courier
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.115 2009/02/22 19:27:14 hanno Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.116 2009/05/04 13:33:47 hanno Exp $
+
+*courier-0.61.2 (04 May 2009)
+
+  04 May 2009; Hanno Boeck <hanno@gentoo.org> +courier-0.61.2.ebuild:
+  Version bump.
 
 *courier-0.61.1 (22 Feb 2009)
 
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 26aa777479b6..28cbfde1bb42 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -16,15 +16,17 @@ AUX set-mime 741 RMD160 8ed45fb4a0aee168a70cdcab6d17cf1606f85cad SHA1 b8834602c7
 DIST courier-0.59.0.tar.bz2 7121762 RMD160 580e57fd9d39b62772e07dcdec653379cd21caaf SHA1 6870d2b12f1c93d5ede12f2a5c9c1107a7fb647c SHA256 e488cc920ed970c6d38496dba21359b50c6032ff4f2f91432b5d23db261578ec
 DIST courier-0.60.0.tar.bz2 7067430 RMD160 f35a9329e87a948ca9abf6bd7fcc42e4bfe3adac SHA1 13be35f2631830ea2bf66831ea492d83b8247464 SHA256 c13da0a0b76c4a59aa219d037129b8305293d1091143027f2dfd631b9e470e64
 DIST courier-0.61.1.tar.bz2 7229642 RMD160 10e2eae71732a8d09ff9550ba035e66669248b7a SHA1 bfc8dd1a1af7f91b24fe715cea93428d4a874efa SHA256 979ff8342f53478c8f14cb79290d1a795433375c8ad18fc5aa950595a9973c90
+DIST courier-0.61.2.tar.bz2 7268675 RMD160 a738e534df69fee51aec50a53ce6e5d799f0eecd SHA1 aff9b418c84912832a81295ff4592a76fbe36853 SHA256 c240f2cfb96c0c94811152ea1495f41f72507bdef4e69806771f7203db0d1202
 EBUILD courier-0.59.0.ebuild 10180 RMD160 0bcd931b501817ffdacfcf2684763ade3c264376 SHA1 b73c6503fe10122d24ea45082a39efd0b156ac51 SHA256 6d78cd3a0037475b12a8c7247ad2c443887de326f2ef18804bc7ee65bcb9c837
 EBUILD courier-0.60.0.ebuild 10055 RMD160 7de8555d4e7287ed2171a779e95851fcdc73ad25 SHA1 0e43ae4359cf395e28515e20395d941afbd7f615 SHA256 3c447554f71ccb1e170cce6f5b15c4efc067058b8f877e0d5de8bf868579df11
 EBUILD courier-0.61.1.ebuild 9855 RMD160 995a86130253ef1a2f6e533f2d88a2eee35730eb SHA1 c44d107afeee163fbbc56bf8cac8aad5d53b2433 SHA256 63eb871a8e579846bf774dc185825e9b77f5c0b56fd43c274126cb842a6db7ee
-MISC ChangeLog 29943 RMD160 055b83db90baa1a1791687f915def9471978038b SHA1 974a1ff7e51ba9672d194e5c0b20923eebdc16b7 SHA256 f72726516f3b66e5b922afe226589230a809104315b9fd0d8514de8005b90a0f
+EBUILD courier-0.61.2.ebuild 9855 RMD160 79a41f370c9c48ed608b39d5b15b3b59acc736f1 SHA1 0bd13ab9b4133e1f11e473767771f05ef850303e SHA256 9388c539c2483b043cf26c4173b0b2a63a09ebe8870da0ce2de5bc739be1fe39
+MISC ChangeLog 30061 RMD160 03afd7b4182bd64a536813ee49d02d81ffeaefdc SHA1 c211c7316923c61932d0c0d0b2b723c1af81b00a SHA256 b4c44dc9fcd71b88c35fb03cd7bf86e8eec4c56591439b710d7aa3dffd6143b2
 MISC metadata.xml 687 RMD160 753323e40a9add2b07fd1f138c672ce283d2f255 SHA1 2e8255902a9e0394bd27e13e488e84ba70f05845 SHA256 ea417e66d396e793212529ed20f5570b0c97eb666a5ba52bb3202bbfbc022be1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmhpxkACgkQr2QksT29OyDYtgCfX5vKcXGZVE21QBvf2fIFDWdR
-uikAnjrkd795HDFqK09FUqmiDROTxlDz
-=94Nv
+iEYEARECAAYFAkn+7sMACgkQr2QksT29OyD51wCfb5V+uEyx9lVhD4G5N6xtd7R4
+HUMAnj5ja+nVxw3vLB/lobSenW1ZrGol
+=yhkE
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.61.2.ebuild b/mail-mta/courier/courier-0.61.2.ebuild
new file mode 100644
index 000000000000..a4a3be3b9e5b
--- /dev/null
+++ b/mail-mta/courier/courier-0.61.2.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.61.2.ebuild,v 1.1 2009/05/04 13:33:47 hanno Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+S="${WORKDIR}/${P}"
+
+SLOT="0"
+LICENSE="GPL-2"
+# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64 ~mips
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \
+	fam web webmail"
+
+PROVIDE="virtual/mta
+	 virtual/mda
+	 virtual/imapd"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.61.0
+	>=dev-libs/openssl-0.9.6
+	>=sys-libs/gdbm-1.8.0
+	dev-libs/libpcre
+	app-misc/mime-types
+	fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
+	pam? ( virtual/pam )
+	mysql? ( virtual/mysql )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( virtual/postgresql-base )
+	spell? ( virtual/aspell-dict )
+	fam? ( virtual/fam )
+	!mailwrapper? ( !virtual/mta )
+	!virtual/imapd
+	!mail-filter/maildrop"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+filter-flags '-fomit-frame-pointer'
+
+src_unpack() {
+	use fam || (
+		ewarn "File Alteration Monitor (FAM) is disabled"
+		ewarn "courier-imap will fall back to 60 second polls."
+		ewarn 'add "fam" to your USE flags to build as usual'
+		ebeep 4
+		epause 4 )
+	unpack ${A}
+	cd "${S}"
+	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+
+}
+
+src_compile() {
+	local myconf
+	myconf="`use_with ipv6` \
+		`use_with ldap ldapaliasd` `use_enable ldap maildropldap`"
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+	use spell || myconf="${myconf} --without-ispell"
+
+	myconf="${myconf} --enable-mimetypes=/etc/mime.types"
+
+	myconf="${myconf} $(use_with fam)"
+
+	einfo "Configuring courier: $(echo ${myconf} | xargs echo)"
+
+	econf \
+		--prefix=/usr \
+		--disable-root-check \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/courier \
+		--libexecdir=/usr/$(get_libdir)/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"
+	sed -e'/^install-perms-local:/a\	sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
+	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}" ; section="${4}"
+	[ -z "${section}" ] && section="${2}"
+	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+src_install() {
+	local f
+	diropts -o mail -g mail
+	keepdir /var/run/courier
+	keepdir /var/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR="${D}" || die "install"
+	make install-configure || die "install-configure"
+
+	# Get rid of files we dont want
+	if ! use webmail ; then
+		cd "${D}"
+		cat "${FILESDIR}/webmail_files" | xargs rm -rf
+	fi
+
+	if ! use web ; then
+		cd "${D}"
+		cat "${FILESDIR}/webadmin_files" | xargs rm -rf
+	fi
+
+	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+		keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+	done
+
+	newinitd "${FILESDIR}/courier-init-r2" "courier"
+	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+	cd "${D}/etc/courier"
+	if use webmail ; then
+		insinto /etc/courier
+		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+	fi
+
+	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+	if use ldap ; then
+		[ -e ldapaliasrc ] &&  ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
+	else
+		rm -f ldapaliasrc
+	fi
+
+	( [ -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"
+
+	use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
+	use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"
+
+	# Fix for a sandbox violation on subsequential merges
+	# - ticho@gentoo.org, 2005-07-10
+	rm "${D}"/usr/sbin/{pop3d,imapd}{,-ssl}
+	dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
+	dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+	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
+	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${P}/html"
+
+	if use webmail ; then
+		insinto /usr/$(get_libdir)/courier/courier
+		insopts -m 755 -o mail -g mail
+		doins "${S}/courier/webmaild"
+	fi
+
+	if use web ; then
+		insinto /etc/courier/webadmin
+		insopts -m 400 -o mail -g mail
+		doins "${FILESDIR}/password.dist"
+	fi
+
+	# 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
+	if use web ; then
+		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"
+	fi
+
+	# users should be able to send mail. Could be restricted with suictl.
+	chmod u+s "${D}/usr/bin/sendmail"
+
+	if use mailwrapper ; then
+		mv "${D}/usr/bin/sendmail" "${D}/usr/bin/sendmail.courier"
+		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.courier"
+		mv "${D}/usr/bin/mailq" "${D}/usr/bin/mailq.courier"
+
+		mv "${D}/usr/share/man/man1/sendmail.1" \
+			"${D}/usr/share/man/man1/sendmail-courier.1"
+		mv "${D}/usr/share/man/man1/mailq.1" \
+			"${D}/usr/share/man/man1/mailq-courier.1"
+		mv "${D}/usr/share/man/man1/rmail.1" \
+			"${D}/usr/share/man/man1/rmail-courier.1"
+
+		insopts -m 444 -o mail -g mail
+		insinto /etc/mail
+		doins "${FILESDIR}/mailer.conf"
+	else
+		dosym /usr/bin/sendmail /usr/sbin/sendmail
+	fi
+}
+
+src_test() {
+	addpredict /
+	vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	if hasq userpriv "${FEATURES}" ; then
+		if ! emake -j1 check; then
+			hasq test "${FEATURES}" && die "Make check failed. See above for details."
+			hasq test "${FEATURES}" || eerror "Make check failed. See above for details."
+		fi
+	else
+		hasq test "${FEATURES}" && eerror "Make check needs FEATURES="userpriv" to work."
+	fi
+	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+pkg_postinst() {
+	use fam && elog "fam daemon is needed for courier-imapd" \
+		|| ewarn "courier was built without fam support"
+}
+
+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
+}