5 files changed, 313 insertions, 2 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 59dfea54f7d0..099c8ba4cf11 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 5f17557c76a4..06b51faec7e1 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -4,7 +4,9 @@ AUX norewrite.patch 489 BLAKE2B f4ed2e1af731811d8da96ee817335016c5ec9a77a53ccd19
 AUX password.dist 247 BLAKE2B 1803a6663c32ccc74c4dfb1d591a01d4416f9de9c4bf35c9a7ca277c2007b8c29a8899f4285c78eeb8592766457eef0caf377a344adee7a61be15bbf8b80c7de SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d
 DIST courier-0.75.0.tar.bz2 6970339 BLAKE2B 2c2f9900ab0370eff8b1a62759295e2d0598153075ea9a2f832d59272c5a21d5ab912fc852c7e75d7510d5ddf2d1484e830e6bf57c6952839f8688f174b6f27d SHA512 37e66329f157e18176d4ac8c5e814be78e80ff7dec234886bec8dce2ae5c58ac68bc18e07c739295c25fae8ec778b162bab505d85ea0998db7192d52c47e7bc6
 DIST courier-0.76.4.tar.bz2 7237424 BLAKE2B 7dbfb43cef75ed5187e044130c6cb793848791956a8531fcc54ae7a444e475c16219816c2ad7834e3b5349cf945f59023f0b9e2415c7c64352b5aa71eaf00bbd SHA512 6350ef5e30bd1e4921350bf3a09de0b56513530852c93f9a06e23625e49ae09d7ff26558da1f816a5bb492579afb5c1cbcf7573199bf898a039cd3607e847c30
+DIST courier-0.78.2.tar.bz2 7379529 BLAKE2B 5ba1ef013e513b269746999b2dd75f37fe8a9f1d87a51b61db1a8100c9a5cd022039462c235d35a95cf14ac5c406becf0f5d4f9344462e862045dc7333b7a0b7 SHA512 376de08cbaf9c2c74cd79e5d42680d8d6c31ecf0b0ef014f4152aa857224ba3e6d9e0f91b5097d15dcb5de9a5603a4707bc9b78902a5934c0a0ca68b74212055
 EBUILD courier-0.75.0-r1.ebuild 9427 BLAKE2B 2c79ee832a5c23990cf3c676a84bdfe0ec4dec2cc62baceee062f6948fabd39f214b6df76546d3987094ca71ccadfe3e4129b4ab980054f6f09188f5051dbf23 SHA512 f2f24fc78ef2865f2734802004abbcad11fd78ff11ec3ea4f9a5a9599c227553bb3c4f73225aef46dba28961e4c9113f722fc1ec9d9bebd23f83097efa4ea866
 EBUILD courier-0.75.0.ebuild 9322 BLAKE2B 5baacc0b69ae5c84269f86b1292f65ede233fbc4b97c81498627182b9dff5f7dd8256f29cbb8115d478bd4e82a0fb4e03b8adc84e6b6cada2f1e058e41e3cce3 SHA512 11c0d1f278d13d0ff77691f48065c289870545414161e35fd10dd95c429a1e2adc97f1cef3da578211468ec46b74fa7b698a8fbf6205c1bd7b05b1f71c6b9434
 EBUILD courier-0.76.4.ebuild 9327 BLAKE2B 6daccaf5e311202f157887017b63e5e890595ed73a0c52cd87e1ddcf0b3d31666c4bbd443116868efe9b555661b94da8c575d1cb21dabf6c3fe64248f2488ec3 SHA512 91a9cf8f9f2953b97793e6c1fe3db0e3e0eeb81692a8604eef46736b58584235bff3194db8d4de2d062e4d90a267c2e578623f8a2c4e710b7092273096672a90
+EBUILD courier-0.78.2.ebuild 9326 BLAKE2B 67554fcb0129810772ff951205ea84f640fb24da44a2b65f87535b14069e58868f7c7c55e77f6533a5530710954eb4c3d8d5545191f190c13ca95b4f95da6628 SHA512 e4993a1480d23f2b75400626d9f5ba0ef5f212ed44181383ced92c3648ed99efe59d684128c55296240c80f85ff42d7161412856f7eea2754f319078278fcf0f
 MISC metadata.xml 860 BLAKE2B 7d4e6eed638b9c07079d56a5c195a27d77ede8f9be9400b2f7158214f6d065c836422ef64110e3ff580be7c1936ef6c470f4ed6ca7cbe6e2744487fd6bb637a2 SHA512 00c4c31649f17ac2fba94122762bcd4c2f9b57ad3117645c1f0607d6d214ecd6c9c789a7b2d48b1945472e38da49257ea2903b1abec3294cfecbc25ff4501c7e
