courier bump

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBBB51E42

4 files changed, 353 insertions, 5 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 995c108bf223..360530e04a1c 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/courier
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.176 2014/11/03 12:50:58 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.177 2014/12/14 01:32:05 hanno Exp $
+
+*courier-0.74.0 (14 Dec 2014)
+
+  14 Dec 2014; <hanno@gentoo.org> +courier-0.74.0.ebuild,
+  +files/courier-0.74.0-fix-linking.diff:
+  Bump, fix --as-needed linking.
 
   03 Nov 2014; Aaron W. Swenson <titanofold@gentoo.org> courier-0.71.ebuild:
   Update PostgreSQL dependencies and/or checks to virtual/postgresql.
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 6af078317dfd..c1f55af5b1ba 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -2,17 +2,30 @@
 Hash: SHA256
 
 AUX apache-sqwebmail.inc 347 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65 SHA512 e3f8f4f01563184ec4afc98d61ab739d5900f7d8757638fb06ff21ca3604f8c6f708730af514f6ca662559980503dee5955ba48c5a643e473054f3eec49b89a0 WHIRLPOOL e586f1bcf82af87df2285ec142f92056fd25df515b2cdc1027d62a97a26ba8205204c192c0bf0b59fb636ca84f70baadd79ea8a60bf9cb97db34e2b66aaee8f4
+AUX courier-0.74.0-fix-linking.diff 1101 SHA256 638fff8645c0d23e1614cf9657cc314a22a0e3d0ec69baf576124d0f27b7d7ae SHA512 019f59a477732c154681629c70a36380e810000350aca3e6f306faf532c797ac9d1f1f8c58d9d433ef87be58e5fff2a1dced53895686faf6ede55216b4c25a95 WHIRLPOOL 246bf9aa882f210e345f0687c5c587f46625f65a4ee5d33fc2715c8866ff3b17ec663e568f82c76740e52010f24bf9e00d0ec888be5eea2deae77bcfa5cf101d
 AUX courier-init-r4 5076 SHA256 69d826eb81803db8eb69aefc94e7d5fcdc2bb4fdc029b5bad2e486b94e71fe49 SHA512 30a575991a96110bbb79e30a7cf94c9cd5c87e364fa412f605a8856163707f04886e2955cf2b5b8a6f827ae45799adb15236fe5ea3e50fd2887dd0bf9596101f WHIRLPOOL 3218e0769b7184f8f11310f17572e1892ff6587b5ee2d9a53fa22222a320c4d5781e4974a485577c3f292acb3b914bac79bb91b18a59dfc7bc8a2a48c8b5b66f
 AUX norewrite.patch 489 SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4 SHA512 e9e95bd5d1a78b510f6dd7e155999089f123eecfdc16d3b5005b00981a7b6d29827cdddc61035ed3c3edcf0b9907ddfbae76df6503a1a8ef26b4de43a02bfc8e WHIRLPOOL c41a0b63a2109ac33532de0830257929995383d246eb3f84674e6fcf267ce5cc0b7e8ce339926429a7212f63aa117b5de65bc870f21b0a4a545f4b3f10827323
 AUX password.dist 247 SHA256 46f20a84922d108d39a7c26ad3ba8915326549f46cea811e2384f55a589d38e2 SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d WHIRLPOOL 98883b10ae103663d1d1205532e6c243bb462e9dc2adf1b9d6a968f9246283bbb2aabb8779ab5d8b7d052a5a3032f9d113ac74c773bf7591e81ccf086a2e51b3
 DIST courier-0.71.tar.bz2 7117940 SHA256 e06058ed6163bd7e706517ad183fb26faba00ff0ad649557123e5f33f265ebcd SHA512 08b02b006c978c4e1d12241d3f687a201e65afbd6a7ca49f10c77c4ddad0b1d89bb43169b1eb7cd90af30117ffa13911794da3f7dec3429c36b4bc3a9cf3cac8 WHIRLPOOL 47b1d5c4adbd1b387a2a2d412f7d55cc661b517e72bc7a29bec07c098dd5efffe91fa85c9ecae701049e0c08a7d4b1d1b777d24befe1103ad079eb9e8dd1e61c
