[gentoo-commits] repo/gentoo:master commit in: mail-mta/postfix/

[Eray Aslan]

commit:     c9b0fa4eb74037c43f7f699e853706cd7991ab32
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  1 11:11:18 2019 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 11:11:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b0fa4e

mail-mta/postfix: bump to 3.4.0

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 mail-mta/postfix/Manifest                              |  2 +-
 .../{postfix-3.4.0_rc3.ebuild => postfix-3.4.0.ebuild} | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 72f17daabd5..84bd6fc2dff 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -5,5 +5,5 @@ DIST postfix-3.2.6.tar.gz 4395159 BLAKE2B 
2eef28f9189830725c02b98512ca7859770f09
 DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 
065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11
 SHA512 
2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
 DIST postfix-3.3.2.tar.gz 4429452 BLAKE2B 
8cbb4ea6626da1fdb78a3f4e5c546b6a335fe7e5727c2f7eb3f14e2b28791165857112e6af4698eae7e38339232fed722e238e289fef40bd1091b3048a543f7f
 SHA512 
df67eb978751900d357597def16f744dae990f5cc4e48af8dca57f84b0140e05416712727c1760b8f557ed3564cd593620756561b0a6f31db4b54d928e15293f
 DIST postfix-3.3.3.tar.gz 4429713 BLAKE2B 
0699d9bdc0f3a5267f9cbe5dc3b6ddc2e83d1b984b07638913c8ba419a0c71135ccae6f434aa2c60f69ffe60356b7a7652a6d83c176b119cd2f9ab8374a32283
 SHA512 
9d04d48b5393c49c00ca62f0a24e21c9642f2b645431b66b532a559ad1b4d35c7581fec8bd1bb1a2d7b31b812b1cea3b29e0a0cbd6576bd377b2c810d27b7ec3
-DIST postfix-3.4.0-RC3.tar.gz 4580606 BLAKE2B 
694549cec8f667e2d9b499c3028b4d5853dfd603fae2bd040b63cf7690d4d0fbdf51148d871da1b10d6d1bc725308cdbb3cf1d9b96f41aeb3d728b2dfa70e410
 SHA512 
e86df26f4019cba14b3aaeb624c1d329b43f161f35def14c58ffa7073317188505ada51db36c4e1a8f047309dc53f4e8b39d48ad8920fd95233048d0b98a4199
+DIST postfix-3.4.0.tar.gz 4580627 BLAKE2B 
4a2356c8bd74d7146833e321e426503003058ba92e50a486fee2eb39a4a75aa96fb48511b4ea457fa94c84363593f24f3671b42bda4e92dcb71bb8eccf219996
 SHA512 
2afc7a4aef8768eb140b803b9e29d9270bd536d168845bfde18fc58c233d6d7293ab4ad40ab0b452c55130f7139246c752007e8d676294af3068110a9021f4e2
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B 
d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536
 SHA512 
0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62

diff --git a/mail-mta/postfix/postfix-3.4.0_rc3.ebuild 
b/mail-mta/postfix/postfix-3.4.0.ebuild
similarity index 95%
rename from mail-mta/postfix/postfix-3.4.0_rc3.ebuild
rename to mail-mta/postfix/postfix-3.4.0.ebuild
index 6dbb6365cc4..26d271615d3 100644
--- a/mail-mta/postfix/postfix-3.4.0_rc3.ebuild
+++ b/mail-mta/postfix/postfix-3.4.0.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit flag-o-matic pam systemd toolchain-funcs user
 
 MY_PV="${PV/_rc/-RC}"
@@ -59,7 +60,12 @@ REQUIRED_USE="ldap-bind? ( ldap sasl )"
 
 S="${WORKDIR}/${MY_SRC}"
 
+PATCHES=( "${FILESDIR}/${PN}-linux-5.patch" )
+
 pkg_setup() {
+       if use libressl; then
+               die "LibreSSL patches are not yet available for postfix-3.4 
releases."
+       fi
        # Add postfix, postdrop user/group (bug #77565)
        enewgroup postfix 207
        enewgroup postdrop 208
@@ -72,11 +78,11 @@ src_prepare() {
                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"
-       eapply "${FILESDIR}/${PN}-linux-5.patch"
-       eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
-               "${FILESDIR}/${PN}-libressl-runtime.patch" \
-               "${FILESDIR}/${PN}-libressl-eccurve.patch"
-               #"${FILESDIR}/${PN}-libressl-session-tickets.patch"
+       # libressl support needs work for postfix-3.4
+       #eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
+       #       "${FILESDIR}/${PN}-libressl-runtime.patch" \
+       #       "${FILESDIR}/${PN}-libressl-eccurve.patch"
+       #       "${FILESDIR}/${PN}-libressl-session-tickets.patch"
 }
 
 src_configure() {