mail-mta/postfix: version bump to 3.1_pre20160213

Package-Manager: portage-2.2.27

2 files changed, 19 insertions, 22 deletions

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index d6887f343f9f..fc5ce1517c3c 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -2,5 +2,5 @@ DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb
 DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 SHA512 a1e146db6d2d71abb1dd7c70cde24e6410b599458ffa8061a0161be9475452034d9dcc7ec3976042b379cd84f5ebdba2f9d8d829637ff376ccaf7e87bcabe7a3 WHIRLPOOL 990cf17bc8d0cb8c8de0aa42f16125b1393feb42ed2eca3cb66ddd4d0b5d9425f619ee22047745fdd2f0069dc321e942ecc326bfbb88519fccf4931f95b1c483
 DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a
 DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9
-DIST postfix-3.1-20160207.tar.gz 4320251 SHA256 4131dde89bc665c18a06a8ecac5cb2d7c4b94293ee45668856cb521fe50cb41f SHA512 4c5e5cc3afa199fce96aa27b0970be0a927684e96de23a4c8354beba1858737416b1fbbefa7297a9d76e90fd18802143f55c09ba479aab6b304081bc8e2e3f18 WHIRLPOOL 9cfc29d05ff4c0a57a51b9e18c9510ece72cf130852ca4440c45998c81207f337c853835c03fe2564d2a001730586791fae31987adbe7092124301ea91190b5b
+DIST postfix-3.1-20160213.tar.gz 4325677 SHA256 c8dda3e03797ccff597611ac35c27244390a6f84a5cc221f9705df58417e120a SHA512 c2f16985e715aac0e62508c102021ad87d93a4516896de936efdeceac6f912dd1f0f464d80bf312129abc22a479add5629070da6d289d05a6f5c6efd65776633 WHIRLPOOL c436d4b20dedc06bf070bee1dbb7bf03c6f1a5379667e01820351d17469c360eb6fe2ac8fa7daa0f2a866fbeb8bfd9eee493db9007bbc53ab2607b855c33faa3
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/postfix-3.1_pre20160207.ebuild b/mail-mta/postfix/postfix-3.1_pre20160213.ebuild
index 0eec0d7f2dbd..ffe02ea03628 100644
--- a/mail-mta/postfix/postfix-3.1_pre20160207.ebuild
+++ b/mail-mta/postfix/postfix-3.1_pre20160213.ebuild
@@ -3,24 +3,23 @@
 # $Id$
 
 EAPI=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
+inherit eutils flag-o-matic multilib pam systemd toolchain-funcs user versionator
 
 MY_PV="${PV/_pre/-}"
 MY_SRC="${PN}-${MY_PV}"
 MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
+#VDA_PV="2.10.0"
+#VDA_P="${PN}-vda-v13-${VDA_PV}"
 RC_VER="2.7"
 
 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 ) "
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 
 LICENSE="IBM"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 
 DEPEND=">=dev-libs/libpcre-3.4
 	dev-lang/perl
@@ -59,9 +58,7 @@ RDEPEND="${DEPEND}
 	!net-mail/fastforward
 	selinux? ( sec-policy/selinux-postfix )"
 
-# No vda support for postfix-3.0
-REQUIRED_USE="ldap-bind? ( ldap sasl )
-		!vda"
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
 
 S="${WORKDIR}/${MY_SRC}"
 
@@ -73,10 +70,6 @@ pkg_setup() {
 }
 
 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"
 
@@ -232,7 +225,7 @@ src_install () {
 	# Provide another link for legacy FSH
 	dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
 
-	# Install qshape tool and posttls-finger
+	# Install qshape and posttls-finger
 	dobin auxiliary/qshape/qshape.pl
 	doman man/man1/qshape.1
 	dobin bin/posttls-finger
@@ -283,7 +276,7 @@ src_install () {
 	insinto /usr/include/postfix
 	doins include/*.h
 
-	# Remove unnecessary files
+	# Keep config_dir clean
 	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
 	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
 
@@ -296,12 +289,16 @@ src_install () {
 }
 
 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}
+	# configure tls
+	if use ssl ; then
+		if postfix tls all-default-client ; then
+			elog "Configuring client side TLS settings"
+			postfix tls enable-client
+		fi
+		if postfix tls all-default-server ; then
+			elog "Configuring server side TLS settings"
+			postfix tls enable-server
+		fi
 	fi
 
 	if [[ ! -e /etc/mail/aliases.db ]] ; then