Version bump, security bug #236453

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64

6 files changed, 17 insertions, 752 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 044657696c97..7404503785e5 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.170 2008/08/30 11:52:42 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.171 2008/09/02 14:02:12 dertobi123 Exp $
+
+*postfix-2.5.5 (02 Sep 2008)
+*postfix-2.4.9 (02 Sep 2008)
+
+  02 Sep 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -postfix-2.2.11-r1.ebuild, -postfix-2.3.8-r1.ebuild,
+  -postfix-2.4.8.ebuild, +postfix-2.4.9.ebuild, -postfix-2.5.4.ebuild,
+  +postfix-2.5.5.ebuild:
+  Version bump, security bug #236453
 
   30 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   postfix-2.5.4.ebuild:
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index b3fd0953193c..ee3ae065eef4 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -8,23 +8,17 @@ AUX postfix.rc6.2.2.9 648 RMD160 5c8242c63e4263734ae2c51f20c5970db53dc604 SHA1 f
 AUX postfix.rc6.2.5 1415 RMD160 9d9b7240b1bfb7bcf53d6914dfc5aea2b150572e SHA1 ba08faaa70311605d2b869519ce876c71ce47a5d SHA256 11f79d4a84acfe0c34ebba11b6d1afde9c6dffcf44e8aba8dc895d4fcd0adcac
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
 AUX smtp.sasl 131 RMD160 6831f9bbfd76be0d39fdda4270120824ebb9f52f SHA1 613dff95ac21bd306c2917e5360430772efbb146 SHA256 954ba1e80537ca01b935b856e31ec4e3e41c138f04b7cf99ccb969876b8b78e7
-DIST postfix-2.2.10-vda.patch.gz 7799 RMD160 01c36255cb2bac7518b94fd5074d1182b7680bdd SHA1 00a989f11fb8bb4561738e454960d6b163a7c68e SHA256 32aa3f7219e3da3bda362223ee34d6571c796f601b565de1890bce628446e0cc
-DIST postfix-2.2.11.tar.gz 2448022 RMD160 0915a4daafeb4e316754d5da1305f3d69074d705 SHA1 e0fe3d2ce8e7b5ec4e760d03d8bcdf67b46544be SHA256 07d3959a20f0d47785cad3dddf22676b041a57c798cb7bad43c405389abf1d12
-DIST postfix-2.3.3-vda.patch.gz 7944 RMD160 bdbd0798ca4d23c6e8443b26b957b8d0d252da1d SHA1 70c2d41363ead6d9129849e09df551d6ed77920a SHA256 4fdff601e0b2653025c9b9ca8875e995b8052e2e362c3a5e035c3d2859bd4fa2
-DIST postfix-2.3.8.tar.gz 2787761 RMD160 2984ca8e81375a3124801c999d23637e745de54c SHA1 c40ebae5cdcd53e13ae8ba5cac1a70167576859b SHA256 f19c26646e19cc93bdb01b1118ad6bdc67c0ec506c7dc989370e117c8d43f3e6
 DIST postfix-2.4.6-vda-ng-r2.patch.gz 12397 RMD160 a03f29df52eb5c2974206cd3ee32305c24d4be73 SHA1 71c9b71a238093f944865fbc90704a25710d3f3f SHA256 d8186d4c0f19b0a989d98305d9bd1c8e27223c3a4fb549d5581f279e567fadf5
 DIST postfix-2.4.6.tar.gz 2935249 RMD160 115b3a4eb982701e29db2e52e294ec8ee69bdae5 SHA1 226222707fd8d963d3173070cac96370c453ffa7 SHA256 00d079d6354bb3979b186da6bbe281b42eea2716620da781bcdb36dd558edcca
 DIST postfix-2.4.7.tar.gz 2937251 RMD160 aea8314d39e2ee3802a814c9efd2b0c5f1b8474d SHA1 9957b6ee0abdc15749655b1f00a3d0c084c28712 SHA256 1d3fcb784d21cd93567e94e8cb244445465b9a1d0e6c2589bb1ed4ab90d536dc
