Bump, port to EAPI 5. Fixes potential security issues.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xA5880072BBB51E42

3 files changed, 335 insertions, 19 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 2e72421d0545..c69d52bc4342 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/courier
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.186 2015/05/15 11:56:21 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.187 2015/06/29 10:26:49 hanno Exp $
+
+*courier-0.75.0 (29 Jun 2015)
+
+  29 Jun 2015; Hanno Boeck <hanno@gentoo.org> +courier-0.75.0.ebuild:
+  Bump, port to EAPI 5. Fixes potential security issues.
 
   15 May 2015; Pacho Ramos <pacho@gentoo.org> courier-0.74.1-r1.ebuild:
   ppc stable wrt bug #548176
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 6715d8cb82f2..1b4273ee582c 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -11,28 +11,28 @@ AUX password.dist 247 SHA256 46f20a84922d108d39a7c26ad3ba8915326549f46cea811e238
 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
 DIST courier-0.74.1.tar.bz2 6951633 SHA256 b373c2b189affa01e8c2cfe9f60e6262bbcd98afa4e927b7fbbd68f478661ae6 SHA512 bcbb2a5b80c5e240587a75c7bb61c5620c7b43dc0bf707c8be5403856a125dfd18094b244d475f7d373f035df09c5b537e440815b5cca37afe6553e23117513a WHIRLPOOL c9e83048f920744babd1268a6804a5fcda834f4c6cf6cdc456402467567b93c7e773e57c1239a72662dd1eeab4494596b309a60071a06b2779a074981f913c3b
+DIST courier-0.75.0.tar.bz2 6970339 SHA256 2571a5b938649681ee98a2dc137f088aae0fd584cca3adf2dde1d826185406cc SHA512 37e66329f157e18176d4ac8c5e814be78e80ff7dec234886bec8dce2ae5c58ac68bc18e07c739295c25fae8ec778b162bab505d85ea0998db7192d52c47e7bc6 WHIRLPOOL 8cfd184beddb48e7e6efab4917372ec331d3e08f608abc6257ed408df96e100cf28226665fe1018b24e00e4336d705417484a6d890f11a6feb84045d9f969e17
 EBUILD courier-0.71.ebuild 9312 SHA256 66808b6d8a88c11f611c9b6e2f9571485581d9dae0c646b3f1579ff1e09ec04d SHA512 d6ed54b926c6aa38cbddb9c79eafc72c95398d452228ed70cd7d1559a9ab883a35105b5f7f0fb1ae885e72938488627d00c170009d9da50a53fad761bdb65762 WHIRLPOOL 02332216a11564d08767850111c07a5c907a76434dfb2e836ab1e0ae36d9ff728eba2e17d394fef60c17dea9a93a9606b4ecef3a9da0a1b867b5b148657243e1
 EBUILD courier-0.74.0.ebuild 9412 SHA256 370e3105cc3744f4daf681a71a2e4ca4dc3f5b0fc1848bfc453b8f5d525d1ddf SHA512 9efcdea30ed45d9fa35ac08d70dc49a2a9fef015c5b028a434900c7c7dec0587e4bddaf36ae97e074fa82fdbda2d7d0ab68a5fa10051b83585ca95f8a2b50b6f WHIRLPOOL b1a26028c33f87c0c5f4c69232464e8c52b76f00b83fef0aa3fcef5257a1bdb2f2140af079e8c183ffe60c0e873339bd17d2933b74d908a33a59114e22b47dc8
 EBUILD courier-0.74.1-r1.ebuild 9558 SHA256 9c156119baafce30a7b4021c9676990465174bc87422649ca75387ce4e9715e4 SHA512 b7250c2a67658d798cb320f9883751a789ab6d92385ea264f619f03412f80fb6b879059ba7fb9eb38be059c8dcbb63c46527688ff9a133c85f8ce839608c5721 WHIRLPOOL 2d05a0c8c9d25d7e21de44fcdfdcfc07ffa6012fb4d2b228e32404dff0f67bfd40a6801f03a2e107ce929defb4e967c0874c495fe78b4dc1b19fe24cc0fcf0c9
 EBUILD courier-0.74.1.ebuild 9358 SHA256 983eb1ce9650d016daf4f82dd1505eb92801c9d4c433c64f78ed2ad880ec3e8b SHA512 4a1f7136996d686459077998a72f8b86c63b0a692f7fcc7df17e1044723e5732d387eb2c08530c2ac0216136645c4de461a188f7e8f286b04da603d71ee725f6 WHIRLPOOL 224d78e46dfdbb6c11edfd7f076dd60a8d814612f3c650e022b6434fb737e6dca890b0dd882b26a8f913a835b961bb3554970f42f8d9611a15f3381b398614f6
-MISC ChangeLog 40706 SHA256 65056fcf58553a46c313109dd7808d3faa3890d61ea3dd55ac1b9e41139393ea SHA512 b83c8fe8e8e3755b03cb7c1add4a829e3a6afe4c25c685c488f99a7df7212b610abfe2fcbaee303421d199af87f810d4c1c6d0fc962e8673d406fe0792914eaf WHIRLPOOL 349b88547f207b816fe5bf5f2e4080f281df7c5945294af0e6ea21919e4ccd9bdbe5d284a4d62b6cb920e865096a035f29c0e4acaa9801063af4ca5d3931dc87
+EBUILD courier-0.75.0.ebuild 9421 SHA256 33c3e763b6641f3d3d393df43840690df7b71842cb695179088049db49832cbc SHA512 3d5189d6a22519f7faf85736848a7cc30ebd3951e38988285d4c3447f8a4e0357361efa510bbdec217d351c3ef353e33e7f2e10c8e37e7fbc1a25533b7010de0 WHIRLPOOL 82cb24dcb256098441b646bee55cdb36fe474963c938bdebd4c7fbe688d1fee4da877373b9e75bf8ec077d8d28ac18ec0882926a0c3b2125231f43951f925e37
+MISC ChangeLog 40865 SHA256 1aca420d9e024eeb5151454f0c05d8de2f1b785aabe83dd5a6ef8236e6676180 SHA512 f1be0dd3bcc0d89d85016413c11a0949a79ca36928317093ba2930c8c1400111b0d17c465210eaa5a921282fd336ccf568a3ddc1c6092e6d7816f4382f333e47 WHIRLPOOL 6a3e936075243867d1156e74846bf7e1c1ec83776501a74f09b78eda379b3c0c7f7233029e7d784f2962d7a99bf4029df4972e95aef490327f24f161a16db3b4
 MISC metadata.xml 764 SHA256 5ecbc0c4da54a1dafc0ab2af31d6a7dbe878f3139491a908bc0980f85bb93755 SHA512 7001c0223740eb3f33902524e77371d5b27ca089058a925882c70c7861cf821ffcb414d3778ec3088d33be78be1ff0eac86ae44ac6550988dee08d7c22d9dbdd WHIRLPOOL a431d8517f3616b376b5d310a2057f3ff1bdd822e674132a7c121e4e84648ece6e7977d41c5a32a0064a2fc672ce7ef1275295915161b583c8db4cd0e5ebee9e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVftDsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmihigP/RMZ/+/RRa26Yx3fX7i5iwKW
