Version bump. Update to EAPI 4 and bump vda patch.

Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64

3 files changed, 277 insertions, 9 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 9d55aec52041..c8ac39e5ba27 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.246 2011/03/23 17:18:21 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.247 2011/03/24 08:17:21 radhermit Exp $
+
+*postfix-2.8.2 (24 Mar 2011)
+
+  24 Mar 2011; Tim Harder <radhermit@gentoo.org> +postfix-2.8.2.ebuild:
+  Version bump. Update to EAPI 4 and bump vda patch.
 
 *postfix-2.8.1-r1 (23 Mar 2011)
 *postfix-2.7.3-r1 (23 Mar 2011)
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 3ccffa773778..ee964c5be901 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -6,20 +6,23 @@ AUX smtp.pass 141 RMD160 799433a4ee9e9e32f20aa2d31f85f33faa2bc7e6 SHA1 e1d75aa25
 AUX smtp.sasl 131 RMD160 6831f9bbfd76be0d39fdda4270120824ebb9f52f SHA1 613dff95ac21bd306c2917e5360430772efbb146 SHA256 954ba1e80537ca01b935b856e31ec4e3e41c138f04b7cf99ccb969876b8b78e7
 DIST postfix-2.7.3.tar.gz 3423755 RMD160 fb4bf033568ef934a656ff1efffb7b189a59910b SHA1 46713f335f19754839d70d76099eac3f24ce1f0b SHA256 c600b9ee5417a050d002d7245410592808d6c14af9a3de4df2b93394efce26dc
 DIST postfix-2.8.1.tar.gz 3643859 RMD160 21a7a46c2e62d98108271423129589bff30ee248 SHA1 c2b5aa6ed3520fd9298b140a71a09fee8ee40f4d SHA256 a1faf7184d5a841cf1dbd8ea412f4282edff106138abf381a9cacce4c0895499
+DIST postfix-2.8.2.tar.gz 3644570 RMD160 cc1c7a4cced486fc35ef6d786397b336d00c2e40 SHA1 224e0b6dd161f4648114de8902124c9dec64aa8c SHA256 9c50dfd0e9520652a1f584f0ca3c7369d3d975e9d0f4d1d74b6c4ae55965248f
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 DIST postfix-vda-2.8.0.patch 59667 RMD160 49c7207366b44095cea351631b326c8aae64a014 SHA1 3ef6f4a82fdbdf75746545f4876f7a72a50ce5c8 SHA256 d5f546751a620bf200e8857311f50d11f9a1beaa234f4b25532b6dfdb5e933e5
+DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
 EBUILD postfix-2.7.3-r1.ebuild 7351 RMD160 338fda618d3b4ea0e581106da975764fb8640e31 SHA1 5994f725aac004499a8f3681a4ede0228a06dce4 SHA256 53b76d40a62f07cfc263185a0143ca18041fdee5a0a80575b0709dd9b4eae15b
 EBUILD postfix-2.8.1-r1.ebuild 7486 RMD160 e5e32c1d499c87c53c6200a3af9ddfd86eda3280 SHA1 2b662a67bfdbbd63092350de71d283af15cfbe99 SHA256 3dbb77a9edb9e0a194e9ac4523c56f74e458e3b57ff5ffc7385c0579d6c749dd
-MISC ChangeLog 63175 RMD160 f5c6d0d057c408c0b338fde2d6e29207cc43400a SHA1 011d299dc3b39eec89d8a3bf9e0eafae6853923a SHA256 7918caac53bf9ba99209e0d3922840393c52c839e930473507ef4c8fa6095e0e
+EBUILD postfix-2.8.2.ebuild 7431 RMD160 27423305e00026c327502da0d31ab7fb6b6c7123 SHA1 45d14e468e448d0eac3c476ad70cc215bf0d7a2f SHA256 da766a3125b74fe9ba6a18b5e12c2d6afdcbe5f00e6139759edec4f4783e0009
+MISC ChangeLog 63331 RMD160 63df5948449beae3e06504186f7a44630c0cf9f8 SHA1 e497df0867f72d7ce5402501b2d6856f6509dbeb SHA256 9da2f4a2bfc4790654355b48972b949819eb7bcd46b4d06c74774c537b40ee32
 MISC metadata.xml 388 RMD160 2a199814dde538c1a3b770310a5ee151488b3e2e SHA1 5b247853d93835655d9713d1f90350035d29e307 SHA256 4a27cb38992ea5bc17952c35aa5af32f77f994e69cb8580014ab267a996d79a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNiitnAAoJEEqz6FtPBkyjjRkH/1wyjgmZqiOwQKUKfLT7RWNE
