From 53e363babd43c94d862b63fd7a10212d0ac57469 Mon Sep 17 00:00:00 2001
From: Andrej Kacian <ticho@gentoo.org>
Date: Sun, 4 Feb 2007 04:20:29 +0000
Subject: [PATCH] Version bump. Add postfix user to both postfix and mail
 groups to fix bug #134776. Package-Manager: portage-2.1.2-r6

---
 mail-mta/postfix/ChangeLog                  |   9 +-
 mail-mta/postfix/Manifest                   |  40 +-
 mail-mta/postfix/files/digest-postfix-2.3.7 |   6 +
 mail-mta/postfix/postfix-2.2.10.ebuild      |   6 +-
 mail-mta/postfix/postfix-2.3.6.ebuild       |   4 +-
 mail-mta/postfix/postfix-2.3.7.ebuild       | 386 ++++++++++++++++++++
 6 files changed, 429 insertions(+), 22 deletions(-)
 create mode 100644 mail-mta/postfix/files/digest-postfix-2.3.7
 create mode 100644 mail-mta/postfix/postfix-2.3.7.ebuild

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 44f65744a95c..1c41eb8aa063 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,13 @@
 # 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.113 2007/01/04 18:43:44 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.114 2007/02/04 04:20:29 ticho Exp $
+
+*postfix-2.3.7 (04 Feb 2007)
+
+  04 Feb 2007; Andrej Kacian <ticho@gentoo.org> postfix-2.2.10.ebuild,
+  postfix-2.3.6.ebuild, +postfix-2.3.7.ebuild:
+  Version bump. Add postfix user to both postfix and mail groups to fix bug
+  #134776.
 
 *postfix-2.3.6 (04 Jan 2007)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 5fc4915888bd..5d1b26009e93 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -66,6 +66,7 @@ DIST postfix-2.3.3-vda.patch.gz 7944 RMD160 bdbd0798ca4d23c6e8443b26b957b8d0d252
 DIST postfix-2.3.4.tar.gz 2778860 RMD160 94f38585f12b409270c59241ff0a01c4ff460d96 SHA1 fc928c366bfc181db78173569b53dedd1bedebc6 SHA256 34894637337d260725e2b58666dd6e6d95bfc9c1d1b27d8bdc4cfddcb0818803
 DIST postfix-2.3.5.tar.gz 2782283 RMD160 19215ee77b82ed2235cb669c0704df200fe0ea0f SHA1 f92c55f3e78bb39e78153e14895bb2e718b3c182 SHA256 fcb22c93633ac7949dcd744ba4a8a7a7135554bf60a45d1fad33bde944c43a9c
 DIST postfix-2.3.6.tar.gz 2783743 RMD160 075abdb127ebef529388dcbfe36af277bab9d7d1 SHA1 6675da860f92237357c0f23214131500951d99a8 SHA256 2ae5d7d6d03d26a7f7b4b4aa1f1ab87017352a8bf9541171e318393fe5309fce
+DIST postfix-2.3.7.tar.gz 2785739 RMD160 5d3c1074f2ab02fba60cc5d7251af45bb15c9068 SHA1 caac1243ea3cbb5f60380d5614f48cc21d3cff33 SHA256 5ea8f9f9b205145b23764b226eea0e4cdfd6489cd5fbacadd61580982e46538d
 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 7514 RMD160 0a4556b746acf0ed7091aaa528942437fa257bec SHA1 14f3e6dbe45dcb62a9b4de9727c0b24de55d63b3 SHA256 3f0159356689cf4bc7b983d873afb202a7b577a97ed1f3c636fefa3f3aa2efa7
 MD5 d2c39889964cc8084cce24e836797fdb postfix-2.1.5-r2.ebuild 7514
@@ -75,10 +76,10 @@ EBUILD postfix-2.2.10-r1.ebuild 10225 RMD160 8599e26bbb45daba0c8d1dde34a1bdd7615
 MD5 14b89bda4941bae19cf6b20e8825dca2 postfix-2.2.10-r1.ebuild 10225
 RMD160 8599e26bbb45daba0c8d1dde34a1bdd76156bee8 postfix-2.2.10-r1.ebuild 10225
 SHA256 85b0164d763b4bba28dcc68a870a6c3cdbea61b3860f64bd04c5ada17e96676c postfix-2.2.10-r1.ebuild 10225
-EBUILD postfix-2.2.10.ebuild 10435 RMD160 b19e870399b609b67577d0b2af6c557b28265e4f SHA1 253d62ce973b59319dabfbe43db0da38a31a11c6 SHA256 19977f39cd6af01902d8616846da56717bf8627841ec27de44f82a09faa4cc55
-MD5 4ac725c294387db5d03174f532ad8897 postfix-2.2.10.ebuild 10435
-RMD160 b19e870399b609b67577d0b2af6c557b28265e4f postfix-2.2.10.ebuild 10435
-SHA256 19977f39cd6af01902d8616846da56717bf8627841ec27de44f82a09faa4cc55 postfix-2.2.10.ebuild 10435
+EBUILD postfix-2.2.10.ebuild 10441 RMD160 67f76bc76d72fef9342b4c0be5c491f90670115e SHA1 1dfe847a9030a708cf5bbc02056fea080c4019ae SHA256 fd6b3226099b61ed2f0493d898ed4e71e8f91ec649b7aeb5f81342e3d4260b68
+MD5 d0f73b7b130e5d0b0a3613edb33128b8 postfix-2.2.10.ebuild 10441
+RMD160 67f76bc76d72fef9342b4c0be5c491f90670115e postfix-2.2.10.ebuild 10441
+SHA256 fd6b3226099b61ed2f0493d898ed4e71e8f91ec649b7aeb5f81342e3d4260b68 postfix-2.2.10.ebuild 10441
 EBUILD postfix-2.2.11.ebuild 10358 RMD160 f8f5cc44a0996514c8e5a350992f0bb90f4ce86a SHA1 58d36aa561a42ac8e81f96fa8b6f593a388043c9 SHA256 370bb446eff306d24d56be8465ed6de826deeda314972b29867481c2a81f95cb
 MD5 414bc6d381d17dbf5e0145138a20352f postfix-2.2.11.ebuild 10358
 RMD160 f8f5cc44a0996514c8e5a350992f0bb90f4ce86a postfix-2.2.11.ebuild 10358
@@ -135,14 +136,18 @@ EBUILD postfix-2.3.5.ebuild 11677 RMD160 70e325351857816d37481912f34818244d747c2
 MD5 8de84129a7f5c9f1af34107e4e07832a postfix-2.3.5.ebuild 11677
 RMD160 70e325351857816d37481912f34818244d747c25 postfix-2.3.5.ebuild 11677
 SHA256 4ceb5db79cad5d54a5a5978751f197606ad24420372d6743c9d095952653e2d8 postfix-2.3.5.ebuild 11677