diff --git a/mail-mta/courier/courier-0.78.2.ebuild b/mail-mta/courier/courier-0.78.2.ebuild
new file mode 100644
index 000000000000..9c648ef0233e
--- /dev/null
+++ b/mail-mta/courier/courier-0.78.2.ebuild
@@ -0,0 +1,309 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+REQUIRED_USE="?? ( gnutls libressl )"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.68.0
+	>=net-libs/courier-unicode-2.0
+	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )
+	libressl? ( dev-libs/libressl:= )
+	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:= )
+	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/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp
+	!mail-mta/opensmtpd
+	!net-mail/dot-forward
+	!sys-apps/ucspi-tcp
+	"
+
+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_prepare() {
+	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+	default
+}
+
+src_configure() {
+	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
+}
+
+src_compile() {
+	default
+}
+
+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/lib/courier/tmp
+	keepdir /var/lib/courier/msgs
+	make install DESTDIR="${D}" || die "install"
+	make install-configure || die "install-configure"
+
+	# init script takes care of this
+	rm -rf "${D}/var/run"
+
+	# 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-r4" "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 ../share/courier/pop3d /usr/sbin/courier-pop3d
+	dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+	dosym ../share/courier/imapd /usr/sbin/courier-imapd
+	dosym ../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 libs/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 ../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
+}
diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 260a0c7f8c73..e8f8f4ec29a3 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -34,7 +34,7 @@ DIST exim-pdf-4.91_RC1.tar.xz 1967968 BLAKE2B 0caae1d8371dd2d90b24c84d4636c17215
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
 EBUILD exim-4.89-r5.ebuild 12585 BLAKE2B 4ab8179cf41e847edcc23214e149e5af9270ebd9367cccf233c17ed3406299f810a195ccbb75368f8a2921a717814e2d4e33dcbe4525cba2d7ff76384138eda3 SHA512 fdd78249ade5e6d1d11a47a71283d47940709d8292b6129722d63f91d422067f4850c350edf28dfce88b7513785f0f0f764bf98a9155be62af404343153c144b
 EBUILD exim-4.89.1.ebuild 12309 BLAKE2B 03cb1d877ccc0057c3242efe64979621c6455aac6371f2ea5cb7eff13b71bc9858cd427d3335269543e03591b2d8b9cb128ede714ef58611b60cdb98e5036adb SHA512 03c237f71fd4d5ede14c02314f2ffce98ccc04337b49ea089d7abf1bceb457eef2baede38d047a75d43d76ec367c0e0f21adb524db0dd8429c6d23dc4f9dbe5e
-EBUILD exim-4.90.1.ebuild 12234 BLAKE2B 48edebc5d04cf9dafd88ab8eb02f2497f87e2710df5be1cf5f59698f1cabc47fbc0e02c9d10c8288cd24b5657edbc116ef36d6d92a9c970716fd8c058cf8e3b5 SHA512 32c2685932041fa678bd8fefbf6f0393a4b23eeaf22b99d19ce4604f04e1c758fe2039457fbd6704eae73927967667c85f200f233a85cb6c6ed2b7416acbee0d
+EBUILD exim-4.90.1.ebuild 12233 BLAKE2B c89aca30fd9de8eec5ab1fc82a6ba1ad9d77c604122d3641921d8e0f2e5647a7d615674569b1419c22ac7d614ea21f0969ca2c6f23ce780e379bb4f229800b1f SHA512 d6d922d545f3c7950be992dc70740f43b76296dfcbf28045a92fe7aa56a3a8e56bf2d899406aa21d2c994379d581728e95f2d9fdd58d7a02154c46ab0df9b9a6
 EBUILD exim-4.90.ebuild 12241 BLAKE2B 62d34f83130e91e4feee5468b1088ef78d23f7fed201b652c13b3c9d22330200cf8b01e745dec0fd4ebc80c4f44614cad744e9944d2c4376f719bf1d20c0a720 SHA512 f3f6ebe42fa81f5527ffdd786a6ab76704bd2bb2caa7263d3931dc1a234fdb27bf2c4c5459d1c2339ad0904906aa2463368135b61b8194c19d3cdda1ac260540
 EBUILD exim-4.91_rc1.ebuild 12451 BLAKE2B 08d93459c37c4eaa5e3270a3a981cabde59476cd898b78594404122f369a5a0f0373d45e605b575b08ea2bce9ac12a19c4aa2a06d20956ad097f5d451e387da3 SHA512 e6a0db7206181e58f1141e64f851b79d3cc70ae6ace0e6ced0656ccd897bd430fd6b2e489ceb530d31e235fdb5514269db0d390c3a8725301574fee84e6483fc
 MISC metadata.xml 2562 BLAKE2B b6eecf1c5ab931f7e0cd1524efcd4408cae9a4788b04ff7e0667aaa38dea77151bbfc0fddce5cedaca1e06e081f0f050106bb374be2beaa93e21ab350cd6f6bf SHA512 74abffc1cdcc3f1d15644422519d248772f7024c76f612bbad33a2b720043f92c82623598bcd9766ce141a8196224f7cd35ce155c11692346c950b20e8657382
diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index cd09df930e66..9bc64560b940 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
 	>=sys-libs/db-3.2:=