-DIST postfix-2.4.8.tar.gz 2937491 RMD160 2b8490078ac10951fdd743ea8ae9da551251e2f2 SHA1 751b604c2ee9fe369f27c643e9e9b5794466b75a SHA256 5c7cf5db497e707e57c04392bb67ecc87d8c27db941d30041675327509988a6d
+DIST postfix-2.4.9.tar.gz 2937677 RMD160 828e3f1daf8623e7ca2a4a59aca37d726da6aa9c SHA1 8bddfa5a0cff8466a1ef5a89ffa018ed58538ca1 SHA256 d4ad643268a3b20bfd5eb4c1a1eaf3c740d16507d42e841ed407571d4c9af65f
 DIST postfix-2.5.3-vda-ng.patch.gz 12809 RMD160 4543db88a244eae7edaf7250449eb6d2e78d0156 SHA1 f3fc798f6eede1d600531877dd069c20b0a1e626 SHA256 5690c734072e6231b151449a7ef1da25e9ac091f51b279c4670219751b984799
 DIST postfix-2.5.3.tar.gz 3156942 RMD160 3966af29024c587da3eebe56446f059a6cd1a8e4 SHA1 95d511c003ef89cc334c90b73396c4d366c74923 SHA256 4f8f933dd437fd9c29b2b53795cb16a20d6ca73bccf445101aeb5e05068a3a43
-DIST postfix-2.5.4.tar.gz 3157713 RMD160 83d59f949eb13656b60226fc43b7ab24b227c873 SHA1 995f5873c464ac9427b543d25c4325e2fbbb7bf5 SHA256 c455de2efd03a38e6b7507521dc0141c526105b8bdf231732f7cd7a9129b4a63
-EBUILD postfix-2.2.11-r1.ebuild 10482 RMD160 38a30850a1d3be0327aaf61eaf3ec085a65c75ed SHA1 e86c048743816eb80cf4a86ce9f7aef977efaab4 SHA256 886a8fa626c202b9eda143aa1d76c052abfdf8722da39072bd4f7abc63ac8f46
-EBUILD postfix-2.3.8-r1.ebuild 11815 RMD160 1ff0b58312bbe3daaa2972b25c8a1f86815a5b4a SHA1 45a577bb284e99e48905b7f3e39496002e85c08a SHA256 720e3c5f359cccc9655c48340b0d7383c3e836ecd7c8b71eba264c99bc03b117
+DIST postfix-2.5.5.tar.gz 3157877 RMD160 2118fa61710bdb266d4fb8b7a0f60cf0f633c801 SHA1 7240be9e362b991bacfcf7e3771ab611e872ac12 SHA256 8c12c4d539818433d2a65019d44c802c06d0d18667cd069a5b313db06f4bc832
 EBUILD postfix-2.4.6-r2.ebuild 11865 RMD160 7055177b96401e61a89f3fe1440d2489dc2389df SHA1 3e9fa6bbc787d9989d95ec9a2ae1c90556c35053 SHA256 1c3fc1a9c1dc3207794217748055ecefabb149c9ad3ec19dd071444f6669444d
 EBUILD postfix-2.4.7-r1.ebuild 11924 RMD160 b5530383f9785785faaeb069265edde44ba75d7a SHA1 418dbb93c48d9ecc49021a3a4c48b83343784d30 SHA256 702afb595dfa10fc1c36fe04291aa75f9dc560364506877dd36f6f5d137c1e64
-EBUILD postfix-2.4.8.ebuild 11839 RMD160 c0654e250aece573b3020d1baad3173d0a563d49 SHA1 48027b7d844b461dd083ac02b886bfac0ea8f6c9 SHA256 b63adc9ab941277d5bbcb6093f33b27139306cacdc6114881c2ba3f08833dbde
+EBUILD postfix-2.4.9.ebuild 11839 RMD160 5507b4e32dee681d13802fe03db583f0f7f94656 SHA1 84e7bdbfab35f6df535d50a74ce71f91c03ebfc6 SHA256 3a87dd05f217d506a2d06a5e806fe154018ad5dd373777cc30d356903ec3f6e5
 EBUILD postfix-2.5.3-r1.ebuild 12029 RMD160 1ee106d262fd7ac7477cc96fbcc88b33ac7ab2c1 SHA1 c1a944f00f0dc0a8d49350acb40e2a2cff3462a4 SHA256 734a94429fbb3fb5a10b787287862b4499fbb9bcb25b77a756b7746e294d8f1e