-EBUILD postfix-2.3.6.ebuild 11677 RMD160 12177c06e9b1f7cc026fada33533f46956d02ba0 SHA1 a9dfb5b1ba850baf68bfc06a82043bf410fb0226 SHA256 3795e9306cc767915ab4ed869a908f12798aff4b1070b8a78a8c63448ac053d3
-MD5 94d3d601d8aa7af76f8115a9b770fd40 postfix-2.3.6.ebuild 11677
-RMD160 12177c06e9b1f7cc026fada33533f46956d02ba0 postfix-2.3.6.ebuild 11677
-SHA256 3795e9306cc767915ab4ed869a908f12798aff4b1070b8a78a8c63448ac053d3 postfix-2.3.6.ebuild 11677
-MISC ChangeLog 41027 RMD160 4fe498e01b631f84bca581eb23452e8e8992aa18 SHA1 a0455c3c8728bdb27d54260d77479fbc61af1c05 SHA256 cf05b2c61f9989515dc8a0ba5593b80d2e8df428a31c06890e89cf1a064e0f36
-MD5 cc297e519b64e51c2f57f6f7575827b6 ChangeLog 41027
-RMD160 4fe498e01b631f84bca581eb23452e8e8992aa18 ChangeLog 41027
-SHA256 cf05b2c61f9989515dc8a0ba5593b80d2e8df428a31c06890e89cf1a064e0f36 ChangeLog 41027
+EBUILD postfix-2.3.6.ebuild 11682 RMD160 69ea7a44c5ae9607deb778780038baa57c227b53 SHA1 5303c89f18d8309ec63d7f0dc6a1fddf375fc144 SHA256 0aa173f9d5617f57796f5cd3dc83b3122a471cb6f51adbf9e3df249db8e6d48a
+MD5 9ee732961705daed6fe3c1c9455d8df8 postfix-2.3.6.ebuild 11682
+RMD160 69ea7a44c5ae9607deb778780038baa57c227b53 postfix-2.3.6.ebuild 11682
+SHA256 0aa173f9d5617f57796f5cd3dc83b3122a471cb6f51adbf9e3df249db8e6d48a postfix-2.3.6.ebuild 11682
+EBUILD postfix-2.3.7.ebuild 11682 RMD160 76a98d9da7ece2df1fcb1712948039fc22d3a1a8 SHA1 fe3d9d598fa4e445735d12c467f77b29a0b333e9 SHA256 6103e0e6f1b941ae73b284b87a2b28f06d5ef7b91a8faa5bc3afdeb68a81e8ff
+MD5 b175fcb97a401316bb4807706bd4b81f postfix-2.3.7.ebuild 11682
+RMD160 76a98d9da7ece2df1fcb1712948039fc22d3a1a8 postfix-2.3.7.ebuild 11682
+SHA256 6103e0e6f1b941ae73b284b87a2b28f06d5ef7b91a8faa5bc3afdeb68a81e8ff postfix-2.3.7.ebuild 11682
+MISC ChangeLog 41263 RMD160 c71b7cb5f3064f8dac8b779f05ae199346f6a8a2 SHA1 3f3a25d84742f04ff4f5b3e17d7059953f12cf49 SHA256 c1ced164f654d34ba044a7863e57bc96276041941f8b85ecf2acfa7424d67672
+MD5 33243651799350475e8a9f8336de9109 ChangeLog 41263
+RMD160 c71b7cb5f3064f8dac8b779f05ae199346f6a8a2 ChangeLog 41263
+SHA256 c1ced164f654d34ba044a7863e57bc96276041941f8b85ecf2acfa7424d67672 ChangeLog 41263
 MISC metadata.xml 253 RMD160 27155323556701c38934832ee9970634a088bb5b SHA1 6c1c3f1fda858526944eb427f5bec79da119da0d SHA256 38f168ad00f8b59ee75efaf002d442b2793f280dafc70955c70920e974c6dfe0
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
 RMD160 27155323556701c38934832ee9970634a088bb5b metadata.xml 253
@@ -201,10 +206,13 @@ SHA256 1336b2c5aaf8a7d742ae934d03d45c6dbae8115c726f4ab55b64ab59a7371b4e files/di
 MD5 dd8759f7f27a498270fdad66b5d69ebd files/digest-postfix-2.3.6 497
 RMD160 d41cec854b920342888d252c4bc412323962cef8 files/digest-postfix-2.3.6 497
 SHA256 c2ad49d669c0a970ea3af7c3485898e0cfd7762418d526e8654b84c9efc1d820 files/digest-postfix-2.3.6 497
+MD5 debce05fa9fb2bd1e3985ed30dfb44cb files/digest-postfix-2.3.7 497
+RMD160 3ee7f86ba4b8e3b3e26d7937cd7d9b611788ab03 files/digest-postfix-2.3.7 497
+SHA256 6d3dddedea52c61a4f900d33601f1343521a68185ecb18a65e09fb1173b26bbc files/digest-postfix-2.3.7 497
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFnUr4ViELBEf1JB0RAl6IAJ4gEMbKTALx+kSfDw9k1mkUMGMzwgCfaMsm
-ewNSCSuSz/uHem6cRRyDzrs=
-=WWUS
+iD8DBQFFxV8bQlM6RnzZP+IRApjNAJ0fMAEAhVpx16D9yaJKWLuBxgHvCACeNhPt
+2/tpRxPgLSuIiO6ctwSB7YY=
+=XjXL
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.7 b/mail-mta/postfix/files/digest-postfix-2.3.7
new file mode 100644
index 000000000000..b809c838eb5a
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.3.7
@@ -0,0 +1,6 @@
+MD5 3506ab432360766b6a2708042b29943a postfix-2.3.3-vda.patch.gz 7944
+RMD160 bdbd0798ca4d23c6e8443b26b957b8d0d252da1d postfix-2.3.3-vda.patch.gz 7944
+SHA256 4fdff601e0b2653025c9b9ca8875e995b8052e2e362c3a5e035c3d2859bd4fa2 postfix-2.3.3-vda.patch.gz 7944
+MD5 a3ce7f2e5d8a6f688571bb55b792b848 postfix-2.3.7.tar.gz 2785739
+RMD160 5d3c1074f2ab02fba60cc5d7251af45bb15c9068 postfix-2.3.7.tar.gz 2785739
+SHA256 5ea8f9f9b205145b23764b226eea0e4cdfd6489cd5fbacadd61580982e46538d postfix-2.3.7.tar.gz 2785739
diff --git a/mail-mta/postfix/postfix-2.2.10.ebuild b/mail-mta/postfix/postfix-2.2.10.ebuild
index 7215838a2f7c..a100ae4bc4dc 100644
--- a/mail-mta/postfix/postfix-2.2.10.ebuild
+++ b/mail-mta/postfix/postfix-2.2.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.2.10.ebuild,v 1.10 2006/11/23 20:28:34 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.10.ebuild,v 1.11 2007/02/04 04:20:29 ticho Exp $
 
 inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
 IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened cdb"
@@ -52,7 +52,7 @@ group_user_check() {
 	einfo "checking for postdrop group...	create if missing."
 	enewgroup postdrop 208
 	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
 }
 
 pkg_setup() {
diff --git a/mail-mta/postfix/postfix-2.3.6.ebuild b/mail-mta/postfix/postfix-2.3.6.ebuild
index f2b6a61b1767..ff1b9a940ee0 100644
--- a/mail-mta/postfix/postfix-2.3.6.ebuild
+++ b/mail-mta/postfix/postfix-2.3.6.ebuild
@@ -1,6 +1,6 @@
 # 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.3.6.ebuild,v 1.1 2007/01/04 18:43:45 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.6.ebuild,v 1.2 2007/02/04 04:20:29 ticho Exp $
 
 # NOTE: this ebuild is regular ebuild without mailer-config support
 # comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -73,7 +73,7 @@ group_user_check() {
 	einfo "checking for postdrop group...	create if missing."
 	enewgroup postdrop 208
 	einfo "checking for postfix user...		create if missing."
-	enewuser postfix 207 -1 /var/spool/postfix postfix
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
 }
 
 pkg_setup() {
diff --git a/mail-mta/postfix/postfix-2.3.7.ebuild b/mail-mta/postfix/postfix-2.3.7.ebuild
new file mode 100644
index 000000000000..0927e28cf4e9
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.3.7.ebuild
@@ -0,0 +1,386 @@
+# 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.3.7.ebuild,v 1.1 2007/02/04 04:20:29 ticho Exp $
+
+# NOTE: this ebuild is regular ebuild without mailer-config support
+# comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
+# to turn this ebuild to mailer-config supported ebuild.
+
+# regular ebuild
+inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
+# mailer-config support.
+#inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
+
+# regular ebuild.
+IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mailwrapper mbox nis selinux hardened cdb vda"
+# mailer-config support.
+#IUSE="ipv6 pam ldap mysql postgres ssl sasl dovecot-sasl mbox nis selinux hardened cdb"
+
+MY_PV=${PV/_rc/-RC}
+MY_SRC=${PN}-${MY_PV}
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_VER=2.3.3
+VDA_P="${PN}-${VDA_VER}-vda"
+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://web.onda.com.br/nadal/postfix/VDA/${VDA_P}.patch.gz ) "
+#	devel? ( ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/${DEV_SRC}.tar.gz ) "
+
+LICENSE="IPL-1"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+# regular ebuild.
+PROVIDE="virtual/mta virtual/mda"
+# mailer-config support.
+#PROVIDE="${PROVIDE} virtual/mda"
+
+DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
+	>=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	pam? ( virtual/pam )
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( virtual/mysql )
+	postgres? ( >=dev-db/postgresql-7.1 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )"
+
+# 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 )"
+
+#if use devel; then
+#	MY_SRC=${DEV_SRC}
+#fi
+
+S=${WORKDIR}/${MY_SRC}
+
+group_user_check() {
+	einfo "checking for postfix group...	create if missing."
+	enewgroup postfix 207
+	einfo "checking for postdrop group...	create if missing."
+	enewgroup postdrop 208
+	einfo "checking for postfix user...		create if missing."
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+pkg_setup() {
+	# do not upgrade live from postfix <2.3.
+	if [[ -f /var/lib/init.d/started/postfix ]] ; then
+		if has_version '<mail-mta/postfix-2.3.0' ; then
+			if [ "${FORCE_UPGRADE}" ]; then
+				echo
+				ewarn "You are upgrading from a incompatible version and"
+				ewarn "you have FORCE_UPGRADE set,  will build this package with postfix running."
+				ewarn "You MUST stop postfix BEFORE install it to your system."
+				echo
+			else
+				echo
+				eerror "You are upgrading from a incompatible version."
+				eerror "You MUST stop postfix BEFORE install it to your system."
+				eerror "If you want a minimal downtime, emerge postfix with:"
+				eerror "\`FORCE_UPGRADE=1 emerge --buildpkgonly postfix\`; then"
+				eerror "\`/etc/init.d/postfix stop && emerge --usepkgonly postfix\`"
+				eerror "run etc-update or dispatch-conf and merge the configuration files."
+				eerror "Next /etc/init.d/postfix start"
+				die "upgrade from an incompatible version!"
+				echo
+			fi
+
+		else
+			echo
+			ewarn "It is 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 continue."
+	ewarn "Bugs should be filed at \"http://bugs.gentoo.org\""
+	ewarn "assign to \"net-mail@gentoo.org\"."
+	echo
+	#epause 5
+
+	# put out 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, one of the empty queue"
+		ewarn "directory get deleted during unmerge the older version (#45764). Please run"
+		ewarn "\`etc/postfix/post-install upgrade-source\` to recreate them."
+		echo
+	#epause 5
+	fi
+
+	#TLS non-prod warn
+	if use ssl; then
+		echo
+		ewarn "you have \"ssl\" in your USE flags, TLS will be enabled."
+		ewarn "This service entry is incompatible with previous TLS patch."
+		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
+		echo
+	#epause 5
+	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
+
+	if use sasl ; then
+		echo
+		elog "postfix 2.3 supports two SASL implementations."
+		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
+		elog "detail at http://www.postfix.org/SASL_README.html"
+		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}"
+
+	epatch "${FILESDIR}/${PN}-master.cf.patch"
+
+	if use vda ; then
+		epatch "${WORKDIR}/${VDA_P}.patch"
+	fi
+
+	# Postfix does not get the FQDN if no hostname is configured.
+	epatch "${FILESDIR}/${PN}-2.0.9-get-FQDN.patch"
+
+	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 62674.
+	# remove -ldl as it is not necessary, resolve bug #106446.
+	# -Wl,-z,now replaced by $(bindnow-flags)
+	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) -L/usr/lib -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 "build with dev-db/tinycdb"
+			# ugly hack because gentoo doesn't install cdb.h
+			cp /usr/include/tinycdb.h ${S}/src/util/cdb.h || die \
+				"failed to cp /usr/include/tinycdb.h to ${S}/util/cdb.h"
+			CDB_LIBS="-ltinycdb"
+		else
+			CDB_PATH="/usr/lib"
+			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/lib/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\\\""
+
+	ebegin "Starting make makefiles..."
+
+	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 an rmail for UUCP, closing 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/lib/sendmail
+	fi
+
+	# Install qshape tool.
+	dobin auxiliary/qshape/qshape.pl
+
+	# performance tuning tools.
+	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) if they are 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 $PN without mailwrapper in USE,"
+		einfo "you probably want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+	# mailer-config support
+	#mailer_pkg_postinst
+}
-- 
2.26.2