+DIST courier-0.74.0.tar.bz2 6952034 SHA256 13865f9e21ed8b6786323aa228892a32593918b55379fbdb4f3fbc65425b6859 SHA512 df96ca0d47d0d3f118944e865eff880b2f42959ef5f62fa48c9c9a0948c431cc6911dac2f93ed0a7a22602de123676ad6076b01055ad773966134b3b6840a847 WHIRLPOOL ef0940506341f2f709ba61698ad2d34b47e28f7d9232d8e7c1de395380e43524dc03263efcd304b690aca14b125c7249c915d062e410560421a0572978786903
 EBUILD courier-0.71.ebuild 9313 SHA256 3e383e41fe9ac38519ea80aca0e64ce600f91870b8433467817aa572d5dc8f89 SHA512 4acc69d770c796ae1904f1e42cd7ece8264927b299a76f5a51fc4f06e87cfbe90f3bd632a29d3185212a1ce892c73bfed2c8f6f4d182f3c841e9c9562be64158 WHIRLPOOL f88c27ff934ca1926e63a58f6a1c2187ea02d099376978d0c50cda6adc43ad5af057ecf1d6e9d353ebbc78ac91dfb0ac06e457dbe0ab0fda6b2eb97a91c53df4
-MISC ChangeLog 39354 SHA256 b84d98cb7a1fcc6c8649bfa02d902e10b565e500156514b70178495561fb7fae SHA512 57447965af7438e28afa06c458d5472a058eee7d272154b0dc54bdce999ecce2f1789959050007a5fb48fc3b37807e48be3b2a7664b92d9980618767c58048c4 WHIRLPOOL 16f45b9646c920a9710b6ee437758af5159b5cc2377adabe01f5dd5961c4e08ca51ce7308245104b013a03be2118a2fad7949289e82ca7eeaca4c76093e1248a
+EBUILD courier-0.74.0.ebuild 9398 SHA256 cc4f47755c19936d606535a4ff7ab1eba8e5cadda8c36a4c721913dbda85a73e SHA512 532b64e22f58bbe9efc7530eb6b4e2451a5e4653fe20220888e5f3f4963ec8ad943d585a26aeb072029786fc3b56fed4c1f6f40b6fcd32322443bf3c8f5b9250 WHIRLPOOL 7ec96dd185774f0db49c16164339b92186cfcd3bcbc90cb35b9f5df0163aa3a1a0fcfd2e94605f89bbd1f694827a3188ace439a3943467cafbf550d3ac2f5783
+MISC ChangeLog 39514 SHA256 ff2597cf390ac1f1d7f3c5a5a7778c46b90297ec9c0b002048f7ed231b157575 SHA512 51e2a13b014cb0b5bc77809de5eb1b9a2059cc299e4abbd4a5d3bd630dd3553c3e464c48675fce7ec245912511caf0330c84ce66b246ce87f092b5834c4618de WHIRLPOOL 12c650f880522b726c728034cac49dd60e910ea36747395260daaee212ed9915f2edbcd55ca0bd1f3b6af31afcb27804b714cedeaaa928522da5095b4fffdccf
 MISC metadata.xml 688 SHA256 1cb15a4a98fc9fae0e167e7aa9f8672f3456af2320bb3f8f011ecb612eaa1557 SHA512 07955a3efaadb572270bcaf9fab65f988d3999834fb95515003e7022707731877efbb7a749622b57b3a768db27db331a5efb3beb0637ac8e6def1d667dcc93ae WHIRLPOOL 07da4b25e2640c2ce0318e5fa2086b3f4f187e821940b7304184a0b4634e0dfe55edc7b359430c76c6617ed512ff68ad33cae150c1e34e0deb9d04484c0408aa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlRXejQACgkQVxOqA9G7/aCcxQD/Z+8/n1UglRqgo+lO2kctUBYV