-EBUILD postfix-2.5.4.ebuild 12002 RMD160 58c3a5c2be85f976ee7bce2887ff7a259f9f4f39 SHA1 50c409b3bb8e3410b3ba7d05e71bfd4c728a3446 SHA256 b1b6cdc876ec88ffac76168a309e25998cb8ecea1ca0378bfbfb981795d413be
-MISC ChangeLog 51225 RMD160 16d86d324d3daa8a87b4453d6b0252ce1bfdcb18 SHA1 98f52c5381e1f62c4ad7a85cb882e698a0b107f8 SHA256 87865416a18b56720aa4b8bf3510d856fd23af9c2848f5ba1bac3dd94d4dd2b4
+EBUILD postfix-2.5.5.ebuild 12002 RMD160 9167beb18b681de74ff0e97354271ec5003a1fac SHA1 b960a0a46027fd29a550b94a67bd6f84bc009aa0 SHA256 b3df4d71ad6a31bf47b6865e5379d76a772a5b486164bbdc565c671eb2dc3479
+MISC ChangeLog 51529 RMD160 eb456a2fb546e542fd7dde2cec7bfc676f32bbb2 SHA1 dbbb01a39c9922e9c33847e9478c81fde0d440d5 SHA256 293a535b041553b4d36a71e3e64b5b3fb5750a4138eb8464fba80da7897ad664
 MISC metadata.xml 388 RMD160 9081cc3e1f3c8c56c257a9a525277eb3d3dff496 SHA1 7a266976e60e25df9769df606a9ebfe3bf79b96a SHA256 b2d51b2d3d8eaa9a3e3bbaa3bd21d2c5841abfd73d6338fa833dae7b7df6202f
diff --git a/mail-mta/postfix/postfix-2.2.11-r1.ebuild b/mail-mta/postfix/postfix-2.2.11-r1.ebuild
deleted file mode 100644
index caa4815ee83d..000000000000
--- a/mail-mta/postfix/postfix-2.2.11-r1.ebuild
+++ /dev/null
@@ -1,349 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.11-r1.ebuild,v 1.11 2008/07/22 17:44:21 dertobi123 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.10
-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 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? ( virtual/mysql )
-	postgres? ( virtual/postgresql-base )
-	ssl? ( >=dev-libs/openssl-0.9.6g )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )"
-RDEPEND="${DEPEND}
-	>=net-mail/mailbase-0.00
-	!mailwrapper? (
-		!virtual/mta
-		!net-mail/mailwrapper
-	)
-	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() {
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	# make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) ${LDFLAGS} -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 '=virtual/postgresql-base-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 PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	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"
-
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	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
-
-}
diff --git a/mail-mta/postfix/postfix-2.3.8-r1.ebuild b/mail-mta/postfix/postfix-2.3.8-r1.ebuild
deleted file mode 100644
index 961424479786..000000000000
--- a/mail-mta/postfix/postfix-2.3.8-r1.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8-r1.ebuild,v 1.11 2008/07/22 17:44:21 dertobi123 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 ~x86-fbsd"
-
-# 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? ( virtual/postgresql-base )
-	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
-		!net-mail/mailwrapper
-	)
-	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() {
-	# added -Wl,-z,now wrt 62674.
-	# remove -ldl as it is not necessary, resolve bug #106446.
-	# -Wl,-z,now replaced by $(bindnow-flags)
-	# make sure LDFLAGS get passed down to the executables.
-	local mycc="-DHAS_PCRE" mylibs="$(bindnow-flags) ${LDFLAGS} -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 '=virtual/postgresql-base-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 PORTING RELEASE_NOTES*
-	dohtml html/*
-
-	pamd_mimic_system smtp auth account
-
-	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"
-
-	# Do not install server.{key,pem) SSL certificates if they already exist
-	if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
-		&& ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
-		install_cert /etc/ssl/postfix/server
-		chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
-	fi
-
-	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.4.8.ebuild b/mail-mta/postfix/postfix-2.4.9.ebuild
index 9e5cc1c63314..1a82142797f9 100644
--- a/mail-mta/postfix/postfix-2.4.8.ebuild
+++ b/mail-mta/postfix/postfix-2.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.8.ebuild,v 1.1 2008/08/19 12:00:04 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.9.ebuild,v 1.1 2008/09/02 14:02:12 dertobi123 Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
diff --git a/mail-mta/postfix/postfix-2.5.4.ebuild b/mail-mta/postfix/postfix-2.5.5.ebuild
index ad904f74fad0..4db573616ee3 100644
--- a/mail-mta/postfix/postfix-2.5.4.ebuild
+++ b/mail-mta/postfix/postfix-2.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.4.ebuild,v 1.2 2008/08/30 11:52:42 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.5.5.ebuild,v 1.1 2008/09/02 14:02:12 dertobi123 Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"