-oSjOACbqA7akaFoZ4YGCtqGHLWjgOnD9kedt/eEb8v3eSHs3+ZAHKrxxtfAesk8i
-/aPg8ZcrjhNFF0INEZlehMoNAxH8FLTilNGBa7u3wGzDwu+H8KdH3bEUuxTbPlAe
-0A+gGEY2xMMqqb9aMGoGoU/ao4cTmmCIwj2YAFZUa2KJwIw0280Ad1kEw45w5FVX
-1PFW4Ka/ZpISOQfE1iUten92hT5Ihfa9Dx1Bb63UtFGgVLW9D81AqNT+4IvG+0yH
-s7W3+Sg5xfncMLcnOzCMuxkj0fku2/2BACGSKX2HG8t5LghNBHWl7Sma6te8ZFs=
-=sfJt
+iQEcBAEBAgAGBQJNiv4XAAoJEEqz6FtPBkyj740IAJEp9eWsz4IwrWtAjx5iRY0u
+y4vjFwXRRJgNIDe7cvRBgFRCVsbc3IBb7Li6wMnYk1ldNESni+DVMrblU9lzcSrG
+aMQgtbTszcdIOZtZnLRKYhvU0AMqFp/3LCIenp6Hshbm4DpeMEoKdMY16EGpLGVw
+xYsGCXKkIHp6AsB973kQPLP3Wl/JSz5s24xoiddn4yCkpXounxFURiLbV3id60wA
+2JPEtU+7WuC+E0huXgjttdo5ioouGydd0hXTXT3QPXYJWdAbfJetD0eGWeMW7Y4a
+/5g1OKwv+Ic8pBrdkSNNiL61wopNTcijl96CM/qjcRc8iZzJ5IOAbUDcxEhTqY0=
+=aToq
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.8.2.ebuild b/mail-mta/postfix/postfix-2.8.2.ebuild
new file mode 100644
index 000000000000..9cafa29a2172
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.8.2.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.8.2.ebuild,v 1.1 2011/03/24 08:17:21 radhermit Exp $
+
+EAPI=4
+
+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.8.1"
+VDA_P="${PN}-vda-v10-${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 doc dovecot-sasl examples hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+PROVIDE="virtual/mta"
+
+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 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase
+	!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() {
+	# 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} $(mysql_config --libs)"
+	fi
+
+	if use postgres ; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
+	fi
+
+	if use sqlite ; then
+		mycc="${mycc} -DHAS_SQLITE"
+		mylibs="${mylibs} -lsqlite3"
+	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\\\""
+
+	# 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
+
+	# Workaround for bug #76512
+	if use hardened ; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/usr/share/doc/${PF}/defaults" \
+		manpage_directory="/usr/share/man" \
+		${myconf} \
+		|| 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
+
+	use examples && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl ; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# Remove unnecessary files
+	rm -f "${D}"/usr/$(get_libdir)/postfix/*.cf
+}
+
+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"
+
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		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."
+		ewarn
+	fi
+
+	if [[ -e /etc/mailer.conf ]] ; then
+		einfo
+		einfo "mailwrapper support is discontinued."
+		einfo "You may want to 'emerge -C mailwrapper' now."
+		einfo
+	fi
+
+	elog
+	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
+	elog "for incompatibilities and other major changes between releases."
+	elog
+}