Version bump.

Package-Manager: portage-2.1.2.5

4 files changed, 398 insertions, 15 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 9785ef9ec356..6923ebd96ca9 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.126 2007/04/28 16:53:21 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.127 2007/05/01 16:00:34 chtekk Exp $
+
+*postfix-2.4.1 (01 May 2007)
+
+  01 May 2007; Luca Longinotti <chtekk@gentoo.org> +postfix-2.4.1.ebuild:
+  Version bump to 2.4.1, use newest VDA-NG patch.
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> postfix-2.1.5-r2.ebuild:
   Fix *initd, *confd and *envd calls (#17388, #174266)
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index a15ce983bf5b..a33403128fe2 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839
 MD5 a3c32f8c9d1344be08f018d377a61f59 files/mailer.conf 438
 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 files/mailer.conf 438
@@ -66,6 +63,8 @@ DIST postfix-2.3.8.tar.gz 2787761 RMD160 2984ca8e81375a3124801c999d23637e745de54
 DIST postfix-2.4.0-vda-ng-r1.patch.gz 12015 RMD160 8ef868bccd69e1c57c67eac524f617ca6eaffb94 SHA1 62c11debf6422920a070f42d6fcbf7728082be9f SHA256 d905ad2084d7f6e7eb831cd3d5b95386c3d78ed389e104dd8a4abc3ecb954496
 DIST postfix-2.4.0-vda.patch.gz 7830 RMD160 0cfc1765b32bc894888517f6d210d2baf1615d56 SHA1 0e1de0bb9de24ea9766d9930a945e3b94fc2a250 SHA256 ff8c79db9128be5f2347259ea46606338d3808cc5120ce45d6ef9453e04cd7e7
 DIST postfix-2.4.0.tar.gz 2931537 RMD160 00eb9e4510da1f6a0a0238417d147774deac50ce SHA1 6223225e5ab116e09da27709ebce7dac3136fbe7 SHA256 7cbc4d8904512ac1792193c54a2989b481e6402447b82988b6a88b8091af6bbd
+DIST postfix-2.4.1-vda-ng-r1.patch.gz 12343 RMD160 644b7823c4cd5a9bbc68c2ef2d864c25b626605c SHA1 0113015a1ba746c467d2d1e4a39e02c5f532a8e9 SHA256 18468ea79b0e777f6b2db73b794065c9f2a9d41a1c58c9ad53694d263993057e
+DIST postfix-2.4.1.tar.gz 2932009 RMD160 006cdaf82e9edb176522079e606b5645eef65734 SHA1 cfd041cd7f16e9ee701c6e5a2f33e417e57751db SHA256 cfd15796684bf8fa4ef0c58013a325b4bf6ad5bf3c13d72d5c441c2bdcec16b8
 DIST tls+ipv6-1.26-pf-2.1.5.patch.gz 256725 RMD160 ff2fb005681659476383fe4f32fd1d14e51fa9d9 SHA1 6813eb7d1c1ac9a76a04b7495d540236aa0aa625 SHA256 9ce416069f8dec16a9fc31aee875f8832cd97c167ceee0e572ef10b94ae4849d
 EBUILD postfix-2.1.5-r2.ebuild 7499 RMD160 40c6806fa4dd5f2f97c05ac0a63d1fecfd44f0e8 SHA1 31e41628d72c5bb92a96555c5ced6bb491a940f4 SHA256 9850160863d7bc785ccadf89d5aa331a2a35576da94dfcd45bb14e3121115287
 MD5 b4dd1ba5c0a9ef994d1c3d7360cd9b97 postfix-2.1.5-r2.ebuild 7499
@@ -131,10 +130,14 @@ EBUILD postfix-2.4.0.ebuild 11870 RMD160 b0f0b875f8f9f3b638e5c58ec90953a8f4e91b3
 MD5 21112140ddddf78ed83a15815d4e9000 postfix-2.4.0.ebuild 11870
 RMD160 b0f0b875f8f9f3b638e5c58ec90953a8f4e91b34 postfix-2.4.0.ebuild 11870
 SHA256 4ad273cf308da48f4faa0e5d307b1cdae7f9342e58cf45317ef80d18b7a8756a postfix-2.4.0.ebuild 11870
-MISC ChangeLog 43095 RMD160 fbcf067c3b3190bf25b1721acf2d70d29655aa13 SHA1 a452358b67fe6e645bb44b4ed00edc8df034fac4 SHA256 b29beb72cd4aa65eb76328aebe6aaabdab75fb6c71c817d4a6d14966fb105b0f
-MD5 ec0c6e16f078e789a149141a901bb329 ChangeLog 43095
-RMD160 fbcf067c3b3190bf25b1721acf2d70d29655aa13 ChangeLog 43095
-SHA256 b29beb72cd4aa65eb76328aebe6aaabdab75fb6c71c817d4a6d14966fb105b0f ChangeLog 43095
+EBUILD postfix-2.4.1.ebuild 11504 RMD160 b9e63c930977a0eb89ada311f895652df6a21b5b SHA1 39c27687f7bc344699d9b2e1a259140b1f8d928a SHA256 939dc5572219bf1357a25eb91e22e8f44b1ef3ef079b5e8974e2e313affec9b0
+MD5 7f0611ce02a356543b00d7b50b3a081d postfix-2.4.1.ebuild 11504
+RMD160 b9e63c930977a0eb89ada311f895652df6a21b5b postfix-2.4.1.ebuild 11504
+SHA256 939dc5572219bf1357a25eb91e22e8f44b1ef3ef079b5e8974e2e313affec9b0 postfix-2.4.1.ebuild 11504
+MISC ChangeLog 43248 RMD160 220a9a1c2e1d49831465e8f151db786901c09629 SHA1 7496dee57c9dcbc06b7e820ff6b01de3f9b7114a SHA256 7e308af3c4cfdc361fa9d611db87488576c50e483d5ce72346453be2c05cb7cf
+MD5 ba6841307af2979ce001d5b41f97b1fe ChangeLog 43248
+RMD160 220a9a1c2e1d49831465e8f151db786901c09629 ChangeLog 43248
+SHA256 7e308af3c4cfdc361fa9d611db87488576c50e483d5ce72346453be2c05cb7cf ChangeLog 43248
 MISC metadata.xml 253 RMD160 27155323556701c38934832ee9970634a088bb5b SHA1 6c1c3f1fda858526944eb427f5bec79da119da0d SHA256 38f168ad00f8b59ee75efaf002d442b2793f280dafc70955c70920e974c6dfe0
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
 RMD160 27155323556701c38934832ee9970634a088bb5b metadata.xml 253
@@ -187,10 +190,6 @@ SHA256 e47c2c1c24ab3af5002a1dd52ed6408156dc785ab3c7f9477c69cb40ae303fb8 files/di
 MD5 3666108d27fd8ea56ae7874e4a15ec62 files/digest-postfix-2.4.0-r1 518
 RMD160 6c6b6179f2b5d95f48b628b9290a590f2d6a3e75 files/digest-postfix-2.4.0-r1 518
 SHA256 cab68d27d89dba71037c6350ba37a48a137c370db249a57686f58eeb970c9243 files/digest-postfix-2.4.0-r1 518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGM3wVI1lqEGTUzyQRAnNEAKCCRpcrSGukHkTEP4dKUqS+gRLcagCbBAyO
-6mViCrWct1uopGVKjNNTKjU=
-=/tnS
------END PGP SIGNATURE-----
+MD5 a5148b807d88f5ff935a4289c366a8cc files/digest-postfix-2.4.1 518
+RMD160 ecf8837b4be2fb5dfcb15ddbb3d8326d4f4f50fb files/digest-postfix-2.4.1 518
+SHA256 21e7c25721f082d9e4ab311e67ca4173aef053289ad7285f46f6aadf813f1ed6 files/digest-postfix-2.4.1 518
diff --git a/mail-mta/postfix/files/digest-postfix-2.4.1 b/mail-mta/postfix/files/digest-postfix-2.4.1
new file mode 100644
index 000000000000..cf5022dc2418
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.4.1
@@ -0,0 +1,6 @@
+MD5 d381ae22b469287039da1a044d493df8 postfix-2.4.1-vda-ng-r1.patch.gz 12343
+RMD160 644b7823c4cd5a9bbc68c2ef2d864c25b626605c postfix-2.4.1-vda-ng-r1.patch.gz 12343
+SHA256 18468ea79b0e777f6b2db73b794065c9f2a9d41a1c58c9ad53694d263993057e postfix-2.4.1-vda-ng-r1.patch.gz 12343
+MD5 dbe8af1e7c7a7755352218cba7a5ba11 postfix-2.4.1.tar.gz 2932009
+RMD160 006cdaf82e9edb176522079e606b5645eef65734 postfix-2.4.1.tar.gz 2932009
+SHA256 cfd15796684bf8fa4ef0c58013a325b4bf6ad5bf3c13d72d5c441c2bdcec16b8 postfix-2.4.1.tar.gz 2932009
diff --git a/mail-mta/postfix/postfix-2.4.1.ebuild b/mail-mta/postfix/postfix-2.4.1.ebuild
new file mode 100644
index 000000000000..457d0b43152a
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.4.1.ebuild
@@ -0,0 +1,373 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.1.ebuild,v 1.1 2007/05/01 16:00:34 chtekk Exp $
+
+# NOTE: this ebuild is a regular ebuild without mailer-config support!
+# Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
+# to turn this ebuild to a mailer-config enabled ebuild.
+
+# regular ebuild
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
+# mailer-config support
+#inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic mailer pam
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+# regular ebuild
+IUSE="cdb dovecot-sasl hardened ipv6 ldap mailwrapper mbox mysql nis pam postgres sasl selinux ssl vda"
+# mailer-config support
+#IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_P="${P}-vda-ng-r1"
+RC_VER="2.2.9"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail."
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
+	vda? ( http://gentoo.longitekk.com/${VDA_P}.patch.gz ) "
+
+LICENSE="IPL-1"
+SLOT="0"
+
+# regular ebuild
+PROVIDE="virtual/mta virtual/mda"
+# mailer-config support
+#PROVIDE="${PROVIDE} virtual/mda"
+
+DEPEND=">=sys-libs/db-3.2
+		>=dev-libs/libpcre-3.4
+		cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
+		ldap? ( >=net-nds/openldap-1.2 )
+		mysql? ( virtual/mysql )
+		pam? ( virtual/pam )
+		postgres? ( >=dev-db/postgresql-7.1 )
+		sasl? (  >=dev-libs/cyrus-sasl-2 )
+		ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+# regular ebuild
+RDEPEND="${DEPEND}
+		>=net-mail/mailbase-0.00
+		!mailwrapper? ( !virtual/mta )
+		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+		selinux? ( sec-policy/selinux-postfix )"
+
+# mailer-config support
+#RDEPEND="${DEPEND}
+#		>=net-mail/mailbase-0.00
+#		selinux? ( sec-policy/selinux-postfix )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+group_user_check() {
+	einfo "Checking for postfix group ..."
+	enewgroup postfix 207
+	einfo "Checking for postdrop group ..."
+	enewgroup postdrop 208
+	einfo "Checking for postfix user ..."
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+pkg_setup() {
+	# Do not upgrade live from Postfix <2.4
+	if [[ -f /var/lib/init.d/started/postfix ]] ; then
+		if has_version '<mail-mta/postfix-2.4.0' ; then
+			if [[ "${FORCE_UPGRADE}" ]] ; then
+				echo
+				ewarn "You are upgrading from an incompatible version and you have"
+				ewarn "FORCE_UPGRADE set, will build this package while Postfix is running."
+				ewarn "You MUST stop Postfix BEFORE installing this version to your system."
+				echo
+			else
+				echo
+				eerror "You are upgrading from an incompatible version."
+				eerror "You MUST stop Postfix BEFORE installing this version to your system."
+				eerror "If you want minimal downtime, emerge postfix with:"
+				eerror "    FORCE_UPGRADE=1 emerge --buildpkgonly postfix"
+				eerror "    /etc/init.d/postfix stop"
+				eerror "    emerge --usepkgonly postfix"
+				eerror "Then run etc-update or dispatch-conf and merge the configuration files."
+				eerror "Then restart Postfix with: /etc/init.d/postfix start"
+				die "Upgrade from an incompatible version!"
+				echo
+			fi
+		else
+			echo
+			ewarn "It's safe to upgrade your current version while it's running."
+			ewarn "If you don't want to take any chance, please hit Ctrl+C now,"
+			ewarn "stop Postfix, then emerge again."
+			ewarn "You have been warned!"
+			ewarn "Waiting 5 seconds before continuing ..."
+			echo
+			epause 5
+		fi
+	fi
+
+	echo
+	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
+	ewarn "for incompatible changes before continueing."
+	ewarn "Bugs should be filed at \"http://bugs.gentoo.org/\" and"
+	ewarn "assigned to \"net-mail@gentoo.org\"."
+	echo
+
+	# Warnings to work around bug #45764
+	if has_version '<=mail-mta/postfix-2.0.18' ; then
+		echo
+		ewarn "You are upgrading from postfix-2.0.18 or earlier, some of the empty queue"
+		ewarn "directories get deleted while unmerging the older version (see bug #45764)."
+		ewarn "Please run '/etc/postfix/post-install upgrade-source' to recreate them."
+		echo
+	fi
+
+	# TLS non-prod warning
+	if use ssl ; then
+		echo
+		ewarn "You have \"ssl\" in your USE flags, TLS will be enabled."
+		ewarn "This service is incompatible with the previous TLS patch."
+		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
+		echo
+	fi
+
+	# IPV6 non-prod warn
+	if use ipv6 ; then
+		echo
+		ewarn "You have \"ipv6\" in your USE flags, IPV6 will be enabled."
+		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
+		echo
+	fi
+
+	# SASL non-prod warning
+	if use sasl ; then
+		echo
+		elog "Postfix 2.3 and newer supports two SASL implementations."
+		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
+		elog "Visit http://www.postfix.org/SASL_README.html for more info."
+		echo
+	fi
+
+	# Add postfix, postdrop user/group (bug #77565)
+	group_user_check || die "Failed to check/add needed user/group"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if use vda ; then
+		epatch "${WORKDIR}/${VDA_P}.patch"
+	fi
+
+	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+}
+
+src_compile() {
+	cd "${S}"
+
+	# Added -Wl,-z,now wrt bug #62674
+	# Remove -ldl as it is not necessary, solves bug #106446
+	# -Wl,-z,now replaced by $(bindnow-flags)
+	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/$(get_libdir) -lpcre -lcrypt -lpthread"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap ; then
+		mycc="${mycc} -DHAS_LDAP"
+		mylibs="${mylibs} -lldap -llber"
+	fi
+
+	if use mysql ; then
+		mycc="${mycc} -DHAS_MYSQL -I/usr/include/mysql"
+		mylibs="${mylibs} -lmysqlclient -lm -lz"
+	fi
+
+	if use postgres ; then
+		if best_version '=dev-db/postgresql-7.3*' ; then
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
+		else
+			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
+		fi
+		mylibs="${mylibs} -lpq"
+	fi
+
+	if use ssl ; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use sasl ; then
+		if use dovecot-sasl ; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl ; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis ; then
+		sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
+			src/util/sys_defs.h || die "sed failed"
+	fi
+
+	if use cdb ; then
+		mycc="${mycc} -DHAS_CDB"
+		CDB_LIBS=""
+
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			CDB_LIBS="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
+			done
+		fi
+
+		mylibs="${mylibs} ${CDB_LIBS}"
+	fi
+
+	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
+	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+	mycc="${mycc} -DDEF_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	local my_cc=$(tc-getCC)
+	einfo "CC=${my_cc:=gcc}"
+
+	# Workaround for bug #76512
+	[[ "$(gcc-version)" == "3.4" ]] && use hardened && replace-flags -O? -Os
+
+	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		makefiles || die "configure problem"
+
+	emake || die "compile problem"
+}
+
+src_install () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}/var"
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# mailwrapper stuff
+	if use mailwrapper ; then
+		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
+		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
+		# mailer-config support
+		#rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
+
+		mv "${D}/usr/share/man/man1/sendmail.1" \
+			"${D}/usr/share/man/man1/sendmail-postfix.1"
+		mv "${D}/usr/share/man/man1/newaliases.1" \
+			"${D}/usr/share/man/man1/newaliases-postfix.1"
+		mv "${D}/usr/share/man/man1/mailq.1" \
+			"${D}/usr/share/man/man1/mailq-postfix.1"
+		mv "${D}/usr/share/man/man5/aliases.5" \
+			"${D}/usr/share/man/man5/aliases-postfix.5"
+
+		# regular ebuild
+		insinto /etc/mail
+		doins "${FILESDIR}/mailer.conf"
+		# mailer-config support
+		#mailer_install_conf
+	else
+		# Provide another link for legacy FSH
+		dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+	fi
+
+	# Install qshape tool
+	dobin auxiliary/qshape/qshape.pl
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	mv "${D}"/usr/share/doc/${PF}/defaults/{*.cf,post*-*} "${D}"/etc/postfix
+	if use mbox ; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	"${D}/usr/sbin/postconf" -c "${D}/etc/postfix" \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}/smtp.pass" saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}/postfix.rc6.${RC_VER}" postfix || die "newinitd failed"
+
+	mv "${S}/examples" "${D}/usr/share/doc/${PF}/"
+	dodoc *README COMPATIBILITY HISTORY INSTALL LICENSE PORTING RELEASE_NOTES*
+	dohtml html/*
+
+	pamd_mimic_system smtp auth account
+
+	# Do not install server.{key,pem) SSL certificates if they already exist
+	if use ssl && [[ ! -f /etc/ssl/postfix/server.key && ! -f /etc/ssl/postfix/server.pem ]] ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
+		insinto /etc/ssl/postfix
+		docert server
+		fowners postfix:mail /etc/ssl/postfix/server.{key,pem}
+	fi
+
+	if use sasl ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}/smtp.sasl" smtpd.conf
+	fi
+}
+
+pkg_postinst() {
+	# Add postfix, postdrop user/group (bug #77565)
+	group_user_check || die "Failed to check/add needed user/group"
+
+	ebegin "Fixing queue directories and permissions"
+	"${ROOT}/etc/postfix/post-install" upgrade-permissions
+	echo
+	ewarn "If you upgraded from Postfix-1.x, you must revisit"
+	ewarn "your configuration files. See"
+	ewarn "  /usr/share/doc/${PF}/RELEASE_NOTES"
+	ewarn "for a list of changes."
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		echo
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+	fi
+
+	# regular ebuild
+	if ! use mailwrapper && [[ -e /etc/mailer.conf ]] ; then
+		einfo
+		einfo "Since you emerged Postfix without mailwrapper in USE,"
+		einfo "you may want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+	# mailer-config support
+	#mailer_pkg_postinst
+}