Version bump (fixes bug #316577, thanks to Artur Frysiak for reporting), update to EAPI=3, remove old mailer-config setup, and remove old warnings relating to postfix versions not in the tree.

Package-Manager: portage-2.2_rc85/cvs/Linux x86_64

3 files changed, 311 insertions, 2 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 42928da89160..db8d97237b1f 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.214 2010/09/06 21:11:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.215 2010/09/25 06:04:16 radhermit Exp $
+
+*postfix-2.7.1 (25 Sep 2010)
+
+  25 Sep 2010; Tim Harder <radhermit@gentoo.org> +postfix-2.7.1.ebuild:
+  Version bump (fixes bug #316577, thanks to Artur Frysiak for reporting),
+  update to EAPI=3, remove old mailer-config setup, and remove old warnings
+  relating to postfix versions not in the tree.
 
   06 Sep 2010; Brent Baude <ranger@gentoo.org> postfix-2.6.6.ebuild:
   Marking postfix-2.6.6 ppc64 for bug 320179
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index c26fd37583b6..1404455eb429 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839
 AUX postfix.rc6.2.5 1415 RMD160 9d9b7240b1bfb7bcf53d6914dfc5aea2b150572e SHA1 ba08faaa70311605d2b869519ce876c71ce47a5d SHA256 11f79d4a84acfe0c34ebba11b6d1afde9c6dffcf44e8aba8dc895d4fcd0adcac
 AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa259fa07b257a617e056662aecfd19957f SHA256 c9b3b56a8df2367cc15bc43a70304fac7ebdd7697e1d450d1bcb4bfdd3e078e9
@@ -7,8 +10,22 @@ DIST postfix-2.6.5-vda-ng.patch.gz 12435 RMD160 c7ac9fbc5c4c5e36dfce17f87fd3c5ca
 DIST postfix-2.6.5.tar.gz 3325444 RMD160 f9b308457b9d3dcc05eb30c47b8267450a552a23 SHA1 98b04c719869b4bd61bec8749e2d57a219eb69a7 SHA256 5b5c8d3c98d7dffece1d30ed4dc1cfbd3220842fd626a324ce038d7d795e4102
 DIST postfix-2.6.6.tar.gz 3327136 RMD160 f3358b1aa330f7c68fb8c8ba778493dd2667d63c SHA1 e59235c0b1ba2a557ea2ba1009cc7c23f79ed044 SHA256 03b08a4a93065ffd07b2abd1e461575215cc8e0ba90595145c0e2e86ea3f0a36
 DIST postfix-2.6.7.tar.gz 3327583 RMD160 c923613d4af15a4d7011af861dba67512abcbac1 SHA1 aa863ca4c141bd1ebb31c4c556b640b619cf2c16 SHA256 7070003cb8d2e89e9c018220c5cac54ab91f68519d9daa3126bf32f5bbcf0594
+DIST postfix-2.7.1.tar.gz 3418747 RMD160 dba0622cf6e21908f27bee0c9da42ab3c189d4bd SHA1 94259e8f008b5b1853292e3de5e0ae3abcfe8c81 SHA256 12301aa8dae18d333c8c96dbf7673f8f05139f10406e7afe278cfd4a1f132df0
+DIST postfix-vda-2.7.0.patch 59667 RMD160 6c3f3b2253cd1d55a888e7483bd3bd19e0481dc5 SHA1 d6d1eb1456e84468a3718770502b5228f2596c4a SHA256 6a81aadc21ddd9ffa22fd3a64c924a241b92fc5f2b3bafd352075e830e086e0b
 EBUILD postfix-2.6.5.ebuild 11147 RMD160 77a2602097af3990bdafd42a9bd89e88fe189b88 SHA1 598a0fe366455226428697c873633f0a91abcd54 SHA256 db1d28e016facae241f54c75b9242f213e39b6eae7dde09a1ddca5ba49194db6
 EBUILD postfix-2.6.6.ebuild 11146 RMD160 d7390b7f07215ab3ae9337fe8db78ecff12b38ed SHA1 1382a3cf8a38951796a12e2d2a8e39f3163afad1 SHA256 91ccd59e6ebf755cdc7190b409333f65ac5d24d195440565ea75e514bd66d30d
 EBUILD postfix-2.6.7.ebuild 11157 RMD160 16120ab5902a693029c4343acbec11354c6f4255 SHA1 f3b9bc53a71a7b045d5a2b39e4599a219bdb2685 SHA256 c86afbc0f8b4b8178ec99414832adbdda9f9be6959484b270de9c8c078ce8f54
-MISC ChangeLog 57901 RMD160 723925a2009cd725504e604f3a60da81c906693d SHA1 788fa16e5e874bec78b03d7b8105ef10b9cf19cb SHA256 cc6791a17bfa08ad511e48040f46d9c1ebf28510aba99f0238dbcafdebd8f628
+EBUILD postfix-2.7.1.ebuild 8434 RMD160 96c000b222fe2f53c71a53899bea18425ce977e0 SHA1 b74fa685406f68d262c9701e31c47d9030afa094 SHA256 59c9369ff75fb69790f18d4f8f14b3c17964f6043db0214bc7828e8981fcbb27
+MISC ChangeLog 58206 RMD160 8767526743b0dc0ab5a268fed311d06fc96843a1 SHA1 d1a28931188c639e58c0ff91a86fe5789abe9239 SHA256 0551c3034346915bc0c10a1229c73d47307345166399a33ce2f2e0ba671da600
 MISC metadata.xml 388 RMD160 2a199814dde538c1a3b770310a5ee151488b3e2e SHA1 5b247853d93835655d9713d1f90350035d29e307 SHA256 4a27cb38992ea5bc17952c35aa5af32f77f994e69cb8580014ab267a996d79a1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJMnZDqAAoJEEqz6FtPBkyjt0cIAIXA4ZTegZRH9zcm5YvdpK1n
+2ThhBMa5SCjqj6QsQQaTWXgDLuTr18RRIxq8ZfXV7RydOk62SKwXDy34wMW5DDVf
+cwfXj1tIj/Y5PRhst1NgJBvqt7nnh/6U5FqyletMMbCfZFnuKuNMnuiZ396R1mzc
+lGcDk41TCgEQFphsyEEu6f5qWLHfnIIHNqoPQIsOyoXRIbJVRRI29Txvmm6TboJv
+Xu3fb9bVBCqD15lf2ajRAs//OMJiirWsgyHEM6r03shhSa1wqGUEw2Mr5wqxk+2S
+nPWOaMBI+xuIe/C2z2e09NEjNIh4hTNRqKe0xNFB3de1pycbxYCkL72Rs/gXl2k=
+=JD4n
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.7.1.ebuild b/mail-mta/postfix/postfix-2.7.1.ebuild
new file mode 100644
index 000000000000..8220228709ab
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.7.1.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.7.1.ebuild,v 1.1 2010/09/25 06:04:16 radhermit Exp $
+
+EAPI=3
+
+inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam
+
+MY_PV="${PV/_rc/-RC}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
+VDA_PV="2.7.0"
+VDA_P="${PN}-vda-${VDA_PV}"
+RC_VER="2.5"
+
+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://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cdb dovecot-sasl hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux ssl vda"
+
+PROVIDE="virtual/mta virtual/mda"
+
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.76 ) )
+	ldap? ( >=net-nds/openldap-1.2 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+RDEPEND="${DEPEND}
+	>=net-mail/mailbase-0.00
+	!virtual/mta
+	!net-mail/mailwrapper
+	selinux? ( sec-policy/selinux-postfix )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+group_user_check() {
+	einfo "Checking for postfix group ..."
+	enewgroup postfix 207
+	einfo "Checking for postdrop group ..."
+	enewgroup postdrop 208
+	einfo "Checking for postfix user ..."
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+pkg_setup() {
+	echo
+	ewarn "Read \"ftp://ftp.porcupine.org/mirrors/postfix-release/official/${MY_SRC}.RELEASE_NOTES\""
+	ewarn "for incompatible changes before continueing."
+	ewarn "Bugs should be filed at \"http://bugs.gentoo.org/\" and"
+	ewarn "assigned to \"net-mail@gentoo.org\"."
+	echo
+
+	# TLS non-prod warning
+	if use ssl ; then
+		echo
+		ewarn "You have \"ssl\" in your USE flags, TLS will be enabled."
+		ewarn "This service is incompatible with the previous TLS patch."
+		ewarn "Visit http://www.postfix.org/TLS_README.html for more info."
+		echo
+	fi
+
+	# IPV6 non-prod warn
+	if use ipv6 ; then
+		echo
+		ewarn "You have \"ipv6\" in your USE flags, IPV6 will be enabled."
+		ewarn "Visit http://www.postfix.org/IPV6_README.html for more info."
+		echo
+	fi
+
+	# SASL non-prod warning
+	if use sasl ; then
+		echo
+		elog "Postfix 2.3 and newer supports two SASL implementations."
+		elog "Cyrus SASL and Dovecot protocol version 1 (server only)"
+		elog "Visit http://www.postfix.org/SASL_README.html for more info."
+		echo
+	fi
+
+	# Add postfix, postdrop user/group (bug #77565)
+	group_user_check || die "Failed to check/add needed user/group"
+}
+
+src_prepare() {
+	if use vda ; then
+		epatch "${DISTDIR}/${VDA_P}.patch"
+	fi
+
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+}
+
+src_configure() {
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${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 $(mysql_config --include)"
+		mylibs="${mylibs} -lmysqlclient -lm -lz"
+	fi
+
+	if use postgres ; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
+	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 -I/usr/include/cdb"
+		CDB_LIBS=""
+
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			CDB_LIBS="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
+			done
+		fi
+
+		mylibs="${mylibs} ${CDB_LIBS}"
+	fi
+
+	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
+	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+	mycc="${mycc} -DDEF_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	local my_cc=$(tc-getCC)
+	einfo "CC=${my_cc:=gcc}"
+
+	# Workaround for bug #76512
+	if use hardened ; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	make DEBUG="" CC="${my_cc:=gcc}" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		makefiles || die "configure problem"
+}
+
+src_install () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}/var"
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape tool
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners postfix:postfix /var/lib/postfix
+	fowners postfix:postfix /var/lib/postfix/.keep_${CATEGORY}_${PN}-${SLOT}
+	fperms 0750 /var/lib/postfix
+	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 "${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}/usr/$(get_libdir)/postfix/post-install" upgrade-permissions \
+		daemon_directory=${ROOT}/usr/$(get_libdir)/postfix
+	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 [[ -e /etc/mailer.conf ]] ; then
+		einfo
+		einfo "mailwrapper support is discontinued."
+		einfo "You may want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+}