courier bump to snapshot

Package-Manager: portage-2.1.11.2/cvs/Linux x86_64

3 files changed, 324 insertions, 6 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 1d796d02dd85..515288c6ba5d 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/courier
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.151 2012/06/04 21:15:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.152 2012/06/27 15:46:18 hanno Exp $
+
+*courier-0.68.2.20120626 (27 Jun 2012)
+
+  27 Jun 2012; Hanno Boeck <hanno@gentoo.org> +courier-0.68.2.20120626.ebuild:
+  Bump to snapshot to fix bug with file ownership (#409943).
 
   04 Jun 2012; Zac Medico <zmedico@gentoo.org> courier-0.65.2.ebuild:
   inherit multilib for get_libdir
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index d4e4a80870ce..afaaaee5a34c 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX apache-sqwebmail.inc 347 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 SHA1 4996c33b74a3c9b70886f27948334e3880df8073 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65
 AUX bofh 23 RMD160 995b6b103c29f390c2f0230af95d4c0823423dcb SHA1 f6399bc612af33ca79921961b223cbdf394d9549 SHA256 7e42d61373770a2b14a6fdd8b5f71c598ce4767726f8f7106de00b7c34a59e8c
@@ -13,15 +13,27 @@ AUX password.dist 247 RMD160 eab211be0b1e3dbd6206f79e993b1d314a24efa3 SHA1 2cdd5
 AUX set-mime 741 RMD160 8ed45fb4a0aee168a70cdcab6d17cf1606f85cad SHA1 b8834602c7304d42f3179a8dde43dcc57d0f4972 SHA256 bf15af7c181d517a924cb82854cbce46278e6e28ffb338e2159ba89c386dc74f
 DIST courier-0.65.2.tar.bz2 7152680 RMD160 6a81f74c85f9e78e6514f840598dde634fe070ce SHA1 784893216ea6c43c91606fa550cfdff13060855d SHA256 496361b8734381ba6128c7b0d5fe4c64ce7d807c01a74aae2cb5be8bb29e5ab2
 DIST courier-0.66.3.tar.bz2 6871617 RMD160 144dc6d5fc2279e50a2f9f349c9c69dd638fe7f8 SHA1 31928fc09dc4e89adae4a601d45df0a9486b7c76 SHA256 5d2f68bdcc89e6a62327b9afed1703a9d2a674f60e0996291f301e7db48d15b5
+DIST courier-0.68.2.20120626.tar.bz2 7068120 RMD160 281ca8659451777a69539145f8c855534819e9ee SHA1 40270febb4e2b99402ff6850eb5cb72bc7519f7d SHA256 b1afcd7454cf893a046b090d25e3fde568108dbe0e9df015cdf97a9a0a99ab46
 EBUILD courier-0.65.2-r1.ebuild 9222 RMD160 195dc916e26f19c3338ab602d0f39751c6ec31ad SHA1 385f0447dd63a228b25a1c063e93d43ac0318529 SHA256 5fa0dc88505d92f876439d505dfc85435ef622888d4d621fd63f307ccc3140eb
 EBUILD courier-0.65.2.ebuild 8971 RMD160 2c5857a9cf08281dd166453d89d88896c4353736 SHA1 34a85bb5f7e33212dba5705ab24502d7f4d3b8d4 SHA256 9b8940e28be0dedf863332a845bdbcbeadd00ce0de2f9c9a5271581821f4db6d
 EBUILD courier-0.66.3.ebuild 9299 RMD160 460366154442644c256d98ca95b3a135e21489f4 SHA1 35ac55c4fd363618d66f4c1d10fb2c74a5f1e369 SHA256 bc3732632f2ad5c315a41360666d95b45822a93b074b0a25b82221237b0a09a7
-MISC ChangeLog 35815 RMD160 4d34f2ba12d974cbdd136f38c3456984facdaf94 SHA1 cf2a5a3348f35f4d269e398284a70325d2f76909 SHA256 261f32ecec8e3419e504947da249f27e3d3693cd54f432aa29e0b6d8ecba8351
+EBUILD courier-0.68.2.20120626.ebuild 9308 RMD160 7b4713b9c7a5c133fcb181565acce0863ccda123 SHA1 c71b0f9c736c069e342051ff80c478105323e773 SHA256 62724314c08d28af08e9a7970fd9ed632f525dd2482029cbbebaa3da5db29ed5
+MISC ChangeLog 35994 RMD160 e852b86d2c930004b5c1ddf0419afcc91877260b SHA1 a7891d60f7dc75114de9defdfbfe14c46761c9b0 SHA256 1559f3bf9a314463cfe789e36b18ce8203005ea245a873f32213943a75984e61
 MISC metadata.xml 688 RMD160 d6ea2c5c87e6f305adfef15da4cbc91affe577af SHA1 eaa2f9fea774bdbc651a59929e2fa84f2292b335 SHA256 1cb15a4a98fc9fae0e167e7aa9f8672f3456af2320bb3f8f011ecb612eaa1557
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/NJW8ACgkQ/ejvha5XGaPFTwCeO4Xbwaaj09V+HzkJk3My84O0
-KwsAn2pugV0Msm7bwcEuU4hgM2wVc4Uv
-=biJ5
+iQIcBAEBCAAGBQJP6yrBAAoJEKWIAHK7tR5Csl0P/0VlPFpmJyML98UGKmihinBa
+NBT57lNBfs49U8sEKCTaQsqi+OSaddxgAsHEf011hBmlDt+Q71TqVr3ZIKUPdg01
+eX3yGPoGpUcRLnvgfFbb+dgA0Qfw39hKIM8HCp3bIxV2ocandfPss7RAoBJw2PUC
+rrQQVk96qTHOJ1cNIQgnreum8Qay99bf8vy7FwM1TKtkyIloXfNEnSA46Jf/5n50
+4sjkSZiHXX4xX+TKH5poQpxPviixPHINBIXgx/Er2ijmivvTsILipmGjTczsL1f1
+KmUVJnPkK01kLcP/xbmd19lF6sEJvKJzJ0g2leh4SEouFMSLnIcT5P/6sw9IlnEL
+b9d+VLw8vhgUwtMDiMikyplUgHXRGbYLaDPJPodD1AvU9QvGK0pySnGhnGb7euoY
+Ocoynq+LK4ESYPtoCOYTq14Xw4z5YjtHyTDpcwlL3tv1uP4HJmKPOynoYbkSz83t
+tudVC03qUlOJTkhXshBWhT+irGGfiBnNim4ovXosYL67gI3k5ck06I5eyjraejdG
+EovZR+vKBEgziTFgVWRgLLchQvASdy2CnLxl6OSOy3KMOJY7H3KxCU+DvcnsXtnO
+8w6hKEy36ZyDjkFCBn/hv8DmvNiPmyMzrnjt+s3q9Gi7HL3udsyXlHjwYXU9cuvp
+aYyHEjHO3QHaY0V3Kio5
+=5y34
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.68.2.20120626.ebuild b/mail-mta/courier/courier-0.68.2.20120626.ebuild
new file mode 100644
index 000000000000..6fd1db3945f0
--- /dev/null
+++ b/mail-mta/courier/courier-0.68.2.20120626.ebuild
@@ -0,0 +1,301 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.68.2.20120626.ebuild,v 1.1 2012/06/27 15:46:18 hanno Exp $
+
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+SLOT="0"
+LICENSE="GPL-2"
+# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.61.0
+	!gnutls? ( >=dev-libs/openssl-0.9.6 )
+	gnutls? ( net-libs/gnutls )
+	>=sys-libs/gdbm-1.8.0
+	dev-libs/libpcre
+	app-misc/mime-types
+	fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
+	pam? ( virtual/pam )
+	mysql? ( virtual/mysql )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( dev-db/postgresql-base )
+	spell? ( app-text/aspell )
+	fam? ( virtual/fam )
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp
+	"
+
+RDEPEND="${DEPEND}
+	dev-lang/perl
+	sys-process/procps"
+
+# get rid of old style virtual/imapd - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
+
+PDEPEND="pam? ( net-mail/mailbase )
+	crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+}
+
+src_compile() {
+	filter-flags '-fomit-frame-pointer'
+
+	local myconf
+	myconf=""
+
+	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+
+	econf ${myconf} \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with spell ispell) \
+		$(use_with ldap ldapaliasd) \
+		$(use_enable ldap maildroldap) \
+		$(use_with gnutls) \
+		--enable-mimetypes=/etc/mime.types \
+		--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}" 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
+		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
+			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
+			"${D}/usr/share/courier/sqwebmail/" \
+			"${D}/usr/sbin/webmaild" \
+			"${D}/usr/sbin/webgpg" \
+			"${D}/etc/courier/webmail.authpam" \
+			"${D}/var/lib/courier/webmail-logincache" \
+			"${D}"/etc/courier/sqwebmaild*
+	fi
+
+	if ! use web ; then
+		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
+			"${D}/etc/courier/webadmin"
+	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-r3" "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
+	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/${PF}/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"
+
+	dosym /usr/bin/sendmail /usr/sbin/sendmail
+}
+
+src_test() {
+	if [ `whoami` != 'root' ]; then
+		emake -j1 check || die "Make check failed."
+	else
+		einfo "make check skipped, can't run as root."
+		einfo "You can enable it with FEATURES=\"userpriv\""
+	fi
+}
+
+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
+}