patchlevel 10.

add a patch for master.cf . Bug #26130.
Package-Manager: portage-2.1_pre7-r4

7 files changed, 802 insertions, 6 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 4cf1195abd8e..1f3cb07f5552 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,15 @@
 # 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.97 2006/03/07 21:07:20 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.98 2006/04/07 16:00:47 langthang Exp $
+
+*postfix-2.2.10-r1 (07 Apr 2006)
+*postfix-2.2.10 (07 Apr 2006)
+
+  07 Apr 2006; Tuấn Văn <langthang@gentoo.org>
+  +files/postfix-master.cf.patch, +postfix-2.2.10.ebuild,
+  +postfix-2.2.10-r1.ebuild:
+  patchlevel 10.
+  add a patch for master.cf . Bug #26130.
 
   07 Mar 2006; Fernando J. Pereda <ferdy@gentoo.org>
   +files/postfix.rc6.2.2.9, postfix-2.2.9.ebuild, postfix-2.2.9-r1.ebuild:
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index b05f72d9b0c1..2e18557a9208 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,37 +1,106 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 0bd5b49fbcae8b48d9f4e7af7c080040 ChangeLog 37905
+MD5 300246f27be3540d6393138e15f795de ChangeLog 38170
+RMD160 99eecef60b09a6bf365752031462e5abd9cbb3cd ChangeLog 38170
+SHA256 7a659dcb7221fb01655235cd8f812d4099d9f3c85f456fd3d0fbf5cc1af3a065 ChangeLog 38170
 MD5 c2fd2c8cd7f31c4c876db365a98b972e files/digest-postfix-2.1.5-r2 363
+RMD160 fd913cc9dcbb828e65a435424ccce15da0afa81b files/digest-postfix-2.1.5-r2 363
+SHA256 d97a93dcc916767d201aefdcac3818c17b8fd220a2325ac95815f2fcb78444eb files/digest-postfix-2.1.5-r2 363
+MD5 8ff1cc9e2bf805224d869fdd6c3b1894 files/digest-postfix-2.2.10 500
+RMD160 656dda5c02aa39bca61fe5c202591712dd9df528 files/digest-postfix-2.2.10 500
+SHA256 b8b84388dcbe1184ffd8218726e2d331965e55a9b1c554349b859c3771d3d833 files/digest-postfix-2.2.10 500
+MD5 8ff1cc9e2bf805224d869fdd6c3b1894 files/digest-postfix-2.2.10-r1 500
+RMD160 656dda5c02aa39bca61fe5c202591712dd9df528 files/digest-postfix-2.2.10-r1 500
+SHA256 b8b84388dcbe1184ffd8218726e2d331965e55a9b1c554349b859c3771d3d833 files/digest-postfix-2.2.10-r1 500
 MD5 ff949f18a6d77e67fba4ed20907d0592 files/digest-postfix-2.2.4 135
+RMD160 81d57ff2b9be0a04dbb58bbfcc4902d0f20c7b45 files/digest-postfix-2.2.4 135
+SHA256 ae05f34a963bebb9360a425665cfbdb33f6afafcbdcfe22515a9cdf70e6e1635 files/digest-postfix-2.2.4 135
 MD5 a45bc89f84c0c8cd2f467b49eba737c8 files/digest-postfix-2.2.5 135
+RMD160 a3c2dc910bb9ba633f8a8e04f43e95622006f98c files/digest-postfix-2.2.5 135
+SHA256 071aa336549f38da568d919fb03d345472b80b8d7344680013fefa8ae4215c28 files/digest-postfix-2.2.5 135
 MD5 a45bc89f84c0c8cd2f467b49eba737c8 files/digest-postfix-2.2.5-r1 135
+RMD160 a3c2dc910bb9ba633f8a8e04f43e95622006f98c files/digest-postfix-2.2.5-r1 135
+SHA256 071aa336549f38da568d919fb03d345472b80b8d7344680013fefa8ae4215c28 files/digest-postfix-2.2.5-r1 135
 MD5 087ab3575175983e2f64959bc6d585fd files/digest-postfix-2.2.8 497
+RMD160 22f8946ed773ae95209cb9d34d02a29f9e628f75 files/digest-postfix-2.2.8 497
+SHA256 f12b1c9355bf39fbc72cd4988cf07d237420c53ebe2432954e008b7d38acf933 files/digest-postfix-2.2.8 497
 MD5 087ab3575175983e2f64959bc6d585fd files/digest-postfix-2.2.8-r1 497
+RMD160 22f8946ed773ae95209cb9d34d02a29f9e628f75 files/digest-postfix-2.2.8-r1 497
+SHA256 f12b1c9355bf39fbc72cd4988cf07d237420c53ebe2432954e008b7d38acf933 files/digest-postfix-2.2.8-r1 497
 MD5 dca94aada71eb97635d0f7cd638fb386 files/digest-postfix-2.2.9 497
+RMD160 f092a227a28b062391e481a7239f82c7e841283b files/digest-postfix-2.2.9 497
+SHA256 87e695782c1576b03d3df22343492407cdc3d2bb70f259df7c108ccda29fdd54 files/digest-postfix-2.2.9 497
 MD5 dca94aada71eb97635d0f7cd638fb386 files/digest-postfix-2.2.9-r1 497
+RMD160 f092a227a28b062391e481a7239f82c7e841283b files/digest-postfix-2.2.9-r1 497
+SHA256 87e695782c1576b03d3df22343492407cdc3d2bb70f259df7c108ccda29fdd54 files/digest-postfix-2.2.9-r1 497
 MD5 a3c32f8c9d1344be08f018d377a61f59 files/mailer.conf 438
+RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 files/mailer.conf 438
+SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839 files/mailer.conf 438
 MD5 fd78f3c5211f280a77dc8c8acd3dd898 files/postfix-2.0.9-get-FQDN.patch 1057
+RMD160 492e9de53c0a16e71940ab4f4ed99bc4f76061fa files/postfix-2.0.9-get-FQDN.patch 1057
+SHA256 6e5f5a1f9bc60e04d6decc8491c5955c625396f23698d961c412b50ec793e878 files/postfix-2.0.9-get-FQDN.patch 1057
+MD5 5741da441965a63229e3ded4a4bc4ec0 files/postfix-master.cf.patch 1064
+RMD160 25283e8c3c27ff156e229ad1ae8643d3be61d6b7 files/postfix-master.cf.patch 1064
+SHA256 b1f7040cb9445379c4318e2161efd79c74bc6927125f4542eb87500ece145f60 files/postfix-master.cf.patch 1064
 MD5 98872da0bd186c6e0d2b884b0fa28b78 files/postfix.rc6 610
+RMD160 aa77be0be55cc95613ea6ab35d46bb9c650e8b8b files/postfix.rc6 610
+SHA256 30ec591c7442c39d7cb32c189218d492d3f880fb0c940197a1f7020e160658aa files/postfix.rc6 610
 MD5 8d7d372a5e867ebc0b1644ee19105e4e files/postfix.rc6.2.2.4 637
+RMD160 abea95b768a709e6fc62ef1c44af1f4743db7210 files/postfix.rc6.2.2.4 637
+SHA256 3c78b579d273d602647399d44867347dc7aa9c756abf7cec6c64ce7252c05d34 files/postfix.rc6.2.2.4 637
 MD5 b98f218de07ec565dfc175e0f3a3c7be files/postfix.rc6.2.2.5 631
+RMD160 a24a3858d99ed8ac7a492def32f044f7d32c4830 files/postfix.rc6.2.2.5 631
+SHA256 5c78e200b5f99946034e38900d295bbf9604fcd32b4326d272ab124f5d8fc59b files/postfix.rc6.2.2.5 631
 MD5 c6f19aa72d695ad889f9130c1b8c8baa files/postfix.rc6.2.2.9 637