-k6wsy6Eol87Cw15Sp39jzjmMRChXlUhbaMzg97Momi+ky8/q2v74y16su+H2KDGQ
-jlvL/Jdc45y9tbz6uENAuz+mAJTrzJpJc3BRzQrsAcrjtXlp/E43SMwoiInPGCtC
-RXGE4l0kGuf0pUkP/wtOgptSZcKRGWaJv6w9hXl1Cymv4j9mrTX8O5kF/AAY/Fml
-EfKuIQM3X3PSmT20jLyNg1Y/V+2OLQUiXulRT5h4E0fSyQSxYjNCSc4w3k0fi7Ag
-3MZ0DxWDqqvC3HfJO5kATYjMYSE2349kEmKeq3qpcwnXqgjXPOFqEg/hOsrpX8qg
-GBZEFx/px2thRSx9M2vqoC5iuCCGw+K77xHKn45AAwrM4dO0DkVYtjVMZuKT7QTr
-6jSKS2uh3tQV0RJidBM7c2LJBSfjaQL019sbhFiJZbeRkA2jUmOfNYBih6cgb1D7
-zS/QsncjHe/WNc34t+jkaciFHJnpTDtxX2+u4sF+WiWzmWz/P8aMdYtYvGFEsy8r
-h9txM+N52gQTJyY7AVKU2LThhy8gJA7HQCishPq64a2BEHj9XcplXXO02/w77Au9
-Cyst9myXzOsxWxAprUl8JLcKt0scfa+giZ7dfUeCgEsHeoNvSI+USGjvL11DSZkK
-dl40jVMlvYKBaCD0a4yc
-=wBpr
+iQIcBAEBCAAGBQJVkR2oAAoJEKWIAHK7tR5Cg6gP/0/6Jolfdj4qLsHWBqco36qj
+El1MleyOLj7DfkqdiIQw0DBtEimoDGn2AUelWqoMU+UN6P4uKTgyWa7typA+fc+e
+Mpl0TXHUCyQzEoeEBAzKmJbLBPYn+uEfbgKbH321Jz6vqV0a61uO57bQi5uvi/o0
+HrOoKw8PjwsRFSn3uJaXWYyuOEaD/VFG6gWSRjkha8ZafnSv6sdzLoJXgwE1ItlC
+JsK8lEv0hfVZMlV7SWhamRaQsYcpj3vIQCGpnzSpzJIQy2hv3gWbFdPIlT5oV89X
+2EuOPLIcS1dabpeZAzxDVP7ArjVUQWg7uhoDlyeRY9Mg1cYLJbKLhxsAlIsGKXrh
+kW/SEbTBDhYOd/Fb83CwYauE1eQm3hXbiN0l9hVClsizh+HrpSPrYEVL52cD2YF4
+Ss10CSRnKWVRWFCdSnxkEReqLPNlzIjdtQoPYvxEqzAfv0AUCi9mGGHDIy6VeoQE
+CTCxEHZo9UlAZHGHx/5q/vjzLx5j03AJ1FrLzQAYiUlouKD99dirMovmXmxPn+Ng
+G8tLt3qdEuA1YtnVuQRt7v0r+iVfzbUC5782twvQKGQ2o0inBiolPhhvDV2lPhSz
+8wPppAyMM9McGW45Y/HxvZcowz+v8e/hbem5+8cOY9aLlFs2BGl2U0uRnNkdd37Y
+YXbf3IqDDk7cvKYfENQv
+=ROUN
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.75.0.ebuild b/mail-mta/courier/courier-0.75.0.ebuild
new file mode 100644
index 000000000000..d8fc378df2e2
--- /dev/null
+++ b/mail-mta/courier/courier-0.75.0.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.75.0.ebuild,v 1.1 2015/06/29 10:26:49 hanno Exp $
+
+EAPI=5
+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:
+# ~s390 ~ppc64 ~alpha ~ia64 ~sparc ~x86
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
+	fam web webmail gnutls"
+
+DEPEND="
+	>=net-libs/courier-authlib-0.66.3
+	>=net-libs/courier-unicode-1.3
+	!gnutls? ( dev-libs/openssl:= )
+	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() {
+#	unpack ${A}
+#	cd "${S}"
+	use norewrite && epatch "${FILESDIR}/norewrite.patch"
+}
+
+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 /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 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 /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
+}