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

2020-06-08 Thread Fabian Groffen
commit: 6a18f75bc0b98b1bc66844c82d5eee10eac9dfd7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jun  8 08:05:57 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jun  8 08:06:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a18f75b

mail-mta/exim-4.94-r1: fix PAM expansion, bug #727310

Closes: https://bugs.gentoo.org/727310
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen  gentoo.org>

 .../exim/{exim-4.94.ebuild => exim-4.94-r1.ebuild} |  1 +
 .../exim/files/exim-4.94-taint-pam-expansion.patch | 35 ++
 2 files changed, 36 insertions(+)

diff --git a/mail-mta/exim/exim-4.94.ebuild b/mail-mta/exim/exim-4.94-r1.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.94.ebuild
rename to mail-mta/exim/exim-4.94-r1.ebuild
index cc977b34b9a..52358f32bef 100644
--- a/mail-mta/exim/exim-4.94.ebuild
+++ b/mail-mta/exim/exim-4.94-r1.ebuild
@@ -114,6 +114,7 @@ src_prepare() {
eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
+   eapply -p2 "${FILESDIR}"/exim-4.94-taint-pam-expansion.patch # drop on 
NR
 
if use maildir ; then
eapply "${FILESDIR}"/exim-4.94-maildir.patch

diff --git a/mail-mta/exim/files/exim-4.94-taint-pam-expansion.patch 
b/mail-mta/exim/files/exim-4.94-taint-pam-expansion.patch
new file mode 100644
index 000..81863d340ed
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.94-taint-pam-expansion.patch
@@ -0,0 +1,35 @@
+From f7f933a199be8bb7362c715e0040545b514cddca Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Tue, 2 Jun 2020 14:50:31 +0100
+Subject: [PATCH] Taint: fix pam expansion condition.  Bug 2587
+
+---
+ doc/doc-txt/ChangeLog| 5 +
+ src/src/auths/call_pam.c | 5 ++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+modified for gentoo so the patch applies by dropping Changelog part
+
+diff --git a/src/src/auths/call_pam.c b/src/src/auths/call_pam.c
+index 2959cbbf3..80bb23ec3 100644
+--- a/src/src/auths/call_pam.c
 b/src/src/auths/call_pam.c
+@@ -83,8 +83,7 @@ for (int i = 0; i < num_msg; i++)
+ {
+ case PAM_PROMPT_ECHO_ON:
+ case PAM_PROMPT_ECHO_OFF:
+-  arg = string_nextinlist(_args, , big_buffer, big_buffer_size);
+-  if (!arg)
++  if (!(arg = string_nextinlist(_args, , NULL, 0)))
+   {
+   arg = US"";
+   pam_arg_ended = TRUE;
+@@ -155,7 +154,7 @@ pam_arg_ended = FALSE;
+ fail. PAM doesn't support authentication with an empty user (it prompts for 
it,
+ causing a potential mis-interpretation). */
+ 
+-user = string_nextinlist(_args, , big_buffer, big_buffer_size);
++user = string_nextinlist(_args, , NULL, 0);
+ if (user == NULL || user[0] == 0) return FAIL;
+ 
+ /* Start off PAM interaction */



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

2020-06-08 Thread Fabian Groffen
commit: d678ac4e8e771fc6a1b35c53d49327c74b86a7e5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jun  8 07:49:10 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jun  8 08:06:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d678ac4e

mail-mta/exim-4.94: add warning about local_part being renamed

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.94.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mail-mta/exim/exim-4.94.ebuild b/mail-mta/exim/exim-4.94.ebuild
index eaeaaeefbd3..cc977b34b9a 100644
--- a/mail-mta/exim/exim-4.94.ebuild
+++ b/mail-mta/exim/exim-4.94.ebuild
@@ -585,4 +585,7 @@ pkg_postinst() {
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"
+   einfo
+   elog "Note that \$local_part is renamed to \$local_part_data, please"
+   elog "update your affected sections, such as local_delivery transport"
 }



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

2020-06-01 Thread Fabian Groffen
commit: 57df96d9c31aae23c50a28f1da2505e72afeb42c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jun  1 17:57:35 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jun  1 17:58:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57df96d9

mail-mta/exim-4.94: version bump

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest |   2 +
 mail-mta/exim/exim-4.94.ebuild | 588 +
 .../exim/files/exim-4.94-localscan_dlopen.patch| 269 ++
 mail-mta/exim/files/exim-4.94-maildir.patch|  13 +
 4 files changed, 872 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index e08c0096757..b618d116c98 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,3 +1,5 @@
 DIST exim-4.93.0.4.tar.xz 1804696 BLAKE2B 
721336101104d9c71b3bb6f432e382c28ad17d80cdb50d04213989e65a719d906caf8eb95639bfaf7a1bfdd62c7000d9df14484953446ecfca901fd7c708514e
 SHA512 
84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96
+DIST exim-4.94.tar.xz 1828824 BLAKE2B 
3836ae6427830b16fa366f5ca35431144eb48b922b699da20f3a5e423c9c8266def981afa008e50a879ac3583f3491d8f9c449e67c66053dc45e8612e38e836f
 SHA512 
3bf95ade30902327403e7308089a3e423761da5b0745397dace7c7fd15ba3838d93e0ee418f1fed57606f79e57b793c7c7407e5c0d526146f0036126d5d95316
 DIST exim-pdf-4.93.0.4.tar.xz 2069744 BLAKE2B 
28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca
 SHA512 
929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361
+DIST exim-pdf-4.94.tar.xz 2089804 BLAKE2B 
08f4631e903f1344d76da8dc1dcfd122cd5963bb2efbd54a486e7cf95df9e7ef06aa31dead1243a007656f05c18993f3fda18ba16ba1fde9377ac33324d5fe99
 SHA512 
d5b619ba850dfa68de90afc7435bae741d72d18b5837762781ba18032878323ad40978e0113d4b88a01fd7a1d07213e6a74c38d699371d62796b6c3c35cc
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.94.ebuild b/mail-mta/exim/exim-4.94.ebuild
new file mode 100644
index 000..eaeaaeefbd3
--- /dev/null
+++ b/mail-mta/exim/exim-4.94.ebuild
@@ -0,0 +1,588 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs multilib pam systemd
+
+IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl 
syslog tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   dkim? ( ssl !gnutls )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   spf? ( exiscan-acl )
+   srs? ( exiscan-acl )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #661164) or b) mask the usage of USE=dane with USE=gnutls.  Both are
+# incorrect, but b) is the only "correct" view from repoman.
+
+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
+   mirror://gentoo/system_filter.exim.gz
+   doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+   ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
+   nis? (
+   elibc_glibc? (
+   net-libs/libtirpc
+   >=net-libs/libnsl-1:=
+   )
+   )
+   mysql? ( dev-db/mysql-connector-c:= )
+   postgres? ( dev-db/postgresql:= )
+   sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+   redis? ( dev-libs/hiredis )
+   spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+   dmarc? ( mail-filter/opendmarc )
+   srs? ( mail-filter/libsrs_alt )
+   X? (
+   x11-libs/libX11
+   x11-libs/libXmu
+   

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

2020-05-24 Thread Fabian Groffen
commit: 08aa447245b739b69a7e36cd324967b3160f2865
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun May 24 11:26:24 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun May 24 11:26:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08aa4472

mail-mta/exim-4.93.0.4-r1: add patch to fix compilation using -fno-common

Closes: https://bugs.gentoo.org/723430
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.93.0.4-r1.ebuild  |  1 +
 mail-mta/exim/files/exim-4.93-fno-common.patch | 16 
 2 files changed, 17 insertions(+)

diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
index cb68569b7c8..19d13cef361 100644
--- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
@@ -116,6 +116,7 @@ src_prepare() {
eapply "${FILESDIR}"/exim-4.93-localscan_dlopen.patch
eapply -p2 "${FILESDIR}"/exim-4.93-radius.patch # 720364
eapply "${FILESDIR}"/exim-4.93-CVE-2020-12783.patch # 722484
+   eapply "${FILESDIR}"/exim-4.93-fno-common.patch # 723430
 
if use maildir ; then
eapply "${FILESDIR}"/exim-4.20-maildir.patch

diff --git a/mail-mta/exim/files/exim-4.93-fno-common.patch 
b/mail-mta/exim/files/exim-4.93-fno-common.patch
new file mode 100644
index 000..c5fff1c6720
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.93-fno-common.patch
@@ -0,0 +1,16 @@
+Fix -fno-common linking
+
+Bug: https://bugs.gentoo.org/723430
+Bug: https://bugs.exim.org/show_bug.cgi?id=2577
+
+--- exim-4.93.0.4/src/globals.h
 exim-4.93.0.4/src/globals.h
+@@ -342,7 +342,7 @@
+ extern BOOLallow_domain_literals;  /* As it says */
+ extern BOOLallow_mx_to_ip; /* Allow MX records to -> ip address */
+ #ifdef EXPERIMENTAL_ARC
+-struct arc_set *arc_received;/* highest ARC instance evaluation 
struct */
++extern struct arc_set *arc_received; /* highest ARC instance 
evaluation struct */
+ extern int arc_received_instance;  /* highest ARC instance number in 
headers */
+ extern int arc_oldest_pass;/* lowest passing instance number in 
headers */
+ extern const uschar *arc_state;  /* verification state */



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

2020-05-13 Thread Fabian Groffen
commit: 4b998533b5bae4ff911d11eb2ece787fd4a9e4c8
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed May 13 17:19:39 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed May 13 17:19:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b998533

mail-mta/exim: security cleanup

Bug: https://bugs.gentoo.org/722484
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest |   2 -
 mail-mta/exim/exim-4.92.3.ebuild   | 581 -
 .../exim/files/exim-4.82-makefile-freebsd.patch|  45 --
 .../exim/files/exim-4.89-as-needed-ldflags.patch   | 145 -
 .../files/exim-4.92-fix-eval-expansion-32bit.patch |  51 --
 .../exim/files/exim-4.92-localscan_dlopen.patch| 267 --
 6 files changed, 1091 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index e8a899771de..e08c0096757 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,5 +1,3 @@
-DIST exim-4.92.3.tar.xz 1773156 BLAKE2B 
7866c23c862f5b5aadac709279f9ed376e526e90e8ca09d41c1789041ec0a3ecd48f8d2237e4d462e547efa2178babd5942d3142fef7419e16d1707fe23fa226
 SHA512 
ca6d6f50653502345511b683859b33aa02faa48454fb2100ff89fed3dcb8af8933e7bce68939365fdee42f96eec0c3b135cf748f4581e92a62be0f0ab093868a
 DIST exim-4.93.0.4.tar.xz 1804696 BLAKE2B 
721336101104d9c71b3bb6f432e382c28ad17d80cdb50d04213989e65a719d906caf8eb95639bfaf7a1bfdd62c7000d9df14484953446ecfca901fd7c708514e
 SHA512 
84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96
-DIST exim-pdf-4.92.3.tar.xz 2039436 BLAKE2B 
8d20e7f0ebfcb573d08b490737923afc2cd2d5837f5c91bd2f3e6b5e637d86a5d5a59123c57ba9219ead675c72bfc46351d5b705d9533fab80bedeeca8bdd580
 SHA512 
3245a627a924db92e5a50e842e096731d08284f757274b5083ea234707c493abd6f27a3b34a2025e3acff167260df0f4ebe68b9f5832920c5f22c258143ab43f
 DIST exim-pdf-4.93.0.4.tar.xz 2069744 BLAKE2B 
28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca
 SHA512 
929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
deleted file mode 100644
index 03bdaab227c..000
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ /dev/null
@@ -1,581 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit db-use toolchain-funcs multilib pam systemd
-
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
-REQUIRED_USE="
-   arc? ( dkim spf )
-   dane? ( ssl !gnutls )
-   dmarc? ( dkim spf )
-   gnutls? ( ssl )
-   pkcs11? ( ssl )
-   spf? ( exiscan-acl )
-   srs? ( exiscan-acl )
-   !ssl? ( !dkim )
-"
-# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
-# for x86 and amd64 only, due to this, repoman won't allow depending on
-# gnutls[dane] for all else.  Because we cannot express USE=dane when
-# USE=gnutls is in effect only in package.use.mask, the only option we
-# have left is to a) ignore the dependency (but that results in bug
-# #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)"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
-   mirror://gentoo/system_filter.exim.gz
-   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
-HOMEPAGE="https://www.exim.org/;
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-   ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
-   nis? (
-   elibc_glibc? (
-   net-libs/libtirpc
-   >=net-libs/libnsl-1:=
-   )
-   )
-   mysql? ( dev-db/mysql-connector-c:= )
-   postgres? ( dev-db/postgresql:= )
-   sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-   redis? ( dev-libs/hiredis )
-   spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-   dmarc? ( mail-filter/opendmarc )
-   srs? ( mail-filter/libsrs_alt )
-   X? (
-   

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

2020-05-13 Thread Agostino Sarubbo
commit: fa2e655039625aa92fc90959a7551f1f62bfe4ab
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 17:12:24 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 17:12:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa2e6550

mail-mta/exim: ppc stable wrt bug #722484

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.93.0.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
index 1ad81352ae0..cb68569b7c8 100644
--- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
@@ -36,7 +36,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-05-13 Thread Agostino Sarubbo
commit: f3f08f9a9b3ad40eaf39b9104b80fbe519b4d6ef
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 11:30:56 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 11:30:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3f08f9a

mail-mta/exim: x86 stable wrt bug #722484

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.93.0.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
index 64cddd54c49..1ad81352ae0 100644
--- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
@@ -36,7 +36,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-05-13 Thread Agostino Sarubbo
commit: 4b551b50434359b8e4c39ffdd0b101283ab8d7eb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 11:29:08 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 11:29:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b551b50

mail-mta/exim: ppc64 stable wrt bug #722484

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.93.0.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
index 5eaa83c694f..64cddd54c49 100644
--- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
@@ -36,7 +36,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-05-13 Thread Agostino Sarubbo
commit: 123b94128ea3d2a9af265832ad1449b19688cd2a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 11:28:15 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 11:28:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123b9412

mail-mta/exim: arm stable wrt bug #722484

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.93.0.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
index de3d6e26966..5eaa83c694f 100644
--- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
@@ -36,7 +36,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-05-13 Thread Agostino Sarubbo
commit: 28362cdf75d00ef3c3b1f438499bae25a516df3a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 11:27:03 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 11:27:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28362cdf

mail-mta/exim: amd64 stable wrt bug #722484

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.93.0.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
index 55708ece38e..de3d6e26966 100644
--- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
@@ -36,7 +36,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-05-13 Thread Agostino Sarubbo
commit: 4ba84ef8a160ce48484d2ebed55604427adbc4d1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 13 11:26:12 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 13 11:26:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ba84ef8

mail-mta/exim: sparc stable wrt bug #722484

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.93.0.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
index 714de0e7045..55708ece38e 100644
--- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
@@ -36,7 +36,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-05-13 Thread Fabian Groffen
commit: 1468afd12e683a61448e2ff58c47e54715f0ff29
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed May 13 07:44:37 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed May 13 07:45:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1468afd1

mail-mta/exim-4.93.0.4-r1: revbump for CVE-2020-12783

Bug: https://bugs.gentoo.org/722484
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen  gentoo.org>

 ...xim-4.93.0.4.ebuild => exim-4.93.0.4-r1.ebuild} |  1 +
 mail-mta/exim/files/exim-4.93-CVE-2020-12783.patch | 83 ++
 2 files changed, 84 insertions(+)

diff --git a/mail-mta/exim/exim-4.93.0.4.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.93.0.4.ebuild
rename to mail-mta/exim/exim-4.93.0.4-r1.ebuild
index ae3fd4019c8..714de0e7045 100644
--- a/mail-mta/exim/exim-4.93.0.4.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r1.ebuild
@@ -115,6 +115,7 @@ src_prepare() {
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply "${FILESDIR}"/exim-4.93-localscan_dlopen.patch
eapply -p2 "${FILESDIR}"/exim-4.93-radius.patch # 720364
+   eapply "${FILESDIR}"/exim-4.93-CVE-2020-12783.patch # 722484
 
if use maildir ; then
eapply "${FILESDIR}"/exim-4.20-maildir.patch

diff --git a/mail-mta/exim/files/exim-4.93-CVE-2020-12783.patch 
b/mail-mta/exim/files/exim-4.93-CVE-2020-12783.patch
new file mode 100644
index 000..c957d5541e4
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.93-CVE-2020-12783.patch
@@ -0,0 +1,83 @@
+auths/spa: fix for CVE-2020-12783
+
+This is a combined patch of git commits:
+
+57aa14b216432be381b6295c312065b2fd034f86
+a04174dc2a84ae1008c23b6a7109e7fa3fb7b8b0
+
+leaving out whitespace noise for a smaller patch
+and made it apply to the 4.93 release
+
+modified paths because Exim dists differ in layout from the git repo
+
+Fix SPA authenticator, checking client-supplied data before using it.  Bug 2571
+Rework SPA fix to avoid overflows.  Bug 2571
+
+
+--- a/src/auths/auth-spa.c
 b/src/auths/auth-spa.c
+@@ -405,7 +405,7 @@ int
+ /* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */
+ {
+   int len = 0;
+-  register uschar digit1, digit2, digit3, digit4;
++  uschar digit1, digit2, digit3, digit4;
+ 
+   if (in[0] == '+' && in[1] == ' ')
+ in += 2;
+--- a/src/auths/spa.c
 b/src/auths/spa.c
+@@ -139,7 +139,8 @@ SPAAuthChallenge challenge;
+ SPAAuthResponse  response;
+ SPAAuthResponse  *responseptr = 
+ uschar msgbuf[2048];
+-uschar *clearpass;
++uschar *clearpass, *s;
++unsigned off;
+ 
+ /* send a 334, MS Exchange style, and grab the client's request,
+ unless we already have it via an initial response. */
+@@ -194,9 +195,19 @@ that causes failure if the size of msgbuf is exceeded. 
/
+ 
+   {
+   int i;
+-  char *p = ((char*)responseptr) + IVAL(>uUser.offset,0);
++  char * p;
+   int len = SVAL(>uUser.len,0)/2;
+ 
++  if (  (off = IVAL(>uUser.offset,0)) >= sizeof(SPAAuthResponse)
++ || len >= sizeof(responseptr->buffer)/2
++ || (p = (CS responseptr) + off) + len*2 >= CS (responseptr+1)
++ )
++{
++DEBUG(D_auth)
++  debug_printf("auth_spa_server(): bad uUser spec in response\n");
++return FAIL;
++}
++
+   if (len + 1 >= sizeof(msgbuf)) return FAIL;
+   for (i = 0; i < len; ++i)
+ {
+@@ -245,12 +256,16 @@ spa_smb_nt_encrypt(clearpass, challenge.challengeData, 
ntRespData);
+ 
+ /* compare NT hash (LM may not be available) */
+ 
+-if (memcmp(ntRespData,
+-  ((unsigned char*)responseptr)+IVAL(>ntResponse.offset,0),
+-  24) == 0)
+-  /* success. we have a winner. */
+-  {
++off = IVAL(>ntResponse.offset,0);
++if (off >= sizeof(SPAAuthResponse) - 24)
++  {
++  DEBUG(D_auth)
++debug_printf("auth_spa_server(): bad ntRespData spec in response\n");
++  return FAIL;
++  }
++s = (US responseptr) + off;
++
++if (memcmp(ntRespData, s, 24) == 0)
+   return auth_check_serv_cond(ablock);
+-  }
+ 
+   /* Expand server_condition as an authorization check (PH) */



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

2020-05-12 Thread Mart Raudsepp
commit: 30e55d93d2f830cd9a65225f8e6fdb1c43135f00
Author: Sam James (sam_c)  cmpct  info>
AuthorDate: Tue May 12 17:21:50 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Tue May 12 17:49:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e55d93

mail-mta/exim: arm64 keyworded (bug #685400)

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c)  cmpct.info>
Signed-off-by: Mart Raudsepp  gentoo.org>

 mail-mta/exim/exim-4.93.0.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.93.0.4.ebuild 
b/mail-mta/exim/exim-4.93.0.4.ebuild
index 1599e1d7e65..ae3fd4019c8 100644
--- a/mail-mta/exim/exim-4.93.0.4.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4.ebuild
@@ -36,7 +36,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-05-12 Thread Fabian Groffen
commit: 903a890ff05ce3dbbe456a7a309a3febb52daa95
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue May 12 06:37:10 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue May 12 06:41:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903a890f

mail-mta/exim-4.93.0.4: force correct version of db.h to be found

Closes: https://bugs.gentoo.org/722530
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.93.0.4.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.93.0.4.ebuild 
b/mail-mta/exim/exim-4.93.0.4.ebuild
index 6e787039465..1599e1d7e65 100644
--- a/mail-mta/exim/exim-4.93.0.4.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4.ebuild
@@ -223,7 +223,8 @@ src_configure() {
LOOKUP_CDB=yes
LOOKUP_PASSWD=yes
LOOKUP_DSEARCH=yes
-   LOOKUP_INCLUDE += -I$(db_includedir ${DB_VERS})
+   # keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
+   CFLAGS += -I$(db_includedir ${DB_VERS})
DBMLIB = -l$(db_libname ${DB_VERS})
EOC
 



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

2020-05-09 Thread Fabian Groffen
commit: 631b045c07527ab0ca4d4d585c56faa3855187fe
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat May  9 09:57:23 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat May  9 09:57:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631b045c

mail-mta/exim-4.93.0.4: fix compilation with certain USE-combinations

- fix localscan compilation
- fix nis compilation
- refine DB includes to lookup only
- fix radius compilation

Closes: https://bugs.gentoo.org/720364
Closes: https://bugs.gentoo.org/720362
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.93.0.4.ebuild |  8 ++-
 .../exim/files/exim-4.93-localscan_dlopen.patch|  4 +-
 mail-mta/exim/files/exim-4.93-radius.patch | 66 ++
 3 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/mail-mta/exim/exim-4.93.0.4.ebuild 
b/mail-mta/exim/exim-4.93.0.4.ebuild
index a7ac64a9ffb..6e787039465 100644
--- a/mail-mta/exim/exim-4.93.0.4.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4.ebuild
@@ -114,6 +114,7 @@ src_prepare() {
eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply "${FILESDIR}"/exim-4.93-localscan_dlopen.patch
+   eapply -p2 "${FILESDIR}"/exim-4.93-radius.patch # 720364
 
if use maildir ; then
eapply "${FILESDIR}"/exim-4.20-maildir.patch
@@ -219,11 +220,11 @@ src_configure() {
local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
cat >> Makefile <<- EOC
USE_DB=yes
-   CFLAGS+=-I$(db_includedir ${DB_VERS})
-   DBMLIB=-l$(db_libname ${DB_VERS})
LOOKUP_CDB=yes
LOOKUP_PASSWD=yes
LOOKUP_DSEARCH=yes
+   LOOKUP_INCLUDE += -I$(db_includedir ${DB_VERS})
+   DBMLIB = -l$(db_libname ${DB_VERS})
EOC
 
if ! use dnsdb; then
@@ -255,7 +256,8 @@ src_configure() {
EOC
if use elibc_glibc ; then
cat >> Makefile <<- EOC
-   CFLAGS += -I"${EPREFIX}"/usr/include/tirpc
+   LOOKUP_INCLUDE += 
-I"${EPREFIX}"/usr/include/tirpc
+   LOOKUP_LIBS += -lnsl
EOC
fi
fi

diff --git a/mail-mta/exim/files/exim-4.93-localscan_dlopen.patch 
b/mail-mta/exim/files/exim-4.93-localscan_dlopen.patch
index d2a5e63128a..0d016dbeb26 100644
--- a/mail-mta/exim/files/exim-4.93-localscan_dlopen.patch
+++ b/mail-mta/exim/files/exim-4.93-localscan_dlopen.patch
@@ -72,7 +72,7 @@ Only in exim-4.92/src: globals.h.orig
 diff -ur exim-4.92.orig/src/local_scan.c exim-4.92/src/local_scan.c
 --- exim-4.92.orig/src/local_scan.c2019-01-30 14:59:52.0 +0100
 +++ exim-4.92/src/local_scan.c 2019-02-16 18:29:56.832732592 +0100
-@@ -5,61 +5,131 @@
+@@ -5,61 +5,133 @@
  /* Copyright (c) University of Cambridge 1995 - 2009 */
  /* See the file NOTICE for conditions of use and distribution. */
  
@@ -126,9 +126,11 @@ diff -ur exim-4.92.orig/src/local_scan.c 
exim-4.92/src/local_scan.c
 -   is used in the rejection message.
 -*/
 +#ifdef DLOPEN_LOCAL_SCAN
++#include 
 +#include 
 +static int (*local_scan_fn)(int fd, uschar **return_text) = NULL;
 +static int load_local_scan_library(void);
++extern uschar *local_scan_path;/* Path to local_scan() library */
 +#endif
  
  int

diff --git a/mail-mta/exim/files/exim-4.93-radius.patch 
b/mail-mta/exim/files/exim-4.93-radius.patch
new file mode 100644
index 000..55c52bee561
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.93-radius.patch
@@ -0,0 +1,66 @@
+From 70b28b113e21d21a528876c3abe88ccb5f7cc77d Mon Sep 17 00:00:00 2001
+From: Fabian Groffen 
+Date: Sat, 9 May 2020 11:35:12 +0200
+Subject: [PATCH] call_radius: fix compilation due to incorrect usage of
+ string_sprintf
+
+Since f3ebb786e451da973560f1c9d8cdb151d25108b5, string_sprintf cannot be
+used without arguments any more, so use US directly.
+
+While at it, also make newline usage consistent to not return a newline
+in errptr, when it is debug-printed, a newline is added.
+
+https://bugs.gentoo.org/720364
+
+Signed-off-by: Fabian Groffen 
+---
+ src/src/auths/call_radius.c | 16 
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/src/auths/call_radius.c b/src/src/auths/call_radius.c
+index c3637436d..253fd75cd 100644
+--- a/src/src/auths/call_radius.c
 b/src/src/auths/call_radius.c
+@@ -115,16 +115,16 @@ if (rc_read_config(RADIUS_CONFIG_FILE) != 0)
+   *errptr = string_sprintf("RADIUS: can't open %s", RADIUS_CONFIG_FILE);
+ 
+ else if (rc_read_dictionary(rc_conf_str("dictionary")) != 0)
+-  *errptr = string_sprintf("RADIUS: can't read dictionary");
++  *errptr = US("RADIUS: can't read dictionary");
+ 
+ else if (rc_avpair_add(, 

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

2020-03-20 Thread Fabian Groffen
commit: ab06f843318c1b0b73d403e074b9ea75ac1f396c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Mar 20 08:50:12 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Mar 20 08:50:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab06f843

mail-mta/exim-4.92.2: drop vulnerable version (dropping hppa stable)

hppa expressed to be ok with Exim dropped to ~hppa for them
https://bugs.gentoo.org/701282#c11

Bug: https://bugs.gentoo.org/701282
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest   |   2 -
 mail-mta/exim/exim-4.92.2.ebuild | 581 ---
 2 files changed, 583 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 19140597147..e8a899771de 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,7 +1,5 @@
-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.0.4.tar.xz 1804696 BLAKE2B 
721336101104d9c71b3bb6f432e382c28ad17d80cdb50d04213989e65a719d906caf8eb95639bfaf7a1bfdd62c7000d9df14484953446ecfca901fd7c708514e
 SHA512 
84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96
-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.0.4.tar.xz 2069744 BLAKE2B 
28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca
 SHA512 
929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
deleted file mode 100644
index d93a9ac37a4..000
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ /dev/null
@@ -1,581 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit db-use toolchain-funcs multilib pam systemd
-
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
-REQUIRED_USE="
-   arc? ( dkim spf )
-   dane? ( ssl !gnutls )
-   dmarc? ( dkim spf )
-   gnutls? ( ssl )
-   pkcs11? ( ssl )
-   spf? ( exiscan-acl )
-   srs? ( exiscan-acl )
-   !ssl? ( !dkim )
-"
-# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
-# for x86 and amd64 only, due to this, repoman won't allow depending on
-# gnutls[dane] for all else.  Because we cannot express USE=dane when
-# USE=gnutls is in effect only in package.use.mask, the only option we
-# have left is to a) ignore the dependency (but that results in bug
-# #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)"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
-   mirror://gentoo/system_filter.exim.gz
-   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
-HOMEPAGE="https://www.exim.org/;
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-   ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
-  

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

2020-03-15 Thread Fabian Groffen
commit: aff1b0cb03abb3466ca6aebe7de96510d933dd1b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Mar 15 08:32:00 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Mar 15 08:32:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff1b0cb

mail-mta/exim-4.93.0.4: reflect DANE default in USE-flags

As pointed out by Hans F. Nordhaug in bug #712360, the configuration for
Exim has changed to default to DANE, because TLS (ssl) is enabled by
default as well.  We handled the latter already, but didn't do the
former, resulting in build failures with TLS disabled.

Rework the logic such that we USE-enable dane (to reflect upstream) and
that we disable it when not enabled.

Closes: https://bugs.gentoo.org/712360
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.93.0.4.ebuild | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/mail-mta/exim/exim-4.93.0.4.ebuild 
b/mail-mta/exim/exim-4.93.0.4.ebuild
index 2fcf22048a1..a7ac64a9ffb 100644
--- a/mail-mta/exim/exim-4.93.0.4.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 
 inherit db-use toolchain-funcs multilib pam systemd
 
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl 
syslog tcpd +tpda X"
+IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl 
syslog tcpd +tpda X"
 REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )
@@ -149,7 +149,7 @@ src_configure() {
local conffile="${EPREFIX}/etc/exim/exim.conf"
sed -e "48i\CFLAGS=${CFLAGS}" \
-e 
"s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-   -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
+   -e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \
-e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-e 
"s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
@@ -166,8 +166,11 @@ src_configure() {
EOC
 
# if we use libiconv, now is the time to tell so
-   use !elibc_glibc && use !elibc_musl && \
-   echo "EXTRALIBS_EXIM=-liconv" >> Makefile
+   if use !elibc_glibc && use !elibc_musl ; then
+   cat >> Makefile <<- EOC
+   EXTRALIBS_EXIM=-liconv
+   EOC
+   fi
 
# support for IPv6
if use ipv6; then
@@ -392,10 +395,9 @@ src_configure() {
fi
 
# DANE
-   if use dane; then
-   cat >> Makefile <<- EOC
-   SUPPORT_DANE=yes
-   EOC
+   if use !dane; then
+   # DANE is enabled by default
+   sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || 
die
fi
 
# DMARC



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

2020-03-02 Thread Agostino Sarubbo
commit: 1701606dd8099c8d288caf58eb2673e4321f62a2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Mar  3 07:54:34 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Mar  3 07:54:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1701606d

mail-mta/exim: ia64 stable wrt bug #701282

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.92.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
index 03bdaab227c..17ba33bbc4b 100644
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-03-02 Thread Agostino Sarubbo
commit: a0de206592d99c8d3bfa04d13fc1bd7ae4eedd1a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar  2 15:22:36 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar  2 15:22:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0de2065

mail-mta/exim: ppc stable wrt bug #701282

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.92.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
index e4c51040382..03bdaab227c 100644
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-03-02 Thread Agostino Sarubbo
commit: 63df7718056d9d547f38daba7bf94910074aabeb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar  2 12:39:17 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar  2 12:39:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63df7718

mail-mta/exim: ppc64 stable wrt bug #701282

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.92.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
index 249a961593a..e4c51040382 100644
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-03-02 Thread Agostino Sarubbo
commit: 55e9681c6c2ab88ad0f4d6f5ae70d575d43ecbb1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar  2 12:31:19 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar  2 12:31:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e9681c

mail-mta/exim: x86 stable wrt bug #701282

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.92.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
index 5a85d51dc26..249a961593a 100644
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-03-02 Thread Agostino Sarubbo
commit: e681a5fb2ad1dd4a8d3c08563693d2017f2d4697
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar  2 12:29:14 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar  2 12:29:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e681a5fb

mail-mta/exim: sparc stable wrt bug #701282

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.92.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
index c7c46a235f5..5a85d51dc26 100644
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-03-02 Thread Agostino Sarubbo
commit: 0ec7f50098f5ef0d6e1bdab7dfc52499273cc87e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar  2 12:27:59 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar  2 12:27:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec7f500

mail-mta/exim: arm stable wrt bug #701282

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.92.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
index 2369878232c..c7c46a235f5 100644
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-03-01 Thread Agostino Sarubbo
commit: 893dba126ac147054f031b03cefd9b59929b9b93
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Mar  1 21:44:15 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Mar  1 21:44:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893dba12

mail-mta/exim: amd64 stable wrt bug #701282

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.92.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
index 22f7f20d3ff..2369878232c 100644
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2020-01-07 Thread Fabian Groffen
commit: 1137bdae713b2ffb655ef89a7e2ff23a7c9394cb
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Jan  7 13:22:03 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Jan  7 13:25:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1137bdae

mail-mta/exim-4.93.0.4: bugfix release for SPF

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest   | 4 ++--
 mail-mta/exim/{exim-4.93.0.3.ebuild => exim-4.93.0.4.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 468778e9a8e..19140597147 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.0.3.tar.xz 1804240 BLAKE2B 
15974e0356640d6deacd82263071cbde76dd88bf7e290de5e04bfcee87f2f11142f03de7d46112942bd052c9f154927eabaaf124d78ae0d1d8e5e33b025763b8
 SHA512 
8afece1059e4ada85f6ecef8197cf2ac5b56274f8c2e1bdd785e0470d37bb1e8b4fe225650ac03302824e3a7fe0a6db1641c6218edc8394a70adcc48af46a1d5
+DIST exim-4.93.0.4.tar.xz 1804696 BLAKE2B 
721336101104d9c71b3bb6f432e382c28ad17d80cdb50d04213989e65a719d906caf8eb95639bfaf7a1bfdd62c7000d9df14484953446ecfca901fd7c708514e
 SHA512 
84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96
 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.0.3.tar.xz 2069756 BLAKE2B 
5d551e3b0f5e729a1551faa0ce34ea559bfe6e60e7ab7705d576d18d36c0bac3bf5431633981ec477bc133a0592154795760101137b0512e4ad52953bbde043a
 SHA512 
fcc14a89098aec895797f4908e6ddeaded39a9913a6f032a253e3878a2499ed20bb3b3822f19bbf3e53962590bacb250a8293d2e67250e4f6eae6ad4c75054d2
+DIST exim-pdf-4.93.0.4.tar.xz 2069744 BLAKE2B 
28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca
 SHA512 
929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.93.0.3.ebuild 
b/mail-mta/exim/exim-4.93.0.4.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.93.0.3.ebuild
rename to mail-mta/exim/exim-4.93.0.4.ebuild
index e8a98ba5417..ab4cf6865d4 100644
--- a/mail-mta/exim/exim-4.93.0.3.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"



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

2019-12-14 Thread Fabian Groffen
commit: 6ae72bcc74e5b316b37de58bfee77cf904705226
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Dec 13 12:43:08 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Dec 14 11:04:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ae72bcc

mail-mta/exim-4.93.0.3: another bugfix release

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index b2b963090ad..468778e9a8e 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.0.2.tar.xz 1803916 BLAKE2B 
17921cc376335f9d317290014a613b23ad3fd5605ae26d9261eaed50e499b4cfc840ea5a598cfc86181539fd8cd3b6d9e8cae4673cc75f5cdd67664125a90194
 SHA512 
562bfed2eb8e7cf51d5c93bf62cd8f9e6154007bf5f57c1165a2f529875c4ab2fd185cbe74def56231942094af006b4729d7b8fdf2ac74e4991a2e0a063283cb
+DIST exim-4.93.0.3.tar.xz 1804240 BLAKE2B 
15974e0356640d6deacd82263071cbde76dd88bf7e290de5e04bfcee87f2f11142f03de7d46112942bd052c9f154927eabaaf124d78ae0d1d8e5e33b025763b8
 SHA512 
8afece1059e4ada85f6ecef8197cf2ac5b56274f8c2e1bdd785e0470d37bb1e8b4fe225650ac03302824e3a7fe0a6db1641c6218edc8394a70adcc48af46a1d5
 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.0.2.tar.xz 2069772 BLAKE2B 
4eddcbac665de1bcf3ce7076448609eeaaf3d98034e27da75ae247c300a956225b685aa25ddd0a8fbd0b1674c360ba64c1da0314ce7a3ce158274c7c1c136012
 SHA512 
2aa259acf46a2aa91aa37a855231e6ab11be857233f4533a233baabcf094e75356e12ab121cf1adb3ff02e10823fef0a359c0b97d1ecc647b18f4068f56a217c
+DIST exim-pdf-4.93.0.3.tar.xz 2069756 BLAKE2B 
5d551e3b0f5e729a1551faa0ce34ea559bfe6e60e7ab7705d576d18d36c0bac3bf5431633981ec477bc133a0592154795760101137b0512e4ad52953bbde043a
 SHA512 
fcc14a89098aec895797f4908e6ddeaded39a9913a6f032a253e3878a2499ed20bb3b3822f19bbf3e53962590bacb250a8293d2e67250e4f6eae6ad4c75054d2
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.93.0.2.ebuild 
b/mail-mta/exim/exim-4.93.0.3.ebuild
similarity index 100%
rename from mail-mta/exim/exim-4.93.0.2.ebuild
rename to mail-mta/exim/exim-4.93.0.3.ebuild



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

2019-12-14 Thread Fabian Groffen
commit: dcf96e7e3e94c2c12f7024f748d596a0295126a0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Dec 14 11:04:22 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Dec 14 11:04:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf96e7e

mail-mta/exim-4.93.0.3: block gnutls with dkim, thanks Bernd Feige

Closes: https://bugs.gentoo.org/702812
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.93.0.3.ebuild | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/mail-mta/exim/exim-4.93.0.3.ebuild 
b/mail-mta/exim/exim-4.93.0.3.ebuild
index 7543ff98849..e8a98ba5417 100644
--- a/mail-mta/exim/exim-4.93.0.3.ebuild
+++ b/mail-mta/exim/exim-4.93.0.3.ebuild
@@ -5,16 +5,16 @@ EAPI="7"
 
 inherit db-use toolchain-funcs multilib pam systemd
 
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl 
syslog tcpd +tpda X"
 REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )
dmarc? ( dkim spf )
+   dkim? ( ssl !gnutls )
gnutls? ( ssl )
pkcs11? ( ssl )
spf? ( exiscan-acl )
srs? ( exiscan-acl )
-   !ssl? ( !dkim )
 "
 # NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
 # for x86 and amd64 only, due to this, repoman won't allow depending on
@@ -46,12 +46,14 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-   gnutls? (
-   net-libs/gnutls:0=[pkcs11?]
-   dev-libs/libtasn1
+   gnutls? (
+   net-libs/gnutls:0=[pkcs11?]
+   dev-libs/libtasn1
+   )
+   !gnutls? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
)
ldap? ( >=net-nds/openldap-2.0.7 )
nis? (



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

2019-12-14 Thread Fabian Groffen
commit: 802ebe845892f2a15bd0f8df079f56626148a9e4
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Dec 14 10:41:26 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Dec 14 11:04:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=802ebe84

mail-mta/exim-4.93.0.3: add hint for opendmarc.tlds

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.93.0.3.ebuild | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.93.0.3.ebuild 
b/mail-mta/exim/exim-4.93.0.3.ebuild
index 5f549103ddc..7543ff98849 100644
--- a/mail-mta/exim/exim-4.93.0.3.ebuild
+++ b/mail-mta/exim/exim-4.93.0.3.ebuild
@@ -565,10 +565,15 @@ pkg_postinst() {
einfo "Please create ${EROOT}/etc/exim/exim.conf from"
einfo "  ${EROOT}/etc/exim/exim.conf.dist."
fi
+   if use dmarc ; then
+   einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds"
+   einfo "you can populate this file with the contents downloaded 
from"
+   einfo "  https://publicsuffix.org/list/public_suffix_list.dat;
+   fi
if use dcc ; then
einfo "DCC support is experimental, you can find some limited"
einfo "documentation at the bottom of this prerelease message:"
-   einfo "http://article.gmane.org/gmane.mail.exim.devel/3579;
+   einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579;
fi
use srs && einfo "SRS support is experimental"
use dsn && einfo "extra information in fail DSN message is experimental"



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

2019-12-12 Thread Fabian Groffen
commit: 4d82b60e02ddef04443f7557628fba20d2869d30
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Dec 13 07:46:42 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Dec 13 07:48:12 2019 +
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  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
 
+   # 

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

2019-12-09 Thread Fabian Groffen
commit: b5fbafb62386fdc6e0958d09804bdb95b700e326
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec  9 17:17:48 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec  9 17:18:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5fbafb6

mail-mta/exim-4.93: version bump

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest |   2 +
 mail-mta/exim/exim-4.93.ebuild | 580 +
 .../exim/files/exim-4.93-as-needed-ldflags.patch   | 145 ++
 .../exim/files/exim-4.93-localscan_dlopen.patch| 267 ++
 4 files changed, 994 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index ff4a789bc71..d062568332d 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,5 +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-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 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.ebuild
new file mode 100644
index 000..6feaa1836fa
--- /dev/null
+++ b/mail-mta/exim/exim-4.93.ebuild
@@ -0,0 +1,580 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   spf? ( exiscan-acl )
+   srs? ( exiscan-acl )
+   !ssl? ( !dkim )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #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)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
+   mirror://gentoo/system_filter.exim.gz
+   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+   ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
+   nis? (
+

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

2019-10-26 Thread Thomas Deutschmann
commit: 090c2b8964bdab171450acfbe10a585c23064118
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Oct 26 18:15:52 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Oct 26 18:15:52 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090c2b89

mail-mta/exim: security cleanup (#693494)

Bug: https://bugs.gentoo.org/693494
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 mail-mta/exim/Manifest  |   4 -
 mail-mta/exim/exim-4.92-r3.ebuild   | 563 ---
 mail-mta/exim/exim-4.92-r4.ebuild   | 578 
 mail-mta/exim/exim-4.92.1-r1.ebuild | 578 
 4 files changed, 1723 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 569ecebc2f5..ff4a789bc71 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,9 +1,5 @@
-DIST exim-4.92.1.tar.xz 1767976 BLAKE2B 
fb5bdb8762f16e30c43c7899e5fb5b459bb5e910458f970d20a5cb26cdde842d87a1f8150e4c0f9e931fa277e2f33a0fb8a6d478b5bf871d03a12ebd06c36d67
 SHA512 
fd43448db0aa5139f8b459322b95e258f232ac8a4bf21a19099c7768329ec20c344c4e0d8dd2e98c33a192a5f97d7666a746de2c87bdfb8da42c625c985d7e05
 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.92.tar.xz 1767136 BLAKE2B 
6c97578807073a782112218c65de460cc94f046d807eddc7330f2f67266c0ef341ded61050a16aca13c88e606a923a9e08033c8bfb618a7ef34b3d2ea6db32ca
 SHA512 
62c327e6184a358ba7f0dbc38b44d2537234be91727a5bfac97e74af64a8d77e376b3221dcfdd8f6eca7d812f9233595503dc6e50e2972bed40a1b74eb209c31
-DIST exim-pdf-4.92.1.tar.xz 2038948 BLAKE2B 
6624fb8930944f79e0c7e52a001727cfcff508ac69cb4107247201b8598d6e223cac7c7eda14c3102d0eabc151a547b6cc5ef11a6c4a830f31dfd88e24907c1d
 SHA512 
437b868cd7dedae59e32b9245c8c1ca3375605eb4911846bc3508b627acf32c99bda644b3c3e84eb539a39b3c2cc4f83314eebe55160b3da617ccaec2f1623a2
 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.92.tar.xz 2038812 BLAKE2B 
d5966a27f980a2ceb31293d92049a6691a08262bd20ae7315f41929f0d7a45b5d66c7000f9596b193e74d0c17f91c56a3262602047673c49649f1cad6b216547
 SHA512 
3a40818025fceaa7ac17f8e7ce06a61e3cf65267c821aea93e1a1a659782b047ab177b88a38c9b2271c0a296e1dc7939e23fe0f89415a11cd45693cb8af10c15
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.92-r3.ebuild 
b/mail-mta/exim/exim-4.92-r3.ebuild
deleted file mode 100644
index b47fb4d177e..000
--- a/mail-mta/exim/exim-4.92-r3.ebuild
+++ /dev/null
@@ -1,563 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit db-use eutils toolchain-funcs multilib pam systemd
-
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
-REQUIRED_USE="
-   arc? ( dkim spf )
-   dane? ( ssl !gnutls )
-   dmarc? ( dkim spf )
-   gnutls? ( ssl )
-   pkcs11? ( ssl )
-   spf? ( exiscan-acl )
-   srs? ( exiscan-acl )
-"
-# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
-# for x86 and amd64 only, due to this, repoman won't allow depending on
-# gnutls[dane] for all else.  Because we cannot express USE=dane when
-# USE=gnutls is in effect only in package.use.mask, the only option we
-# have left is to a) ignore the dependency (but that results in bug
-# #661164) or b) 

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

2019-10-13 Thread Matt Turner
commit: bf764a9b5dc917f6fcd63dd5921962d3b8834d37
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Oct 14 02:18:26 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Oct 14 02:18:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf764a9b

mail-mta/exim-4.92.2: alpha stable, bug 693494

Signed-off-by: Matt Turner  gentoo.org>

 mail-mta/exim/exim-4.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index d03e8297b76..3628f1466d7 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-10-12 Thread Mikle Kolyada
commit: a956baba18eb8a16fd0763f722bd0113393b66f7
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Oct 12 19:17:09 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Oct 12 19:17:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a956baba

mail-mta/exim: migrate to sys-libs/pam

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 mail-mta/exim/exim-4.92-r3.ebuild   | 2 +-
 mail-mta/exim/exim-4.92-r4.ebuild   | 2 +-
 mail-mta/exim/exim-4.92.1-r1.ebuild | 2 +-
 mail-mta/exim/exim-4.92.2.ebuild| 2 +-
 mail-mta/exim/exim-4.92.3.ebuild| 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mail-mta/exim/exim-4.92-r3.ebuild 
b/mail-mta/exim/exim-4.92-r3.ebuild
index 1ab0e1ecd9c..b47fb4d177e 100644
--- a/mail-mta/exim/exim-4.92-r3.ebuild
+++ b/mail-mta/exim/exim-4.92-r3.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre
idn? ( net-dns/libidn:= net-dns/libidn2:= )
perl? ( dev-lang/perl:= )
-   pam? ( virtual/pam )
+   pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
ssl? (
!libressl? ( dev-libs/openssl:0= )

diff --git a/mail-mta/exim/exim-4.92-r4.ebuild 
b/mail-mta/exim/exim-4.92-r4.ebuild
index 6acbd3dae4b..0cd959d5439 100644
--- a/mail-mta/exim/exim-4.92-r4.ebuild
+++ b/mail-mta/exim/exim-4.92-r4.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre
idn? ( net-dns/libidn:= net-dns/libidn2:= )
perl? ( dev-lang/perl:= )
-   pam? ( virtual/pam )
+   pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
ssl? (
!libressl? ( dev-libs/openssl:0= )

diff --git a/mail-mta/exim/exim-4.92.1-r1.ebuild 
b/mail-mta/exim/exim-4.92.1-r1.ebuild
index 04077c99b5b..e2f8fdc93a8 100644
--- a/mail-mta/exim/exim-4.92.1-r1.ebuild
+++ b/mail-mta/exim/exim-4.92.1-r1.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre
idn? ( net-dns/libidn:= net-dns/libidn2:= )
perl? ( dev-lang/perl:= )
-   pam? ( virtual/pam )
+   pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
ssl? (
!libressl? ( dev-libs/openssl:0= )

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index dacbdf715ed..d03e8297b76 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre
idn? ( net-dns/libidn:= net-dns/libidn2:= )
perl? ( dev-lang/perl:= )
-   pam? ( virtual/pam )
+   pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
ssl? (
!libressl? ( dev-libs/openssl:0= )

diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
index f225baeeb2d..7b828027f63 100644
--- a/mail-mta/exim/exim-4.92.3.ebuild
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre
idn? ( net-dns/libidn:= net-dns/libidn2:= )
perl? ( dev-lang/perl:= )
-   pam? ( virtual/pam )
+   pam? ( sys-libs/pam )
tcpd? ( sys-apps/tcp-wrappers )
ssl? (
!libressl? ( dev-libs/openssl:0= )



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

2019-09-29 Thread Fabian Groffen
commit: 05e27f7049c028a88fda4f46b9e3b7f1a9d042af
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Sep 29 08:19:55 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Sep 29 08:19:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e27f70

mail-mta/exim: security bump for heap overflow

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest   |   2 +
 mail-mta/exim/exim-4.92.3.ebuild | 582 +++
 2 files changed, 584 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index e94787221cc..569ecebc2f5 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,7 +1,9 @@
 DIST exim-4.92.1.tar.xz 1767976 BLAKE2B 
fb5bdb8762f16e30c43c7899e5fb5b459bb5e910458f970d20a5cb26cdde842d87a1f8150e4c0f9e931fa277e2f33a0fb8a6d478b5bf871d03a12ebd06c36d67
 SHA512 
fd43448db0aa5139f8b459322b95e258f232ac8a4bf21a19099c7768329ec20c344c4e0d8dd2e98c33a192a5f97d7666a746de2c87bdfb8da42c625c985d7e05
 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.92.tar.xz 1767136 BLAKE2B 
6c97578807073a782112218c65de460cc94f046d807eddc7330f2f67266c0ef341ded61050a16aca13c88e606a923a9e08033c8bfb618a7ef34b3d2ea6db32ca
 SHA512 
62c327e6184a358ba7f0dbc38b44d2537234be91727a5bfac97e74af64a8d77e376b3221dcfdd8f6eca7d812f9233595503dc6e50e2972bed40a1b74eb209c31
 DIST exim-pdf-4.92.1.tar.xz 2038948 BLAKE2B 
6624fb8930944f79e0c7e52a001727cfcff508ac69cb4107247201b8598d6e223cac7c7eda14c3102d0eabc151a547b6cc5ef11a6c4a830f31dfd88e24907c1d
 SHA512 
437b868cd7dedae59e32b9245c8c1ca3375605eb4911846bc3508b627acf32c99bda644b3c3e84eb539a39b3c2cc4f83314eebe55160b3da617ccaec2f1623a2
 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.92.tar.xz 2038812 BLAKE2B 
d5966a27f980a2ceb31293d92049a6691a08262bd20ae7315f41929f0d7a45b5d66c7000f9596b193e74d0c17f91c56a3262602047673c49649f1cad6b216547
 SHA512 
3a40818025fceaa7ac17f8e7ce06a61e3cf65267c821aea93e1a1a659782b047ab177b88a38c9b2271c0a296e1dc7939e23fe0f89415a11cd45693cb8af10c15
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild
new file mode 100644
index 000..1217a52cf51
--- /dev/null
+++ b/mail-mta/exim/exim-4.92.3.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   spf? ( exiscan-acl )
+   srs? ( exiscan-acl )
+   !ssl? ( !dkim )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #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 

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

2019-09-20 Thread Sergei Trofimovich
commit: 12ebe55762ef829dafea3a4b7864f7bd84baa082
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep 20 06:39:02 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep 20 06:39:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12ebe557

mail-mta/exim: stable 4.92.2 for hppa, bug #693494

Package-Manager: Portage-2.3.76, Repoman-2.3.17
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/exim/exim-4.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 5dac69e2f87..85b2c048788 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-09-13 Thread Agostino Sarubbo
commit: efc684062067c82c62ed31e7cecc4b6a6665352f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Sep 13 17:26:59 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Sep 13 17:27:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efc68406

mail-mta/exim: ia64 stable wrt bug #693494

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 3d80bfb9a26..5dac69e2f87 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-09-13 Thread Mikle Kolyada
commit: dd5ae093d2a09dbf03f34a7d2d25c12fc75ed1c3
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Sep 13 15:41:34 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Sep 13 15:41:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd5ae093

mail-mta/exim: arm stable wrt bug #693494

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 mail-mta/exim/exim-4.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 84c257a6e44..3d80bfb9a26 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-09-09 Thread Agostino Sarubbo
commit: 3075e546b0c1da321d4d155563db08beca548fc1
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Sep  9 06:02:15 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Sep  9 06:02:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3075e546

mail-mta/exim: sparc stable wrt bug #693494

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 2c9fb3ecfd5..84c257a6e44 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-09-08 Thread Agostino Sarubbo
commit: 8785cd804bed140a6d8147cef82b772533e96297
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Sep  9 05:53:55 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Sep  9 05:53:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8785cd80

mail-mta/exim: amd64 stable wrt bug #693494

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/exim/exim-4.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 32b1307c0b4..2c9fb3ecfd5 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-09-08 Thread Sergei Trofimovich
commit: 6ebcb8a757d23eb20c8059c2ab49251a9ccb69cf
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep  8 18:29:03 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep  8 18:29:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ebcb8a7

mail-mta/exim: stable 4.92.2 for ppc64, bug #693494

Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/exim/exim-4.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 1a5d4a6ec10..32b1307c0b4 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-09-08 Thread Sergei Trofimovich
commit: 0d6f93470190fc51b16481401315e88038433eb9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep  8 18:24:30 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep  8 18:24:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6f9347

mail-mta/exim: stable 4.92.2 for ppc, bug #693494

Package-Manager: Portage-2.3.75, Repoman-2.3.17
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/exim/exim-4.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 8ccda5caf15..1a5d4a6ec10 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-09-06 Thread Thomas Deutschmann
commit: 18c76e1a78f17bdbdf44e694a69fa51eb103579d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep  7 00:22:07 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep  7 00:22:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18c76e1a

mail-mta/exim: x86 stable (bug #693494)

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 mail-mta/exim/exim-4.92.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
index 1217a52cf51..8ccda5caf15 100644
--- a/mail-mta/exim/exim-4.92.2.ebuild
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-09-06 Thread Thomas Deutschmann
commit: 5c1968d993330fcd3d593e014de4d7eccfd05872
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Sep  6 13:16:23 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Fri Sep  6 13:17:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1968d9

mail-mta/exim: bump to v4.92.2 (CVE-2019-15846)

Ebuild changes:
- EAPI bumped to EAPI=7

Bug: https://bugs.gentoo.org/693494
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 mail-mta/exim/Manifest   |   2 +
 mail-mta/exim/exim-4.92.2.ebuild | 582 +++
 2 files changed, 584 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 92f89a8e4ee..e94787221cc 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,5 +1,7 @@
 DIST exim-4.92.1.tar.xz 1767976 BLAKE2B 
fb5bdb8762f16e30c43c7899e5fb5b459bb5e910458f970d20a5cb26cdde842d87a1f8150e4c0f9e931fa277e2f33a0fb8a6d478b5bf871d03a12ebd06c36d67
 SHA512 
fd43448db0aa5139f8b459322b95e258f232ac8a4bf21a19099c7768329ec20c344c4e0d8dd2e98c33a192a5f97d7666a746de2c87bdfb8da42c625c985d7e05
+DIST exim-4.92.2.tar.xz 1772688 BLAKE2B 
618c70e26811d0e6d453a4b88ab1cdb9e337a9ca8ceec50aee665b1493c75157001483cf9721e3d57313a90910d2605717b2c4be4174c2897b3f992af01c1c26
 SHA512 
d27aca4d4e9df267b0afcbe7b3f74c9ca6e96e7e6eb4d2f86ff00b0e2234eaec90271405eb387a36a2e0d4ec5597b2920753f85318a5618ddbc8af475a7d81cd
 DIST exim-4.92.tar.xz 1767136 BLAKE2B 
6c97578807073a782112218c65de460cc94f046d807eddc7330f2f67266c0ef341ded61050a16aca13c88e606a923a9e08033c8bfb618a7ef34b3d2ea6db32ca
 SHA512 
62c327e6184a358ba7f0dbc38b44d2537234be91727a5bfac97e74af64a8d77e376b3221dcfdd8f6eca7d812f9233595503dc6e50e2972bed40a1b74eb209c31
 DIST exim-pdf-4.92.1.tar.xz 2038948 BLAKE2B 
6624fb8930944f79e0c7e52a001727cfcff508ac69cb4107247201b8598d6e223cac7c7eda14c3102d0eabc151a547b6cc5ef11a6c4a830f31dfd88e24907c1d
 SHA512 
437b868cd7dedae59e32b9245c8c1ca3375605eb4911846bc3508b627acf32c99bda644b3c3e84eb539a39b3c2cc4f83314eebe55160b3da617ccaec2f1623a2
+DIST exim-pdf-4.92.2.tar.xz 2039468 BLAKE2B 
3542bb5d38267bb06728ada72cfa89f06027b917799e743a1764cb7568cf0ba4cdbc5b40738c3ae41c9540d348810b388d74ad315a201f2740a5a0b79e83f904
 SHA512 
da90354cd8133103f08b978dd0422fd1a00e5866cd3f40e523d06875fb8b31163d7fe9791f1cf81d15bc63b16fc7f6bb98cf28c3036d054464336c07245b3c91
 DIST exim-pdf-4.92.tar.xz 2038812 BLAKE2B 
d5966a27f980a2ceb31293d92049a6691a08262bd20ae7315f41929f0d7a45b5d66c7000f9596b193e74d0c17f91c56a3262602047673c49649f1cad6b216547
 SHA512 
3a40818025fceaa7ac17f8e7ce06a61e3cf65267c821aea93e1a1a659782b047ab177b88a38c9b2271c0a296e1dc7939e23fe0f89415a11cd45693cb8af10c15
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild
new file mode 100644
index 000..1217a52cf51
--- /dev/null
+++ b/mail-mta/exim/exim-4.92.2.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   spf? ( exiscan-acl )
+   srs? ( exiscan-acl )
+   !ssl? ( !dkim )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #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)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
+   mirror://gentoo/system_filter.exim.gz
+   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
+HOMEPAGE="https://www.exim.org/;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+   ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
+   nis? (
+   elibc_glibc? (
+

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

2019-08-28 Thread Thomas Deutschmann
commit: b66ee1807f582885ab6550d39122761021571b67
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Aug 28 10:58:59 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Aug 28 11:17:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b66ee180

mail-mta/exim: rev bump to ease migration to dev-db/mysql-connector-c

Commit 7d85d12fa332090c3f33da324f083718f89d7fbb replaced
virtual/libmysqlclient dependency with dev-db/mysql-connector-c atom
without a rev bump.

To avoid unecessary user interaction for users not using emerge's
--changed-deps=y because we are already pushing towards removal of
virtual/libmysqlclient (see commit 08b83d736f77fd5dffa9cd5f6b1b44771726ce94),
this commit will now force the re-installation through rev bump
to ease migration.

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 mail-mta/exim/{exim-4.92.ebuild => exim-4.92-r3.ebuild} | 0
 mail-mta/exim/{exim-4.92-r2.ebuild => exim-4.92-r4.ebuild}  | 0
 mail-mta/exim/{exim-4.92.1.ebuild => exim-4.92.1-r1.ebuild} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92-r3.ebuild
similarity index 100%
rename from mail-mta/exim/exim-4.92.ebuild
rename to mail-mta/exim/exim-4.92-r3.ebuild

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r4.ebuild
similarity index 100%
rename from mail-mta/exim/exim-4.92-r2.ebuild
rename to mail-mta/exim/exim-4.92-r4.ebuild

diff --git a/mail-mta/exim/exim-4.92.1.ebuild 
b/mail-mta/exim/exim-4.92.1-r1.ebuild
similarity index 100%
rename from mail-mta/exim/exim-4.92.1.ebuild
rename to mail-mta/exim/exim-4.92.1-r1.ebuild



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

2019-08-24 Thread Thomas Deutschmann
commit: 7d85d12fa332090c3f33da324f083718f89d7fbb
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Aug 24 10:10:28 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Aug 24 10:30:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d85d12f

mail-mta/exim: migrate to dev-db/mysql-connector-c

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann  gentoo.org>

 mail-mta/exim/exim-4.92-r2.ebuild | 2 +-
 mail-mta/exim/exim-4.92.1.ebuild  | 2 +-
 mail-mta/exim/exim-4.92.ebuild| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
index d6949b4d5eb..e63e0643c3e 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -58,7 +58,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=net-libs/libnsl-1:=
)
)
-   mysql? ( virtual/libmysqlclient )
+   mysql? ( dev-db/mysql-connector-c:= )
postgres? ( dev-db/postgresql:= )
sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
redis? ( dev-libs/hiredis )

diff --git a/mail-mta/exim/exim-4.92.1.ebuild b/mail-mta/exim/exim-4.92.1.ebuild
index 9d74e713de0..34e7b79bd72 100644
--- a/mail-mta/exim/exim-4.92.1.ebuild
+++ b/mail-mta/exim/exim-4.92.1.ebuild
@@ -58,7 +58,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=net-libs/libnsl-1:=
)
)
-   mysql? ( virtual/libmysqlclient )
+   mysql? ( dev-db/mysql-connector-c:= )
postgres? ( dev-db/postgresql:= )
sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
redis? ( dev-libs/hiredis )

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index fe6cf5e40f1..90a6e8765fa 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -57,7 +57,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=net-libs/libnsl-1:=
)
)
-   mysql? ( virtual/libmysqlclient )
+   mysql? ( dev-db/mysql-connector-c:= )
postgres? ( dev-db/postgresql:= )
sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
redis? ( dev-libs/hiredis )



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

2019-08-02 Thread Fabian Groffen
commit: e4104b9c4bd8cbaba4712e6a8d4e6c8d120ba5c0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Aug  2 06:42:47 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Aug  2 06:42:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4104b9c

mail-mta/exim: cleanup vulnerable CVE-2019-10149

Bug: https://bugs.gentoo.org/687336
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest |   2 -
 mail-mta/exim/exim-4.91-r2.ebuild  | 561 -
 .../exim/files/exim-4.74-localscan_dlopen.patch| 262 --
 3 files changed, 825 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index c666f92c515..92f89a8e4ee 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,7 +1,5 @@
-DIST exim-4.91.tar.xz 1744660 BLAKE2B 
8d50a709def02a52f8e76a16fcf51a4fc7e553217d5513a361aa780f58bff336a9ab90d8683e3841a074f54f3c75f2f77bf1a353a849be1207bffdd5fb6e4c51
 SHA512 
35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
 DIST exim-4.92.1.tar.xz 1767976 BLAKE2B 
fb5bdb8762f16e30c43c7899e5fb5b459bb5e910458f970d20a5cb26cdde842d87a1f8150e4c0f9e931fa277e2f33a0fb8a6d478b5bf871d03a12ebd06c36d67
 SHA512 
fd43448db0aa5139f8b459322b95e258f232ac8a4bf21a19099c7768329ec20c344c4e0d8dd2e98c33a192a5f97d7666a746de2c87bdfb8da42c625c985d7e05
 DIST exim-4.92.tar.xz 1767136 BLAKE2B 
6c97578807073a782112218c65de460cc94f046d807eddc7330f2f67266c0ef341ded61050a16aca13c88e606a923a9e08033c8bfb618a7ef34b3d2ea6db32ca
 SHA512 
62c327e6184a358ba7f0dbc38b44d2537234be91727a5bfac97e74af64a8d77e376b3221dcfdd8f6eca7d812f9233595503dc6e50e2972bed40a1b74eb209c31
-DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 
0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ecfce3b44763d5a24f2d98353bc58c42456e9884994f404d17685909ea287a478189407ba8e7835352274c788980
 SHA512 
82add9b42749b6d938ff3b44a4dea3dfe84bcb2a1efea8a32b64d81a9ea312033d33023b5c224a44a2c053b18f9042bd1f2834847cf48873d1725a5594704a12
 DIST exim-pdf-4.92.1.tar.xz 2038948 BLAKE2B 
6624fb8930944f79e0c7e52a001727cfcff508ac69cb4107247201b8598d6e223cac7c7eda14c3102d0eabc151a547b6cc5ef11a6c4a830f31dfd88e24907c1d
 SHA512 
437b868cd7dedae59e32b9245c8c1ca3375605eb4911846bc3508b627acf32c99bda644b3c3e84eb539a39b3c2cc4f83314eebe55160b3da617ccaec2f1623a2
 DIST exim-pdf-4.92.tar.xz 2038812 BLAKE2B 
d5966a27f980a2ceb31293d92049a6691a08262bd20ae7315f41929f0d7a45b5d66c7000f9596b193e74d0c17f91c56a3262602047673c49649f1cad6b216547
 SHA512 
3a40818025fceaa7ac17f8e7ce06a61e3cf65267c821aea93e1a1a659782b047ab177b88a38c9b2271c0a296e1dc7939e23fe0f89415a11cd45693cb8af10c15
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
deleted file mode 100644
index cf587588b81..000
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ /dev/null
@@ -1,561 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit db-use eutils toolchain-funcs multilib pam systemd
-
-IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
-REQUIRED_USE="
-   arc? ( dkim spf )
-   dane? ( ssl !gnutls )
-   dmarc? ( dkim spf )
-   gnutls? ( ssl )
-   pkcs11? ( ssl )
-   spf? ( exiscan-acl )
-   srs? ( exiscan-acl )
-"
-# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
-# for x86 and amd64 only, due to this, repoman won't allow depending on
-# gnutls[dane] for all else.  Because we cannot express USE=dane when
-# USE=gnutls is in effect only in package.use.mask, the only option we
-# have left is to a) ignore the dependency (but that results in bug
-# #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)"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
-   mirror://gentoo/system_filter.exim.gz
-   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
-HOMEPAGE="http://www.exim.org/;
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-   ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
-   nis? (
-   elibc_glibc? (
-  

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

2019-07-28 Thread Mikle Kolyada
commit: af6d46a69eb7827110c81b9212f75a0838469f76
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jul 28 20:02:20 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jul 28 20:02:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6d46a6

mail-mta/exim: arm stable wrt bug #687554

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 mail-mta/exim/exim-4.92-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
index 1ec2588c988..d6949b4d5eb 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-07-25 Thread Fabian Groffen
commit: 5cfac6562424f7b39506efdcef033747e95a2b7f
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jul 25 10:46:03 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jul 25 10:46:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cfac656

mail-mta/exim: version bump 4.92.1 CVE-2019-13917

Signed-off-by: Fabian Groffen  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 mail-mta/exim/Manifest   |   2 +
 mail-mta/exim/exim-4.92.1.ebuild | 578 +++
 2 files changed, 580 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 7195d5f1d29..c666f92c515 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,5 +1,7 @@
 DIST exim-4.91.tar.xz 1744660 BLAKE2B 
8d50a709def02a52f8e76a16fcf51a4fc7e553217d5513a361aa780f58bff336a9ab90d8683e3841a074f54f3c75f2f77bf1a353a849be1207bffdd5fb6e4c51
 SHA512 
35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
+DIST exim-4.92.1.tar.xz 1767976 BLAKE2B 
fb5bdb8762f16e30c43c7899e5fb5b459bb5e910458f970d20a5cb26cdde842d87a1f8150e4c0f9e931fa277e2f33a0fb8a6d478b5bf871d03a12ebd06c36d67
 SHA512 
fd43448db0aa5139f8b459322b95e258f232ac8a4bf21a19099c7768329ec20c344c4e0d8dd2e98c33a192a5f97d7666a746de2c87bdfb8da42c625c985d7e05
 DIST exim-4.92.tar.xz 1767136 BLAKE2B 
6c97578807073a782112218c65de460cc94f046d807eddc7330f2f67266c0ef341ded61050a16aca13c88e606a923a9e08033c8bfb618a7ef34b3d2ea6db32ca
 SHA512 
62c327e6184a358ba7f0dbc38b44d2537234be91727a5bfac97e74af64a8d77e376b3221dcfdd8f6eca7d812f9233595503dc6e50e2972bed40a1b74eb209c31
 DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 
0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ecfce3b44763d5a24f2d98353bc58c42456e9884994f404d17685909ea287a478189407ba8e7835352274c788980
 SHA512 
82add9b42749b6d938ff3b44a4dea3dfe84bcb2a1efea8a32b64d81a9ea312033d33023b5c224a44a2c053b18f9042bd1f2834847cf48873d1725a5594704a12
+DIST exim-pdf-4.92.1.tar.xz 2038948 BLAKE2B 
6624fb8930944f79e0c7e52a001727cfcff508ac69cb4107247201b8598d6e223cac7c7eda14c3102d0eabc151a547b6cc5ef11a6c4a830f31dfd88e24907c1d
 SHA512 
437b868cd7dedae59e32b9245c8c1ca3375605eb4911846bc3508b627acf32c99bda644b3c3e84eb539a39b3c2cc4f83314eebe55160b3da617ccaec2f1623a2
 DIST exim-pdf-4.92.tar.xz 2038812 BLAKE2B 
d5966a27f980a2ceb31293d92049a6691a08262bd20ae7315f41929f0d7a45b5d66c7000f9596b193e74d0c17f91c56a3262602047673c49649f1cad6b216547
 SHA512 
3a40818025fceaa7ac17f8e7ce06a61e3cf65267c821aea93e1a1a659782b047ab177b88a38c9b2271c0a296e1dc7939e23fe0f89415a11cd45693cb8af10c15
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.92.1.ebuild b/mail-mta/exim/exim-4.92.1.ebuild
new file mode 100644
index 000..9d74e713de0
--- /dev/null
+++ b/mail-mta/exim/exim-4.92.1.ebuild
@@ -0,0 +1,578 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit db-use eutils toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   spf? ( exiscan-acl )
+   srs? ( exiscan-acl )
+   !ssl? ( !dkim )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #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)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
+   mirror://gentoo/system_filter.exim.gz
+   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
+HOMEPAGE="http://www.exim.org/;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+   ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
+   nis? (
+   elibc_glibc? (
+   net-libs/libtirpc
+   >=net-libs/libnsl-1:=
+ 

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

2019-07-23 Thread Fabian Groffen
commit: 75d254d4ea90f99e8c2fe01104f6eae4033c6a89
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Jul 23 18:15:35 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Jul 23 18:15:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d254d4

mail-mta/exim: lack of TLS forces DKIM off

Bug: https://bugs.gentoo.org/689910
Signed-off-by: Fabian Groffen  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 mail-mta/exim/exim-4.92-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
index 3ccacfb418c..1ec2588c988 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -14,6 +14,7 @@ REQUIRED_USE="
pkcs11? ( ssl )
spf? ( exiscan-acl )
srs? ( exiscan-acl )
+   !ssl? ( !dkim )
 "
 # NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
 # for x86 and amd64 only, due to this, repoman won't allow depending on



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

2019-07-18 Thread Agostino Sarubbo
commit: d5d3869da7c3834e7474cb1fbe572e265af8930d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 18 10:48:39 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 18 10:48:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5d3869d

mail-mta/exim: ia64 stable wrt bug #687554

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ia64"

 mail-mta/exim/exim-4.92-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
index cdcd2027742..3ccacfb418c 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-07-18 Thread Agostino Sarubbo
commit: 8353a87205349bb5b95c1537391b4caffa3900e3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 18 10:45:08 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 18 10:45:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8353a872

mail-mta/exim: alpha stable wrt bug #687554

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"

 mail-mta/exim/exim-4.92-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
index c215dafe44b..cdcd2027742 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-07-18 Thread Agostino Sarubbo
commit: 11423b4b1ab150dfde7c37687d97649b21bdca6c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 18 10:01:23 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 18 10:01:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11423b4b

mail-mta/exim: ppc64 stable wrt bug #687554

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"

 mail-mta/exim/exim-4.92-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
index d5545d59152..c215dafe44b 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-07-18 Thread Agostino Sarubbo
commit: c0f375a8dbb39a63f2282c01e2e4690d44348e17
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul 18 09:57:01 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul 18 09:57:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f375a8

mail-mta/exim: ppc stable wrt bug #687554

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 mail-mta/exim/exim-4.92-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
index f464bbfb5dc..d5545d59152 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-07-17 Thread Agostino Sarubbo
commit: 93950d433a41062bab1ebf775d00023be93f5677
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jul 17 15:23:24 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jul 17 15:23:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93950d43

mail-mta/exim: x86 stable wrt bug #687554

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"

 mail-mta/exim/exim-4.92-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
index cf6a98ea5c4..f464bbfb5dc 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-07-15 Thread Sergei Trofimovich
commit: 9416d0ed527cf855457974f4f6c9ee5de6890a7a
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jul 15 16:15:34 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul 15 19:10:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9416d0ed

mail-mta/exim: stable 4.92-r2 for sparc, bug #687554

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/exim/exim-4.92-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
index 4d96a679ace..cf6a98ea5c4 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-07-15 Thread Agostino Sarubbo
commit: 98d43f7c131a02aba0cc9cc291e40de47cb434f9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jul 15 13:14:01 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jul 15 13:14:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98d43f7c

mail-mta/exim: amd64 stable wrt bug #687554

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 mail-mta/exim/exim-4.92-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92-r2.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
index 3a5c9bf51b0..4d96a679ace 100644
--- a/mail-mta/exim/exim-4.92-r2.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-06-28 Thread Fabian Groffen
commit: 47afd5252208d69ef4df50a86442bdd73287530e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jun 28 13:50:23 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jun 28 13:50:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47afd525

mail-mta/exim: fix USE=dlfunc

Closes: https://bugs.gentoo.org/688572
Signed-off-by: Fabian Groffen  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 .../{exim-4.92-r1.ebuild => exim-4.92-r2.ebuild}   | 59 ++
 mail-mta/exim/exim-4.92.ebuild |  2 +
 .../exim/files/exim-4.92-localscan_dlopen.patch|  2 +-
 3 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/mail-mta/exim/exim-4.92-r1.ebuild 
b/mail-mta/exim/exim-4.92-r2.ebuild
similarity index 90%
rename from mail-mta/exim/exim-4.92-r1.ebuild
rename to mail-mta/exim/exim-4.92-r2.ebuild
index a0346ffb579..3a5c9bf51b0 100644
--- a/mail-mta/exim/exim-4.92-r1.ebuild
+++ b/mail-mta/exim/exim-4.92-r2.ebuild
@@ -131,25 +131,27 @@ src_prepare() {
 src_configure() {
# general config and paths
 
-   sed -i.orig \
-   -e 
"/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
-   "${S}"/src/configure.default || die
+   local aliases="${EPREFIX}/etc/mail/aliases"
+   sed -i \
+   -e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \
+   src/configure.default || die
 
-   sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
+   sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die
 
+   if use elibc_musl; then
+   sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+   fi
+
+   local conffile="${EPREFIX}/etc/exim/exim.conf"
sed -e "48i\CFLAGS=${CFLAGS}" \
-e 
"s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
-   -e 
"s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:"
 \
+   -e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \
-e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \
-e 
"s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \
-   src/EDITME > Local/Makefile
-
-   if use elibc_musl; then
-   sed -e 's/^LIBS = -lnsl/LIBS =/g' \
-   -i OS/Makefile-Linux
-   fi
+   src/EDITME > Local/Makefile || die
 
+   # work on Local/Makefile from now on
cd Local
 
cat >> Makefile <<- EOC
@@ -181,6 +183,7 @@ src_configure() {
 
#
# mail storage formats
+   #
 
# mailstore is Exim's traditional storage format
cat >> Makefile <<- EOC
@@ -218,14 +221,14 @@ src_configure() {
 
if ! use dnsdb; then
# DNSDB lookup is enabled by default
-   sed -i "s:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:" Makefile
+   sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || 
die
fi
 
if use ldap; then
cat >> Makefile <<- EOC
LOOKUP_LDAP=yes
LDAP_LIB_TYPE=OPENLDAP2
-   LOOKUP_INCLUDE += -I"${EROOT}"usr/include/ldap
+   LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap
LOOKUP_LIBS += -lldap -llber
EOC
fi
@@ -245,7 +248,7 @@ src_configure() {
EOC
if use elibc_glibc ; then
cat >> Makefile <<- EOC
-   CFLAGS += -I/usr/include/tirpc
+   CFLAGS += -I"${EPREFIX}"/usr/include/tirpc
EOC
fi
fi
@@ -272,17 +275,17 @@ src_configure() {
EOC
fi
 
-   #
# Exim monitor, enabled by default, controlled via X USE-flag,
# 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
+   sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die
fi
 
#
# features
+   #
 
# content scanning support
if use exiscan-acl; then
@@ -317,7 +320,10 @@ src_configure() {
 
# log to syslog
if use syslog; then
-   sed -i 
"s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Makefile
+   local eximlog="${EPREFIX}/var/log/exim/exim_%s.log"
+   sed -i \
+   -e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \
+   Makefile || die
cat >> Makefile <<- EOC
LOG_FILE_PATH=syslog
EOC
@@ -365,6 +371,8 @@ src_configure() {
if use dlfunc; then
 

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

2019-06-12 Thread Markus Meier
commit: aed261d5646377073281cbd2e1e0d12078a809a4
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Jun 13 04:28:23 2019 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Jun 13 04:28:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aed261d5

mail-mta/exim: arm stable, bug #687336

Signed-off-by: Markus Meier  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 mail-mta/exim/exim-4.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index 8b41a7ee534..a68f1b94203 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-06-11 Thread Fabian Groffen
commit: 4971a74df5e8753cfbb4d40c0ff4960d951b2e52
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Jun 11 08:16:54 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Jun 11 08:16:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4971a74d

mail-mta/exim: revbump for fix for bug #687554

Bug: https://bugs.gentoo.org/687554
Signed-off-by: Fabian Groffen  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 mail-mta/exim/exim-4.92-r1.ebuild  | 562 +
 .../files/exim-4.92-fix-eval-expansion-32bit.patch |  51 ++
 2 files changed, 613 insertions(+)

diff --git a/mail-mta/exim/exim-4.92-r1.ebuild 
b/mail-mta/exim/exim-4.92-r1.ebuild
new file mode 100644
index 000..a0346ffb579
--- /dev/null
+++ b/mail-mta/exim/exim-4.92-r1.ebuild
@@ -0,0 +1,562 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit db-use eutils toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   spf? ( exiscan-acl )
+   srs? ( exiscan-acl )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #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)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
+   mirror://gentoo/system_filter.exim.gz
+   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
+HOMEPAGE="http://www.exim.org/;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+   ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
+   nis? (
+   elibc_glibc? (
+   net-libs/libtirpc
+   >=net-libs/libnsl-1:=
+   )
+   )
+   mysql? ( virtual/libmysqlclient )
+   postgres? ( dev-db/postgresql:= )
+   sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+   redis? ( dev-libs/hiredis )
+   spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+   dmarc? ( mail-filter/opendmarc )
+   srs? ( mail-filter/libsrs_alt )
+   X? (
+   x11-libs/libX11
+   x11-libs/libXmu
+   x11-libs/libXt
+   x11-libs/libXaw
+   )
+   sqlite? ( dev-db/sqlite )
+   radius? ( net-dialup/freeradius-client )
+   virtual/libiconv
+   elibc_glibc? ( net-libs/libnsl )
+   "
+   # added X check for #57206
+DEPEND="${COMMON_DEPEND}
+   virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+   !mail-mta/courier
+   !mail-mta/esmtp
+   !mail-mta/mini-qmail
+   !=mail-mta/msmtp-1.4.19-r1[mta]
+   !mail-mta/netqmail
+   !mail-mta/nullmailer
+   !mail-mta/postfix
+   !mail-mta/qmail-ldap
+   !mail-mta/sendmail
+   !mail-mta/opensmtpd
+   !=mail-mta/ssmtp-2.64-r2[mta]
+   !net-mail/mailwrapper
+   >=net-mail/mailbase-0.00-r5
+   virtual/logger
+   dcc? ( mail-filter/dcc )
+   selinux? ( sec-policy/selinux-exim )
+   "
+
+S=${WORKDIR}/${P//rc/RC}
+
+src_prepare() {
+   epatch "${FILESDIR}"/exim-4.14-tail.patch
+   epatch "${FILESDIR}"/exim-4.92-localscan_dlopen.patch
+   epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
+   epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+   epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
+   epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
+   epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+   epatch "${FILESDIR}"/exim-4.92-fix-eval-expansion-32bit.patch #687554
+
+   if use maildir ; then
+   epatch "${FILESDIR}"/exim-4.20-maildir.patch
+   else
+   epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+   fi
+
+   eapply_user
+
+   # user Exim believes it should be
+   MAILUSER=mail
+   MAILGROUP=mail
+   if use prefix && [[ ${EUID} != 0 ]] ; then
+   MAILUSER=$(id -un)
+   MAILGROUP=$(id -gn)
+   fi
+}
+
+src_configure() {
+   # general 

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

2019-06-08 Thread Agostino Sarubbo
commit: b0775a8d766a70f7f787c6dd5529f981ee330797
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jun  8 18:20:31 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jun  8 18:20:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0775a8d

mail-mta/exim: alpha stable wrt bug #687336

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"

 mail-mta/exim/exim-4.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index b5f79aae44d..8b41a7ee534 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-06-06 Thread Sergei Trofimovich
commit: 8b3d110c053d586d66f41ebde6c2259a0669ab7a
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Jun  6 20:25:09 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jun  6 20:59:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b3d110c

mail-mta/exim: stable 4.92 for hppa, bug #687336

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/exim/exim-4.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index 1b0530ee306..b5f79aae44d 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-06-06 Thread Agostino Sarubbo
commit: fab68719bb8da79a6054e6b5367dfd932aef7495
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun  6 06:54:49 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun  6 06:54:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fab68719

mail-mta/exim: ia64 stable wrt bug #687336

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ia64"

 mail-mta/exim/exim-4.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index b1b0c4dc8b6..1b0530ee306 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-06-05 Thread Sergei Trofimovich
commit: 21e89c94a73ab8f039356b440c44702e6d594ff6
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Jun  5 17:39:18 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Jun  5 18:13:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21e89c94

mail-mta/exim: stable 4.92 for sparc, bug #687336

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/exim/exim-4.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index 8b4d4cbd5fc..b1b0c4dc8b6 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-06-05 Thread Agostino Sarubbo
commit: 21d19912bd30aeb0ef1b7f3c74c0a542b7efec84
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun  5 07:11:06 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun  5 07:12:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d19912

mail-mta/exim: ppc stable wrt bug #687336

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 mail-mta/exim/exim-4.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index 3d8394a01da..8b4d4cbd5fc 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-06-05 Thread Agostino Sarubbo
commit: 53c55744d2c2d7f1b03ffe37c1f419a508b5c19f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun  5 06:47:08 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun  5 06:47:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c55744

mail-mta/exim: amd64 stable wrt bug #687336

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 mail-mta/exim/exim-4.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index 5456845d756..3d8394a01da 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-06-04 Thread Agostino Sarubbo
commit: f5c9f49ac30d679b43cebd814ee22f7ed169549d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jun  4 18:55:59 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jun  4 18:55:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c9f49a

mail-mta/exim: ppc64 stable wrt bug #687336

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"

 mail-mta/exim/exim-4.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index ba8440ff66a..5456845d756 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-06-04 Thread Thomas Deutschmann
commit: 83537e6f53a56c2363351df1f5bb299c98d0643f
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jun  4 17:18:02 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jun  4 17:18:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83537e6f

mail-mta/exim: x86 stable (bug #687336)

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann  gentoo.org>

 mail-mta/exim/exim-4.92.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
index 1b4f24e9a07..ba8440ff66a 100644
--- a/mail-mta/exim/exim-4.92.ebuild
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-02-19 Thread Fabian Groffen
commit: 85749f8757dad788e0a475affc9b77f4a722aac9
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Feb 17 10:37:02 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Feb 19 12:19:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85749f87

mail-mta/exim: version bump

Signed-off-by: Fabian Groffen  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 mail-mta/exim/Manifest |   2 +
 mail-mta/exim/exim-4.92.ebuild | 561 +
 .../exim/files/exim-4.92-localscan_dlopen.patch| 267 ++
 3 files changed, 830 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index a9d8a746f01..7195d5f1d29 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,3 +1,5 @@
 DIST exim-4.91.tar.xz 1744660 BLAKE2B 
8d50a709def02a52f8e76a16fcf51a4fc7e553217d5513a361aa780f58bff336a9ab90d8683e3841a074f54f3c75f2f77bf1a353a849be1207bffdd5fb6e4c51
 SHA512 
35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
+DIST exim-4.92.tar.xz 1767136 BLAKE2B 
6c97578807073a782112218c65de460cc94f046d807eddc7330f2f67266c0ef341ded61050a16aca13c88e606a923a9e08033c8bfb618a7ef34b3d2ea6db32ca
 SHA512 
62c327e6184a358ba7f0dbc38b44d2537234be91727a5bfac97e74af64a8d77e376b3221dcfdd8f6eca7d812f9233595503dc6e50e2972bed40a1b74eb209c31
 DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 
0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ecfce3b44763d5a24f2d98353bc58c42456e9884994f404d17685909ea287a478189407ba8e7835352274c788980
 SHA512 
82add9b42749b6d938ff3b44a4dea3dfe84bcb2a1efea8a32b64d81a9ea312033d33023b5c224a44a2c053b18f9042bd1f2834847cf48873d1725a5594704a12
+DIST exim-pdf-4.92.tar.xz 2038812 BLAKE2B 
d5966a27f980a2ceb31293d92049a6691a08262bd20ae7315f41929f0d7a45b5d66c7000f9596b193e74d0c17f91c56a3262602047673c49649f1cad6b216547
 SHA512 
3a40818025fceaa7ac17f8e7ce06a61e3cf65267c821aea93e1a1a659782b047ab177b88a38c9b2271c0a296e1dc7939e23fe0f89415a11cd45693cb8af10c15
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.92.ebuild b/mail-mta/exim/exim-4.92.ebuild
new file mode 100644
index 000..1b4f24e9a07
--- /dev/null
+++ b/mail-mta/exim/exim-4.92.ebuild
@@ -0,0 +1,561 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit db-use eutils toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   spf? ( exiscan-acl )
+   srs? ( exiscan-acl )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #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)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
+   mirror://gentoo/system_filter.exim.gz
+   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
+HOMEPAGE="http://www.exim.org/;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+   ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
+   nis? (
+   elibc_glibc? (
+   net-libs/libtirpc
+   >=net-libs/libnsl-1:=
+   )
+   )
+   mysql? ( virtual/libmysqlclient )
+   postgres? ( dev-db/postgresql:= )
+   sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+   redis? ( dev-libs/hiredis )
+   spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+   dmarc? ( mail-filter/opendmarc )
+   srs? ( mail-filter/libsrs_alt )
+   X? (
+   x11-libs/libX11
+   x11-libs/libXmu
+   x11-libs/libXt
+   x11-libs/libXaw
+   )
+   sqlite? ( dev-db/sqlite )
+   radius? ( net-dialup/freeradius-client )
+   virtual/libiconv
+   

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

2019-01-13 Thread Sergei Trofimovich
commit: 5ce87633de6585f1bd001b81200064d41ff062aa
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jan 14 06:36:23 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jan 14 07:14:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce87633

mail-mta/exim: stable 4.91-r2 for hppa, bug #637546

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/exim/exim-4.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
index 111f05cbcc3..cf587588b81 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2019-01-11 Thread Fabian Groffen
commit: 761a608fa0e44fa01af49b605afd4e86cf80e81c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan 11 13:17:16 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan 11 13:17:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761a608f

mail-mta/exim: fix compilation of USE=dane, bug #675142

Closes: https://bugs.gentoo.org/675142
Signed-off-by: Fabian Groffen  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 mail-mta/exim/exim-4.91-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
index d8caa901fa0..111f05cbcc3 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -307,7 +307,7 @@ src_configure() {
fi
 
# Transport post-delivery actions
-   if ! use tpda; then
+   if use !tpda && use !dane; then
# EVENT is enabled by default
cat >> Makefile <<- EOC
DISABLE_EVENT=yes



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

2018-09-11 Thread Andreas Hüttel
commit: 061ff65b498e0076335679bfb54aa59980e080f1
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Tue Sep 11 20:49:24 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Tue Sep 11 20:49:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=061ff65b

mail-mta/exim: Drop old, drop hppa to ~hppa

Closes: https://bugs.gentoo.org/637546
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 mail-mta/exim/Manifest  |   2 -
 mail-mta/exim/exim-4.90.1-r1.ebuild | 528 --
 mail-mta/exim/exim-4.91-r1.ebuild   | 547 
 3 files changed, 1077 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 8c73a77828d..a9d8a746f01 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,5 +1,3 @@
-DIST exim-4.90.1.tar.bz2 1854894 BLAKE2B 
d7fd8963fb8e98e562a87d248b4e0a54c382d922ea9ea0df10d06fd0992dc19b53e85b73e16dc4b8ae294268fa4f66fe1ae98c7bd3a1d62798425fc2a8a4aa01
 SHA512 
ba612cf056d97dfaac2b49255ad1e952c5f6b2623118a65f4ddae35ceb51a45f63e77956373f5550121bc1d7eb0c2ebeece1144cf1b15d57332a4782e3fb6db1
 DIST exim-4.91.tar.xz 1744660 BLAKE2B 
8d50a709def02a52f8e76a16fcf51a4fc7e553217d5513a361aa780f58bff336a9ab90d8683e3841a074f54f3c75f2f77bf1a353a849be1207bffdd5fb6e4c51
 SHA512 
35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
-DIST exim-pdf-4.90.1.tar.bz2 1958791 BLAKE2B 
2dcb523dbdaa989ca0a228db31967230b1bbb68cb998c90231108a822ca4dcc7db9e4c4a91034129ba7d9f08bb632379f021c65ea43159e21f9c6bae9060f146
 SHA512 
9529b9b459cc766a7171cbd37c2fab710acf130131326b8eb50d9c65714297b0139364fe6129e80d2f29ccee88e35497604a80d6d92207e16518c1d96c267127
 DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 
0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ecfce3b44763d5a24f2d98353bc58c42456e9884994f404d17685909ea287a478189407ba8e7835352274c788980
 SHA512 
82add9b42749b6d938ff3b44a4dea3dfe84bcb2a1efea8a32b64d81a9ea312033d33023b5c224a44a2c053b18f9042bd1f2834847cf48873d1725a5594704a12
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.90.1-r1.ebuild 
b/mail-mta/exim/exim-4.90.1-r1.ebuild
deleted file mode 100644
index 299ab812b7a..000
--- a/mail-mta/exim/exim-4.90.1-r1.ebuild
+++ /dev/null
@@ -1,528 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils toolchain-funcs multilib pam systemd
-
-IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres 
+prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X 
elibc_glibc"
-REQUIRED_USE="
-   dane? ( ssl !gnutls )
-   dmarc? ( spf dkim )
-   pkcs11? ( ssl gnutls )
-   spf? ( exiscan-acl )
-   srs? ( exiscan-acl )
-"
-
-COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo 
/test)"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
-   mirror://gentoo/system_filter.exim.gz
-   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.bz2 )"
-HOMEPAGE="http://www.exim.org/;
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-   >=sys-libs/db-3.2:=
-   dev-libs/libpcre
-   perl? ( dev-lang/perl:= )
-   pam? ( virtual/pam )
-   tcpd? ( sys-apps/tcp-wrappers )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-   gnutls? ( net-libs/gnutls[pkcs11?]
- dev-libs/libtasn1 )
-   ldap? ( >=net-nds/openldap-2.0.7 )
-   nis? ( elibc_glibc? ( || (
-   =sys-libs/glibc-2.23[rpc]
-   ) ) )
-   mysql? ( virtual/libmysqlclient )
-   postgres? ( dev-db/postgresql:= )
-   sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-   redis? ( dev-libs/hiredis )
-   spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-   dmarc? ( mail-filter/opendmarc )
-   srs? ( mail-filter/libsrs_alt )
-   X? (
-   x11-libs/libX11
-   x11-libs/libXmu
-   x11-libs/libXt
-   x11-libs/libXaw
-   )
-   sqlite? ( dev-db/sqlite )
-   radius? ( net-dialup/freeradius-client )
-   virtual/libiconv
-   elibc_glibc? ( net-libs/libnsl )
-   "
-   # added X check for #57206
-DEPEND="${COMMON_DEPEND}
-   virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-   !mail-mta/courier
-   !mail-mta/esmtp
-   

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

2018-09-11 Thread Matt Turner
commit: a79d6a89a5e00b94c6d1d73baa0a735bc4babb55
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Sep 11 20:13:03 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Sep 11 20:13:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a79d6a89

mail-mta/exim-4.91-r2: ppc64 stable, bug 637546

 mail-mta/exim/exim-4.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
index 28708b2c325..d8caa901fa0 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2018-09-11 Thread Matt Turner
commit: 2e12f89de498c9d3a47a057a6092cb04d306d002
Author: Matt Turner  gentoo  org>
AuthorDate: Tue Sep 11 20:12:56 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Sep 11 20:13:12 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e12f89d

mail-mta/exim-4.91-r2: ppc stable, bug 637546

 mail-mta/exim/exim-4.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
index a854a56cf37..28708b2c325 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -33,7 +33,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2018-07-22 Thread Fabian Groffen
commit: 6a45bb6f39d321ba5cd6cc3b1c6e4803a924fed1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jul 22 17:44:30 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jul 22 17:45:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a45bb6f

mail-mta/exim: disallow USE='gnutls dane', bug #661164

Closes: https://bugs.gentoo.org/661164
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-mta/exim/exim-4.91-r2.ebuild | 13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
index 02c3148dd39..a854a56cf37 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -8,13 +8,20 @@ inherit db-use eutils toolchain-funcs multilib pam systemd
 IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
 REQUIRED_USE="
arc? ( dkim spf )
-   dane? ( ssl )
+   dane? ( ssl !gnutls )
dmarc? ( dkim spf )
gnutls? ( ssl )
pkcs11? ( ssl )
spf? ( exiscan-acl )
srs? ( exiscan-acl )
 "
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
+# for x86 and amd64 only, due to this, repoman won't allow depending on
+# gnutls[dane] for all else.  Because we cannot express USE=dane when
+# USE=gnutls is in effect only in package.use.mask, the only option we
+# have left is to a) ignore the dependency (but that results in bug
+# #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)"
 
@@ -31,7 +38,7 @@ KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sparc x86 
~x86-fbsd ~x86-solari
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2018-07-21 Thread Mikle Kolyada
commit: a0dfef5499540ba38df71c860be0981c5c4eed18
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Jul 22 02:20:33 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Jul 22 02:20:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0dfef54

mail-mta/exim: arm stable wrt bug #637546

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-mta/exim/exim-4.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
index f9c38b2c713..02c3148dd39 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2018-07-14 Thread Sergei Trofimovich
commit: f4da6cb8b9bb005922849b2cc42901c52cf4b646
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Jul 14 17:26:43 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul 14 17:53:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4da6cb8

mail-mta/exim: stable 4.91-r2 for sparc

Bug: https://bugs.gentoo.org/637546
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"

 mail-mta/exim/exim-4.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
index b20c98daec6..f9c38b2c713 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2018-06-27 Thread Tobias Klausmann
commit: 19695af33da797ddc325d6aaeb39b9398851f8c4
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Wed Jun 27 10:13:20 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Wed Jun 27 17:23:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19695af3

mail-mta/exim-4.91-r2: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/637546

 mail-mta/exim/exim-4.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
index 2971607021a..b20c98daec6 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2018-06-23 Thread Mikle Kolyada
commit: 26a3ae3da894a2eccba501c97a34cfb78ab00df9
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Jun 23 18:13:37 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jun 23 18:13:37 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26a3ae3d

mail-mta/exim: amd64 stable wrt bug #637546

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 mail-mta/exim/exim-4.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
index 310bcc4fa3b..744ceede397 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2018-06-21 Thread Sergei Trofimovich
commit: 8a6179a12c4b31ba233731146f4078a5f13b4135
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jun 21 06:32:55 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jun 21 06:33:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a6179a1

mail-mta/exim: stable 4.91-r2 for ia64, bug #637546

Bug: https://bugs.gentoo.org/637546
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"

 mail-mta/exim/exim-4.91-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
index 5e542b3cba0..310bcc4fa3b 100644
--- a/mail-mta/exim/exim-4.91-r2.ebuild
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
( >=sys-libs/db-3.2:= 

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

2018-05-05 Thread Andreas Hüttel
commit: f9f46770cb19a4d24ac02b9d49768976c13124a2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat May  5 14:57:52 2018 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat May  5 14:58:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f46770

mail-mta/exim: Add revbump building with libtirpc, bug 637546

This still needs stabilization, preferably in sync with glibc-2.26.

Bug: https://bugs.gentoo.org/637546
Package-Manager: Portage-2.3.33, Repoman-2.3.9

 mail-mta/exim/exim-4.91-r2.ebuild | 554 ++
 1 file changed, 554 insertions(+)

diff --git a/mail-mta/exim/exim-4.91-r2.ebuild 
b/mail-mta/exim/exim-4.91-r2.ebuild
new file mode 100644
index 000..5e542b3cba0
--- /dev/null
+++ b/mail-mta/exim/exim-4.91-r2.ebuild
@@ -0,0 +1,554 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit db-use eutils toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl )
+   dmarc? ( dkim spf )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   spf? ( exiscan-acl )
+   srs? ( exiscan-acl )
+"
+
+COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo 
/test)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz
+   mirror://gentoo/system_filter.exim.gz
+   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )"
+HOMEPAGE="http://www.exim.org/;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+   ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
+   nis? (
+   elibc_glibc? (
+   net-libs/libtirpc
+   >=net-libs/libnsl-1:=
+   )
+   )
+   mysql? ( virtual/libmysqlclient )
+   postgres? ( dev-db/postgresql:= )
+   sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
+   redis? ( dev-libs/hiredis )
+   spf? ( >=mail-filter/libspf2-1.2.5-r1 )
+   dmarc? ( mail-filter/opendmarc )
+   srs? ( mail-filter/libsrs_alt )
+   X? (
+   x11-libs/libX11
+   x11-libs/libXmu
+   x11-libs/libXt
+   x11-libs/libXaw
+   )
+   sqlite? ( dev-db/sqlite )
+   radius? ( net-dialup/freeradius-client )
+   virtual/libiconv
+   elibc_glibc? ( net-libs/libnsl )
+   "
+   # added X check for #57206
+DEPEND="${COMMON_DEPEND}
+   virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+   !mail-mta/courier
+   !mail-mta/esmtp
+   !mail-mta/mini-qmail
+   !=mail-mta/msmtp-1.4.19-r1[mta]
+   !mail-mta/netqmail
+   !mail-mta/nullmailer
+   !mail-mta/postfix
+   !mail-mta/qmail-ldap
+   !mail-mta/sendmail
+   !mail-mta/opensmtpd
+   !=mail-mta/ssmtp-2.64-r2[mta]
+   !net-mail/mailwrapper
+   >=net-mail/mailbase-0.00-r5
+   virtual/logger
+   dcc? ( mail-filter/dcc )
+   selinux? ( sec-policy/selinux-exim )
+   "
+
+S=${WORKDIR}/${P//rc/RC}
+
+src_prepare() {
+   epatch "${FILESDIR}"/exim-4.14-tail.patch
+   epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch
+   epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
+   epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+   epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
+   epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
+   epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+
+   if use maildir ; then
+   epatch "${FILESDIR}"/exim-4.20-maildir.patch
+   else
+   epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
+   fi
+
+   eapply_user
+
+   # user Exim believes it should be
+   MAILUSER=mail
+   MAILGROUP=mail
+   if use prefix && [[ ${EUID} != 0 ]] ; then
+   MAILUSER=$(id -un)
+   MAILGROUP=$(id -gn)
+   fi
+}
+
+src_configure() {
+   # general config and paths
+
+   sed -i.orig \
+   -e 
"/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
+   "${S}"/src/configure.default || die
+
+   sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
+
+   sed -e "48i\CFLAGS=${CFLAGS}" \
+   -e 
"s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
+   -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \
+   -e 
"s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=${EPREFIX}/etc/exim/exim.conf:"
 \
+   -e 

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

2018-04-28 Thread Fabian Groffen
commit: 0d2ad91a2a60915a6988a7a7889f81fdbe57f358
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Apr 28 07:45:22 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Apr 28 08:54:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d2ad91a

mail-mta/exim: remove unused patches

Signed-off-by: Fabian Groffen  gentoo.org>

 .../exim/files/exim-4.89-CVE-2017-1000369.patch| 58 ---
 mail-mta/exim/files/exim-4.89-CVE-2017-16943.patch | 40 --
 mail-mta/exim/files/exim-4.89-CVE-2017-16944.patch | 57 ---
 .../files/exim-4.89-address-expando-crash.patch| 85 --
 .../exim/files/exim-4.89-transport-crash.patch | 62 
 5 files changed, 302 deletions(-)

diff --git a/mail-mta/exim/files/exim-4.89-CVE-2017-1000369.patch 
b/mail-mta/exim/files/exim-4.89-CVE-2017-1000369.patch
deleted file mode 100644
index c3d976a2b90..000
--- a/mail-mta/exim/files/exim-4.89-CVE-2017-1000369.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-CVE-2017-1000369
-
-https://github.com/Exim/exim/commit/65e061b76867a9ea7aeeb535341b790b90ae6c21
-
 a/doc/exim.8
-+++ b/doc/exim.8
-@@ -1350,7 +1350,7 @@ option sets the received protocol value that is stored in
- or \fB\-bs\fP is used. For \fB\-bh\fP, the protocol is forced to one of the 
standard
- SMTP protocol names. For \fB\-bs\fP, the protocol is always "local\-" 
followed by
- one of those same names. For \fB\-bS\fP (batched SMTP) however, the protocol 
can
--be set by \fB\-oMr\fP.
-+be set by \fB\-oMr\fP. Repeated use of this option is not supported.
- .TP 10
- \fB\-oMs\fP <\fIhost name\fP>
- See \fB\-oMa\fP above for general remarks about the \fB\-oM\fP options. The 
\fB\-oMs\fP
-@@ -1418,6 +1418,7 @@ host name and its colon can be omitted when only the 
protocol is to be set.
- Note the Exim already has two private options, \fB\-pd\fP and \fB\-ps\fP, 
that refer
- to embedded Perl. It is therefore impossible to set a protocol value of d
- or s using this option (but that does not seem a real limitation).
-+Repeated use of this option is not supported.
- .TP 10
- \fB\-q\fP
- This option is normally restricted to admin users. However, there is a
 a/src/exim.c
-+++ b/src/exim.c
-@@ -3092,7 +3092,14 @@ for (i = 1; i < argc; i++)
- 
-   /* -oMr: Received protocol */
- 
--  else if (Ustrcmp(argrest, "Mr") == 0) received_protocol = argv[++i];
-+  else if (Ustrcmp(argrest, "Mr") == 0)
-+
-+if (received_protocol)
-+  {
-+  fprintf(stderr, "received_protocol is set already\n");
-+  exit(EXIT_FAILURE);
-+  }
-+else received_protocol = argv[++i];
- 
-   /* -oMs: Set sender host name */
- 
-@@ -3188,7 +3195,15 @@ for (i = 1; i < argc; i++)
- 
- if (*argrest != 0)
-   {
--  uschar *hn = Ustrchr(argrest, ':');
-+  uschar *hn;
-+
-+  if (received_protocol)
-+{
-+fprintf(stderr, "received_protocol is set already\n");
-+exit(EXIT_FAILURE);
-+}
-+
-+  hn = Ustrchr(argrest, ':');
-   if (hn == NULL)
- {
- received_protocol = argrest;

diff --git a/mail-mta/exim/files/exim-4.89-CVE-2017-16943.patch 
b/mail-mta/exim/files/exim-4.89-CVE-2017-16943.patch
deleted file mode 100644
index b864ffa5ad1..000
--- a/mail-mta/exim/files/exim-4.89-CVE-2017-16943.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 4e6ae6235c68de243b1c2419027472d7659aa2b4 Mon Sep 17 00:00:00 2001
-From: Jeremy Harris 
-Date: Fri, 24 Nov 2017 20:22:33 +
-Subject: [PATCH] Avoid release of store if there have been later allocations. 
- Bug 2199
-

- src/src/receive.c | 7 ---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/src/receive.c b/src/src/receive.c
-index e7e518a..d9b5001 100644
 a/src/src/receive.c
-+++ b/src/src/receive.c
-@@ -1810,8 +1810,8 @@ for (;;)
-   (and sometimes lunatic messages can have ones that are 100s of K long) we
-   call store_release() for strings that have been copied - if the string is at
-   the start of a block (and therefore the only thing in it, because we aren't
--  doing any other gets), the block gets freed. We can only do this because we
--  know there are no other calls to store_get() going on. */
-+  doing any other gets), the block gets freed. We can only do this release if
-+  there were no allocations since the once that we want to free. */
- 
-   if (ptr >= header_size - 4)
- {
-@@ -1820,9 +1820,10 @@ for (;;)
- header_size *= 2;
- if (!store_extend(next->text, oldsize, header_size))
-   {
-+  BOOL release_ok = store_last_get[store_pool] == next->text;
-   uschar *newtext = store_get(header_size);
-   memcpy(newtext, next->text, ptr);
--  store_release(next->text);
-+  if (release_ok) store_release(next->text);
-   next->text = newtext;
-   }
- }
--- 
-1.9.1
-

diff --git 

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

2018-04-27 Thread Matt Turner
commit: 6fb38e5bcbb0923041e9eaa70fda1987d03aff96
Author: Matt Turner  gentoo  org>
AuthorDate: Sat Apr 28 01:05:04 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sat Apr 28 01:07:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb38e5b

mail-mta/exim: Drop unnecessary x11-proto dep

 mail-mta/exim/{exim-4.90.1.ebuild => exim-4.90.1-r1.ebuild} | 2 +-
 mail-mta/exim/{exim-4.91.ebuild => exim-4.91-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-mta/exim/exim-4.90.1.ebuild 
b/mail-mta/exim/exim-4.90.1-r1.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.90.1.ebuild
rename to mail-mta/exim/exim-4.90.1-r1.ebuild
index 3cf5615b57d..299ab812b7a 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1-r1.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
spf? ( >=mail-filter/libspf2-1.2.5-r1 )
dmarc? ( mail-filter/opendmarc )
srs? ( mail-filter/libsrs_alt )
-   X? ( x11-proto/xproto
+   X? (
x11-libs/libX11
x11-libs/libXmu
x11-libs/libXt

diff --git a/mail-mta/exim/exim-4.91.ebuild b/mail-mta/exim/exim-4.91-r1.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.91.ebuild
rename to mail-mta/exim/exim-4.91-r1.ebuild
index d4c8a7abd70..eae8fce2154 100644
--- a/mail-mta/exim/exim-4.91.ebuild
+++ b/mail-mta/exim/exim-4.91-r1.ebuild
@@ -55,7 +55,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
spf? ( >=mail-filter/libspf2-1.2.5-r1 )
dmarc? ( mail-filter/opendmarc )
srs? ( mail-filter/libsrs_alt )
-   X? ( x11-proto/xproto
+   X? (
x11-libs/libX11
x11-libs/libXmu
x11-libs/libXt



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

2018-04-23 Thread Fabian Groffen
commit: fea8855f8ace5d7818d73201a09b94342aedb1fb
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Apr 23 08:46:47 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Apr 23 08:46:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fea8855f

mail-mta/exim: drop vulnerable versions, bug #647240

Bug: https://bugs.gentoo.org/647240
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-mta/exim/Manifest|   6 -
 mail-mta/exim/exim-4.89-r5.ebuild | 533 --
 mail-mta/exim/exim-4.89.1.ebuild  | 530 -
 mail-mta/exim/exim-4.90.ebuild| 528 -
 4 files changed, 1597 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index f9c57ddd678..8c73a77828d 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,11 +1,5 @@
-DIST exim-4.89.1.tar.bz2 1828699 BLAKE2B 
21b3acc73717319c58341f28463d0fd576c725291ae348015f6696f079fc6c3c08c86f9a2c19f81e0019c50b6cb8670466f4b449bf09a454e6b6e02feee60bfc
 SHA512 
391102c5af991c3f9035aefadd031a9ab2505c682a5cd9c2268f82edb01dc5edec94d86e298d2be3c0437c261b63fb2662cc37f4de67106b0325f2c3bf7e0b9e
-DIST exim-4.89.tar.bz2 1844430 BLAKE2B 
255bb3f27a264d92bf4664cf1278beabffa888006dfc0b31cde8a04d62501b0fe282db5b959bd303e2a818322716548c97264842130b8d5c3b9075615f668ca7
 SHA512 
1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
 DIST exim-4.90.1.tar.bz2 1854894 BLAKE2B 
d7fd8963fb8e98e562a87d248b4e0a54c382d922ea9ea0df10d06fd0992dc19b53e85b73e16dc4b8ae294268fa4f66fe1ae98c7bd3a1d62798425fc2a8a4aa01
 SHA512 
ba612cf056d97dfaac2b49255ad1e952c5f6b2623118a65f4ddae35ceb51a45f63e77956373f5550121bc1d7eb0c2ebeece1144cf1b15d57332a4782e3fb6db1
-DIST exim-4.90.tar.bz2 1873037 BLAKE2B 
5498886560f85fba94a5055d9e72eece959cde6db20a589e6567e89b9c7669c4bb421d6a48f3c5d676381aa008088f391007be5de30e033f64e8e6a128059e62
 SHA512 
0424d5d4eff28d94ade786402cfece3e2760ff0e44da3be5327b8695e4c3c483ec925ab24e13b1ebe145e204ad02b67ae99ff0992705bd1a3c312ede0464c74b
 DIST exim-4.91.tar.xz 1744660 BLAKE2B 
8d50a709def02a52f8e76a16fcf51a4fc7e553217d5513a361aa780f58bff336a9ab90d8683e3841a074f54f3c75f2f77bf1a353a849be1207bffdd5fb6e4c51
 SHA512 
35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
-DIST exim-pdf-4.89.1.tar.bz2 1942785 BLAKE2B 
588298b2c3007a94d40370463dec52d9b5c44b72e8c93e9b749e0ed513f1da045b58140f8802edfd9a5e9dd2d9911f70b4d4cdde3b3952c794c6abd9744ed3d9
 SHA512 
0b7944237fcadf708570c39a7963246fc70579fecafc746ed8e210c3319eed64a4678162c8c4243e84f48396b3b8bcbc3626523984a716b85564ee50c5712333
-DIST exim-pdf-4.89.tar.bz2 1924606 BLAKE2B 
f03182d51f4cc5b71cb65c2e0bcf74142f8110b6bfbd5b0fc05e321b692ebde5dbc84c4562a39ee85065f4d2db0654e6a189c826bfdea19051f56969d4ca74e2
 SHA512 
b04ea2e4dcdb1aaf52ef77ccd76e6599c68c4c6e5a98090720dbd3c50f7191bf3f6cd7dc2089a765c47576311780809cff547f85f004caec411d0f1ac9985299
 DIST exim-pdf-4.90.1.tar.bz2 1958791 BLAKE2B 
2dcb523dbdaa989ca0a228db31967230b1bbb68cb998c90231108a822ca4dcc7db9e4c4a91034129ba7d9f08bb632379f021c65ea43159e21f9c6bae9060f146
 SHA512 
9529b9b459cc766a7171cbd37c2fab710acf130131326b8eb50d9c65714297b0139364fe6129e80d2f29ccee88e35497604a80d6d92207e16518c1d96c267127
-DIST exim-pdf-4.90.tar.bz2 2025099 BLAKE2B 
9b82d0a0dcace893ab6fd6b2273ed6961aa4b0091909eea49f72cace3ac25d9a861f9883373a4a41753ba2fb0eda118e9df2e779f29e6b988865ba4630e2898b
 SHA512 
4baeabeee5554d9e80edc21b12622bf9d4b84461307f2eacaff0ad583818f7f38306ae1029de1066019327e490a3bd046c175c735fe3c6724c31b34d6171bf45
 DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 
0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ecfce3b44763d5a24f2d98353bc58c42456e9884994f404d17685909ea287a478189407ba8e7835352274c788980
 SHA512 
82add9b42749b6d938ff3b44a4dea3dfe84bcb2a1efea8a32b64d81a9ea312033d33023b5c224a44a2c053b18f9042bd1f2834847cf48873d1725a5594704a12
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.89-r5.ebuild 
b/mail-mta/exim/exim-4.89-r5.ebuild
deleted file mode 100644
index 5201343c00f..000
--- a/mail-mta/exim/exim-4.89-r5.ebuild
+++ /dev/null
@@ -1,533 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils toolchain-funcs multilib pam systemd
-
-IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres 
+prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X 
elibc_glibc"
-REQUIRED_USE="
- 

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

2018-04-22 Thread Matt Turner
commit: f3885ee8740b3b8aa021237c2de4154deddd077b
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr 22 19:08:19 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr 22 19:17:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3885ee8

mail-mta/exim-4.90.1: hppa stable, bug 647240

 mail-mta/exim/exim-4.90.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index 9bc64560b94..3cf5615b57d 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2:=



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

2018-04-16 Thread Fabian Groffen
commit: 3077289440d70b8f87a042cdfed42dae72b7ce49
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Apr 16 16:38:19 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Apr 16 16:38:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30772894

mail-mta/exim: specify best matching db version, bug #653252

Upstream banned >=db-6 for various reasons, so we need to tell
explicitly which version of db is available (<6) to be used.

Closes: https://bugs.gentoo.org/653252
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-mta/exim/exim-4.91.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mail-mta/exim/exim-4.91.ebuild b/mail-mta/exim/exim-4.91.ebuild
index ff66e6daa53..d4c8a7abd70 100644
--- a/mail-mta/exim/exim-4.91.ebuild
+++ b/mail-mta/exim/exim-4.91.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit eutils toolchain-funcs multilib pam systemd
+inherit db-use eutils toolchain-funcs multilib pam systemd
 
 IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
 REQUIRED_USE="
@@ -196,9 +196,11 @@ src_configure() {
 
# use the "native" interfaces to the DBM and CDB libraries, support
# passwd and directory lookups by default
+   local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2"
cat >> Makefile <<- EOC
USE_DB=yes
-   DBMLIB=-ldb
+   CFLAGS+=-I$(db_includedir ${DB_VERS})
+   DBMLIB=-l$(db_libname ${DB_VERS})
LOOKUP_CDB=yes
LOOKUP_PASSWD=yes
LOOKUP_DSEARCH=yes



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

2018-04-16 Thread Fabian Groffen
commit: 595474fdaf4ff29ea06d82c64ab065c157b26ae5
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Apr 16 09:02:05 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Apr 16 09:02:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=595474fd

mail-mta/exim: restrict sys-libs/db dependency, bug #653252

Closes: https://bugs.gentoo.org/653252
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-mta/exim/exim-4.91.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.91.ebuild b/mail-mta/exim/exim-4.91.ebuild
index 9cedf573dfa..ff66e6daa53 100644
--- a/mail-mta/exim/exim-4.91.ebuild
+++ b/mail-mta/exim/exim-4.91.ebuild
@@ -29,7 +29,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
-   >=sys-libs/db-3.2:=
+   ( >=sys-libs/db-3.2:= 

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

2018-04-15 Thread Fabian Groffen
commit: f9690e0b8e9164d8a498383a7d1011f6a766ebd2
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Apr 15 15:14:05 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Apr 15 15:14:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9690e0b

mail-mta/exim: version bump to 4.91

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-mta/exim/Manifest   | 4 ++--
 mail-mta/exim/{exim-4.91_rc1.ebuild => exim-4.91.ebuild} | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index d44fb114162..f9c57ddd678 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -2,10 +2,10 @@ DIST exim-4.89.1.tar.bz2 1828699 BLAKE2B 
21b3acc73717319c58341f28463d0fd576c7252
 DIST exim-4.89.tar.bz2 1844430 BLAKE2B 
255bb3f27a264d92bf4664cf1278beabffa888006dfc0b31cde8a04d62501b0fe282db5b959bd303e2a818322716548c97264842130b8d5c3b9075615f668ca7
 SHA512 
1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
 DIST exim-4.90.1.tar.bz2 1854894 BLAKE2B 
d7fd8963fb8e98e562a87d248b4e0a54c382d922ea9ea0df10d06fd0992dc19b53e85b73e16dc4b8ae294268fa4f66fe1ae98c7bd3a1d62798425fc2a8a4aa01
 SHA512 
ba612cf056d97dfaac2b49255ad1e952c5f6b2623118a65f4ddae35ceb51a45f63e77956373f5550121bc1d7eb0c2ebeece1144cf1b15d57332a4782e3fb6db1
 DIST exim-4.90.tar.bz2 1873037 BLAKE2B 
5498886560f85fba94a5055d9e72eece959cde6db20a589e6567e89b9c7669c4bb421d6a48f3c5d676381aa008088f391007be5de30e033f64e8e6a128059e62
 SHA512 
0424d5d4eff28d94ade786402cfece3e2760ff0e44da3be5327b8695e4c3c483ec925ab24e13b1ebe145e204ad02b67ae99ff0992705bd1a3c312ede0464c74b
-DIST exim-4.91_RC1.tar.xz 1738460 BLAKE2B 
0a973c097adad9c322afd634e6b7a53bb7746ad32ee5c7c68b3321429e881475a3c26f5706623c3624e4beb71bcee80ba411e6b60bc17e39e56507119ba982d5
 SHA512 
fefb3955ce1267e15f929edad36579eb15a6230bd885d1e15e57a570a584209b48421f204669d7c83fe630bee688a27126de7056c918a041262acef093dcd493
+DIST exim-4.91.tar.xz 1744660 BLAKE2B 
8d50a709def02a52f8e76a16fcf51a4fc7e553217d5513a361aa780f58bff336a9ab90d8683e3841a074f54f3c75f2f77bf1a353a849be1207bffdd5fb6e4c51
 SHA512 
35b34dda8dd0f27c0429e6eb8409756ecd3cf9e535bac421d696b1560db0ff3bf4cd0e4a00bc0b7e32137d31bb5de20776c7c1830ec125aa36b5c4376b0c71a2
 DIST exim-pdf-4.89.1.tar.bz2 1942785 BLAKE2B 
588298b2c3007a94d40370463dec52d9b5c44b72e8c93e9b749e0ed513f1da045b58140f8802edfd9a5e9dd2d9911f70b4d4cdde3b3952c794c6abd9744ed3d9
 SHA512 
0b7944237fcadf708570c39a7963246fc70579fecafc746ed8e210c3319eed64a4678162c8c4243e84f48396b3b8bcbc3626523984a716b85564ee50c5712333
 DIST exim-pdf-4.89.tar.bz2 1924606 BLAKE2B 
f03182d51f4cc5b71cb65c2e0bcf74142f8110b6bfbd5b0fc05e321b692ebde5dbc84c4562a39ee85065f4d2db0654e6a189c826bfdea19051f56969d4ca74e2
 SHA512 
b04ea2e4dcdb1aaf52ef77ccd76e6599c68c4c6e5a98090720dbd3c50f7191bf3f6cd7dc2089a765c47576311780809cff547f85f004caec411d0f1ac9985299
 DIST exim-pdf-4.90.1.tar.bz2 1958791 BLAKE2B 
2dcb523dbdaa989ca0a228db31967230b1bbb68cb998c90231108a822ca4dcc7db9e4c4a91034129ba7d9f08bb632379f021c65ea43159e21f9c6bae9060f146
 SHA512 
9529b9b459cc766a7171cbd37c2fab710acf130131326b8eb50d9c65714297b0139364fe6129e80d2f29ccee88e35497604a80d6d92207e16518c1d96c267127
 DIST exim-pdf-4.90.tar.bz2 2025099 BLAKE2B 
9b82d0a0dcace893ab6fd6b2273ed6961aa4b0091909eea49f72cace3ac25d9a861f9883373a4a41753ba2fb0eda118e9df2e779f29e6b988865ba4630e2898b
 SHA512 
4baeabeee5554d9e80edc21b12622bf9d4b84461307f2eacaff0ad583818f7f38306ae1029de1066019327e490a3bd046c175c735fe3c6724c31b34d6171bf45
-DIST exim-pdf-4.91_RC1.tar.xz 1967968 BLAKE2B 
0caae1d8371dd2d90b24c84d4636c1721570f70edec20f9e078d4a70c0e5efbcd5b5052224b6290b48409a3a4898ff4eadadc3bbf0ffaa837861c88091faffa3
 SHA512 
4c1a490a2dd7870a632f5d777ae9e2ba6c75cd97654c6c064b4d515f85e87d2249e03dcd058dcb9b9270d17503415ad5433d18e224bc65690eb6d0ea8f295289
+DIST exim-pdf-4.91.tar.xz 1973672 BLAKE2B 
0b9e3f65c8e8a5f727dd4359d1c5c6c867c0ecfce3b44763d5a24f2d98353bc58c42456e9884994f404d17685909ea287a478189407ba8e7835352274c788980
 SHA512 
82add9b42749b6d938ff3b44a4dea3dfe84bcb2a1efea8a32b64d81a9ea312033d33023b5c224a44a2c053b18f9042bd1f2834847cf48873d1725a5594704a12
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.91_rc1.ebuild b/mail-mta/exim/exim-4.91.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.91_rc1.ebuild
rename to mail-mta/exim/exim-4.91.ebuild
index 6007c7afe3f..9cedf573dfa 100644
--- a/mail-mta/exim/exim-4.91_rc1.ebuild
+++ b/mail-mta/exim/exim-4.91.ebuild
@@ -16,7 +16,7 @@ REQUIRED_USE="
srs? ( exiscan-acl )
 "
 
-COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && 

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

2018-04-07 Thread Sergei Trofimovich
commit: e25c9a89c7e9629e66c384efae346738cc950078
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Apr  7 18:06:49 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Apr  7 18:06:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e25c9a89

mail-mta/exim: stable 4.90.1 for ppc, bug #647240

Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc"

 mail-mta/exim/exim-4.90.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index cd09df930e6..9bc64560b94 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2:=



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

2018-03-31 Thread Sergei Trofimovich
commit: 7ff7d052c34b3dd08e9ab9f1cf6b752db8affa82
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar 31 17:57:32 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar 31 17:57:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff7d052

mail-mta/exim: stable 4.90.1 for ppc64, bug #647240

Package-Manager: Portage-2.3.27, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc64"

 mail-mta/exim/exim-4.90.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index cdc93ac79e6..cd09df930e6 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2:=



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

2018-03-16 Thread Fabian Groffen
commit: c9f0ab26d305695245e40ab672df87502e66a919
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Mar 16 08:11:12 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Mar 16 08:11:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f0ab26

mail-mta/exim: version bump to 4.91 RC1

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-mta/exim/Manifest |   2 +
 mail-mta/exim/exim-4.91_rc1.ebuild | 545 +
 mail-mta/exim/metadata.xml |   2 +
 3 files changed, 549 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 49f2c66cc02..d44fb114162 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -2,8 +2,10 @@ DIST exim-4.89.1.tar.bz2 1828699 BLAKE2B 
21b3acc73717319c58341f28463d0fd576c7252
 DIST exim-4.89.tar.bz2 1844430 BLAKE2B 
255bb3f27a264d92bf4664cf1278beabffa888006dfc0b31cde8a04d62501b0fe282db5b959bd303e2a818322716548c97264842130b8d5c3b9075615f668ca7
 SHA512 
1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
 DIST exim-4.90.1.tar.bz2 1854894 BLAKE2B 
d7fd8963fb8e98e562a87d248b4e0a54c382d922ea9ea0df10d06fd0992dc19b53e85b73e16dc4b8ae294268fa4f66fe1ae98c7bd3a1d62798425fc2a8a4aa01
 SHA512 
ba612cf056d97dfaac2b49255ad1e952c5f6b2623118a65f4ddae35ceb51a45f63e77956373f5550121bc1d7eb0c2ebeece1144cf1b15d57332a4782e3fb6db1
 DIST exim-4.90.tar.bz2 1873037 BLAKE2B 
5498886560f85fba94a5055d9e72eece959cde6db20a589e6567e89b9c7669c4bb421d6a48f3c5d676381aa008088f391007be5de30e033f64e8e6a128059e62
 SHA512 
0424d5d4eff28d94ade786402cfece3e2760ff0e44da3be5327b8695e4c3c483ec925ab24e13b1ebe145e204ad02b67ae99ff0992705bd1a3c312ede0464c74b
+DIST exim-4.91_RC1.tar.xz 1738460 BLAKE2B 
0a973c097adad9c322afd634e6b7a53bb7746ad32ee5c7c68b3321429e881475a3c26f5706623c3624e4beb71bcee80ba411e6b60bc17e39e56507119ba982d5
 SHA512 
fefb3955ce1267e15f929edad36579eb15a6230bd885d1e15e57a570a584209b48421f204669d7c83fe630bee688a27126de7056c918a041262acef093dcd493
 DIST exim-pdf-4.89.1.tar.bz2 1942785 BLAKE2B 
588298b2c3007a94d40370463dec52d9b5c44b72e8c93e9b749e0ed513f1da045b58140f8802edfd9a5e9dd2d9911f70b4d4cdde3b3952c794c6abd9744ed3d9
 SHA512 
0b7944237fcadf708570c39a7963246fc70579fecafc746ed8e210c3319eed64a4678162c8c4243e84f48396b3b8bcbc3626523984a716b85564ee50c5712333
 DIST exim-pdf-4.89.tar.bz2 1924606 BLAKE2B 
f03182d51f4cc5b71cb65c2e0bcf74142f8110b6bfbd5b0fc05e321b692ebde5dbc84c4562a39ee85065f4d2db0654e6a189c826bfdea19051f56969d4ca74e2
 SHA512 
b04ea2e4dcdb1aaf52ef77ccd76e6599c68c4c6e5a98090720dbd3c50f7191bf3f6cd7dc2089a765c47576311780809cff547f85f004caec411d0f1ac9985299
 DIST exim-pdf-4.90.1.tar.bz2 1958791 BLAKE2B 
2dcb523dbdaa989ca0a228db31967230b1bbb68cb998c90231108a822ca4dcc7db9e4c4a91034129ba7d9f08bb632379f021c65ea43159e21f9c6bae9060f146
 SHA512 
9529b9b459cc766a7171cbd37c2fab710acf130131326b8eb50d9c65714297b0139364fe6129e80d2f29ccee88e35497604a80d6d92207e16518c1d96c267127
 DIST exim-pdf-4.90.tar.bz2 2025099 BLAKE2B 
9b82d0a0dcace893ab6fd6b2273ed6961aa4b0091909eea49f72cace3ac25d9a861f9883373a4a41753ba2fb0eda118e9df2e779f29e6b988865ba4630e2898b
 SHA512 
4baeabeee5554d9e80edc21b12622bf9d4b84461307f2eacaff0ad583818f7f38306ae1029de1066019327e490a3bd046c175c735fe3c6724c31b34d6171bf45
+DIST exim-pdf-4.91_RC1.tar.xz 1967968 BLAKE2B 
0caae1d8371dd2d90b24c84d4636c1721570f70edec20f9e078d4a70c0e5efbcd5b5052224b6290b48409a3a4898ff4eadadc3bbf0ffaa837861c88091faffa3
 SHA512 
4c1a490a2dd7870a632f5d777ae9e2ba6c75cd97654c6c064b4d515f85e87d2249e03dcd058dcb9b9270d17503415ad5433d18e224bc65690eb6d0ea8f295289
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.91_rc1.ebuild 
b/mail-mta/exim/exim-4.91_rc1.ebuild
new file mode 100644
index 000..6007c7afe3f
--- /dev/null
+++ b/mail-mta/exim/exim-4.91_rc1.ebuild
@@ -0,0 +1,545 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils toolchain-funcs multilib pam systemd
+
+IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc 
exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl 
pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog 
tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl )
+   dmarc? ( dkim spf )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   spf? ( exiscan-acl )
+   srs? ( exiscan-acl )
+"
+
+COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo 
/test)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"

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

2018-03-08 Thread Markus Meier
commit: 1b32ade3578736c2eb94445192741e4df539721f
Author: Markus Meier  gentoo  org>
AuthorDate: Thu Mar  8 20:01:31 2018 +
Commit: Markus Meier  gentoo  org>
CommitDate: Thu Mar  8 20:01:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b32ade3

mail-mta/exim: arm stable, bug #647240

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"

 mail-mta/exim/exim-4.90.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index ecb06e22f35..cdc93ac79e6 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2:=



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

2018-03-07 Thread Agostino Sarubbo
commit: 44f4f42cacbb5841a324dc1527a6f13cb2cbf40f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Mar  7 09:38:31 2018 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Mar  7 09:38:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f4f42c

mail-mta/exim: amd64 stable wrt bug #647240

Signed-off-by: Agostino Sarubbo  gentoo.org>
Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="amd64"

 mail-mta/exim/exim-4.90.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index da6bcc8d994..ecb06e22f35 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2:=



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

2018-03-07 Thread Tobias Klausmann
commit: 2ec981d4e3510534e086019ef0325e3e55ed850f
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Wed Mar  7 09:31:08 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Wed Mar  7 09:31:22 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ec981d4

mail-mta/exim-4.90.1-r0: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/647240

 mail-mta/exim/exim-4.90.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index 2a2b09328b8..da6bcc8d994 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2:=



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

2018-02-20 Thread Sergei Trofimovich
commit: 865fb73ec855ef6b3ac6f80a1e33edba70b7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Feb 20 22:18:44 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb 20 22:18:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865fb73e

mail-mta/exim: stable 4.90.1 for ia64, bug #647240

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 mail-mta/exim/exim-4.90.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index 13903c6cfe6..2a2b09328b8 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2:=



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

2018-02-20 Thread Sergei Trofimovich
commit: 4a7594f1853dca9d6f784f99eb2e7d8608fb9755
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Feb 20 08:03:35 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb 20 08:10:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a7594f1

mail-mta/exim: stable 4.90.1 for sparc, bug #647240

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 mail-mta/exim/exim-4.90.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index 18749d99cf5..13903c6cfe6 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2:=



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

2018-02-18 Thread Thomas Deutschmann
commit: 4105c4476a8d4964cc40433db1717a1415b85071
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 18 21:34:44 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 18 21:47:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4105c447

mail-mta/exim: x86 stable (bug #647240)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-mta/exim/exim-4.90.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
index e4f0e7b5fa0..18749d99cf5 100644
--- a/mail-mta/exim/exim-4.90.1.ebuild
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2:=



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

2018-02-11 Thread Fabian Groffen
commit: c39f04f7b599211e948c4fc1546e7b30ca2e7f00
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Feb 11 07:59:36 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Feb 11 07:59:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c39f04f7

mail-mta/exim: version bump, bug #647240

Bug: https://bugs.gentoo.org/647240
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 mail-mta/exim/Manifest   |   2 +
 mail-mta/exim/exim-4.90.1.ebuild | 528 +++
 2 files changed, 530 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 37c3f479ba2..49f2c66cc02 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,7 +1,9 @@
 DIST exim-4.89.1.tar.bz2 1828699 BLAKE2B 
21b3acc73717319c58341f28463d0fd576c725291ae348015f6696f079fc6c3c08c86f9a2c19f81e0019c50b6cb8670466f4b449bf09a454e6b6e02feee60bfc
 SHA512 
391102c5af991c3f9035aefadd031a9ab2505c682a5cd9c2268f82edb01dc5edec94d86e298d2be3c0437c261b63fb2662cc37f4de67106b0325f2c3bf7e0b9e
 DIST exim-4.89.tar.bz2 1844430 BLAKE2B 
255bb3f27a264d92bf4664cf1278beabffa888006dfc0b31cde8a04d62501b0fe282db5b959bd303e2a818322716548c97264842130b8d5c3b9075615f668ca7
 SHA512 
1e059966a93b47f055ab4ec2a4556f2c918aff56ea0367585f3a853f00411e9c275e13be4f9ae615a468fa06263135cd6a138fa1753f1b7fb3259a3321fcca65
+DIST exim-4.90.1.tar.bz2 1854894 BLAKE2B 
d7fd8963fb8e98e562a87d248b4e0a54c382d922ea9ea0df10d06fd0992dc19b53e85b73e16dc4b8ae294268fa4f66fe1ae98c7bd3a1d62798425fc2a8a4aa01
 SHA512 
ba612cf056d97dfaac2b49255ad1e952c5f6b2623118a65f4ddae35ceb51a45f63e77956373f5550121bc1d7eb0c2ebeece1144cf1b15d57332a4782e3fb6db1
 DIST exim-4.90.tar.bz2 1873037 BLAKE2B 
5498886560f85fba94a5055d9e72eece959cde6db20a589e6567e89b9c7669c4bb421d6a48f3c5d676381aa008088f391007be5de30e033f64e8e6a128059e62
 SHA512 
0424d5d4eff28d94ade786402cfece3e2760ff0e44da3be5327b8695e4c3c483ec925ab24e13b1ebe145e204ad02b67ae99ff0992705bd1a3c312ede0464c74b
 DIST exim-pdf-4.89.1.tar.bz2 1942785 BLAKE2B 
588298b2c3007a94d40370463dec52d9b5c44b72e8c93e9b749e0ed513f1da045b58140f8802edfd9a5e9dd2d9911f70b4d4cdde3b3952c794c6abd9744ed3d9
 SHA512 
0b7944237fcadf708570c39a7963246fc70579fecafc746ed8e210c3319eed64a4678162c8c4243e84f48396b3b8bcbc3626523984a716b85564ee50c5712333
 DIST exim-pdf-4.89.tar.bz2 1924606 BLAKE2B 
f03182d51f4cc5b71cb65c2e0bcf74142f8110b6bfbd5b0fc05e321b692ebde5dbc84c4562a39ee85065f4d2db0654e6a189c826bfdea19051f56969d4ca74e2
 SHA512 
b04ea2e4dcdb1aaf52ef77ccd76e6599c68c4c6e5a98090720dbd3c50f7191bf3f6cd7dc2089a765c47576311780809cff547f85f004caec411d0f1ac9985299
+DIST exim-pdf-4.90.1.tar.bz2 1958791 BLAKE2B 
2dcb523dbdaa989ca0a228db31967230b1bbb68cb998c90231108a822ca4dcc7db9e4c4a91034129ba7d9f08bb632379f021c65ea43159e21f9c6bae9060f146
 SHA512 
9529b9b459cc766a7171cbd37c2fab710acf130131326b8eb50d9c65714297b0139364fe6129e80d2f29ccee88e35497604a80d6d92207e16518c1d96c267127
 DIST exim-pdf-4.90.tar.bz2 2025099 BLAKE2B 
9b82d0a0dcace893ab6fd6b2273ed6961aa4b0091909eea49f72cace3ac25d9a861f9883373a4a41753ba2fb0eda118e9df2e779f29e6b988865ba4630e2898b
 SHA512 
4baeabeee5554d9e80edc21b12622bf9d4b84461307f2eacaff0ad583818f7f38306ae1029de1066019327e490a3bd046c175c735fe3c6724c31b34d6171bf45
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.90.1.ebuild b/mail-mta/exim/exim-4.90.1.ebuild
new file mode 100644
index 000..e4f0e7b5fa0
--- /dev/null
+++ b/mail-mta/exim/exim-4.90.1.ebuild
@@ -0,0 +1,528 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils toolchain-funcs multilib pam systemd
+
+IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres 
+prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X 
elibc_glibc"
+REQUIRED_USE="
+   dane? ( ssl !gnutls )
+   dmarc? ( spf dkim )
+   pkcs11? ( ssl gnutls )
+   spf? ( exiscan-acl )
+   srs? ( exiscan-acl )
+"
+
+COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo 
/test)"
+
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
+   mirror://gentoo/system_filter.exim.gz
+   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.bz2 )"
+HOMEPAGE="http://www.exim.org/;
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd 
~x86-solaris"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+   >=sys-libs/db-3.2:=
+   dev-libs/libpcre
+   perl? ( dev-lang/perl:= )
+   pam? ( virtual/pam )
+   tcpd? ( 

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

2018-02-08 Thread Fabian Groffen
commit: a54014c3a59aa701cae98288d3ed9f8a04809a0c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Feb  8 09:44:39 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Feb  8 09:44:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54014c3

mail-mta/exim: USE=dane requires USE=ssl, bug #646836

Thanks Rolf Eike Beer for reporting.

Closes: https://bugs.gentoo.org/646836
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 mail-mta/exim/exim-4.89-r5.ebuild | 4 ++--
 mail-mta/exim/exim-4.89.1.ebuild  | 6 +++---
 mail-mta/exim/exim-4.90.ebuild| 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/mail-mta/exim/exim-4.89-r5.ebuild 
b/mail-mta/exim/exim-4.89-r5.ebuild
index e2dd69cac65..5201343c00f 100644
--- a/mail-mta/exim/exim-4.89-r5.ebuild
+++ b/mail-mta/exim/exim-4.89-r5.ebuild
@@ -7,9 +7,9 @@ inherit eutils toolchain-funcs multilib pam systemd
 
 IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres 
+prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X 
elibc_glibc"
 REQUIRED_USE="
-   dane? ( !gnutls )
+   dane? ( ssl !gnutls )
dmarc? ( spf dkim )
-   pkcs11? ( gnutls )
+   pkcs11? ( ssl gnutls )
spf? ( exiscan-acl )
srs? ( exiscan-acl )
 "

diff --git a/mail-mta/exim/exim-4.89.1.ebuild b/mail-mta/exim/exim-4.89.1.ebuild
index 55536b6c0d3..6ccacc0529b 100644
--- a/mail-mta/exim/exim-4.89.1.ebuild
+++ b/mail-mta/exim/exim-4.89.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,9 +7,9 @@ inherit eutils toolchain-funcs multilib pam systemd
 
 IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres 
+prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X 
elibc_glibc"
 REQUIRED_USE="
-   dane? ( !gnutls )
+   dane? ( ssl !gnutls )
dmarc? ( spf dkim )
-   pkcs11? ( gnutls )
+   pkcs11? ( ssl gnutls )
spf? ( exiscan-acl )
srs? ( exiscan-acl )
 "

diff --git a/mail-mta/exim/exim-4.90.ebuild b/mail-mta/exim/exim-4.90.ebuild
index c6f82d8187f..e4f0e7b5fa0 100644
--- a/mail-mta/exim/exim-4.90.ebuild
+++ b/mail-mta/exim/exim-4.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,9 +7,9 @@ inherit eutils toolchain-funcs multilib pam systemd
 
 IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres 
+prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X 
elibc_glibc"
 REQUIRED_USE="
-   dane? ( !gnutls )
+   dane? ( ssl !gnutls )
dmarc? ( spf dkim )
-   pkcs11? ( gnutls )
+   pkcs11? ( ssl gnutls )
spf? ( exiscan-acl )
srs? ( exiscan-acl )
 "



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

2018-02-06 Thread Fabian Groffen
commit: 1bc317cd39ecf7b89bb4cf9de05000e52f59110e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Feb  7 07:41:09 2018 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Feb  7 07:41:09 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc317cd

mail-mta/exim: drop vulnerable version, bug #638772

Bug: https://bugs.gentoo.org/638772
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 mail-mta/exim/exim-4.89-r1.ebuild | 529 --
 1 file changed, 529 deletions(-)

diff --git a/mail-mta/exim/exim-4.89-r1.ebuild 
b/mail-mta/exim/exim-4.89-r1.ebuild
deleted file mode 100644
index aab4f2e3242..000
--- a/mail-mta/exim/exim-4.89-r1.ebuild
+++ /dev/null
@@ -1,529 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils toolchain-funcs multilib pam systemd
-
-IUSE="dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres 
+prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd tpda X 
elibc_glibc"
-REQUIRED_USE="
-   dane? ( !gnutls )
-   dmarc? ( spf dkim )
-   pkcs11? ( gnutls )
-   spf? ( exiscan-acl )
-   srs? ( exiscan-acl )
-"
-
-COMM_URI="ftp://ftp.exim.org/pub/exim/exim4$([[ ${PV} == *_rc* ]] && echo 
/test)"
-
-DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
-SRC_URI="${COMM_URI}/${P//rc/RC}.tar.bz2
-   mirror://gentoo/system_filter.exim.gz
-   doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.bz2 )"
-HOMEPAGE="http://www.exim.org/;
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="sparc"
-
-COMMON_DEPEND=">=sys-apps/sed-4.0.5
-   >=sys-libs/db-3.2:=
-   dev-libs/libpcre
-   perl? ( dev-lang/perl:= )
-   pam? ( virtual/pam )
-   tcpd? ( sys-apps/tcp-wrappers )
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-   gnutls? ( net-libs/gnutls[pkcs11?]
- dev-libs/libtasn1 )
-   ldap? ( >=net-nds/openldap-2.0.7 )
-   nis? ( elibc_glibc? ( || (
-   =sys-libs/glibc-2.23[rpc]
-   ) ) )
-   mysql? ( virtual/libmysqlclient )
-   postgres? ( dev-db/postgresql:= )
-   sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-   redis? ( dev-libs/hiredis )
-   spf? ( >=mail-filter/libspf2-1.2.5-r1 )
-   dmarc? ( mail-filter/opendmarc )
-   srs? ( mail-filter/libsrs_alt )
-   X? ( x11-proto/xproto
-   x11-libs/libX11
-   x11-libs/libXmu
-   x11-libs/libXt
-   x11-libs/libXaw
-   )
-   sqlite? ( dev-db/sqlite )
-   radius? ( net-dialup/freeradius-client )
-   virtual/libiconv
-   elibc_glibc? ( net-libs/libnsl )
-   "
-   # added X check for #57206
-DEPEND="${COMMON_DEPEND}
-   virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-   !mail-mta/courier
-   !mail-mta/esmtp
-   !mail-mta/mini-qmail
-   !=mail-mta/msmtp-1.4.19-r1[mta]
-   !mail-mta/netqmail
-   !mail-mta/nullmailer
-   !mail-mta/postfix
-   !mail-mta/qmail-ldap
-   !mail-mta/sendmail
-   !mail-mta/opensmtpd
-   !=mail-mta/ssmtp-2.64-r2[mta]
-   !net-mail/mailwrapper
-   >=net-mail/mailbase-0.00-r5
-   virtual/logger
-   dcc? ( mail-filter/dcc )
-   selinux? ( sec-policy/selinux-exim )
-   "
-
-S=${WORKDIR}/${P//rc/RC}
-
-src_prepare() {
-   epatch "${FILESDIR}"/exim-4.14-tail.patch
-   epatch "${FILESDIR}"/exim-4.74-localscan_dlopen.patch
-   epatch "${FILESDIR}"/exim-4.69-r1.27021.patch
-   epatch "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-   epatch "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785
-   epatch "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279
-   epatch "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
-   epatch "${FILESDIR}"/exim-4.89-CVE-2017-1000369.patch # 622212
-
-   if use maildir ; then
-   epatch "${FILESDIR}"/exim-4.20-maildir.patch
-   else
-   epatch "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606
-   fi
-
-   eapply_user
-
-   # user Exim believes it should be
-   MAILUSER=mail
-   MAILGROUP=mail
-   if use prefix && [[ ${EUID} != 0 ]] ; then
-   MAILUSER=$(id -un)
-   MAILGROUP=$(id -gn)
-   fi
-}
-
-src_configure() {
-   # general config and paths
-
-   sed -i.orig \
-   -e 
"/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${EPREFIX}/etc/mail/aliases'" \
-   "${S}"/src/configure.default || die
-
-   sed -i -e 's/^buildname=.*/buildname=exim-gentoo/g' Makefile || die
-
-   sed -e "48i\CFLAGS=${CFLAGS}" \
-   -e 
"s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \
-   -e 

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

2018-02-06 Thread Sergei Trofimovich
commit: 2c7dd6a3fcdbbeb168172f6a9cedd1ce59d9c217
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Feb  6 21:27:46 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb  6 21:39:52 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c7dd6a3

mail-mta/exim: stable 4.89-r5 for sparc, bug #638772

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --include-arches="sparc"

 mail-mta/exim/exim-4.89-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-mta/exim/exim-4.89-r5.ebuild 
b/mail-mta/exim/exim-4.89-r5.ebuild
index 226c7601533..e2dd69cac65 100644
--- a/mail-mta/exim/exim-4.89-r5.ebuild
+++ b/mail-mta/exim/exim-4.89-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd 
~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
>=sys-libs/db-3.2:=



  1   2   >