New postfix 2.3 patch 02.

add vda patch back.
Package-Manager: portage-2.1.1_pre4-r1

6 files changed, 816 insertions, 8 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 672a8659db83..f2e02dace4c6 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.107 2006/07/26 16:14:38 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.108 2006/08/01 18:42:51 langthang Exp $
+
+*postfix-2.3.2-r1 (01 Aug 2006)
+*postfix-2.3.2 (01 Aug 2006)
+
+  01 Aug 2006; Tuấn Văn <langthang@gentoo.org> +postfix-2.3.2.ebuild,
+  +postfix-2.3.2-r1.ebuild:
+  New postfix 2.3 patch 02.
+  add vda patch back.
 
 *postfix-2.2.11 (26 Jul 2006)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 41106cbb76ca..e42e5c77d566 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -60,6 +60,8 @@ DIST postfix-2.2.8-vda.patch.gz 7741 RMD160 c74969b300232900d816df5f5dad7e3178db
 DIST postfix-2.2.8.tar.gz 2434615 RMD160 449a6b417bafbcd598a96979b5de5af40b3f663e SHA1 1949863d07b4590208359c2e81b270c107514e51 SHA256 eb6c5aebafe873b0a9b27fc6abc38ee3fb3b51465c5d5b73318ab15bebfd216b
 DIST postfix-2.2.9.tar.gz 2442158 RMD160 d8da9d83156f4d26e94723398f19570121c62b23 SHA1 f373e2a6c0d3a973644d463590f9845e1b3dc65b SHA256 47cacebab97f2659f83c4aeff5b9660505684bd7f8fb2f41628997673eb94f69
 DIST postfix-2.3.0.tar.gz 2770810 RMD160 41a0f3ea81189dfa2225d22475510e65449c7bef SHA1 fd29896f054c530c6e19a60b3379a277ce90c9b2 SHA256 719ad43cfb032fc94272f63b0bb4bc6930bdf9b48bd539927dbe403a1d53d786
+DIST postfix-2.3.1-vda.patch.gz 7956 RMD160 e258e3b383f5179f318199a43f9584d2ef3a0e8b SHA1 c006d2d0c2c1d221c183fb8c78bb7eba19adcda4 SHA256 b92de9749df915a1f23e21d3d08269fb249b0e5d8bf6a606170b4b329850c9b4
+DIST postfix-2.3.2.tar.gz 2774600 RMD160 ce561dcc03e7f6bc1bb3bdd9426175b18571c625 SHA1 cb56e7f8f0d4335cc8beb572ab7aa0423aab2dcf SHA256 151b766389fc8453be01700220e9fb726e202d539f055ce83b9c928b27d44413
 DIST tls+ipv6-1.26-pf-2.1.5.patch.gz 256725 RMD160 ff2fb005681659476383fe4f32fd1d14e51fa9d9 SHA256 9ce416069f8dec16a9fc31aee875f8832cd97c167ceee0e572ef10b94ae4849d
 EBUILD postfix-2.1.5-r2.ebuild 7525 RMD160 39807b6d7a75a3dc2e1c14d420e5ad5aa7d7d3db SHA1 351b435a32e1db38f332ec5a641b05d556144dc5 SHA256 97db204eaf91401fc986a9e6cbc897ab578c4afe75bc3c3ab09485baef7b3caf
 MD5 ac54433bbfb8588c01144dd4d61ecdd7 postfix-2.1.5-r2.ebuild 7525
@@ -113,10 +115,18 @@ EBUILD postfix-2.3.0.ebuild 11839 RMD160 f2253410816ef3d25fa84897349fce16118f2fb
 MD5 66d0e13c1e6a896eff8135cf77e600fb postfix-2.3.0.ebuild 11839
 RMD160 f2253410816ef3d25fa84897349fce16118f2fbd postfix-2.3.0.ebuild 11839
 SHA256 2dcf0255b334f3db9575c2cf545602abe508dd03c3bdfc9c1a877122aae9d340 postfix-2.3.0.ebuild 11839
