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

["Eray Aslan" <eras@gentoo.org>]

commit:     2e1f94e9569a9715073765e994e8db45ad63dc50
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 21 15:30:14 2019 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Thu Feb 21 15:30:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e1f94e9

mail-mta/postfix: bump to 3.4.0-RC2

Closes: https://bugs.gentoo.org/678362
Closes: https://bugs.gentoo.org/678326
Closes: https://github.com/gentoo/gentoo/pull/11099
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 mail-mta/postfix/Manifest                          |  2 +-
 mail-mta/postfix/files/postfix-linux-5.patch       | 29 ++++++++++++++++++++++
 ...pre20190129.ebuild => postfix-3.4.0_rc2.ebuild} | 16 ++++++++++--
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 195ab9e84df..b5297ab376e 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -4,5 +4,5 @@ DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6
 DIST postfix-3.2.6.tar.gz 4395159 BLAKE2B 2eef28f9189830725c02b98512ca7859770f090cbef3fe453b57fade967fd20f94cd3cd8e8955252dc230e674ed7827fc68ad910cd4fc63029dc2c92ea75f0af SHA512 081751fe9af7612e7ee01a80ceffbc09db60764e12099d2a5e053205d0e7c70c6ef4f96526e1a98780965c43354e0ccd6ef61b4dbe93b249179890b81836c705
 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.4-20190129.tar.gz 4560684 BLAKE2B b66c4fda75af092849516db1437d4fa15e6fcef8ffd3b03d9a1e4c74c7046af364516ccfbc4bdd1f0b91b93a17642b06d7dac2a571dd50cb7464fc175a60571e SHA512 cf506b14cfa3572d51203bcd02ed717819a9318b67f989512bb385a3b10f804fc7881655d07759980778cb4358e08be004cb0f1184522d088afc1204902d41a0
+DIST postfix-3.4.0-RC2.tar.gz 4581595 BLAKE2B 4d96941dd0c9eb58cfab9320b2412614db6ca7cc5aa5eb6ea193057b058a658e0238ab7a8c9f46943359810fd2ded1e10b8199ae495147f8883d33c86b66bbe8 SHA512 120770727b58ee018422dc326769022f413d93aa9e6dc42c66932ef31739dcacccc1186a4fa5dafe5b151881a7e80838e594799ad08ebdfa5933480e47e20eba
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62

diff --git a/mail-mta/postfix/files/postfix-linux-5.patch b/mail-mta/postfix/files/postfix-linux-5.patch
new file mode 100644
index 00000000000..df9d456c977
--- /dev/null
+++ b/mail-mta/postfix/files/postfix-linux-5.patch
@@ -0,0 +1,29 @@
+diff --git a/mail-mta/postfix/files/postfix-linux-5.patch b/mail-mta/postfix/files/postfix-linux-5.patch
+new file mode 100644
+index 000000000000..a806ab0dbb9c
+--- /dev/null
++++ b/mail-mta/postfix/files/postfix-linux-5.patch
+@@ -0,0 +1,23 @@
++See http://postfix.1071664.n5.nabble.com/Support-for-quot-Linux-5-quot-td99786.html
++--- a/makedefs	2018-02-03 12:20:46.000000000 -0500
+++++ b/makedefs	2019-02-18 15:39:17.711376206 -0500
++@@ -546,7 +546,7 @@
++ 		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
++ 		: ${PLUGIN_LD="${CC-gcc} -shared"}
++ 		;;
++-  Linux.[34].*)	SYSTYPE=LINUX$RELEASE_MAJOR
+++  Linux.[345].*)	SYSTYPE=LINUX$RELEASE_MAJOR
++ 		case "$CCARGS" in
++ 		 *-DNO_DB*) ;;
++ 		 *-DHAS_DB*) ;;
++--- a/src/util/sys_defs.h	2019-02-18 15:40:19.008167828 -0500
+++++ b/src/util/sys_defs.h	2019-02-18 15:42:17.241742169 -0500
++@@ -748,7 +748,7 @@
++  /*
++   * LINUX.
++   */
++-#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4)
+++#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5)
++ #define SUPPORTED
++ #define UINT32_TYPE	unsigned int
++ #define UINT16_TYPE	unsigned short

diff --git a/mail-mta/postfix/postfix-3.4_pre20190129.ebuild b/mail-mta/postfix/postfix-3.4.0_rc2.ebuild
similarity index 94%
rename from mail-mta/postfix/postfix-3.4_pre20190129.ebuild
rename to mail-mta/postfix/postfix-3.4.0_rc2.ebuild
index 456b4615bde..6dbb6365cc4 100644
--- a/mail-mta/postfix/postfix-3.4_pre20190129.ebuild
+++ b/mail-mta/postfix/postfix-3.4.0_rc2.ebuild
@@ -4,9 +4,9 @@
 EAPI=6
 inherit flag-o-matic pam systemd toolchain-funcs user
 
-MY_PV="${PV/_pre/-}"
+MY_PV="${PV/_rc/-RC}"
 MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
 RC_VER="2.7"
 
 DESCRIPTION="A fast and secure drop-in replacement for sendmail"
@@ -72,6 +72,7 @@ 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"
@@ -282,6 +283,17 @@ src_install () {
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 
+pkg_preinst() {
+	if has_version '<mail-mta/postfix-3.4'; then
+		elog
+		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
+		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
+		elog "Before backing out to an older Postfix version, edit the master.cf"
+		elog "file and remove the postlog entry."
+		elog
+	fi
+}
+
 pkg_postinst() {
 	if [[ ! -e /etc/mail/aliases.db ]] ; then
 		ewarn