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

["Fabian Groffen" <grobian@gentoo.org>]

commit:     4d82b60e02ddef04443f7557628fba20d2869d30
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 07:46:42 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 07:48:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d82b60e

mail-mta/exim-4.93.0.2: bump to fixes version

Closes: https://bugs.gentoo.org/702462
Closes: https://bugs.gentoo.org/702428
Closes: https://bugs.gentoo.org/702420
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 mail-mta/exim/Manifest                             |  4 +--
 .../{exim-4.93.ebuild => exim-4.93.0.2.ebuild}     | 30 ++++++++++------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index d062568332d..b2b963090ad 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,7 +1,7 @@
 DIST exim-4.92.2.tar.xz 1772688 BLAKE2B 618c70e26811d0e6d453a4b88ab1cdb9e337a9ca8ceec50aee665b1493c75157001483cf9721e3d57313a90910d2605717b2c4be4174c2897b3f992af01c1c26 SHA512 d27aca4d4e9df267b0afcbe7b3f74c9ca6e96e7e6eb4d2f86ff00b0e2234eaec90271405eb387a36a2e0d4ec5597b2920753f85318a5618ddbc8af475a7d81cd
 DIST exim-4.92.3.tar.xz 1773156 BLAKE2B 7866c23c862f5b5aadac709279f9ed376e526e90e8ca09d41c1789041ec0a3ecd48f8d2237e4d462e547efa2178babd5942d3142fef7419e16d1707fe23fa226 SHA512 ca6d6f50653502345511b683859b33aa02faa48454fb2100ff89fed3dcb8af8933e7bce68939365fdee42f96eec0c3b135cf748f4581e92a62be0f0ab093868a
-DIST exim-4.93.tar.xz 1803660 BLAKE2B deef8a48dec4e8b79c43a54ab2033d00e858d8316f9994cbfcc4cc3f0673fc28783c73d4b9719062784155821594970fdb0c535cadb692bdb14c6407093920b6 SHA512 556c7fe75042739c3e92346b96c40960680fe2838589add5fad1f69f18600dd9ed128f367627c812051b3a3a1a64e740488d5ce8c198bf87b59fa84ab8a0eb5b
+DIST exim-4.93.0.2.tar.xz 1803916 BLAKE2B 17921cc376335f9d317290014a613b23ad3fd5605ae26d9261eaed50e499b4cfc840ea5a598cfc86181539fd8cd3b6d9e8cae4673cc75f5cdd67664125a90194 SHA512 562bfed2eb8e7cf51d5c93bf62cd8f9e6154007bf5f57c1165a2f529875c4ab2fd185cbe74def56231942094af006b4729d7b8fdf2ac74e4991a2e0a063283cb
 DIST exim-pdf-4.92.2.tar.xz 2039468 BLAKE2B 3542bb5d38267bb06728ada72cfa89f06027b917799e743a1764cb7568cf0ba4cdbc5b40738c3ae41c9540d348810b388d74ad315a201f2740a5a0b79e83f904 SHA512 da90354cd8133103f08b978dd0422fd1a00e5866cd3f40e523d06875fb8b31163d7fe9791f1cf81d15bc63b16fc7f6bb98cf28c3036d054464336c07245b3c91
 DIST exim-pdf-4.92.3.tar.xz 2039436 BLAKE2B 8d20e7f0ebfcb573d08b490737923afc2cd2d5837f5c91bd2f3e6b5e637d86a5d5a59123c57ba9219ead675c72bfc46351d5b705d9533fab80bedeeca8bdd580 SHA512 3245a627a924db92e5a50e842e096731d08284f757274b5083ea234707c493abd6f27a3b34a2025e3acff167260df0f4ebe68b9f5832920c5f22c258143ab43f
-DIST exim-pdf-4.93.tar.xz 2068840 BLAKE2B b9cfcdcc4c37c312d11a5e6921ebeee09562ad9642fba66cef336f470ece69a3e62702219ec249058425bde489cce295d2bd39003da2f5042e0676f4286cf66b SHA512 817152ceb3aaa6f1a5676023c751ab01c14141e5248164848f33b04a5489a826fc9f19dbf29c6d555dd2bd54299b0c0c536426ea20cc9bffb325adb61366abe5
+DIST exim-pdf-4.93.0.2.tar.xz 2069772 BLAKE2B 4eddcbac665de1bcf3ce7076448609eeaaf3d98034e27da75ae247c300a956225b685aa25ddd0a8fbd0b1674c360ba64c1da0314ce7a3ce158274c7c1c136012 SHA512 2aa259acf46a2aa91aa37a855231e6ab11be857233f4533a233baabcf094e75356e12ab121cf1adb3ff02e10823fef0a359c0b97d1ecc647b18f4068f56a217c
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.93.ebuild b/mail-mta/exim/exim-4.93.0.2.ebuild
similarity index 97%
rename from mail-mta/exim/exim-4.93.ebuild
rename to mail-mta/exim/exim-4.93.0.2.ebuild
index 1374ea7d36c..5f549103ddc 100644
--- a/mail-mta/exim/exim-4.93.ebuild
+++ b/mail-mta/exim/exim-4.93.0.2.ebuild
@@ -24,7 +24,9 @@ REQUIRED_USE="
 # #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
 # incorrect, but b) is the only "correct" view from repoman.
 
-COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)"
+SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
+       [[ ${PV} == *.*.*.* ]] && echo /fixes)
+COMM_URI="https://downloads.exim.org/exim4${SDIR}"
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
 SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
@@ -279,8 +281,9 @@ src_configure() {
 	# disable if not requested, bug #46778
 	if use X; then
 		cp ../exim_monitor/EDITME eximon.conf || die
-	else
-		sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die
+		cat >> Makefile <<- EOC
+			EXIM_MONITOR=eximon.bin
+		EOC
 	fi
 
 	#
@@ -393,6 +396,14 @@ src_configure() {
 		EOC
 	fi
 
+	# DMARC
+	if use dmarc; then
+		cat >> Makefile <<- EOC
+			SUPPORT_DMARC=yes
+			EXTRALIBS_EXIM += -lopendmarc
+		EOC
+	fi
+
 	# Sender Policy Framework
 	if use spf; then
 		cat >> Makefile <<- EOC
@@ -423,14 +434,6 @@ src_configure() {
 		EOC
 	fi
 
-	# DMARC
-	if use dmarc; then
-		cat >> Makefile <<- EOC
-			EXPERIMENTAL_DMARC=yes
-			EXTRALIBS_EXIM += -lopendmarc
-		EOC
-	fi
-
 	# Delivery Sender Notifications extra information in fail message
 	if use dsn; then
 		cat >> Makefile <<- EOC
@@ -568,11 +571,6 @@ pkg_postinst() {
 		einfo "http://article.gmane.org/gmane.mail.exim.devel/3579"
 	fi
 	use srs && einfo "SRS support is experimental"
-	if use dmarc ; then
-		einfo "DMARC support is experimental.  See global settings to"
-		einfo "configure DMARC, for usage see the documentation at "
-		einfo "experimental-spec.txt."
-	fi
 	use dsn && einfo "extra information in fail DSN message is experimental"
 	elog "The obsolete acl condition 'demime' is removed, the replacements"
 	elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime"