VDA patch bump. Tidy up conf directory.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

3 files changed, 302 insertions, 15 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index dbb75734a84f..78a73026e27d 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.265 2011/06/13 09:34:20 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.266 2011/06/14 20:27:58 eras Exp $
+
+*postfix-2.8.3-r2 (14 Jun 2011)
+
+  14 Jun 2011; Eray Aslan <eras@gentoo.org> +postfix-2.8.3-r2.ebuild:
+  VDA patch bump. Tidy up conf directory.
 
 *postfix-2.8.3-r1 (13 Jun 2011)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 7d2b5547da50..8ff7b54166cb 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -8,25 +8,27 @@ DIST postfix-2.7.4.tar.gz 3423968 RMD160 4f3e0db43c55cd50b3fb4493dbc698ff3f34329
 DIST postfix-2.8.3.tar.gz 3645105 RMD160 9312cb25c352cc3613efed48e0a3b83f7f5fcba5 SHA1 2604066f158f5327449960afd6334b996dc01799 SHA256 288267caede6ea1c4f155855395aa957998909a4968af431b8057062f7d60b49
 DIST postfix-vda-2.7.2.patch 59667 RMD160 ebec1fa4a4c6b3c0160407b09aacf8357c936148 SHA1 ac712922f45856965118fa7b8551ece1ccb524db SHA256 f9b12376983833ef9305f7696e9792b62058f242ff2630aeb0866cf686f0a14b
 DIST postfix-vda-v10-2.8.1.patch 56777 RMD160 42f6351d645cc7a211aea86cc35e1f3b10b50da1 SHA1 6b36480be036e7b7aa834fd904a2aa57c537cd40 SHA256 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12
+DIST postfix-vda-v10-2.8.3.patch 56777 RMD160 ce30005d590d884c589612e65dbd34cbdbf84a31 SHA1 c27217b9af33c86a44bbb4469b7ebd4203210f7a SHA256 02599bdf16e7d77fe6043d1dac972daecdd40c4b2758579200d6ccb11e83acaa
 EBUILD postfix-2.7.4.ebuild 7539 RMD160 71057256b96bce15692ca8306a88914f68155885 SHA1 2354101816138a0ff0629190b77167bfd2a89d3d SHA256 3a325df91ff80f04465743a4e1b43b5b2d4cbca925a715a7b8866d626fc78c2b
 EBUILD postfix-2.8.3-r1.ebuild 8229 RMD160 182de16ddfcc2f8308f849cdba1a64f9c7c0dc8d SHA1 a1c6c7b967c971f9c6b85c647e65eaff7ff92e64 SHA256 54aa229f4572b09e7afe0b767e5f9465b9775a430816f107c039930beb4f702b
+EBUILD postfix-2.8.3-r2.ebuild 8445 RMD160 a0fd6a75eaa571d162662b641a86261b3de9a34f SHA1 53fef3095f829120a136a5a44d05f20046c6fbd8 SHA256 86f91c5cc536934e719ccf761968fd5e932cb3fa6ccc1df1efd2fbd9b5a7a217
 EBUILD postfix-2.8.3.ebuild 7681 RMD160 f5fa99dfa15825b35c200135ee2cb9a2456d0f7a SHA1 8f40aa5b50310f23f6eaa061e189fd1c8ac9540e SHA256 b118a70662931db7ead44b663cdba2750520e6c37552ab4c3dc126df392e1cd4
-MISC ChangeLog 66059 RMD160 f4f75e9470bad45f452847cad582f1cf29d45766 SHA1 81de79346795f1ac46fbd431acad9baa888d98dc SHA256 0e6dbc9b74bf77d6369f4b958660e6ffff7811b4c4bc6c0fd6c1ca7075bee7f3
+MISC ChangeLog 66205 RMD160 03f2047d11fb9ea3b458b1f4d031347c1313df97 SHA1 5a8743a5f3e95cdf5d5625b461143c69e30026b8 SHA256 ad7a06a491e95b057a5e22319280464e7eba0fb1f0ca47f804b642ee36683462
 MISC metadata.xml 501 RMD160 faf5708865464f36ec686bb58b2474e2a5a1fb53 SHA1 f5d83c47e3edc4a6c337d4bb905eb4917dc0d417 SHA256 7a46203782ad8363c75a53faa35a434e20f879a7f23f624388ce248ea8bb55a0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN9dmpAAoJEHfx8XVYajsfe/4QAJxKH/7cnqJRLHtcoV25a69j
-9YxpTZctpMLqOi9MBg2Ihd/mKegm2nggx1gz0t+MpKKILE0RyAxA2HR4hzr1bip7
-6KUfBccV9TkoafNWyQsqG1mFVI5O8xAAjesn9piigqb5g6EgHhS36bMiqc6IUK3d
-cnejmcU+717CF7IogRPz+ot+RkqpJLVAdokfIxgUfJCUHKMyp/DxMGJY+wRKBhWM
-5ZCKmCSH1YhoTKtyfP3nWhMx+uA1x7SLazDV05Hr6nURTMwsDI09ANsuw2vo/mZ8
-l39bAI+1e9eAcUsOtMKcePT4vwowxSpQo+1c2w0HwRC4zzXzfO8C7H/80nwQ/WNL
-icqOepm6xMlz1U6++CqB8vp39jlazjIcGKbkBhwzqUa7ZllRGlyh0qHxSC/ctx4V
-y7yDROLTvFxq0TtjarkHZ/2AsCsGc80F3x2T5N6AXauj7rFC0kAQV5v2ndNHwGfl
-tmO7oQD1nnHHKYOvN3ROAcLVJW37Qwt2Ci2NoOfOMTCQa3qOUf1mJL46uqBBvTPm
-Kbmlmy8XKZ36OKqSlCeLU9HgAxqEqyhufn3F/02KV8DMoXpZh5eonstl9vnHrRD0
-eW0PfeY4E1w73LVY95cHQypg4igLvEi6QpJNVPzoWmdVhbruO0nTxTlt+OZoSJE9
-JPl6D3fOSx7Kt/15PgkC
-=IYmJ
+iQIcBAEBCAAGBQJN98RcAAoJEHfx8XVYajsfV9AP/3RKTx04QZ0ebSjcQH5QVCfP
+WKCqQsY/PalOoAxmeaD3wmGTbpnneJ10OFG+Jypj7DtCrpwoP+bDPcaV6+XzzV3t
+tOjP7vM5VI1XeQyTdbRGxERkca/YmYYDgGyCKMShPQv3VEbLBXnepnW+vREXbs13
+3DFZftVg9+yM8DjupdvcKCV2wPzLfdsSyp7il2oCYqRkRHSAhbL2p1RO7QUYn6GN
+No/WT1HERyox5hFqmy1wiGUFj0352qKphJnSVXXleQ9R4dgsiYRP7riCxgiysHre
+dax01AezsoNnK8xiCne99aHsIunVRlkTm8Sz2sMu4rybpBtCy0x62jLMBLXNw1/7
+FioaJoWk9zL3+GpHbmnbWkO8U5Lx54mLChOggAC2n3opNh1ZS0eUHVZgM456RR9O
+t9/VtkvvjnUttJdpk+ZSB0NKFzBprQQyNn82YtFA7rAZKnPse1JnkXJJz6LLGlyh
+3NuxgCM6ItWjwWTaWTzLhTuKFK9nyUYNoM00jVdFveOusZUzNdWAxpAzNkQ4ont4
+4ywgv903ek97nWQsJGFzaQd74MkE2lsii/YLeBXtUE3kij6tdEoYQXMMs3ux5lZd
++PDYE4DOCT7RNTi5zEQqGqHL5YEBGJUif19g0YJCE0IbSRhWnuEWs9OhpJxrmtbf
+u7LC7WCBUcxIG3QjL87H
+=CIc8
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.8.3-r2.ebuild b/mail-mta/postfix/postfix-2.8.3-r2.ebuild
new file mode 100644
index 000000000000..b983f1bab317
--- /dev/null
+++ b/mail-mta/postfix/postfix-2.8.3-r2.ebuild
@@ -0,0 +1,280 @@
+# 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.3-r2.ebuild,v 1.1 2011/06/14 20:27:58 eras 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.3"
+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 ~sparc ~x86 ~x86-fbsd"
+IUSE="cdb doc dovecot-sasl hardened ipv6 ldap ldap-bind mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+
+DEPEND=">=sys-libs/db-3.2
+	>=dev-libs/libpcre-3.4
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	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}
+	dovecot-sasl? ( net-mail/dovecot )
+	net-mail/mailbase
+	selinux? ( sec-policy/selinux-postfix )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+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
+		if use ldap-bind ; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		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_CONFIG_DIR=\\\"/etc/postfix\\\""
+	mycc="${mycc} -DDEF_COMMAND_DIR=\\\"/usr/sbin\\\""
+	mycc="${mycc} -DDEF_SENDMAIL_PATH=\\\"/usr/sbin/sendmail\\\""
+	mycc="${mycc} -DDEF_NEWALIS_PATH=\\\"/usr/bin/newaliases\\\""
+	mycc="${mycc} -DDEF_MAILQ_PATH=\\\"/usr/bin/mailq\\\""
+	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\\\""
+	mycc="${mycc} -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\""
+	mycc="${mycc} -DDEF_DATA_DIR=\\\"/var/lib/postfix\\\""
+	mycc="${mycc} -DDEF_MAIL_OWNER=\\\"postfix\\\""
+	mycc="${mycc} -DDEF_SGID_GROUP=\\\"postdrop\\\""
+
+	# 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 () {
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		html_directory="/usr/share/doc/${PF}/html" \
+		command_directory="/usr/sbin" \
+		daemon_directory="/usr/$(get_libdir)/postfix" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		|| 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
+	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
+	# bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY INSTALL PORTING RELEASE_NOTES*
+
+	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+	mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
+
+	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
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+}
+
+pkg_postinst() {
+	# 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
+
+	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
+
+	elog
+	elog "See the RELEASE_NOTES file in /usr/share/doc/${PF}"
+	elog "for incompatibilities and other major changes between releases."
+	elog
+}