-MISC ChangeLog 39657 RMD160 0d8bd50540ca14be53a3a6d6b5a76a1283e9fcfd SHA1 cf313e23f9f9644395459f1b6dec123a0f758e53 SHA256 e4523ab46629cb4f6f825466607b51bdec6c329522d5f624a7e517f964a4bef4
-MD5 c7dbf2119077fba5734242c202c5c184 ChangeLog 39657
-RMD160 0d8bd50540ca14be53a3a6d6b5a76a1283e9fcfd ChangeLog 39657
-SHA256 e4523ab46629cb4f6f825466607b51bdec6c329522d5f624a7e517f964a4bef4 ChangeLog 39657
+EBUILD postfix-2.3.2-r1.ebuild 11706 RMD160 da1dd05fa943475e09aee733dca09da1041e7cc7 SHA1 3df29519b8c5a236f00cd905b926cab2041ca014 SHA256 ea9c093dca93276f6e3f81e3d781ea75f414d28501bd6782ffed673275bcab95
+MD5 dbea57a3b85c4a130ee6327e2af51388 postfix-2.3.2-r1.ebuild 11706
+RMD160 da1dd05fa943475e09aee733dca09da1041e7cc7 postfix-2.3.2-r1.ebuild 11706
+SHA256 ea9c093dca93276f6e3f81e3d781ea75f414d28501bd6782ffed673275bcab95 postfix-2.3.2-r1.ebuild 11706
+EBUILD postfix-2.3.2.ebuild 11690 RMD160 d3d8b74293bee3693719db7b9dc46d1e2682d8ce SHA1 a56e3b6258d76d9897337c11b8ec3138e920810c SHA256 f93fd6b64a97898d7a3440200d0b7635fcda0a22a7076e62b213d7f35fc92d96
+MD5 b7d0f7c6630d6f80f7e1a90f207746f1 postfix-2.3.2.ebuild 11690
+RMD160 d3d8b74293bee3693719db7b9dc46d1e2682d8ce postfix-2.3.2.ebuild 11690
+SHA256 f93fd6b64a97898d7a3440200d0b7635fcda0a22a7076e62b213d7f35fc92d96 postfix-2.3.2.ebuild 11690
+MISC ChangeLog 39871 RMD160 bb9a975a1ddd684fe8540d8640ae1061ca8f7dc7 SHA1 4fdfec3e890b8f88dcea9dff4a1a939fb2b2a0ed SHA256 66c007ba74aaf89d0416ba3bf65158aedb00f73bb397d999cfedc2389c5ec5a5
+MD5 c36d5de6bf067875dbe53e4a1be3c4ed ChangeLog 39871
+RMD160 bb9a975a1ddd684fe8540d8640ae1061ca8f7dc7 ChangeLog 39871
+SHA256 66c007ba74aaf89d0416ba3bf65158aedb00f73bb397d999cfedc2389c5ec5a5 ChangeLog 39871
 MISC metadata.xml 253 RMD160 27155323556701c38934832ee9970634a088bb5b SHA1 6c1c3f1fda858526944eb427f5bec79da119da0d SHA256 38f168ad00f8b59ee75efaf002d442b2793f280dafc70955c70920e974c6dfe0
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
 RMD160 27155323556701c38934832ee9970634a088bb5b metadata.xml 253
@@ -160,10 +170,16 @@ SHA256 78de95c0458c01817f10eb8571dbbc2abc8402b996d9b5dba0a020baa9a664b1 files/di
 MD5 1822c39a5e1fb331c5a851b3bec380d7 files/digest-postfix-2.3.0-r1 244
 RMD160 c30245e65a83590d13fa9521293d964ceee41d6b files/digest-postfix-2.3.0-r1 244
 SHA256 78de95c0458c01817f10eb8571dbbc2abc8402b996d9b5dba0a020baa9a664b1 files/digest-postfix-2.3.0-r1 244