-JWJ0irsJvSak7Wrie80BAJZPlK8Or0ySr8QUtPiA6JdWXl7NOzByLY/+JSG0TMcY
-=4KzZ
+iQIcBAEBCAAGBQJUjOiWAAoJEKWIAHK7tR5C+6wQAI7X+4qnpjo2Fj96ITt46SLz
+4DDWljLg0Ocr0fLXV8GpTTuBd/MdYGM7OPhntGh4/D+StfTHfRv6o1SjTISiUMX1
+FLhI4rDbGBbLY1JUuNSSNuZzK5rLj66zgsSiDpv7m6PXOmNXd4Fr8v4SOSDaAb2n
+EtLhKzMASegyJGDicSp+Qw+s2vQqs7arTWbT9mC0qz3KN7vwlOC9jOhOEUyd5Kr1
+ngSaFalb5Qqouu9f7sxZLd7YxO3WYXWAjHF84sjkD2HC+eiwpGqG56gH4vb0q6eu
+rtUivwQupgMTaGxIQ4SivxSI7sklK5p90XqEmB0TLCXfSgLAVZTH79FLBYGY8XBA
+W7BaK3jwAieMx5qBQiwvlKBfAmLu23K0Nb0Od+v5HWjfKN1Kecy7NJev3Rr4CVE7
+aJmvVuD9kPh9lT3YfLD43f7NavGLCOsh3SeDEAWXUMT2XgETvLtr0lHQ5xE82moy
+B0tCInj5ZGLlOOTH2GCed58yqS1GpvOwoibQNFbvdyPjEFsfATljq66G1BaQgnnb
+6AbbAG3U99OX88ssh55oJo0RGUigmZXJjcgTCXvMj/MXrKLU5n7Nqmxh53Oxuf7O
+bsG777UWhZhH6pZh32iUUU1zMMcIz2HPr5+lEdAcfnYDndN9xf1JnWBKoDdfDcDq
+CEvXSWji+E/JLszyF681
+=FnmS
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.74.0.ebuild b/mail-mta/courier/courier-0.74.0.ebuild
new file mode 100644
index 000000000000..abf4de3ad20a
--- /dev/null
+++ b/mail-mta/courier/courier-0.74.0.ebuild
@@ -0,0 +1,305 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.74.0.ebuild,v 1.1 2014/12/14 01:32:05 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 ~alpha ~hppa ~ia64 ~ppc ~sparc ~x86
+KEYWORDS="~amd64"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.66.1
+	net-libs/courier-unicode
+	!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? ( virtual/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_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+	epatch "${FILESDIR}/courier-0.74.0-fix-linking.diff"
+}
+
+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/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-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 /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
+}
diff --git a/mail-mta/courier/files/courier-0.74.0-fix-linking.diff b/mail-mta/courier/files/courier-0.74.0-fix-linking.diff
new file mode 100644
index 000000000000..f9d10d02c432
--- /dev/null
+++ b/mail-mta/courier/files/courier-0.74.0-fix-linking.diff
@@ -0,0 +1,24 @@
+diff -Naur courier-0.74.0/libs/gpglib/Makefile.am courier-0.74.0-1/libs/gpglib/Makefile.am
+--- courier-0.74.0/libs/gpglib/Makefile.am	2014-12-04 03:31:09.000000000 +0100
++++ courier-0.74.0-1/libs/gpglib/Makefile.am	2014-12-14 02:18:25.599274395 +0100
+@@ -18,7 +18,7 @@
+ 
+ testgpg_SOURCES=testgpg.c
+ testgpg_DEPENDENCIES=libgpg.la ../numlib/libnumlib.la
+-testgpg_LDADD= -lunicode $(testgpg_DEPENDENCIES)
++testgpg_LDADD= $(testgpg_DEPENDENCIES) -lunicode
+ testgpg_LDFLAGS=-static
+ 
+ mimegpg_SOURCES=mimegpg.c
+diff -Naur courier-0.74.0/libs/gpglib/Makefile.in courier-0.74.0-1/libs/gpglib/Makefile.in
+--- courier-0.74.0/libs/gpglib/Makefile.in	2014-12-13 15:26:42.000000000 +0100
++++ courier-0.74.0-1/libs/gpglib/Makefile.in	2014-12-14 02:18:35.512275143 +0100
+@@ -335,7 +335,7 @@
+ 
+ testgpg_SOURCES = testgpg.c
+ testgpg_DEPENDENCIES = libgpg.la ../numlib/libnumlib.la
+-testgpg_LDADD = -lunicode $(testgpg_DEPENDENCIES)
++testgpg_LDADD = $(testgpg_DEPENDENCIES) -lunicode
+ testgpg_LDFLAGS = -static
+ mimegpg_SOURCES = mimegpg.c
+ mimegpg_LDADD = libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la \