+RMD160 155fc1e1420089b6144f7ae1065c46a8fd622aa7 files/postfix.rc6.2.2.9 637
+SHA256 a8a6561a039a766e4e999ca52c45d94de7a7790cbee93740d021eb3eb4e1cd27 files/postfix.rc6.2.2.9 637
 MD5 502e444ec6b9d6fb9bbef3bb0f5e284a files/smtp.pam 254
+RMD160 20dd773a4918a5d73a8ff6353c083018964892b6 files/smtp.pam 254
+SHA256 a13eedc9e0efe8066295719d780d188e28d3d0c0ca838f32fea874c4baf1c445 files/smtp.pam 254
 MD5 889559c8b5d02597e9e7eec89e328360 files/smtp.pass 141
+RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 files/smtp.pass 141
+SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9 files/smtp.pass 141
 MD5 43e9368a07952c4aae9e370b59ce1450 files/smtp.sasl 131
+RMD160 6831f9bbfd76be0d39fdda4270120824ebb9f52f files/smtp.sasl 131
+SHA256 954ba1e80537ca01b935b856e31ec4e3e41c138f04b7cf99ccb969876b8b78e7 files/smtp.sasl 131
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
+RMD160 27155323556701c38934832ee9970634a088bb5b metadata.xml 253
+SHA256 38f168ad00f8b59ee75efaf002d442b2793f280dafc70955c70920e974c6dfe0 metadata.xml 253
 MD5 ac54433bbfb8588c01144dd4d61ecdd7 postfix-2.1.5-r2.ebuild 7525
+RMD160 39807b6d7a75a3dc2e1c14d420e5ad5aa7d7d3db postfix-2.1.5-r2.ebuild 7525
+SHA256 97db204eaf91401fc986a9e6cbc897ab578c4afe75bc3c3ab09485baef7b3caf postfix-2.1.5-r2.ebuild 7525
+MD5 4e780b13f41aeb54a45f5cd2e7a5bf47 postfix-2.2.10-r1.ebuild 10233
+RMD160 b64714884beecaafa65e4064545ce498d39361cd postfix-2.2.10-r1.ebuild 10233
+SHA256 762e2ff05ac9524f558bee898bd4083b06b59d5c0c0b4cbe60581d68d31af504 postfix-2.2.10-r1.ebuild 10233
+MD5 839bd69ad1f5ce6e4cfee112f62e427d postfix-2.2.10.ebuild 10454
+RMD160 4e919c2cfa5db136e4024a951be4c0a522bfbaf7 postfix-2.2.10.ebuild 10454
+SHA256 3ed24f3778e49c589be3e2de2027422e0d272a6097fa831832aa177bcd57f6c9 postfix-2.2.10.ebuild 10454
 MD5 6a23485292037b5bd4444da2b636fabe postfix-2.2.4.ebuild 9235
+RMD160 2a5c3b1e3d5199cb6709f1fe414fd348a10c4a4c postfix-2.2.4.ebuild 9235
+SHA256 738532ba0a4c3d1887767a0e7cf168ef467f7a6af13f90aa650f122483c19d70 postfix-2.2.4.ebuild 9235
 MD5 f1052a274b0e52f23522e679c102d016 postfix-2.2.5-r1.ebuild 9246
+RMD160 a0819382fc9eb6342643a051962512fedcd73bd2 postfix-2.2.5-r1.ebuild 9246
+SHA256 50ada556958d24a35c708be4584520f532129e76d4e0ca5a50a4c73e11bcba44 postfix-2.2.5-r1.ebuild 9246
 MD5 b9d87dbf24464c335f81059f4c8ab124 postfix-2.2.5.ebuild 9535
+RMD160 40ab26c6582abbe6f3cffedc5ab6452c6412869b postfix-2.2.5.ebuild 9535
+SHA256 77dd108ea9cd6c4273aa5b056539ac6dc2706dfedebe6f349f3aea942e457d5f postfix-2.2.5.ebuild 9535
 MD5 e096b2140dc52302a2fdf4030e43992f postfix-2.2.8-r1.ebuild 10187