+MD5 42265b1f69d2eb61de005c14c3f3fb42 files/digest-postfix-2.3.2 497
+RMD160 00b75d6c8eb2dc1ae2752f5821ae78f3519ac2fc files/digest-postfix-2.3.2 497
+SHA256 d7269905f65bd19fb4e45e019e21c187a44a45b90c657bd85481ae8d2af31812 files/digest-postfix-2.3.2 497
+MD5 42265b1f69d2eb61de005c14c3f3fb42 files/digest-postfix-2.3.2-r1 497
+RMD160 00b75d6c8eb2dc1ae2752f5821ae78f3519ac2fc files/digest-postfix-2.3.2-r1 497
+SHA256 d7269905f65bd19fb4e45e019e21c187a44a45b90c657bd85481ae8d2af31812 files/digest-postfix-2.3.2-r1 497
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEx5VH5FrxP71izLARAsJaAKCKUDC7oN900XG8YX/JQ43X/IK+7wCgvcsl
-GDFWi8vhQkkD49XbZM/Ka1o=
-=DYrc
+iD8DBQFEz6Dh5FrxP71izLARAl9XAKC9okkWUopcwCjGzor1/1ogmU7SRwCfQD98
+eUVZk0M3wfONGYFtadNAWZw=
+=orr+
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.2 b/mail-mta/postfix/files/digest-postfix-2.3.2
new file mode 100644
index 000000000000..6bb968542f6e
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.3.2
@@ -0,0 +1,6 @@
+MD5 fc7c1676ceecbfb414353af1dafe11de postfix-2.3.1-vda.patch.gz 7956
+RMD160 e258e3b383f5179f318199a43f9584d2ef3a0e8b postfix-2.3.1-vda.patch.gz 7956
+SHA256 b92de9749df915a1f23e21d3d08269fb249b0e5d8bf6a606170b4b329850c9b4 postfix-2.3.1-vda.patch.gz 7956
+MD5 b1e482eea6a340041b8a637e62b15e3c postfix-2.3.2.tar.gz 2774600
+RMD160 ce561dcc03e7f6bc1bb3bdd9426175b18571c625 postfix-2.3.2.tar.gz 2774600
+SHA256 151b766389fc8453be01700220e9fb726e202d539f055ce83b9c928b27d44413 postfix-2.3.2.tar.gz 2774600
diff --git a/mail-mta/postfix/files/digest-postfix-2.3.2-r1 b/mail-mta/postfix/files/digest-postfix-2.3.2-r1
new file mode 100644
index 000000000000..6bb968542f6e
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.3.2-r1
@@ -0,0 +1,6 @@
+MD5 fc7c1676ceecbfb414353af1dafe11de postfix-2.3.1-vda.patch.gz 7956
+RMD160 e258e3b383f5179f318199a43f9584d2ef3a0e8b postfix-2.3.1-vda.patch.gz 7956
+SHA256 b92de9749df915a1f23e21d3d08269fb249b0e5d8bf6a606170b4b329850c9b4 postfix-2.3.1-vda.patch.gz 7956
+MD5 b1e482eea6a340041b8a637e62b15e3c postfix-2.3.2.tar.gz 2774600
+RMD160 ce561dcc03e7f6bc1bb3bdd9426175b18571c625 postfix-2.3.2.tar.gz 2774600
+SHA256 151b766389fc8453be01700220e9fb726e202d539f055ce83b9c928b27d44413 postfix-2.3.2.tar.gz 2774600
diff --git a/mail-mta/postfix/postfix-2.3.2-r1.ebuild b/mail-mta/postfix/postfix-2.3.2-r1.ebuild
new file mode 100644
index 000000000000..0a0fcfc72a6e
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.3.2-r1.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.2-r1.ebuild,v 1.1 2006/08/01 18:42:51 langthang 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 vda"
+
+MY_PV=${PV/_rc/-RC}
+MY_SRC=${PN}-${MY_PV}
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_VER=2.3.1
+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? ( >=dev-db/mysql-3.23.51 )
+	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
+}
+
+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
+}
diff --git a/mail-mta/postfix/postfix-2.3.2.ebuild b/mail-mta/postfix/postfix-2.3.2.ebuild
new file mode 100644
index 000000000000..fbc02f876558
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.3.2.ebuild
@@ -0,0 +1,386 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.2.ebuild,v 1.1 2006/08/01 18:42:51 langthang 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.1
+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? ( >=dev-db/mysql-3.23.51 )
+	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
+}
+
+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
+}