Version bump. Update vda patch, add doc and examples USE flags to selectively install optional files, use mysql_config to get the mysql linking libraries, don't install legacy sendmail symlink, remove unnecessary config files, and don't install a new main.cf config file if one already exists (fixes bug #349944).

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

3 files changed, 291 insertions, 2 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index ba9dea1eeb94..2ccc9aa8adec 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,15 @@
 # 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.232 2011/01/29 18:54:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.233 2011/02/28 00:00:18 radhermit Exp $
+
+*postfix-2.8.1 (28 Feb 2011)
+
+  28 Feb 2011; Tim Harder <radhermit@gentoo.org> +postfix-2.8.1.ebuild:
+  Version bump. Update vda patch, add doc and examples USE flags to selectively
+  install optional files, use mysql_config to get the mysql linking libraries,
+  don't install legacy sendmail symlink, remove unnecessary config files, and
+  don't install a new main.cf config file if one already exists (fixes bug
+  #349944).
 
   29 Jan 2011; Raúl Porcel <armin76@gentoo.org> postfix-2.7.2.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable wrt #352654
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 48539707505d..0af9a6c27662 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
@@ -10,13 +13,27 @@ DIST postfix-2.6.7.tar.gz 3327583 RMD160 c923613d4af15a4d7011af861dba67512abcbac
 DIST postfix-2.7.1.tar.gz 3418747 RMD160 dba0622cf6e21908f27bee0c9da42ab3c189d4bd SHA1 94259e8f008b5b1853292e3de5e0ae3abcfe8c81 SHA256 12301aa8dae18d333c8c96dbf7673f8f05139f10406e7afe278cfd4a1f132df0
 DIST postfix-2.7.2.tar.gz 3421671 RMD160 e07a59f2f663b286a6c24e75b98952a51d2234fe SHA1 2415c63c98ba0e0273bcb490ee7753a3891f5a73 SHA256 46e2e7a7fcc45da43aff5362632ad5e7cc6a17740fda88bfd9db489b15b20840
 DIST postfix-2.8.0.tar.gz 3643132 RMD160 b7d5c5e6972c1cba6296c23bf4f7cb8a943cfb15 SHA1 d7a4fb5ee1f5d12aa1abd6cf8ce8254b4805486d SHA256 4b6c44601e2ed591b0863ddac43fbe04e30caf9ae0ec65089cb13e9a92aa37ed
+DIST postfix-2.8.1.tar.gz 3643859 RMD160 21a7a46c2e62d98108271423129589bff30ee248 SHA1 c2b5aa6ed3520fd9298b140a71a09fee8ee40f4d SHA256 a1faf7184d5a841cf1dbd8ea412f4282edff106138abf381a9cacce4c0895499
 DIST postfix-vda-2.7.0.patch 59667 RMD160 6c3f3b2253cd1d55a888e7483bd3bd19e0481dc5 SHA1 d6d1eb1456e84468a3718770502b5228f2596c4a SHA256 6a81aadc21ddd9ffa22fd3a64c924a241b92fc5f2b3bafd352075e830e086e0b
 DIST postfix-vda-2.7.1.patch 59667 RMD160 6b45a3b988595b872556d5b5bec7518fb746b847 SHA1 0a6459449d6c11e0ddf3a09bae54481be44fa545 SHA256 67e4fe48a8ceba710d9b4e7e2a73f875e82b7acc5ab66ed42e8d2c7a3061495c
+DIST postfix-vda-2.8.0.patch 59667 RMD160 49c7207366b44095cea351631b326c8aae64a014 SHA1 3ef6f4a82fdbdf75746545f4876f7a72a50ce5c8 SHA256 d5f546751a620bf200e8857311f50d11f9a1beaa234f4b25532b6dfdb5e933e5
 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
 EBUILD postfix-2.7.1.ebuild 8424 RMD160 a60f9b994844b573a13bf0e37c43bb2e1a8eaf54 SHA1 bd2dca962f933e5b186124df0f186c1b8931576d SHA256 739f4e8f13617b6ee0a8ee4cf947147b5cc40b8f26eeee61044dd23a934abb22
 EBUILD postfix-2.7.2.ebuild 7791 RMD160 eec2fb0870355a5f56178444d47a68f03ea81f86 SHA1 cb4d1d1494633fc3c3c31dd5cc5983f678b30a32 SHA256 a2c63696635003ea849d7bdb319627a6cb0e366e81eee6b53306e44596408862
 EBUILD postfix-2.8.0-r1.ebuild 7512 RMD160 b53952b765155e412ee212fed4cd01547063638e SHA1 d0feca470f334429ac38156ae6a2d491fbd23d6d SHA256 6b248d6de31f37e2c5cdcbef3045ef801d0aa85380f9a37695fdb81768428809
-MISC ChangeLog 60734 RMD160 f4fc7371b4c59e591e904d757d47e93746836e21 SHA1 c7ea38261a2f86b1b7128db30f298f706cafeb0c SHA256 a2ebf041005b1af0a1038f40ff4ee064c34e175ed20cef781319fd7c511f2e69
+EBUILD postfix-2.8.1.ebuild 7562 RMD160 578632dee155b819f160e7b4b6673cc83b2150ad SHA1 f5cd40d5075c8c9bbc1b0e66d0d0bd9f464553ec SHA256 86304fe69eb6712163fa020d58353007bbbad0c1c5023d61e78a3ec6c775cf4b
+MISC ChangeLog 61163 RMD160 f19a0a40ad59b88bf9d97a4877b97e077f8af828 SHA1 af86127ffd3ac5f0710ef0670da53ebca1c7ed53 SHA256 b97a6879e6ca0c2c0024944343d7516de2ee4be63559a0c7534eca9fe5903473
 MISC metadata.xml 388 RMD160 2a199814dde538c1a3b770310a5ee151488b3e2e SHA1 5b247853d93835655d9713d1f90350035d29e307 SHA256 4a27cb38992ea5bc17952c35aa5af32f77f994e69cb8580014ab267a996d79a1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNauWbAAoJEEqz6FtPBkyja5QIALISkBjm8JxgThaRn+K+tD75
+Lx3/+jyyH6wCdwB2l2onDsF9UwK3mcbH6TaSS/NERLJQf661vkce3M2MfEhv3dpU
+VnWXO8f+lv0B7yC8RK2Wk8WPnGkgLsamXrjiLbowHKV4rnnOHP1BAniP2pPWOgqM
+aX/sX6luSs9JdszqB4TktzgvB8WkfPshj0MRdHXXtout+GURtLH/JT9fZqBgXUXQ
+Y3h0DOXkYeKewx0Ym16PBNj0PEuD7Ts8wOmCsu+PsszmZ2dYWdlgjeaGW31wr+mk
+iwIq4G7S2mIlu4c7twZivzBdWMAgiOSIrYWEyNdTfGSRtGXuTQNihhOItdop2rQ=
+=NHSm
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.8.1.ebuild b/mail-mta/postfix/postfix-2.8.1.ebuild
new file mode 100644
index 000000000000..09ba4c28e78f
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.8.1.ebuild
@@ -0,0 +1,263 @@
+# 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.1.ebuild,v 1.1 2011/02/28 00:00:18 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.8.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 doc dovecot-sasl examples hardened ipv6 ldap mbox mysql nis pam postgres sasl selinux sqlite 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 )
+	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 || die "configure problem"
+}
+
+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
+
+	# 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"
+
+	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
+
+	# Don't install a new config file if one already exists (bug #349944)
+	if [[ -e "${ROOT}"/etc/postfix/main.cf ]] ; then
+		rm -f "${D}"/etc/postfix/main.cf
+	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"
+
+	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
+}