+RMD160 7b011604fd9f9051acf5b55d21b878ea9131bc7d postfix-2.2.8-r1.ebuild 10187
+SHA256 7989492a8aff9227e4490f6e037409dd003794b9c0f6a7c883c36a720e358906 postfix-2.2.8-r1.ebuild 10187
 MD5 f6abb5d8034f1922d26ad0bce760a017 postfix-2.2.8.ebuild 10408
+RMD160 f0e7c077fa3a0401127d044cc0fc404495980ed6 postfix-2.2.8.ebuild 10408
+SHA256 228c033b8206d180f701265ab121eaa3953732d9befdc75046da3096f4b06a72 postfix-2.2.8.ebuild 10408
 MD5 647159588c88601c472344bb53dca79d postfix-2.2.9-r1.ebuild 10183
+RMD160 18ffabee648d5c870c29fc062e47e0ab937d7ec2 postfix-2.2.9-r1.ebuild 10183
+SHA256 56f351ffc446fbeaaf5c6197f50ca53264432ec93aacb06ca32fb1fe005cfeb9 postfix-2.2.9-r1.ebuild 10183
 MD5 07d4904ac988ffa461e57c46ca4131dd postfix-2.2.9.ebuild 10404
+RMD160 2bf8a790d425437c80cd37d89fa939154c16a711 postfix-2.2.9.ebuild 10404
+SHA256 a3cd8bd090af5c20ad58ebdd009954918974af93e3b1d3e71c49d325f555249c postfix-2.2.9.ebuild 10404
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEDfYcViELBEf1JB0RApzKAJ9pow+/jzlPT0JGsfAAky+YcE3k9wCfaiiN
-3VYMAc51DcTbs40V3+5Ig68=
-=w6nX
+iD8DBQFENozF5FrxP71izLARAtVyAJ9+GUeohR5fOzwIPytG5bK0xcpsNwCeK4gL
+57DsOG6wN0Je9OIy5vXk+Aw=
+=4LGw
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.10 b/mail-mta/postfix/files/digest-postfix-2.2.10
new file mode 100644
index 000000000000..95a322624eb9
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.2.10
@@ -0,0 +1,6 @@
+MD5 440a4702182a79ac2f51e8974fb742c9 postfix-2.2.10.tar.gz 2443513
+RMD160 12376298eef12cbe127687328ebfb9166cfee5d6 postfix-2.2.10.tar.gz 2443513
+SHA256 7c3f4cabd9f5bbba0c8987b0dcbafdce45a4f13b7f917bcfc6d7b3caf8ce34f1 postfix-2.2.10.tar.gz 2443513
+MD5 50a7768db7bf7374b6e3fa24b99c19b9 postfix-2.2.8-vda.patch.gz 7741
+RMD160 c74969b300232900d816df5f5dad7e3178db43ed postfix-2.2.8-vda.patch.gz 7741
+SHA256 b325514aa1bb3f90dcc749be16f7c74d18d8ab75cee6f9b20d740dd0ce5c07ac postfix-2.2.8-vda.patch.gz 7741
diff --git a/mail-mta/postfix/files/digest-postfix-2.2.10-r1 b/mail-mta/postfix/files/digest-postfix-2.2.10-r1
new file mode 100644
index 000000000000..95a322624eb9
--- /dev/null
+++ b/mail-mta/postfix/files/digest-postfix-2.2.10-r1
@@ -0,0 +1,6 @@
+MD5 440a4702182a79ac2f51e8974fb742c9 postfix-2.2.10.tar.gz 2443513
+RMD160 12376298eef12cbe127687328ebfb9166cfee5d6 postfix-2.2.10.tar.gz 2443513
+SHA256 7c3f4cabd9f5bbba0c8987b0dcbafdce45a4f13b7f917bcfc6d7b3caf8ce34f1 postfix-2.2.10.tar.gz 2443513
+MD5 50a7768db7bf7374b6e3fa24b99c19b9 postfix-2.2.8-vda.patch.gz 7741
+RMD160 c74969b300232900d816df5f5dad7e3178db43ed postfix-2.2.8-vda.patch.gz 7741
+SHA256 b325514aa1bb3f90dcc749be16f7c74d18d8ab75cee6f9b20d740dd0ce5c07ac postfix-2.2.8-vda.patch.gz 7741
diff --git a/mail-mta/postfix/files/postfix-master.cf.patch b/mail-mta/postfix/files/postfix-master.cf.patch
new file mode 100644
index 000000000000..fa53dd165b15
--- /dev/null
+++ b/mail-mta/postfix/files/postfix-master.cf.patch
@@ -0,0 +1,20 @@
+--- conf/master.cf.orig	2006-03-02 10:57:19.000000000 -0800
++++ conf/master.cf	2006-03-02 11:08:03.000000000 -0800
+@@ -60,11 +60,15 @@
+ # The Cyrus deliver program has changed incompatibly, multiple times.
+ #
+ old-cyrus unix  -       n       n       -       -       pipe
+-  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
++  flags=R user=cyrus argv=/usr/lib/cyrus/deliver -e -m ${extension} ${user}
+ # Cyrus 2.1.5 (Amos Gouaux)
+ # Also specify in main.cf: cyrus_destination_recipient_limit=1
+ cyrus     unix  -       n       n       -       -       pipe
+-  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
++  flags=hu user=cyrus argv=/usr/lib/cyrus/deliver -e -r ${sender} -m ${extension} ${user}
++# Cyrus with "virtdomains: yes"
++# Also specify in main.cf: virtual_transport = virt-cyrus
++virt-cyrus     unix  -       n       n       -       -       pipe
++  flags=hu user=cyrus argv=/usr/lib/cyrus/deliver -e -r ${sender} -m ${recipient} ${user}
+ #
+ # See the Postfix UUCP_README file for configuration details.
+ #
diff --git a/mail-mta/postfix/postfix-2.2.10-r1.ebuild b/mail-mta/postfix/postfix-2.2.10-r1.ebuild
new file mode 100644
index 000000000000..f162203eab4a
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.2.10-r1.ebuild
@@ -0,0 +1,339 @@
+# 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.2.10-r1.ebuild,v 1.1 2006/04/07 16:00:47 langthang Exp $
+
+inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
+IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened cdb"
+#IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened devel"
+
+MY_PV=${PV}
+MY_SRC=${PN}-${MY_PV}
+#DEV_SRC=${MY_SRC}-newdb-nonprod
+VDA_VER=2.2.8
+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="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${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"
+
+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 )"
+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 from postfix-2.1. logic to fix bug #53324
+	if [[ -f /var/lib/init.d/started/postfix ]] ; then
+		if has_version '<mail-mta/postfix-2.2' ; 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
+
+	# 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
+		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	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
+
+	# CDB support, bug #112293
+	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 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"
+		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"
+
+		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
+
+	mailer_pkg_postinst
+}
diff --git a/mail-mta/postfix/postfix-2.2.10.ebuild b/mail-mta/postfix/postfix-2.2.10.ebuild
new file mode 100644
index 000000000000..78b1fe295ef4
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.2.10.ebuild
@@ -0,0 +1,347 @@
+# 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.2.10.ebuild,v 1.1 2006/04/07 16:00:47 langthang 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"
+#IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened devel"
+
+MY_PV=${PV}
+MY_SRC=${PN}-${MY_PV}
+#DEV_SRC=${MY_SRC}-newdb-nonprod
+VDA_VER=2.2.8
+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="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${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"
+
+PROVIDE="virtual/mta 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 )"
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!mailwrapper? ( !virtual/mta )
+	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+	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 from postfix-2.1. logic to fix bug #53324
+	if [[ -f /var/lib/init.d/started/postfix ]] ; then
+		if has_version '<mail-mta/postfix-2.2' ; 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
+
+	# 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
+		mycc="${mycc} -DUSE_SASL_AUTH -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	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 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"
+
+		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"
+
+		insinto /etc/mail
+		doins "${FILESDIR}/mailer.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
+
+	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
+
+}