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

[Arthur Zamarin]

commit: 7596edd7c84512c45d0a4ca87e1027d39a27500d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Mar 21 20:36:56 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Mar 21 20:36:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7596edd7

mail-mta/exim: Stabilize 4.97.1-r5 sparc, #927198

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.97.1-r5.ebuild 
b/mail-mta/exim/exim-4.97.1-r5.ebuild
index 0d9fadc820c0..2d387c7847d9 100644
--- a/mail-mta/exim/exim-4.97.1-r5.ebuild
+++ b/mail-mta/exim/exim-4.97.1-r5.ebuild
@@ -44,7 +44,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Sam James]

commit: 8aaf254dfe696fc9aade07b2b8d30f4a798ddb09
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 19 09:25:22 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 19 09:25:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aaf254d

mail-mta/exim: Stabilize 4.97.1-r5 arm, #927198

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.97.1-r5.ebuild 
b/mail-mta/exim/exim-4.97.1-r5.ebuild
index 797f5ff6b84b..0d9fadc820c0 100644
--- a/mail-mta/exim/exim-4.97.1-r5.ebuild
+++ b/mail-mta/exim/exim-4.97.1-r5.ebuild
@@ -44,7 +44,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Fabian Groffen]

commit: bd31a1fd62028a9d13fe4966fafdc6039598580d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Feb 23 09:06:33 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Feb 23 09:09:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd31a1fd

mail-mta/exim: DANE support cannot be disabled using OpenSSL

require USE=dane with OpenSSL to make the code compile

Closes: https://bugs.gentoo.org/925108
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.97.1-r5.ebuild | 9 ++---
 mail-mta/exim/exim-4.97.1.ebuild| 9 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/mail-mta/exim/exim-4.97.1-r5.ebuild 
b/mail-mta/exim/exim-4.97.1-r5.ebuild
index 8ac924524bb1..797f5ff6b84b 100644
--- a/mail-mta/exim/exim-4.97.1-r5.ebuild
+++ b/mail-mta/exim/exim-4.97.1-r5.ebuild
@@ -12,6 +12,7 @@ socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )
+   !dane? ( ssl? ( gnutls ) )
dmarc? ( dkim spf )
dkim? ( ssl !gnutls )
gnutls? ( ssl )
@@ -19,12 +20,14 @@ REQUIRED_USE="
|| ( berkdb gdbm tdb )
 "
 # 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
+# for x86 and amd64 only (probably due to unbound dep)
+# Exim supports it but we cannot express the dep 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.
+# incorrect, but b) is the only "correct" view from dep-pointofview.
+# Bug #925108 showed that DANE is basically non-optional with OpenSSL,
+# so we make -dane mandatory to use gnutls.  Bleh.
 # We cannot express a required use for berkdb/gdbm/tdb correctly because
 # berkdb and gdbm are both enabled in base profile
 

diff --git a/mail-mta/exim/exim-4.97.1.ebuild b/mail-mta/exim/exim-4.97.1.ebuild
index 4c9425c5df01..01c2c81116af 100644
--- a/mail-mta/exim/exim-4.97.1.ebuild
+++ b/mail-mta/exim/exim-4.97.1.ebuild
@@ -12,6 +12,7 @@ socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )
+   !dane? ( ssl? ( gnutls ) )
dmarc? ( dkim spf )
dkim? ( ssl !gnutls )
gnutls? ( ssl )
@@ -19,12 +20,14 @@ REQUIRED_USE="
|| ( berkdb gdbm tdb )
 "
 # 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
+# for x86 and amd64 only (probably due to unbound dep)
+# Exim supports it but we cannot express the dep 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.
+# incorrect, but b) is the only "correct" view from dep-pointofview.
+# Bug #925108 showed that DANE is basically non-optional with OpenSSL,
+# so we make -dane mandatory to use gnutls.  Bleh.
 # We cannot express a required use for berkdb/gdbm/tdb correctly because
 # berkdb and gdbm are both enabled in base profile
 

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

[Fabian Groffen]

commit: 8b177cea39a5f4c6b96b698fb29266678ee19e0b
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Feb 16 12:07:39 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Feb 16 12:07:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b177cea

mail-mta/exim-4.97.1-r4: update regex memory patch

Include 44b3172e3694 from upstream.

Bug: https://bugs.gentoo.org/922780
Signed-off-by: Fabian Groffen  gentoo.org>

 .../{exim-4.97.1-r4.ebuild => exim-4.97.1-r5.ebuild}   |  0
 .../exim/files/exim-4.97.1-memory-usage-bug-3047.patch | 18 --
 2 files changed, 12 insertions(+), 6 deletions(-)

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

diff --git a/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch 
b/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
index e467edf71fa2..c9b52f2aebfe 100644
--- a/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
+++ b/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
@@ -26,6 +26,11 @@ Date: Tue, 13 Feb 2024 17:34:19 +
 Subject: [PATCH] Use non-releasable memory for regex line-buffer
 Broken-by: 5aacb69f5c8
 
+From 44b3172e369435c2c1baa4e9c837252f729d2905 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Thu, 15 Feb 2024 19:56:40 +
+Subject: [PATCH] regex: avoid releasing built RE midloop
+
 diff --git a/src/src/exim.c b/src/src/exim.c
 --- a/src/exim.c
 +++ b/src/exim.c
@@ -176,7 +181,7 @@ diff --git a/src/src/regex.c b/src/src/regex.c
  return OK;
  }
}
-@@ -110,9 +111,9 @@ FILE * mbox_file;
+@@ -110,9 +111,8 @@ FILE * mbox_file;
  unsigned long mbox_size;
  FILE * mbox_file;
  pcre_list * re_list_head;
@@ -184,7 +189,6 @@ diff --git a/src/src/regex.c b/src/src/regex.c
  long f_pos = 0;
 -int ret = FAIL;
 +int ret = FAIL, cnt, lcount = REGEX_LOOPCOUNT_STORE_RESET;
-+rmark reset_point;
  
  regex_vars_clear();
  
@@ -199,8 +203,7 @@ diff --git a/src/src/regex.c b/src/src/regex.c
 -/* match each line against all regexes */
 -linebuffer = store_get(32767, GET_TAINTED);
 -while (fgets(CS linebuffer, 32767, mbox_file))
-+reset_point = store_mark();
-   {
+-  {
 -  if (  mime_stream && mime_current_boundary  /* check boundary */
 - && Ustrncmp(linebuffer, "--", 2) == 0
 - && Ustrncmp((linebuffer+2), mime_current_boundary,
@@ -212,6 +215,8 @@ diff --git a/src/src/regex.c b/src/src/regex.c
 +  /* precompile our regexes */
 +  if ((re_list_head = compile(*listptr, cacheable, )))
 +{
++rmark reset_point = store_mark();
++
 +while (fgets(CS big_buffer, big_buffer_size, mbox_file))
 +  {
 +  if (  mime_stream && mime_current_boundary  /* check 
boundary */
@@ -229,10 +234,11 @@ diff --git a/src/src/regex.c b/src/src/regex.c
 +  lcount = REGEX_LOOPCOUNT_STORE_RESET;
 +  }
 +  }
++
++store_reset(reset_point);
 +}
-   }
+-  }
 -/* no matches ... */
-+store_reset(reset_point);
  
 -done:
  if (!mime_stream)

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

[Fabian Groffen]

commit: fa7a1f384983f4d7158e7edbd9cab1a914140d28
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Feb 15 08:27:25 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Feb 15 08:28:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa7a1f38

mail-mta/exim-4.97.1-r4: update regex memory patch

Include 6fcb3173d6 and 5aacb69f5c8 from upstream.

Bug: https://bugs.gentoo.org/922780
Signed-off-by: Fabian Groffen  gentoo.org>

 ...exim-4.97.1-r3.ebuild => exim-4.97.1-r4.ebuild} |  0
 .../files/exim-4.97.1-memory-usage-bug-3047.patch  | 49 --
 2 files changed, 36 insertions(+), 13 deletions(-)

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

diff --git a/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch 
b/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
index b8f4eb9c5eef..e467edf71fa2 100644
--- a/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
+++ b/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
@@ -15,6 +15,16 @@ Date: Sun, 11 Feb 2024 13:57:18 + (+)
 Subject: Use non-releaseable memory for regex match strings. Bug 3047
 Broken-by: 35aacb69f5c8
 
+From 6fcb3173d64ef8a9d70f8adf19f134a0cd9cf6e8 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Sun, 11 Feb 2024 15:04:58 +
+Subject: [PATCH] use dynamic mem for regex_match_string
+
+From a173a4376d168edbf3fe2494dff998c4060bf425 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Tue, 13 Feb 2024 17:34:19 +
+Subject: [PATCH] Use non-releasable memory for regex line-buffer
+Broken-by: 5aacb69f5c8
 
 diff --git a/src/src/exim.c b/src/src/exim.c
 --- a/src/exim.c
@@ -99,6 +109,15 @@ diff --git a/src/src/macros.h b/src/src/macros.h
 diff --git a/src/src/regex.c b/src/src/regex.c
 --- a/src/regex.c
 +++ b/src/regex.c
+@@ -24,8 +24,6 @@ typedef struct pcre_list {
+   struct pcre_list *  next;
+ } pcre_list;
+ 
+-uschar regex_match_string_buffer[1024];
+-
+ extern FILE *mime_stream;
+ extern uschar *mime_current_boundary;
+ 
 @@ -31,12 +31,11 @@ extern uschar *mime_current_boundary;
  
  
@@ -135,16 +154,20 @@ diff --git a/src/src/regex.c b/src/src/regex.c
  static int
  matcher(pcre_list * re_list_head, uschar * linebuffer, int len)
  {
-@@ -75,6 +82,9 @@ for (pcre_list * ri = re_list_head; ri; ri = ri->next)
+@@ -75,9 +82,10 @@ for (pcre_list * ri = re_list_head; ri; ri = ri->next)
/* try matcher on the line */
if ((n = pcre2_match(ri->re, (PCRE2_SPTR)linebuffer, len, 0, 0, md, 
pcre_gen_mtc_ctx)) > 0)
  {
 +int save_pool = store_pool;
 +store_pool = POOL_PERM;
 +
- Ustrncpy(regex_match_string_buffer, ri->pcre_text,
- sizeof(regex_match_string_buffer)-1);
- regex_match_string = regex_match_string_buffer;
+-Ustrncpy(regex_match_string_buffer, ri->pcre_text,
+-sizeof(regex_match_string_buffer)-1);
+-regex_match_string = regex_match_string_buffer;
++regex_match_string = string_copy(ri->pcre_text);
+ 
+ for (int nn = 1; nn < n; nn++)
+   {
 @@ -87,6 +97,7 @@ for (pcre_list * ri = re_list_head; ri; ri = ri->next)
regex_vars[nn-1] = string_copyn(linebuffer + ovec[off], len);
}
@@ -153,9 +176,11 @@ diff --git a/src/src/regex.c b/src/src/regex.c
  return OK;
  }
}
-@@ -112,7 +113,8 @@ FILE * mbox_file;
+@@ -110,9 +111,9 @@ FILE * mbox_file;
+ unsigned long mbox_size;
+ FILE * mbox_file;
  pcre_list * re_list_head;
- uschar * linebuffer;
+-uschar * linebuffer;
  long f_pos = 0;
 -int ret = FAIL;
 +int ret = FAIL, cnt, lcount = REGEX_LOOPCOUNT_STORE_RESET;
@@ -163,7 +188,7 @@ diff --git a/src/src/regex.c b/src/src/regex.c
  
  regex_vars_clear();
  
-@@ -136,26 +138,34 @@ else
+@@ -136,26 +138,32 @@ else
mbox_file = mime_stream;
}
  
@@ -187,17 +212,15 @@ diff --git a/src/src/regex.c b/src/src/regex.c
 +  /* precompile our regexes */
 +  if ((re_list_head = compile(*listptr, cacheable, )))
 +{
-+/* match each line against all regexes */
-+linebuffer = store_get(32767, GET_TAINTED);
-+while (fgets(CS linebuffer, 32767, mbox_file))
++while (fgets(CS big_buffer, big_buffer_size, mbox_file))
 +  {
 +  if (  mime_stream && mime_current_boundary  /* check 
boundary */
-+   && Ustrncmp(linebuffer, "--", 2) == 0
-+   && Ustrncmp((linebuffer+2), mime_current_boundary,
++   && Ustrncmp(big_buffer, "--", 2) == 0
++   && Ustrncmp((big_buffer+2), mime_current_boundary,
 +Ustrlen(mime_current_boundary)) == 0)
 +  break;  /* found boundary */
 +
-+  if ((ret = matcher(re_list_head, linebuffer, (int)Ustrlen(linebuffer))) 
== OK)
++  if ((ret = matcher(re_list_head, big_buffer, (int)Ustrlen(big_buffer))) 
== OK)
 +  break;
 +
 +  if ((lcount -= cnt) <= 0)

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

[Fabian Groffen]

commit: 2582b32d9016fdda44afd8cbbfbb198584e14c41
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Feb 11 20:05:31 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Feb 11 20:05:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2582b32d

mail-mta/exim-4.97.1-r3: update regex memory patch

Include 84add256b346 from upstream.

Bug: https://bugs.gentoo.org/922780
Signed-off-by: Fabian Groffen  gentoo.org>

 ...exim-4.97.1-r2.ebuild => exim-4.97.1-r3.ebuild} |  0
 .../files/exim-4.97.1-memory-usage-bug-3047.patch  | 35 +-
 2 files changed, 34 insertions(+), 1 deletion(-)

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

diff --git a/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch 
b/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
index 75e5d1a42781..b8f4eb9c5eef 100644
--- a/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
+++ b/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
@@ -10,6 +10,11 @@ Date: Fri, 26 Jan 2024 21:58:59 +
 Subject: [PATCH] ACL: in "regex" condition, release store every thousand
  lines.  Bug 3047
 
+From: Jeremy Harris 
+Date: Sun, 11 Feb 2024 13:57:18 + (+)
+Subject: Use non-releaseable memory for regex match strings. Bug 3047
+Broken-by: 35aacb69f5c8
+
 
 diff --git a/src/src/exim.c b/src/src/exim.c
 --- a/src/exim.c
@@ -110,7 +115,7 @@ diff --git a/src/src/regex.c b/src/src/regex.c
  
  /* precompile our regexes */
  while ((regex_string = string_nextinlist(, , NULL, 0)))
-@@ -58,7 +57,9 @@ while ((regex_string = string_nextinlist(, , NULL, 
0)))
+@@ -58,10 +57,19 @@ while ((regex_string = string_nextinlist(, , 
NULL, 0)))
  ri->pcre_text = regex_string;
  ri->next = re_list_head;
  re_list_head = ri;
@@ -120,6 +125,34 @@ diff --git a/src/src/regex.c b/src/src/regex.c
  return re_list_head;
  }
  
++
++/* Check list of REs against buffer, returning OK for (first) match,
++else FAIL.  On match return allocated result strings in regex_vars[]. 
++
++We use the perm-pool for that, so that our caller can release
++other allocations.
++*/
+ static int
+ matcher(pcre_list * re_list_head, uschar * linebuffer, int len)
+ {
+@@ -75,6 +82,9 @@ for (pcre_list * ri = re_list_head; ri; ri = ri->next)
+   /* try matcher on the line */
+   if ((n = pcre2_match(ri->re, (PCRE2_SPTR)linebuffer, len, 0, 0, md, 
pcre_gen_mtc_ctx)) > 0)
+ {
++int save_pool = store_pool;
++store_pool = POOL_PERM;
++
+ Ustrncpy(regex_match_string_buffer, ri->pcre_text,
+ sizeof(regex_match_string_buffer)-1);
+ regex_match_string = regex_match_string_buffer;
+@@ -87,6 +97,7 @@ for (pcre_list * ri = re_list_head; ri; ri = ri->next)
+   regex_vars[nn-1] = string_copyn(linebuffer + ovec[off], len);
+   }
+ 
++store_pool = save_pool;
+ return OK;
+ }
+   }
 @@ -112,7 +113,8 @@ FILE * mbox_file;
  pcre_list * re_list_head;
  uschar * linebuffer;

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

[Fabian Groffen]

commit: 662e4585eef68252845c897c989764350141
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Jan 28 18:18:46 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Jan 28 18:20:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=662e4585

mail-mta/exim-4.97.1-r2: update upstream patches for pcre2 memory usage

Bug: https://bugs.gentoo.org/922780
Signed-off-by: Fabian Groffen  gentoo.org>

 ...exim-4.97.1-r1.ebuild => exim-4.97.1-r2.ebuild} |   0
 .../files/exim-4.97.1-memory-usage-bug-3047.patch  | 210 +++--
 2 files changed, 190 insertions(+), 20 deletions(-)

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

diff --git a/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch 
b/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
index f141d08bb7b4..75e5d1a42781 100644
--- a/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
+++ b/mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch
@@ -1,36 +1,60 @@
-https://bugs.exim.org/show_bug.cgi?id=3047
-https://bugs.gentoo.org/922780
+From b4e7527561f1c68b821d5cf25efe29ae63d1d434 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Thu, 25 Jan 2024 17:48:43 +
+Subject: [PATCH] Appendfile: release regex-match store every thousand files. 
+ Bug 3047
 
-diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
-index ec41ca035..91b353079 100644
 a/src/transports/appendfile.c
-+++ b/src/transports/appendfile.c
-@@ -153,6 +153,10 @@ static const char *mailbox_formats[] = {
-   (!ob->quota_warn_threshold_is_percent || ob->quota_value > 0))
+From 35aacb69f5c839a4b77158464e401d86eb422ed6 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Fri, 26 Jan 2024 21:58:59 +
+Subject: [PATCH] ACL: in "regex" condition, release store every thousand
+ lines.  Bug 3047
+
+
+diff --git a/src/src/exim.c b/src/src/exim.c
+--- a/src/exim.c
 b/src/exim.c
+@@ -49,6 +49,8 @@ optimize out the tail recursion and so not make them too 
expensive. */
+ static void *
+ function_store_malloc(PCRE2_SIZE size, void * tag)
+ {
++if (size > INT_MAX)
++  log_write(0, LOG_MAIN|LOG_PANIC_DIE, "excessive memory alloc request");
+ return store_malloc((int)size);
+ }
  
+@@ -63,12 +65,15 @@ if (block) store_free(block);
+ static void *
+ function_store_get(PCRE2_SIZE size, void * tag)
+ {
++if (size > INT_MAX)
++  log_write(0, LOG_MAIN|LOG_PANIC_DIE, "excessive memory alloc request");
+ return store_get((int)size, GET_UNTAINTED);   /* loses track of taint */
+ }
+ 
+ static void
+ function_store_nullfree(void * block, void * tag)
+ {
++/* We cannot free memory allocated using store_get() */
+ }
  
-+/* Free memory allocated by PCRE2 every so often, because a recent version
-+is now using 20kB for every match call */
-+
-+#define RESET_STORE_FILECNT   1000
  
- /*
- *  Setup entry point *
+diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
+--- a/src/transports/appendfile.c
 b/src/transports/appendfile.c
 @@ -661,13 +665,14 @@ Returns:the sum of the sizes of the stattable 
files
  off_t
  check_dir_size(const uschar * dirname, int * countptr, const pcre2_code * re)
  {
--DIR *dir;
-+DIR * dir;
+ DIR *dir;
  off_t sum = 0;
 -int count = *countptr;
-+int count = *countptr, lcount = RESET_STORE_FILECNT;
++int count = *countptr, lcount = REGEX_LOOPCOUNT_STORE_RESET;
 +rmark reset_point = store_mark();
  
  if (!(dir = exim_opendir(dirname))) return 0;
  
--for (struct dirent *ent; ent = readdir(dir); )
-+for (struct dirent * ent; ent = readdir(dir); )
+ for (struct dirent *ent; ent = readdir(dir); )
{
uschar * path, * name = US ent->d_name;
struct stat statbuf;
@@ -41,7 +65,7 @@ index ec41ca035..91b353079 100644
 +  if (--lcount == 0)
 +{
 +store_reset(reset_point); reset_point = store_mark();
-+lcount = RESET_STORE_FILECNT;
++lcount = REGEX_LOOPCOUNT_STORE_RESET;
 +}
  
/* If there's a regex, try to find the size using it */
@@ -54,3 +78,149 @@ index ec41ca035..91b353079 100644
  *countptr = count;
  return sum;
  }
+diff --git a/src/src/macros.h b/src/src/macros.h
+--- a/src/macros.h
 b/src/macros.h
+@@ -1185,4 +1185,9 @@ typedef enum {
+   sw_mrc_tx_fail, /* transmit failed */
+ } sw_mrc_t;
+ 
++/* Recent versions of PCRE2 are allocating 20kB per match, rather than the 
previous 112 B.
++When doing en extended loop of matching, release store periodically. */
++
++#define   REGEX_LOOPCOUNT_STORE_RESET 1000
++
+ /* End of macros.h */
+diff --git a/src/src/regex.c b/src/src/regex.c
+--- a/src/regex.c
 b/src/regex.c
+@@ -31,12 +31,11 @@ extern uschar *mime_current_boundary;
+ 
+ 
+ static pcre_list *
+-compile(const uschar * list, BOOL 

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

[Fabian Groffen]

commit: 7125e469ee81e0899df0a174d72fe90b774cb356
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan 26 19:06:36 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan 26 19:06:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7125e469

mail-mta/exim-4.97.1-r1: bump for upstream candidate patch plugging memuse

PCRE2 changed the amount of memory it allocates considerably, making it
necessary to cleanup more often.

Bug: https://bugs.gentoo.org/922780
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.97.1-r1.ebuild| 631 +
 .../files/exim-4.97.1-memory-usage-bug-3047.patch  |  56 ++
 2 files changed, 687 insertions(+)

diff --git a/mail-mta/exim/exim-4.97.1-r1.ebuild 
b/mail-mta/exim/exim-4.97.1-r1.ebuild
new file mode 100644
index ..8ac924524bb1
--- /dev/null
+++ b/mail-mta/exim/exim-4.97.1-r1.ebuild
@@ -0,0 +1,631 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use flag-o-matic toolchain-funcs pam systemd
+
+IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
+dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
+socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   dkim? ( ssl !gnutls )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   || ( berkdb gdbm tdb )
+"
+# 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.
+# We cannot express a required use for berkdb/gdbm/tdb correctly because
+# berkdb and gdbm are both enabled in base profile
+
+SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
+[[ ${PV} == *.*.*.* ]] && echo /fixes)
+COMM_URI="https://downloads.exim.org/exim4${SDIR};
+
+GPV="r0"
+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"
+
+COMMON_DEPEND=">=sys-apps/sed-4.0.5
+   dev-libs/libpcre2:=
+   tdb? ( sys-libs/tdb:= )
+   !tdb? ( berkdb? ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7:= )
+   elibc_glibc? (
+   net-libs/libnsl:=
+   nis? (
+   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:= )
+   X? (
+   x11-libs/libX11
+   x11-libs/libXmu
+   x11-libs/libXt
+   x11-libs/libXaw
+   )
+   sqlite? ( dev-db/sqlite )
+   radius? ( net-dialup/freeradius-client )
+   virtual/libcrypt:=
+   virtual/libiconv
+   "
+   # added X check for #57206
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+   !mail-mta/courier
+   !mail-mta/esmtp
+   !mail-mta/msmtp[mta]
+   !mail-mta/netqmail
+   !mail-mta/nullmailer
+   !mail-mta/postfix
+   !mail-mta/sendmail
+   !mail-mta/opensmtpd
+   !mail-mta/ssmtp[mta]
+   >=net-mail/mailbase-0.00-r5
+   virtual/logger
+   dcc? ( mail-filter/dcc )
+   selinux? ( sec-policy/selinux-exim )
+   "
+
+S=${WORKDIR}/${P//_rc/-RC}
+
+src_prepare() {
+   # Legacy patches which need a respin for -p1
+   eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+   eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+   eapply "${FILESDIR}"/exim-4.97-as-needed-ldflags.patch # 352265, 
391279
+   eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+   eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
+   eapply "${FILESDIR}"/exim-4.97-localscan_dlopen.patch
+   eapply "${FILESDIR}"/exim-4.97-no-exim_id_update.patch
+   eapply "${FILESDIR}"/exim-4.97.1-memory-usage-bug-3047.patch # 
922780
+
+   # oddity, they disable berkdb as hack, and then throw an error when
+   # berkdb isn't enabled
+   sed -i \
+   -e 's/_DB_/_DONTMESS_/' \

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

[Fabian Groffen]

commit: c11d2a7a9507bd2392e0c8c83e6719debbf18ab1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Jan 12 11:56:22 2024 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Jan 12 11:56:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11d2a7a

mail-mta/exim: cleanup vulnerable

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

 mail-mta/exim/Manifest |   5 -
 mail-mta/exim/exim-4.96-r4.ebuild  | 655 
 mail-mta/exim/exim-4.96.2-r1.ebuild| 656 -
 mail-mta/exim/exim-4.96.2.ebuild   | 655 
 .../exim/files/exim-4.93-as-needed-ldflags.patch   | 145 -
 mail-mta/exim/files/exim-4.94-opendmarc-1.4.patch  |  14 -
 .../exim/files/exim-4.95-localscan_dlopen.patch| 221 ---
 mail-mta/exim/files/exim-4.97-CVE-2023-51766.patch | 265 -
 8 files changed, 2616 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 9553d4d46a0a..d87f52e906c4 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,8 +1,3 @@
-DIST exim-4.96-gentoo-patches-r0.tar.xz 13308 BLAKE2B 
e01cd8b90593329d858cced27bea9da4860e80500c0b0b3f86418931a77616ac1e4a532cfffc551de5844bfcbcd115c1591b28577c234beb551458dc0877e764
 SHA512 
0a8d7b5903c8cd7c2cc07e4ea3ed62200ee0116fe0b5513ec97ba7f3ab1dd5cd0dc181eb93c3c1c7f767be7df3546ac07b622a8f4352eb883323c3a005a1c7db
-DIST exim-4.96.2.tar.xz 1879896 BLAKE2B 
f172340e5f896dc1996e4e3cf46515c2336c47d3390524ca91cb9ef7258a62b83426592de582aa792584cbeaace519b4edea5e62b3ebeb8e5f599379255e04a5
 SHA512 
dc9f6a114e64ac826489edff88d50a24195b64714428e691c10a7bfb119b3ebb6455bf80cbb34dfd0a4e2e44cbde72effb009357a8e0a6065e512fe32092e3ed
-DIST exim-4.96.tar.xz 1879152 BLAKE2B 
4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a52cddd24fdd452daa76c84e471d4f8f278cf951d1503b01fd46fc3e6858d6feded09f34253d2cf2ae99b45a
 SHA512 
6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
 DIST exim-4.97.1.tar.xz 1919308 BLAKE2B 
ea41bf851185c7330e648c7757f2bf0b0aea3133e399630a40d220f5f542e9055e3ed0cd67c9ee5dcede281ccc17919a4ac328abd8f05d4d828e0381f10df0b8
 SHA512 
eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc
-DIST exim-pdf-4.96.2.tar.xz 2132268 BLAKE2B 
9104d42d742e7152d166b6158a6f060d0a29143b11e5064ecda177ead59ac66a9bb6ab3575e5bcaf7af5b49964d29b841285e67184592a8b64bab6099f4c8ac9
 SHA512 
c35eea4ab5510bba50d22813b28c9d2f5e4e2fed76993693b997f2090024dde674d58dffe044cb64642bf57b83fcae3bfc3dbcae43288fae11692ee49374df74
-DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 
7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081
 SHA512 
05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
 DIST exim-pdf-4.97.1.tar.xz 2139688 BLAKE2B 
baadbb6ca7b88b11ea88f6b5ce0c96d9d713a1f5b358e4dfb52647ccc2bb1a9a6f74e75341839a8ee7df327f2f5645dbf223e4e5923631b02aa53a01b436
 SHA512 
6aa733b1d48b6237f458939ff53e484e702f47a0c10ba781ba101db404d39667bd2ddc876af4f597deda1991e534d5b8b874c549e6a86b5325ebd624a6713183
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.96-r4.ebuild 
b/mail-mta/exim/exim-4.96-r4.ebuild
deleted file mode 100644
index c3bb1a1d477e..
--- a/mail-mta/exim/exim-4.96-r4.ebuild
+++ /dev/null
@@ -1,655 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit db-use toolchain-funcs pam systemd
-
-IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
-dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
-mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
-socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
-REQUIRED_USE="
-   arc? ( dkim spf )
-   dane? ( ssl !gnutls )
-   dmarc? ( dkim spf )
-   dkim? ( ssl !gnutls )
-   gnutls? ( ssl )
-   pkcs11? ( ssl )
-   || ( berkdb gdbm tdb )
-"
-# 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.
-# We cannot express a required 

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

[Arthur Zamarin]

commit: 782fef3039638d0f6aa7630380c6accd18ee1819
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 12 11:29:03 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 12 11:29:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782fef30

mail-mta/exim: Stabilize 4.97.1 x86, #921844

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.97.1.ebuild b/mail-mta/exim/exim-4.97.1.ebuild
index 92b8d17dcc6b..68f3e009d832 100644
--- a/mail-mta/exim/exim-4.97.1.ebuild
+++ b/mail-mta/exim/exim-4.97.1.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Arthur Zamarin]

commit: 7f9bc5b2d43e3396f8fb5d380af0b3641ac81a52
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 12 11:29:06 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 12 11:29:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9bc5b2

mail-mta/exim: Stabilize 4.97.1 amd64, #921844

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.97.1.ebuild b/mail-mta/exim/exim-4.97.1.ebuild
index 68f3e009d832..4c9425c5df01 100644
--- a/mail-mta/exim/exim-4.97.1.ebuild
+++ b/mail-mta/exim/exim-4.97.1.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Sam James]

commit: 0a70cd9a4e22c59a9cbe9fac6d6e712b6617af89
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 12 09:23:32 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 12 09:23:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a70cd9a

mail-mta/exim: Stabilize 4.97.1 sparc, #921844

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.97.1.ebuild b/mail-mta/exim/exim-4.97.1.ebuild
index 3cd2a179318a..92b8d17dcc6b 100644
--- a/mail-mta/exim/exim-4.97.1.ebuild
+++ b/mail-mta/exim/exim-4.97.1.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Arthur Zamarin]

commit: f6522e9245fc9f6b4ed5f82f4740a5efa4b85c0f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 12 08:54:29 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 12 08:54:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6522e92

mail-mta/exim: Stabilize 4.97.1 ppc64, #921844

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.97.1.ebuild b/mail-mta/exim/exim-4.97.1.ebuild
index 4f219dc84657..3cd2a179318a 100644
--- a/mail-mta/exim/exim-4.97.1.ebuild
+++ b/mail-mta/exim/exim-4.97.1.ebuild
@@ -41,7 +41,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Arthur Zamarin]

commit: d1565634ea00a0c2e21003f79511e7076db2ee4f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 12 08:28:30 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 12 08:28:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1565634

mail-mta/exim: Stabilize 4.97.1 arm, #921844

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.97.1.ebuild b/mail-mta/exim/exim-4.97.1.ebuild
index b900297354e3..4f219dc84657 100644
--- a/mail-mta/exim/exim-4.97.1.ebuild
+++ b/mail-mta/exim/exim-4.97.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -41,7 +41,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Fabian Groffen]

commit: 374b8b93ffbc2d6bf2da9e6898930bb1522d08e1
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Dec 29 18:07:56 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Dec 29 18:08:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=374b8b93

mail-mta/exim-4.97.1: official release addressing CVE-2023-51766

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

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

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 897713920daf..9553d4d46a0a 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,8 +1,8 @@
 DIST exim-4.96-gentoo-patches-r0.tar.xz 13308 BLAKE2B 
e01cd8b90593329d858cced27bea9da4860e80500c0b0b3f86418931a77616ac1e4a532cfffc551de5844bfcbcd115c1591b28577c234beb551458dc0877e764
 SHA512 
0a8d7b5903c8cd7c2cc07e4ea3ed62200ee0116fe0b5513ec97ba7f3ab1dd5cd0dc181eb93c3c1c7f767be7df3546ac07b622a8f4352eb883323c3a005a1c7db
 DIST exim-4.96.2.tar.xz 1879896 BLAKE2B 
f172340e5f896dc1996e4e3cf46515c2336c47d3390524ca91cb9ef7258a62b83426592de582aa792584cbeaace519b4edea5e62b3ebeb8e5f599379255e04a5
 SHA512 
dc9f6a114e64ac826489edff88d50a24195b64714428e691c10a7bfb119b3ebb6455bf80cbb34dfd0a4e2e44cbde72effb009357a8e0a6065e512fe32092e3ed
 DIST exim-4.96.tar.xz 1879152 BLAKE2B 
4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a52cddd24fdd452daa76c84e471d4f8f278cf951d1503b01fd46fc3e6858d6feded09f34253d2cf2ae99b45a
 SHA512 
6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
-DIST exim-4.97.tar.xz 1909536 BLAKE2B 
b0f09d5f162853996976c222786de14e2104acdf01fd61da486f59f4cf8af1182cdfb7ea31fd55ccfd9c57256e7f442dc1b46727e08fe2eca82a296ac4ae7899
 SHA512 
b28cbb49fa7e143dfcc94e004d57cf98a1945013e676cd103c1ee4cf52933d49d378baa13bea2663353dba97745d6b2ab8b7b66cde870788a2d85d7abd716968
+DIST exim-4.97.1.tar.xz 1919308 BLAKE2B 
ea41bf851185c7330e648c7757f2bf0b0aea3133e399630a40d220f5f542e9055e3ed0cd67c9ee5dcede281ccc17919a4ac328abd8f05d4d828e0381f10df0b8
 SHA512 
eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc
 DIST exim-pdf-4.96.2.tar.xz 2132268 BLAKE2B 
9104d42d742e7152d166b6158a6f060d0a29143b11e5064ecda177ead59ac66a9bb6ab3575e5bcaf7af5b49964d29b841285e67184592a8b64bab6099f4c8ac9
 SHA512 
c35eea4ab5510bba50d22813b28c9d2f5e4e2fed76993693b997f2090024dde674d58dffe044cb64642bf57b83fcae3bfc3dbcae43288fae11692ee49374df74
 DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 
7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081
 SHA512 
05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
-DIST exim-pdf-4.97.tar.xz 2136852 BLAKE2B 
df188e658e9e86d1b651d12b29e8a440677d75cc0384bab829323582a3a89b62f34e504b759ef2824b7735056696aed6ac33a4ca10a74fc5bc036f150caaac12
 SHA512 
defd1e7d823f4eadd2afe426d9105a395421824a1b1941b97bfda408905bdd105b5c219b713e15506d25d98fa48e965228f8daab286dc1be14a387f567c0b58b
+DIST exim-pdf-4.97.1.tar.xz 2139688 BLAKE2B 
baadbb6ca7b88b11ea88f6b5ce0c96d9d713a1f5b358e4dfb52647ccc2bb1a9a6f74e75341839a8ee7df327f2f5645dbf223e4e5923631b02aa53a01b436
 SHA512 
6aa733b1d48b6237f458939ff53e484e702f47a0c10ba781ba101db404d39667bd2ddc876af4f597deda1991e534d5b8b874c549e6a86b5325ebd624a6713183
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.97-r2.ebuild 
b/mail-mta/exim/exim-4.97.1.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.97-r2.ebuild
rename to mail-mta/exim/exim-4.97.1.ebuild
index ada81a9a2399..b900297354e3 100644
--- a/mail-mta/exim/exim-4.97-r2.ebuild
+++ b/mail-mta/exim/exim-4.97.1.ebuild
@@ -116,7 +116,6 @@ src_prepare() {
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply "${FILESDIR}"/exim-4.97-localscan_dlopen.patch
eapply "${FILESDIR}"/exim-4.97-no-exim_id_update.patch
-   eapply -p2 "${FILESDIR}"/exim-4.97-CVE-2023-51766.patch # 3063
 
# oddity, they disable berkdb as hack, and then throw an error when
# berkdb isn't enabled

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

[Fabian Groffen]

commit: 1bc69cd1697042a933e8426c2b0f34bf9903fb7e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 25 11:02:35 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 25 11:02:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc69cd1

mail-mta/exim-4.96.2-r1: drop to ~arch

accidential commit to stable

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

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

diff --git a/mail-mta/exim/exim-4.96.2-r1.ebuild 
b/mail-mta/exim/exim-4.96.2-r1.ebuild
index 4504ad11f95d..f31266dbaa83 100644
--- a/mail-mta/exim/exim-4.96.2-r1.ebuild
+++ b/mail-mta/exim/exim-4.96.2-r1.ebuild
@@ -42,7 +42,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Fabian Groffen]

commit: 696f3182bbf70449d0fd2db9b8ff15824cdf8a12
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 25 10:58:50 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 25 10:58:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696f3182

mail-mta/exim-4.96.2-r1: backport CVE-2023-51766 fix

Previously applied to 4.96 in error, patch latest from 4.96 branch
instead.

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

 mail-mta/exim/{exim-4.96-r5.ebuild => exim-4.96.2-r1.ebuild} | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mail-mta/exim/exim-4.96-r5.ebuild 
b/mail-mta/exim/exim-4.96.2-r1.ebuild
similarity index 98%
rename from mail-mta/exim/exim-4.96-r5.ebuild
rename to mail-mta/exim/exim-4.96.2-r1.ebuild
index 95cd963bee1d..4504ad11f95d 100644
--- a/mail-mta/exim/exim-4.96-r5.ebuild
+++ b/mail-mta/exim/exim-4.96.2-r1.ebuild
@@ -35,14 +35,14 @@ COMM_URI="https://downloads.exim.org/exim4${SDIR};
 GPV="r0"
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
 SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
-   
https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches-${GPV}.tar.xz
+   
https://dev.gentoo.org/~grobian/distfiles/${PN}-4.96-gentoo-patches-${GPV}.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"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=
@@ -116,9 +116,10 @@ src_prepare() {
eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply "${FILESDIR}"/exim-4.95-localscan_dlopen.patch
+   eapply -p2 "${FILESDIR}"/exim-4.97-CVE-2023-51766.patch # 3063
 
# Upstream post-release fixes :(
-   local GPVDIR=${WORKDIR}/${P}-gentoo-patches-${GPV}
+   local GPVDIR=${WORKDIR}/${PN}-4.96-gentoo-patches-${GPV}
eapply "${GPVDIR}"/exim-4.96-rewrite-malformed-addr-fix.patch # 
upstr
eapply "${GPVDIR}"/exim-4.96-spf-memory-error-fix.patch # upstr
eapply "${GPVDIR}"/exim-4.96-regex-use-after-free.patch # upstr
@@ -134,8 +135,6 @@ src_prepare() {
eapply "${GPVDIR}"/exim-4.96-expansion-crash.patch # upstr
eapply "${GPVDIR}"/exim-4.96-transport-crash.patch # upstr
 
-   eapply -p2 "${FILESDIR}"/exim-4.97-CVE-2023-51766.patch # 3063
-
# oddity, they disable berkdb as hack, and then throw an error when
# berkdb isn't enabled
sed -i \

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

[Fabian Groffen]

commit: 5bdda955cd4ce33c8cfe88cb5fa74fe2d29f8e2a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 25 10:55:13 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 25 10:55:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdda955

mail-mta/exim: drop no longer used exiscan-acl USE-desc from metadata.xml

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

 mail-mta/exim/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index d74398a75cc0..abbcc855d88d 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -31,8 +31,6 @@
Adds support for DMARC
Adds support for Delivery Status Notifications
(DSN)
-   Patch providing support for content
-   scanning
Adds support for lmtp
Adds support for UW's mbx format
Adds support for Sender Policy Framework

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

[Fabian Groffen]

commit: e2a2f4e0318e7ba37697d632452307f509c5055d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 25 10:57:00 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 25 10:57:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a2f4e0

mail-mta/exim: drop srs-alt/srs-native USE-flags descriptions

remove from metadata.xml
remove change notice from 4.97

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

 mail-mta/exim/exim-4.97-r2.ebuild | 4 
 mail-mta/exim/metadata.xml| 4 
 2 files changed, 8 deletions(-)

diff --git a/mail-mta/exim/exim-4.97-r2.ebuild 
b/mail-mta/exim/exim-4.97-r2.ebuild
index 06ad474f9e9c..ada81a9a2399 100644
--- a/mail-mta/exim/exim-4.97-r2.ebuild
+++ b/mail-mta/exim/exim-4.97-r2.ebuild
@@ -622,10 +622,6 @@ pkg_postinst() {
einfo "documentation at the bottom of this prerelease message:"
einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579;
fi
-   if use srs; then
-   einfo "SRS support using libsrs_alt was dropped in this"
-   einfo "release of Exim, you are now using the native SRS 
implementation"
-   fi
use dsn && einfo "extra information in fail DSN message is experimental"
einfo
elog "Note that this release contains a tainted variable check that"

diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index abbcc855d88d..536bdc48deb3 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -35,10 +35,6 @@
Adds support for UW's mbx format
Adds support for Sender Policy Framework
Adds support for Sender Rewriting Scheme
-   Use mail-filter/libsrs_alt to
-   implement SRS support
-   Use Exim's built-in SRS support to
-   implement SRS support
Add support for being behind a proxy, such 
as HAProxy
Require pkcs11 support in 
net-libs/gnutls with USE=gnutls
Adds support for querying 
dev-db/redis

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

[Fabian Groffen]

commit: 33d31763db5da4fd9529a21e7213c121c3925f36
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 25 10:52:23 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 25 10:52:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d31763

mail-mta/exim-4.96-r4: flag last stable for x86

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

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

diff --git a/mail-mta/exim/exim-4.96-r4.ebuild 
b/mail-mta/exim/exim-4.96-r4.ebuild
index 503519b18ac5..c3bb1a1d477e 100644
--- a/mail-mta/exim/exim-4.96-r4.ebuild
+++ b/mail-mta/exim/exim-4.96-r4.ebuild
@@ -42,7 +42,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Fabian Groffen]

commit: 8a7059d941873a35822e577495cf71fdea4dcc08
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 25 10:34:01 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 25 10:42:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a7059d9

mail-mta/exim-4.94.2: drop old

sparc how has exim-4.96.2 stable

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

 mail-mta/exim/exim-4.94.2-r7.ebuild| 618 -
 .../exim/files/exim-4.94-localscan_dlopen.patch| 269 -
 2 files changed, 887 deletions(-)

diff --git a/mail-mta/exim/exim-4.94.2-r7.ebuild 
b/mail-mta/exim/exim-4.94.2-r7.ebuild
deleted file mode 100644
index 8f5367aecfb8..
--- a/mail-mta/exim/exim-4.94.2-r7.ebuild
+++ /dev/null
@@ -1,618 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit db-use toolchain-funcs pam systemd
-
-IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr 
proxy radius redis sasl selinux spf sqlite srs +srs-alt srs-native +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
-   ^^ ( srs-alt srs-native )
-   )
-"
-# 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="sparc"
-
-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? ( srs-alt? ( 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/libcrypt:=
-   virtual/libiconv
-   elibc_glibc? ( net-libs/libnsl )
-   "
-   # added X check for #57206
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}
-   !mail-mta/courier
-   !mail-mta/esmtp
-   !mail-mta/msmtp[mta]
-   !mail-mta/netqmail
-   !mail-mta/nullmailer
-   !mail-mta/postfix
-   !mail-mta/sendmail
-   !mail-mta/opensmtpd
-   !mail-mta/ssmtp[mta]
-   >=net-mail/mailbase-0.00-r5
-   virtual/logger
-   dcc? ( mail-filter/dcc )
-   selinux? ( sec-policy/selinux-exim )
-   "
-
-S=${WORKDIR}/${P//_rc/-RC}
-
-src_prepare() {
-   # Legacy patches which need a respin for -p1
-   eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
-   eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
-   eapply "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 
391279
-   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
-
-   # for this reason we have a := dep on opendmarc, they changed their
-   # API in a minor release
-   if use dmarc && has_version ">=mail-filter/opendmarc-1.4" ; then
-   eapply "${FILESDIR}"/exim-4.94-opendmarc-1.4.patch
-   fi
-
-   if use maildir ; then
-   eapply "${FILESDIR}"/exim-4.94-maildir.patch
-   else
-   eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 
438606
-   fi
-
-   eapply_user
-
-   # user Exim believes it should be
-   MAILUSER=mail
-   MAILGROUP=mail
- 

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

[Fabian Groffen]

commit: 38b56d6352c696749e20078af71daaf871e58691
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Dec 25 10:39:54 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Dec 25 10:42:12 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38b56d63

mail-mta/exim: add backport for CVE-2023-51766 to 4.96 and 4.97

Addresses:
 Partially vulnerable to "SMTP Smuggling" if pipelining is enabled and
 chunking is disabled/unused

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

 mail-mta/exim/Manifest |   2 -
 .../{exim-4.97-r1.ebuild => exim-4.96-r5.ebuild}   |  33 ++-
 .../{exim-4.97-r1.ebuild => exim-4.97-r2.ebuild}   |   1 +
 mail-mta/exim/files/exim-4.97-CVE-2023-51766.patch | 265 +
 4 files changed, 294 insertions(+), 7 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 2422a76d59b8..897713920daf 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,9 +1,7 @@
-DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 
684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046
 SHA512 
5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
 DIST exim-4.96-gentoo-patches-r0.tar.xz 13308 BLAKE2B 
e01cd8b90593329d858cced27bea9da4860e80500c0b0b3f86418931a77616ac1e4a532cfffc551de5844bfcbcd115c1591b28577c234beb551458dc0877e764
 SHA512 
0a8d7b5903c8cd7c2cc07e4ea3ed62200ee0116fe0b5513ec97ba7f3ab1dd5cd0dc181eb93c3c1c7f767be7df3546ac07b622a8f4352eb883323c3a005a1c7db
 DIST exim-4.96.2.tar.xz 1879896 BLAKE2B 
f172340e5f896dc1996e4e3cf46515c2336c47d3390524ca91cb9ef7258a62b83426592de582aa792584cbeaace519b4edea5e62b3ebeb8e5f599379255e04a5
 SHA512 
dc9f6a114e64ac826489edff88d50a24195b64714428e691c10a7bfb119b3ebb6455bf80cbb34dfd0a4e2e44cbde72effb009357a8e0a6065e512fe32092e3ed
 DIST exim-4.96.tar.xz 1879152 BLAKE2B 
4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a52cddd24fdd452daa76c84e471d4f8f278cf951d1503b01fd46fc3e6858d6feded09f34253d2cf2ae99b45a
 SHA512 
6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
 DIST exim-4.97.tar.xz 1909536 BLAKE2B 
b0f09d5f162853996976c222786de14e2104acdf01fd61da486f59f4cf8af1182cdfb7ea31fd55ccfd9c57256e7f442dc1b46727e08fe2eca82a296ac4ae7899
 SHA512 
b28cbb49fa7e143dfcc94e004d57cf98a1945013e676cd103c1ee4cf52933d49d378baa13bea2663353dba97745d6b2ab8b7b66cde870788a2d85d7abd716968
-DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
 DIST exim-pdf-4.96.2.tar.xz 2132268 BLAKE2B 
9104d42d742e7152d166b6158a6f060d0a29143b11e5064ecda177ead59ac66a9bb6ab3575e5bcaf7af5b49964d29b841285e67184592a8b64bab6099f4c8ac9
 SHA512 
c35eea4ab5510bba50d22813b28c9d2f5e4e2fed76993693b997f2090024dde674d58dffe044cb64642bf57b83fcae3bfc3dbcae43288fae11692ee49374df74
 DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 
7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081
 SHA512 
05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
 DIST exim-pdf-4.97.tar.xz 2136852 BLAKE2B 
df188e658e9e86d1b651d12b29e8a440677d75cc0384bab829323582a3a89b62f34e504b759ef2824b7735056696aed6ac33a4ca10a74fc5bc036f150caaac12
 SHA512 
defd1e7d823f4eadd2afe426d9105a395421824a1b1941b97bfda408905bdd105b5c219b713e15506d25d98fa48e965228f8daab286dc1be14a387f567c0b58b

diff --git a/mail-mta/exim/exim-4.97-r1.ebuild 
b/mail-mta/exim/exim-4.96-r5.ebuild
similarity index 90%
copy from mail-mta/exim/exim-4.97-r1.ebuild
copy to mail-mta/exim/exim-4.96-r5.ebuild
index 3dbed307e7e4..95cd963bee1d 100644
--- a/mail-mta/exim/exim-4.97-r1.ebuild
+++ b/mail-mta/exim/exim-4.96-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit db-use flag-o-matic toolchain-funcs pam systemd
+inherit db-use toolchain-funcs pam systemd
 
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
@@ -35,6 +35,7 @@ COMM_URI="https://downloads.exim.org/exim4${SDIR};
 GPV="r0"
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
 SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
+   
https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches-${GPV}.tar.xz
mirror://gentoo/system_filter.exim.gz
doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
 HOMEPAGE="https://www.exim.org/;
@@ -111,11 +112,29 @@ src_prepare() {
# Legacy patches which need a respin for -p1
eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
eapply -p0 

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

[Arthur Zamarin]

commit: 08ff9498e21a806adcca75abaadd5db44ab9fc33
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Nov 25 11:49:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Nov 25 11:49:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ff9498

mail-mta/exim: Stabilize 4.96.2 arm, #916524

Signed-off-by: Arthur Zamarin  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.96.2.ebuild b/mail-mta/exim/exim-4.96.2.ebuild
index 54ec7974c088..27cf43584c3e 100644
--- a/mail-mta/exim/exim-4.96.2.ebuild
+++ b/mail-mta/exim/exim-4.96.2.ebuild
@@ -42,7 +42,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Sam James]

commit: 6dd6c9f9b6d183f1cb6fb0198713c318b08741fd
Author: Sam James  gentoo  org>
AuthorDate: Mon Nov 13 04:52:34 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov 13 04:52:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dd6c9f9

mail-mta/exim: Stabilize 4.96.2 amd64, #916524

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.96.2.ebuild b/mail-mta/exim/exim-4.96.2.ebuild
index 2fb3f6b6970a..54ec7974c088 100644
--- a/mail-mta/exim/exim-4.96.2.ebuild
+++ b/mail-mta/exim/exim-4.96.2.ebuild
@@ -42,7 +42,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Fabian Groffen]

commit: 7cbec58d29297ca9ed3509ee3d62303ab52bdb25
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Nov  8 07:50:33 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Nov  8 07:50:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cbec58d

mail-mta/exim-4.97-r1: fix build for musl

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

 mail-mta/exim/{exim-4.97.ebuild => exim-4.97-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.97.ebuild b/mail-mta/exim/exim-4.97-r1.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.97.ebuild
rename to mail-mta/exim/exim-4.97-r1.ebuild
index 93fa8745430f..3dbed307e7e4 100644
--- a/mail-mta/exim/exim-4.97.ebuild
+++ b/mail-mta/exim/exim-4.97-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit db-use toolchain-funcs pam systemd
+inherit db-use flag-o-matic toolchain-funcs pam systemd
 
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
@@ -153,6 +153,7 @@ src_configure() {
 
if use elibc_musl; then
sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die
+   append-cflags -DNO_EXECINFO
fi
 
local conffile="${EPREFIX}/etc/exim/exim.conf"

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

[Fabian Groffen]

commit: e1634b7a70c6c987472c68a979add070fea799d6
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Nov  8 08:03:24 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Nov  8 08:03:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1634b7a

mail-mta/exim: cleanup

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

 mail-mta/exim/Manifest |   2 -
 mail-mta/exim/exim-4.94.2-r12.ebuild   | 662 -
 mail-mta/exim/exim-4.94.2-r7.ebuild|   2 +-
 mail-mta/exim/exim-4.96.1.ebuild   | 655 
 mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch  |  99 ---
 .../exim/files/exim-4.94.2-fix-crash-resolve.patch |  24 -
 mail-mta/exim/files/exim-4.94.2-openssl3.patch | 332 ---
 7 files changed, 1 insertion(+), 1775 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 1ad7d2a61766..2422a76d59b8 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,11 +1,9 @@
 DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 
684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046
 SHA512 
5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
 DIST exim-4.96-gentoo-patches-r0.tar.xz 13308 BLAKE2B 
e01cd8b90593329d858cced27bea9da4860e80500c0b0b3f86418931a77616ac1e4a532cfffc551de5844bfcbcd115c1591b28577c234beb551458dc0877e764
 SHA512 
0a8d7b5903c8cd7c2cc07e4ea3ed62200ee0116fe0b5513ec97ba7f3ab1dd5cd0dc181eb93c3c1c7f767be7df3546ac07b622a8f4352eb883323c3a005a1c7db
-DIST exim-4.96.1.tar.xz 1879404 BLAKE2B 
fc6425be41ef7722f7d7b6b541c01774a4bafe55ca38152dc3fbb837e00ea52fabc39a42fcbf0500f4e0eda40deec3cbb0d746da9700a4a615f9ee4869e325c5
 SHA512 
ef1a0e57c59cdf4e915b3ac5dcdbc69f565b14dd92b0527f6796b2c46a9ec34f991f9790fb4171c99417f7e482cdd62d77e780cc71fab227c8bed876103f7fdd
 DIST exim-4.96.2.tar.xz 1879896 BLAKE2B 
f172340e5f896dc1996e4e3cf46515c2336c47d3390524ca91cb9ef7258a62b83426592de582aa792584cbeaace519b4edea5e62b3ebeb8e5f599379255e04a5
 SHA512 
dc9f6a114e64ac826489edff88d50a24195b64714428e691c10a7bfb119b3ebb6455bf80cbb34dfd0a4e2e44cbde72effb009357a8e0a6065e512fe32092e3ed
 DIST exim-4.96.tar.xz 1879152 BLAKE2B 
4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a52cddd24fdd452daa76c84e471d4f8f278cf951d1503b01fd46fc3e6858d6feded09f34253d2cf2ae99b45a
 SHA512 
6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
 DIST exim-4.97.tar.xz 1909536 BLAKE2B 
b0f09d5f162853996976c222786de14e2104acdf01fd61da486f59f4cf8af1182cdfb7ea31fd55ccfd9c57256e7f442dc1b46727e08fe2eca82a296ac4ae7899
 SHA512 
b28cbb49fa7e143dfcc94e004d57cf98a1945013e676cd103c1ee4cf52933d49d378baa13bea2663353dba97745d6b2ab8b7b66cde870788a2d85d7abd716968
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
-DIST exim-pdf-4.96.1.tar.xz 2132252 BLAKE2B 
7e6d756630211b6465f9162c7a6b461774b3999ad8c3c1ace157a39b7e07f86644d206c5687991b6098aec47445319def44ddb2895b2a16146f6abd1c11d47a6
 SHA512 
d39ee2f9a05326809a6e8454a108d717838dacfa42c2cade72f5937b1b44d70e70152fa75f4b4e9548cd4198d54f8a8c1323e14d7d1f9a0a23c99a53db1001b0
 DIST exim-pdf-4.96.2.tar.xz 2132268 BLAKE2B 
9104d42d742e7152d166b6158a6f060d0a29143b11e5064ecda177ead59ac66a9bb6ab3575e5bcaf7af5b49964d29b841285e67184592a8b64bab6099f4c8ac9
 SHA512 
c35eea4ab5510bba50d22813b28c9d2f5e4e2fed76993693b997f2090024dde674d58dffe044cb64642bf57b83fcae3bfc3dbcae43288fae11692ee49374df74
 DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 
7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081
 SHA512 
05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
 DIST exim-pdf-4.97.tar.xz 2136852 BLAKE2B 
df188e658e9e86d1b651d12b29e8a440677d75cc0384bab829323582a3a89b62f34e504b759ef2824b7735056696aed6ac33a4ca10a74fc5bc036f150caaac12
 SHA512 
defd1e7d823f4eadd2afe426d9105a395421824a1b1941b97bfda408905bdd105b5c219b713e15506d25d98fa48e965228f8daab286dc1be14a387f567c0b58b

diff --git a/mail-mta/exim/exim-4.94.2-r12.ebuild 
b/mail-mta/exim/exim-4.94.2-r12.ebuild
deleted file mode 100644
index c84859d97f58..
--- a/mail-mta/exim/exim-4.94.2-r12.ebuild
+++ /dev/null
@@ -1,662 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit db-use toolchain-funcs pam systemd
-
-IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
-dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp 

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

[Fabian Groffen]

commit: 188612161131269127746a5e43c8df0a7f48a171
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Nov  7 20:46:36 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Nov  7 20:46:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18861216

mail-mta/exim-4.97: version bump

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

 mail-mta/exim/Manifest |   2 +
 mail-mta/exim/exim-4.97.ebuild | 633 +
 .../exim/files/exim-4.97-as-needed-ldflags.patch   | 145 +
 .../exim/files/exim-4.97-localscan_dlopen.patch| 209 +++
 .../exim/files/exim-4.97-no-exim_id_update.patch   |  13 +
 5 files changed, 1002 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index c253fa5f9734..1ad7d2a61766 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -3,8 +3,10 @@ DIST exim-4.96-gentoo-patches-r0.tar.xz 13308 BLAKE2B 
e01cd8b90593329d858cced27b
 DIST exim-4.96.1.tar.xz 1879404 BLAKE2B 
fc6425be41ef7722f7d7b6b541c01774a4bafe55ca38152dc3fbb837e00ea52fabc39a42fcbf0500f4e0eda40deec3cbb0d746da9700a4a615f9ee4869e325c5
 SHA512 
ef1a0e57c59cdf4e915b3ac5dcdbc69f565b14dd92b0527f6796b2c46a9ec34f991f9790fb4171c99417f7e482cdd62d77e780cc71fab227c8bed876103f7fdd
 DIST exim-4.96.2.tar.xz 1879896 BLAKE2B 
f172340e5f896dc1996e4e3cf46515c2336c47d3390524ca91cb9ef7258a62b83426592de582aa792584cbeaace519b4edea5e62b3ebeb8e5f599379255e04a5
 SHA512 
dc9f6a114e64ac826489edff88d50a24195b64714428e691c10a7bfb119b3ebb6455bf80cbb34dfd0a4e2e44cbde72effb009357a8e0a6065e512fe32092e3ed
 DIST exim-4.96.tar.xz 1879152 BLAKE2B 
4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a52cddd24fdd452daa76c84e471d4f8f278cf951d1503b01fd46fc3e6858d6feded09f34253d2cf2ae99b45a
 SHA512 
6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
+DIST exim-4.97.tar.xz 1909536 BLAKE2B 
b0f09d5f162853996976c222786de14e2104acdf01fd61da486f59f4cf8af1182cdfb7ea31fd55ccfd9c57256e7f442dc1b46727e08fe2eca82a296ac4ae7899
 SHA512 
b28cbb49fa7e143dfcc94e004d57cf98a1945013e676cd103c1ee4cf52933d49d378baa13bea2663353dba97745d6b2ab8b7b66cde870788a2d85d7abd716968
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
 DIST exim-pdf-4.96.1.tar.xz 2132252 BLAKE2B 
7e6d756630211b6465f9162c7a6b461774b3999ad8c3c1ace157a39b7e07f86644d206c5687991b6098aec47445319def44ddb2895b2a16146f6abd1c11d47a6
 SHA512 
d39ee2f9a05326809a6e8454a108d717838dacfa42c2cade72f5937b1b44d70e70152fa75f4b4e9548cd4198d54f8a8c1323e14d7d1f9a0a23c99a53db1001b0
 DIST exim-pdf-4.96.2.tar.xz 2132268 BLAKE2B 
9104d42d742e7152d166b6158a6f060d0a29143b11e5064ecda177ead59ac66a9bb6ab3575e5bcaf7af5b49964d29b841285e67184592a8b64bab6099f4c8ac9
 SHA512 
c35eea4ab5510bba50d22813b28c9d2f5e4e2fed76993693b997f2090024dde674d58dffe044cb64642bf57b83fcae3bfc3dbcae43288fae11692ee49374df74
 DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 
7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081
 SHA512 
05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
+DIST exim-pdf-4.97.tar.xz 2136852 BLAKE2B 
df188e658e9e86d1b651d12b29e8a440677d75cc0384bab829323582a3a89b62f34e504b759ef2824b7735056696aed6ac33a4ca10a74fc5bc036f150caaac12
 SHA512 
defd1e7d823f4eadd2afe426d9105a395421824a1b1941b97bfda408905bdd105b5c219b713e15506d25d98fa48e965228f8daab286dc1be14a387f567c0b58b
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.97.ebuild b/mail-mta/exim/exim-4.97.ebuild
new file mode 100644
index ..93fa8745430f
--- /dev/null
+++ b/mail-mta/exim/exim-4.97.ebuild
@@ -0,0 +1,633 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs pam systemd
+
+IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
+dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
+socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   dkim? ( ssl !gnutls )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   || ( berkdb gdbm tdb )
+"
+# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked

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

[Fabian Groffen]

commit: c48d21f54a2936e6e443e8c12b048b5f167f55c3
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Oct 15 20:10:51 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Oct 15 20:10:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48d21f5

mail-mta/exim-4.96.2: version bump for security fixes

Bug: https://bugs.gentoo.org/914923
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest   |   2 +
 mail-mta/exim/exim-4.96.2.ebuild | 655 +++
 2 files changed, 657 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 08e3a5320cb6..c253fa5f9734 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,8 +1,10 @@
 DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 
684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046
 SHA512 
5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
 DIST exim-4.96-gentoo-patches-r0.tar.xz 13308 BLAKE2B 
e01cd8b90593329d858cced27bea9da4860e80500c0b0b3f86418931a77616ac1e4a532cfffc551de5844bfcbcd115c1591b28577c234beb551458dc0877e764
 SHA512 
0a8d7b5903c8cd7c2cc07e4ea3ed62200ee0116fe0b5513ec97ba7f3ab1dd5cd0dc181eb93c3c1c7f767be7df3546ac07b622a8f4352eb883323c3a005a1c7db
 DIST exim-4.96.1.tar.xz 1879404 BLAKE2B 
fc6425be41ef7722f7d7b6b541c01774a4bafe55ca38152dc3fbb837e00ea52fabc39a42fcbf0500f4e0eda40deec3cbb0d746da9700a4a615f9ee4869e325c5
 SHA512 
ef1a0e57c59cdf4e915b3ac5dcdbc69f565b14dd92b0527f6796b2c46a9ec34f991f9790fb4171c99417f7e482cdd62d77e780cc71fab227c8bed876103f7fdd
+DIST exim-4.96.2.tar.xz 1879896 BLAKE2B 
f172340e5f896dc1996e4e3cf46515c2336c47d3390524ca91cb9ef7258a62b83426592de582aa792584cbeaace519b4edea5e62b3ebeb8e5f599379255e04a5
 SHA512 
dc9f6a114e64ac826489edff88d50a24195b64714428e691c10a7bfb119b3ebb6455bf80cbb34dfd0a4e2e44cbde72effb009357a8e0a6065e512fe32092e3ed
 DIST exim-4.96.tar.xz 1879152 BLAKE2B 
4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a52cddd24fdd452daa76c84e471d4f8f278cf951d1503b01fd46fc3e6858d6feded09f34253d2cf2ae99b45a
 SHA512 
6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
 DIST exim-pdf-4.96.1.tar.xz 2132252 BLAKE2B 
7e6d756630211b6465f9162c7a6b461774b3999ad8c3c1ace157a39b7e07f86644d206c5687991b6098aec47445319def44ddb2895b2a16146f6abd1c11d47a6
 SHA512 
d39ee2f9a05326809a6e8454a108d717838dacfa42c2cade72f5937b1b44d70e70152fa75f4b4e9548cd4198d54f8a8c1323e14d7d1f9a0a23c99a53db1001b0
+DIST exim-pdf-4.96.2.tar.xz 2132268 BLAKE2B 
9104d42d742e7152d166b6158a6f060d0a29143b11e5064ecda177ead59ac66a9bb6ab3575e5bcaf7af5b49964d29b841285e67184592a8b64bab6099f4c8ac9
 SHA512 
c35eea4ab5510bba50d22813b28c9d2f5e4e2fed76993693b997f2090024dde674d58dffe044cb64642bf57b83fcae3bfc3dbcae43288fae11692ee49374df74
 DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 
7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081
 SHA512 
05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.96.2.ebuild b/mail-mta/exim/exim-4.96.2.ebuild
new file mode 100644
index ..2fb3f6b6970a
--- /dev/null
+++ b/mail-mta/exim/exim-4.96.2.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs pam systemd
+
+IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
+dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
+socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   dkim? ( ssl !gnutls )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   || ( berkdb gdbm tdb )
+"
+# 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 

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

[Fabian Groffen]

commit: a8673898da41a5934c0b6124d53f36413e85a239
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Oct  2 12:55:42 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Oct  2 12:56:33 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8673898

mail-mta/exim-4.96.1: version bump for security

Bug: https://bugs.gentoo.org/914923
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest   |   2 +
 mail-mta/exim/exim-4.96.1.ebuild | 655 +++
 2 files changed, 657 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 079903b715c8..08e3a5320cb6 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,6 +1,8 @@
 DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 
684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046
 SHA512 
5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
 DIST exim-4.96-gentoo-patches-r0.tar.xz 13308 BLAKE2B 
e01cd8b90593329d858cced27bea9da4860e80500c0b0b3f86418931a77616ac1e4a532cfffc551de5844bfcbcd115c1591b28577c234beb551458dc0877e764
 SHA512 
0a8d7b5903c8cd7c2cc07e4ea3ed62200ee0116fe0b5513ec97ba7f3ab1dd5cd0dc181eb93c3c1c7f767be7df3546ac07b622a8f4352eb883323c3a005a1c7db
+DIST exim-4.96.1.tar.xz 1879404 BLAKE2B 
fc6425be41ef7722f7d7b6b541c01774a4bafe55ca38152dc3fbb837e00ea52fabc39a42fcbf0500f4e0eda40deec3cbb0d746da9700a4a615f9ee4869e325c5
 SHA512 
ef1a0e57c59cdf4e915b3ac5dcdbc69f565b14dd92b0527f6796b2c46a9ec34f991f9790fb4171c99417f7e482cdd62d77e780cc71fab227c8bed876103f7fdd
 DIST exim-4.96.tar.xz 1879152 BLAKE2B 
4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a52cddd24fdd452daa76c84e471d4f8f278cf951d1503b01fd46fc3e6858d6feded09f34253d2cf2ae99b45a
 SHA512 
6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
+DIST exim-pdf-4.96.1.tar.xz 2132252 BLAKE2B 
7e6d756630211b6465f9162c7a6b461774b3999ad8c3c1ace157a39b7e07f86644d206c5687991b6098aec47445319def44ddb2895b2a16146f6abd1c11d47a6
 SHA512 
d39ee2f9a05326809a6e8454a108d717838dacfa42c2cade72f5937b1b44d70e70152fa75f4b4e9548cd4198d54f8a8c1323e14d7d1f9a0a23c99a53db1001b0
 DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 
7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081
 SHA512 
05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.96.1.ebuild b/mail-mta/exim/exim-4.96.1.ebuild
new file mode 100644
index ..2fb3f6b6970a
--- /dev/null
+++ b/mail-mta/exim/exim-4.96.1.ebuild
@@ -0,0 +1,655 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit db-use toolchain-funcs pam systemd
+
+IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
+dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
+socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
+REQUIRED_USE="
+   arc? ( dkim spf )
+   dane? ( ssl !gnutls )
+   dmarc? ( dkim spf )
+   dkim? ( ssl !gnutls )
+   gnutls? ( ssl )
+   pkcs11? ( ssl )
+   || ( berkdb gdbm tdb )
+"
+# 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.
+# We cannot express a required use for berkdb/gdbm/tdb correctly because
+# berkdb and gdbm are both enabled in base profile
+
+SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
+[[ ${PV} == *.*.*.* ]] && echo /fixes)
+COMM_URI="https://downloads.exim.org/exim4${SDIR};
+
+GPV="r0"
+DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
+SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
+   

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

[Jakov Smolić]

commit: f68d53bc06fe9c44a208080d88c4d8688004b224
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sun Jul 16 20:22:03 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Jul 16 20:22:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68d53bc

mail-mta/exim: Stabilize 4.96-r4 ppc64, #909016

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.96-r4.ebuild 
b/mail-mta/exim/exim-4.96-r4.ebuild
index 31c5c926a115..503519b18ac5 100644
--- a/mail-mta/exim/exim-4.96-r4.ebuild
+++ b/mail-mta/exim/exim-4.96-r4.ebuild
@@ -42,7 +42,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Jakov Smolić]

commit: 213864f9818ce2669dfb96473026379bb78d634a
Author: Jakov Smolić  gentoo  org>
AuthorDate: Wed Jul 12 06:39:36 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Wed Jul 12 06:39:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=213864f9

mail-mta/exim: Stabilize 4.96-r4 x86, #909016

Signed-off-by: Jakov Smolić  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.96-r4.ebuild 
b/mail-mta/exim/exim-4.96-r4.ebuild
index bbe904bb0e96..31c5c926a115 100644
--- a/mail-mta/exim/exim-4.96-r4.ebuild
+++ b/mail-mta/exim/exim-4.96-r4.ebuild
@@ -42,7 +42,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Sam James]

commit: cbd9cc827951eb7ce3a1dfc1e7a9e522018f3180
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 27 17:04:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 27 17:04:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd9cc82

mail-mta/exim: Stabilize 4.96-r4 amd64, #909016

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.96-r4.ebuild 
b/mail-mta/exim/exim-4.96-r4.ebuild
index 917fe92baec2..bbe904bb0e96 100644
--- a/mail-mta/exim/exim-4.96-r4.ebuild
+++ b/mail-mta/exim/exim-4.96-r4.ebuild
@@ -42,7 +42,7 @@ HOMEPAGE="https://www.exim.org/;
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre2:=

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

[Fabian Groffen]

commit: 51094e6bcf42daf4ec7b2757457039b9ba21c84c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jun  5 18:36:50 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jun  5 18:39:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51094e6b

mail-mta/exim-4.96-r4: revbump to fix compilation issue #907870

Enable exiscan patch by default for the regex_vars infra builds on it
(via our patches).  So simplify the world somewhat by making the feature
non-optional.

Closes: https://bugs.gentoo.org/907870
Signed-off-by: Fabian Groffen  gentoo.org>

 .../exim/{exim-4.96-r3.ebuild => exim-4.96-r4.ebuild} | 15 ++-
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/mail-mta/exim/exim-4.96-r3.ebuild 
b/mail-mta/exim/exim-4.96-r4.ebuild
similarity index 98%
rename from mail-mta/exim/exim-4.96-r3.ebuild
rename to mail-mta/exim/exim-4.96-r4.ebuild
index b9f58258caa4..8a6457798562 100644
--- a/mail-mta/exim/exim-4.96-r3.ebuild
+++ b/mail-mta/exim/exim-4.96-r4.ebuild
@@ -6,7 +6,7 @@ EAPI="7"
 inherit db-use toolchain-funcs pam systemd
 
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
-dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+dsn gdbm gnutls idn ipv6 ldap lmtp maildir mbx
 mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
 socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="
@@ -16,8 +16,6 @@ REQUIRED_USE="
dkim? ( ssl !gnutls )
gnutls? ( ssl )
pkcs11? ( ssl )
-   spf? ( exiscan-acl )
-   srs? ( exiscan-acl )
|| ( berkdb gdbm tdb )
 "
 # NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
@@ -196,6 +194,7 @@ src_configure() {
PID_FILE_PATH=${EPREFIX}/run/exim.pid
SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim
HAVE_ICONV=yes
+   WITH_CONTENT_SCAN=yes
EOC
 
# configure db implementation, Exim always needs one for its hints
@@ -356,13 +355,6 @@ src_configure() {
# features
#
 
-   # content scanning support
-   if use exiscan-acl; then
-   cat >> Makefile <<- EOC
-   WITH_CONTENT_SCAN=yes
-   EOC
-   fi
-
# DomainKeys Identified Mail, RFC4871
if ! use dkim; then
# DKIM is enabled by default
@@ -595,9 +587,6 @@ src_install() {
# conf files
insinto /etc/exim
newins "${S}"/src/configure.default exim.conf.dist
-   if use exiscan-acl; then
-   newins "${S}"/src/configure.default exim.conf.exiscan-acl
-   fi
doins "${WORKDIR}"/system_filter.exim
doins "${FILESDIR}"/auth_conf.sub
 

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

[Fabian Groffen]

commit: 050f88a892c6dc4f60c338ed8da4fb953f85090e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat May 27 09:24:25 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat May 27 09:24:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=050f88a8

mail-mta/exim-4.96-r3: move 4.96 patches into tarball

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

 mail-mta/exim/Manifest |   1 +
 mail-mta/exim/exim-4.96-r3.ebuild  |  33 +--
 mail-mta/exim/files/exim-4.96-dane-dns_again.patch |  81 ---
 .../exim/files/exim-4.96-deamon-startup-fix.patch  |  53 -
 .../files/exim-4.96-dmarc_use_after_free.patch |  31 ---
 .../exim/files/exim-4.96-expansion-crash.patch |  69 --
 .../exim/files/exim-4.96-openssl-bad-alpn.patch| 101 -
 .../files/exim-4.96-openssl-double-expansion.patch | 217 ---
 .../files/exim-4.96-openssl-tls_eccurve-lt-3.patch |  44 
 .../exim-4.96-openssl-tls_eccurve-setting.patch| 169 ---
 .../exim/files/exim-4.96-openssl-verify-ocsp.patch | 232 -
 .../exim/files/exim-4.96-recursion-dns_again.patch |  57 -
 .../files/exim-4.96-regex-use-after-free.patch | 173 ---
 .../exim-4.96-rewrite-malformed-addr-fix.patch |  42 
 .../files/exim-4.96-spf-memory-error-fix.patch |  25 ---
 .../exim/files/exim-4.96-transport-crash.patch |  27 ---
 16 files changed, 20 insertions(+), 1335 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 254aa57e04a2..079903b715c8 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,4 +1,5 @@
 DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 
684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046
 SHA512 
5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
+DIST exim-4.96-gentoo-patches-r0.tar.xz 13308 BLAKE2B 
e01cd8b90593329d858cced27bea9da4860e80500c0b0b3f86418931a77616ac1e4a532cfffc551de5844bfcbcd115c1591b28577c234beb551458dc0877e764
 SHA512 
0a8d7b5903c8cd7c2cc07e4ea3ed62200ee0116fe0b5513ec97ba7f3ab1dd5cd0dc181eb93c3c1c7f767be7df3546ac07b622a8f4352eb883323c3a005a1c7db
 DIST exim-4.96.tar.xz 1879152 BLAKE2B 
4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a52cddd24fdd452daa76c84e471d4f8f278cf951d1503b01fd46fc3e6858d6feded09f34253d2cf2ae99b45a
 SHA512 
6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
 DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 
7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081
 SHA512 
05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1

diff --git a/mail-mta/exim/exim-4.96-r3.ebuild 
b/mail-mta/exim/exim-4.96-r3.ebuild
index 646aa80b8ade..b9f58258caa4 100644
--- a/mail-mta/exim/exim-4.96-r3.ebuild
+++ b/mail-mta/exim/exim-4.96-r3.ebuild
@@ -34,8 +34,10 @@ SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
 [[ ${PV} == *.*.*.* ]] && echo /fixes)
 COMM_URI="https://downloads.exim.org/exim4${SDIR};
 
+GPV="r0"
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"
 SRC_URI="${COMM_URI}/${P//_rc/-RC}.tar.xz
+   
https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches-${GPV}.tar.xz
mirror://gentoo/system_filter.exim.gz
doc? ( ${COMM_URI}/${PN}-pdf-${PV//_rc/-RC}.tar.xz )"
 HOMEPAGE="https://www.exim.org/;
@@ -116,20 +118,23 @@ src_prepare() {
eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply "${FILESDIR}"/exim-4.95-localscan_dlopen.patch
-   eapply "${FILESDIR}"/exim-4.96-rewrite-malformed-addr-fix.patch # 
upstr
-   eapply "${FILESDIR}"/exim-4.96-spf-memory-error-fix.patch # upstr
-   eapply "${FILESDIR}"/exim-4.96-regex-use-after-free.patch # upstr
-   eapply -p2 "${FILESDIR}"/exim-4.96-dmarc_use_after_free.patch # upstr
-   eapply "${FILESDIR}"/exim-4.96-deamon-startup-fix.patch # upstr
-   eapply "${FILESDIR}"/exim-4.96-openssl-verify-ocsp.patch # upstr
-   eapply "${FILESDIR}"/exim-4.96-openssl-double-expansion.patch # 
upstr
-   eapply "${FILESDIR}"/exim-4.96-recursion-dns_again.patch # upstr
-   eapply "${FILESDIR}"/exim-4.96-openssl-tls_eccurve-setting.patch # 
upstr
-   eapply 

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

[Fabian Groffen]

commit: b03890e439529ef3bed2bb111f93687065dd54bb
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat May 27 08:54:10 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat May 27 08:55:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03890e4

mail-mta/exim-4.96-r3: add a bunch of upstream patches

Try to fix a bunch of crashes and problem with upstream fixes inspired
by Debian packaging.

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

 .../{exim-4.96-r2.ebuild => exim-4.96-r3.ebuild}   |  24 ++-
 mail-mta/exim/files/exim-4.96-dane-dns_again.patch |  81 +++
 .../exim/files/exim-4.96-deamon-startup-fix.patch  |  53 +
 .../exim/files/exim-4.96-expansion-crash.patch |  69 ++
 .../exim/files/exim-4.96-openssl-bad-alpn.patch| 101 +
 .../files/exim-4.96-openssl-double-expansion.patch | 217 +++
 .../files/exim-4.96-openssl-tls_eccurve-lt-3.patch |  44 
 .../exim-4.96-openssl-tls_eccurve-setting.patch| 169 +++
 .../exim/files/exim-4.96-openssl-verify-ocsp.patch | 232 +
 .../exim/files/exim-4.96-recursion-dns_again.patch |  57 +
 .../files/exim-4.96-regex-use-after-free.patch | 173 +++
 .../exim-4.96-rewrite-malformed-addr-fix.patch |  42 
 .../files/exim-4.96-spf-memory-error-fix.patch |  25 +++
 .../exim/files/exim-4.96-transport-crash.patch |  27 +++
 14 files changed, 1308 insertions(+), 6 deletions(-)

diff --git a/mail-mta/exim/exim-4.96-r2.ebuild 
b/mail-mta/exim/exim-4.96-r3.ebuild
similarity index 93%
rename from mail-mta/exim/exim-4.96-r2.ebuild
rename to mail-mta/exim/exim-4.96-r3.ebuild
index e6c19640021e..646aa80b8ade 100644
--- a/mail-mta/exim/exim-4.96-r2.ebuild
+++ b/mail-mta/exim/exim-4.96-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -116,7 +116,20 @@ src_prepare() {
eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply "${FILESDIR}"/exim-4.95-localscan_dlopen.patch
+   eapply "${FILESDIR}"/exim-4.96-rewrite-malformed-addr-fix.patch # 
upstr
+   eapply "${FILESDIR}"/exim-4.96-spf-memory-error-fix.patch # upstr
+   eapply "${FILESDIR}"/exim-4.96-regex-use-after-free.patch # upstr
eapply -p2 "${FILESDIR}"/exim-4.96-dmarc_use_after_free.patch # upstr
+   eapply "${FILESDIR}"/exim-4.96-deamon-startup-fix.patch # upstr
+   eapply "${FILESDIR}"/exim-4.96-openssl-verify-ocsp.patch # upstr
+   eapply "${FILESDIR}"/exim-4.96-openssl-double-expansion.patch # 
upstr
+   eapply "${FILESDIR}"/exim-4.96-recursion-dns_again.patch # upstr
+   eapply "${FILESDIR}"/exim-4.96-openssl-tls_eccurve-setting.patch # 
upstr
+   eapply "${FILESDIR}"/exim-4.96-openssl-tls_eccurve-lt-3.patch # 
upstr
+   eapply "${FILESDIR}"/exim-4.96-openssl-bad-alpn.patch # upstr
+   eapply "${FILESDIR}"/exim-4.96-dane-dns_again.patch # upstr
+   eapply "${FILESDIR}"/exim-4.96-expansion-crash.patch # upstr
+   eapply "${FILESDIR}"/exim-4.96-transport-crash.patch # upstr
 
# oddity, they disable berkdb as hack, and then throw an error when
# berkdb isn't enabled
@@ -125,11 +138,10 @@ src_prepare() {
-e 's/define DB void/define DONTMESS void/' \
src/auths/call_radius.c || die
 
-   # for this reason we have a := dep on opendmarc, they changed their
-   # API in a minor release
-   if use dmarc && has_version ">=mail-filter/opendmarc-1.4" ; then
-   eapply "${FILESDIR}"/exim-4.94-opendmarc-1.4.patch
-   fi
+   # API changed from 1.3 to 1.4, upstream doesn't think 1.4 should be
+   # used, but 1.3 has a CVE and Gentoo (like most downstreams) only
+   # has 1.4 available
+   eapply "${FILESDIR}"/exim-4.94-opendmarc-1.4.patch
 
if use maildir ; then
eapply "${FILESDIR}"/exim-4.94-maildir.patch

diff --git a/mail-mta/exim/files/exim-4.96-dane-dns_again.patch 
b/mail-mta/exim/files/exim-4.96-dane-dns_again.patch
new file mode 100644
index ..9bd94f784594
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.96-dane-dns_again.patch
@@ -0,0 +1,81 @@
+modified for Gentoo, removed Changelog due to conflicts
+
+From 30520c8f87fcf660ed99a2344cae7f9787f7bc89 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Thu, 5 Jan 2023 18:39:51 +
+Subject: [PATCH 3/3] DANE: do not check dns_again_means_nonexist for TLSA
+ results of TRY_AGAIN
+
+---
+ doc/doc-docbook/spec.xfpt |  7 ++-
+ doc/ChangeLog |  4 
+ src/dns.c | 35 ++-
+ 3 files changed, 32 insertions(+), 14 deletions(-)
+
+--- a/src/dns.c
 b/src/dns.c
+@@ -904,25 +904,34 @@ if (dnsa->answerlen < 0) switch (h_errno
+   

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

[Fabian Groffen]

commit: d4637e8d3a6d78bfb956570ddf9b03236f3620c0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Jan  3 10:22:20 2023 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Jan  3 10:22:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4637e8d

mail-mta/exim-4.94.2-r12: update openssl-3 patches

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

 ...im-4.94.2-r11.ebuild => exim-4.94.2-r12.ebuild} |   2 +-
 mail-mta/exim/files/exim-4.94.2-openssl3.patch | 306 -
 2 files changed, 303 insertions(+), 5 deletions(-)

diff --git a/mail-mta/exim/exim-4.94.2-r11.ebuild 
b/mail-mta/exim/exim-4.94.2-r12.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.94.2-r11.ebuild
rename to mail-mta/exim/exim-4.94.2-r12.ebuild
index 352ae0cdcd7e..a347cf1581f6 100644
--- a/mail-mta/exim/exim-4.94.2-r11.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r12.ebuild
@@ -122,7 +122,7 @@ src_prepare() {
eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
eapply "${FILESDIR}"/exim-4.94.2-fix-crash-resolve.patch # 799368 
upstr
eapply "${FILESDIR}"/exim-4.94-CVE-2022-3559.patch  # 877607 upstr
-   eapply "${FILESDIR}"/exim-4.94.2-openssl3.patch # 888619 backport
+   eapply "${FILESDIR}"/exim-4.94.2-openssl3.patch # 888619 backports
 
# for this reason we have a := dep on opendmarc, they changed their
# API in a minor release

diff --git a/mail-mta/exim/files/exim-4.94.2-openssl3.patch 
b/mail-mta/exim/files/exim-4.94.2-openssl3.patch
index d1102aac8bfa..f9758515bef1 100644
--- a/mail-mta/exim/files/exim-4.94.2-openssl3.patch
+++ b/mail-mta/exim/files/exim-4.94.2-openssl3.patch
@@ -1,13 +1,34 @@
-Based on original commit, but applied to 4.94.2 tarball.
+Original commits from upstream applied to 4.94.2 release tarball
+
+From a5d79c99f4948d9fd288a1bfaca3a44cf2caaa32 Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Wed, 1 Dec 2021 17:36:18 +
+Subject: [PATCH] OpenSSL: use nondeprecated D-H functions under 3.0.0.
+
+From c6a290f4d8df3734b3cdc2232b4334ff8386c1da Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Wed, 1 Dec 2021 18:52:21 +
+Subject: [PATCH] OpenSSL: tidy DH and ECDH param setup Testsuite: expand DH
+ testcase
 
 From ff7829398d74e67f1c1f40339a772fd76708e5ac Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= 
 Date: Sat, 27 Nov 2021 21:07:15 +
 Subject: [PATCH] Fix build for OpenSSL 3.0.0 .  Bug 2810
 

- src/src/tls-openssl.c | 10 +++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+From ca4014de81e6aa367aa0a54c49b4c3d4b137814c Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Sun, 1 Jan 2023 12:18:38 +
+Subject: [PATCH] OpenSSL: fix tls_eccurve setting explicit curve/group.  Bug
+ 2954
+
+From 7fa5764c203f2f4a900898a79ed02d674075313f Mon Sep 17 00:00:00 2001
+From: Jeremy Harris 
+Date: Mon, 2 Jan 2023 15:04:14 +
+Subject: [PATCH] OpenSSL: Fix tls_eccurve on earlier versions than 3.0.0.  Bug
+ 2954
+
+Broken-by: ca4014de81e6
 
 --- a/src/tls-openssl.c
 +++ b/src/tls-openssl.c
@@ -32,3 +53,280 @@ Subject: [PATCH] Fix build for OpenSSL 3.0.0 .  Bug 2810
  #endif
  #ifdef SSL_OP_NO_TLSv1_2
{ US"no_tlsv1_2", SSL_OP_NO_TLSv1_2 },
+@@ -1017,23 +1021,27 @@
+ */
+ 
+ /* If dhparam is set, expand it, and load up the parameters for DH encryption.
++Server only.
+ 
+ Arguments:
+   sctx  The current SSL CTX (inbound or outbound)
+   dhparam   DH parameter file or fixed parameter identity string
+-  host  connected host, if client; NULL if server
+   errstrerror string pointer
+ 
+ Returns:TRUE if OK (nothing to set up, or setup worked)
+ */
+ 
+ static BOOL
+-init_dh(SSL_CTX *sctx, uschar *dhparam, const host_item *host, uschar ** 
errstr)
++init_dh(SSL_CTX * sctx, uschar * dhparam, uschar ** errstr)
+ {
+-BIO *bio;
+-DH *dh;
+-uschar *dhexpanded;
+-const char *pem;
++BIO * bio;
++#if OPENSSL_VERSION_NUMBER < 0x3000L
++DH * dh;
++#else
++EVP_PKEY * pkey;
++#endif
++uschar * dhexpanded;
++const char * pem;
+ int dh_bitsize;
+ 
+ if (!expand_check(dhparam, US"tls_dhparam", , errstr))
+@@ -1046,7 +1054,7 @@
+   if (!(bio = BIO_new_file(CS dhexpanded, "r")))
+ {
+ tls_error(string_sprintf("could not read dhparams file %s", dhexpanded),
+-  host, US strerror(errno), errstr);
++  NULL, US strerror(errno), errstr);
+ return FALSE;
+ }
+   }
+@@ -1061,17 +1069,23 @@
+   if (!(pem = std_dh_prime_named(dhexpanded)))
+ {
+ tls_error(string_sprintf("Unknown standard DH prime \"%s\"", dhexpanded),
+-host, US strerror(errno), errstr);
++NULL, US strerror(errno), errstr);
+ return FALSE;
+ }
+   bio = BIO_new_mem_buf(CS pem, -1);
+   }
+ 
+-if (!(dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL)))
++if (!(
++#if OPENSSL_VERSION_NUMBER < 0x3000L
++  dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL)
++#else
++ 

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

[Fabian Groffen]

commit: e44efacab8c0d769cd1b6145e14bba16b109c094
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 27 20:31:29 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 27 20:33:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44efaca

mail-mta/exim-4.94.2-r11: backport OpenSSL3 patch from 4.96

Closes: https://bugs.gentoo.org/888619
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.94.2-r11.ebuild   |  1 +
 mail-mta/exim/files/exim-4.94.2-openssl3.patch | 34 ++
 2 files changed, 35 insertions(+)

diff --git a/mail-mta/exim/exim-4.94.2-r11.ebuild 
b/mail-mta/exim/exim-4.94.2-r11.ebuild
index c62c296b2534..352ae0cdcd7e 100644
--- a/mail-mta/exim/exim-4.94.2-r11.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r11.ebuild
@@ -122,6 +122,7 @@ src_prepare() {
eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
eapply "${FILESDIR}"/exim-4.94.2-fix-crash-resolve.patch # 799368 
upstr
eapply "${FILESDIR}"/exim-4.94-CVE-2022-3559.patch  # 877607 upstr
+   eapply "${FILESDIR}"/exim-4.94.2-openssl3.patch # 888619 backport
 
# for this reason we have a := dep on opendmarc, they changed their
# API in a minor release

diff --git a/mail-mta/exim/files/exim-4.94.2-openssl3.patch 
b/mail-mta/exim/files/exim-4.94.2-openssl3.patch
new file mode 100644
index ..d1102aac8bfa
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.94.2-openssl3.patch
@@ -0,0 +1,34 @@
+Based on original commit, but applied to 4.94.2 tarball.
+
+From ff7829398d74e67f1c1f40339a772fd76708e5ac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= 
+Date: Sat, 27 Nov 2021 21:07:15 +
+Subject: [PATCH] Fix build for OpenSSL 3.0.0 .  Bug 2810
+
+---
+ src/src/tls-openssl.c | 10 +++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+--- a/src/tls-openssl.c
 b/src/tls-openssl.c
+@@ -227,12 +227,16 @@
+   { US"no_tlsv1", SSL_OP_NO_TLSv1 },
+ #endif
+ #ifdef SSL_OP_NO_TLSv1_1
+-#if SSL_OP_NO_TLSv1_1 == 0x0400L
++# if OPENSSL_VERSION_NUMBER < 0x3000L
++#  if SSL_OP_NO_TLSv1_1 == 0x0400L
+   /* Error in chosen value in 1.0.1a; see first item in CHANGES for 1.0.1b */
+-#warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
+-#else
++#   warning OpenSSL 1.0.1a uses a bad value for SSL_OP_NO_TLSv1_1, ignoring
++#   define NO_SSL_OP_NO_TLSv1_1
++#  endif
++# endif
++# ifndef NO_SSL_OP_NO_TLSv1_1
+   { US"no_tlsv1_1", SSL_OP_NO_TLSv1_1 },
+-#endif
++# endif
+ #endif
+ #ifdef SSL_OP_NO_TLSv1_2
+   { US"no_tlsv1_2", SSL_OP_NO_TLSv1_2 },

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

[Fabian Groffen]

commit: a3d8d8adbd38e235b75232ac2e42741d03e0de65
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Oct 19 12:50:54 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Oct 19 12:52:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d8d8ad

mail-mta/exim-4.94.2-r11: 3rd attempt at CVE patch

Fix another combination in which the code can be compiled.  Hopefully
3rd time is the charm or something.

Closes: https://bugs.gentoo.org/877641
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/{exim-4.94.2-r10.ebuild => exim-4.94.2-r11.ebuild} | 0
 mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch| 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.94.2-r10.ebuild 
b/mail-mta/exim/exim-4.94.2-r11.ebuild
similarity index 100%
rename from mail-mta/exim/exim-4.94.2-r10.ebuild
rename to mail-mta/exim/exim-4.94.2-r11.ebuild

diff --git a/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch 
b/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
index 8793514b8fb7..533aaf1f9e51 100644
--- a/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
+++ b/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
@@ -69,7 +69,7 @@ Subject: [PATCH 1/1] Fix $regex use-after-free.  Bug 2915
  
  /* precompile our regexes */
  if (!(re_list_head = compile(*listptr)))
-@@ -213,3 +205,12 @@
+@@ -213,3 +205,14 @@
  }
  
  #endif /* WITH_CONTENT_SCAN */
@@ -78,7 +78,9 @@ Subject: [PATCH 1/1] Fix $regex use-after-free.  Bug 2915
 +void
 +regex_vars_clear(void)
 +{
++#ifdef WITH_CONTENT_SCAN
 +regex_match_string = NULL;
++#endif
 +for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
 +}
 +

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

[Fabian Groffen]

commit: c1ee45f74e9ab5f27b279d1a604f6dc71f7685b7
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Oct 19 09:18:29 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Oct 19 09:20:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1ee45f7

mail-mta/exim-4.94.2-r10: revbump to fix compilation with exiscan

The CVE patch broke compilation when content scanning is not enabled.
Ensure the regex_vars_clear function is always built.

Closes: https://bugs.gentoo.org/877633
Signed-off-by: Fabian Groffen  gentoo.org>

 ...xim-4.94.2-r9.ebuild => exim-4.94.2-r10.ebuild} |  0
 mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch  | 28 ++
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/mail-mta/exim/exim-4.94.2-r9.ebuild 
b/mail-mta/exim/exim-4.94.2-r10.ebuild
similarity index 100%
rename from mail-mta/exim/exim-4.94.2-r9.ebuild
rename to mail-mta/exim/exim-4.94.2-r10.ebuild

diff --git a/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch 
b/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
index 9617c70d9e57..8793514b8fb7 100644
--- a/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
+++ b/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
@@ -50,21 +50,6 @@ Subject: [PATCH 1/1] Fix $regex use-after-free.  Bug 2915
  #endif
 --- exim-4.94.2/src/regex.c2021-04-30 14:08:21.0 +0200
 +++ exim-4.94.2/src/regex.c2022-10-19 09:35:03.229084750 +0200
-@@ -87,6 +87,14 @@
- return FAIL;
- }
- 
-+/* reset expansion variables */
-+void
-+regex_vars_clear(void)
-+{
-+regex_match_string = NULL;
-+for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
-+}
-+
- int
- regex(const uschar **listptr)
- {
 @@ -98,7 +106,7 @@
  int ret = FAIL;
  
@@ -84,6 +69,19 @@ Subject: [PATCH 1/1] Fix $regex use-after-free.  Bug 2915
  
  /* precompile our regexes */
  if (!(re_list_head = compile(*listptr)))
+@@ -213,3 +205,12 @@
+ }
+ 
+ #endif /* WITH_CONTENT_SCAN */
++
++/* reset expansion variables */
++void
++regex_vars_clear(void)
++{
++regex_match_string = NULL;
++for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
++}
++
 --- exim-4.94.2/src/smtp_in.c  2021-04-30 14:08:21.0 +0200
 +++ exim-4.94.2/src/smtp_in.c  2022-10-19 09:15:58.613447975 +0200
 @@ -2161,8 +2161,10 @@

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

[Fabian Groffen]

commit: b74dc7a9c13b34133d3691993afdbebd7dd0f59e
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Oct 19 07:51:00 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Oct 19 07:53:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b74dc7a9

mail-mta/exim: revbumps for use-after-free fixes, CVE-2022-3559, cleanup

Bug: https://bugs.gentoo.org/877607
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.94.2-r7.ebuild| 11 +--
 ...exim-4.94.2-r8.ebuild => exim-4.94.2-r9.ebuild} | 12 +--
 .../{exim-4.96-r1.ebuild => exim-4.96-r2.ebuild}   | 12 +--
 mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch  | 99 ++
 .../files/exim-4.96-dmarc_use_after_free.patch | 31 +++
 5 files changed, 141 insertions(+), 24 deletions(-)

diff --git a/mail-mta/exim/exim-4.94.2-r7.ebuild 
b/mail-mta/exim/exim-4.94.2-r7.ebuild
index 4d949c4c4c01..2c3b5101c59f 100644
--- a/mail-mta/exim/exim-4.94.2-r7.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit db-use toolchain-funcs multilib pam systemd
+inherit db-use toolchain-funcs pam systemd
 
 IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr 
proxy radius redis sasl selinux spf sqlite srs +srs-alt srs-native +ssl syslog 
tcpd +tpda X"
 REQUIRED_USE="
@@ -89,18 +89,13 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
!mail-mta/courier
!mail-mta/esmtp
-   !mail-mta/mini-qmail
-   !=mail-mta/msmtp-1.4.19-r1[mta]
+   !mail-mta/msmtp[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
+   !mail-mta/ssmtp[mta]
>=net-mail/mailbase-0.00-r5
virtual/logger
dcc? ( mail-filter/dcc )

diff --git a/mail-mta/exim/exim-4.94.2-r8.ebuild 
b/mail-mta/exim/exim-4.94.2-r9.ebuild
similarity index 98%
rename from mail-mta/exim/exim-4.94.2-r8.ebuild
rename to mail-mta/exim/exim-4.94.2-r9.ebuild
index 7cce1a0a02e3..c62c296b2534 100644
--- a/mail-mta/exim/exim-4.94.2-r8.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit db-use toolchain-funcs multilib pam systemd
+inherit db-use toolchain-funcs pam systemd
 
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
@@ -97,18 +97,13 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
!mail-mta/courier
!mail-mta/esmtp
-   !mail-mta/mini-qmail
-   !=mail-mta/msmtp-1.4.19-r1[mta]
+   !mail-mta/msmtp[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
+   !mail-mta/ssmtp[mta]
>=net-mail/mailbase-0.00-r5
virtual/logger
dcc? ( mail-filter/dcc )
@@ -126,6 +121,7 @@ src_prepare() {
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
eapply "${FILESDIR}"/exim-4.94.2-fix-crash-resolve.patch # 799368 
upstr
+   eapply "${FILESDIR}"/exim-4.94-CVE-2022-3559.patch  # 877607 upstr
 
# for this reason we have a := dep on opendmarc, they changed their
# API in a minor release

diff --git a/mail-mta/exim/exim-4.96-r1.ebuild 
b/mail-mta/exim/exim-4.96-r2.ebuild
similarity index 98%
rename from mail-mta/exim/exim-4.96-r1.ebuild
rename to mail-mta/exim/exim-4.96-r2.ebuild
index 719ead900410..739a2fcdea96 100644
--- a/mail-mta/exim/exim-4.96-r1.ebuild
+++ b/mail-mta/exim/exim-4.96-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit db-use toolchain-funcs multilib pam systemd
+inherit db-use toolchain-funcs pam systemd
 
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
@@ -93,18 +93,13 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
!mail-mta/courier
!mail-mta/esmtp
-   !mail-mta/mini-qmail
-   !=mail-mta/msmtp-1.4.19-r1[mta]
+   !mail-mta/msmtp[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
+   !mail-mta/ssmtp[mta]
>=net-mail/mailbase-0.00-r5
virtual/logger
dcc? ( mail-filter/dcc )
@@ -121,6 +116,7 @@ src_prepare() {
eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply 

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

[Fabian Groffen]

commit: 8178c3c1238395b7112fca6c6b70311cdac19247
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Jul  2 07:32:47 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Jul  2 07:32:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8178c3c1

mail-mta/exim-4.96-r1: drop srs-alt/srs-native flags

Only the native implementation is available in 4.96

Closes: https://bugs.gentoo.org/855608
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.96-r1.ebuild | 39 ++-
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/mail-mta/exim/exim-4.96-r1.ebuild 
b/mail-mta/exim/exim-4.96-r1.ebuild
index 1d04cbc97f35..719ead900410 100644
--- a/mail-mta/exim/exim-4.96-r1.ebuild
+++ b/mail-mta/exim/exim-4.96-r1.ebuild
@@ -8,7 +8,7 @@ inherit db-use toolchain-funcs multilib pam systemd
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
 mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
-socks5 spf sqlite srs srs-alt +srs-native +ssl syslog tdb tcpd +tpda X"
+socks5 spf sqlite srs +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )
@@ -17,10 +17,7 @@ REQUIRED_USE="
gnutls? ( ssl )
pkcs11? ( ssl )
spf? ( exiscan-acl )
-   srs? (
-   exiscan-acl
-   ^^ ( srs-alt srs-native )
-   )
+   srs? ( exiscan-acl )
|| ( berkdb gdbm tdb )
 "
 # NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked
@@ -79,7 +76,6 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
redis? ( dev-libs/hiredis:= )
spf? ( >=mail-filter/libspf2-1.2.5-r1 )
dmarc? ( mail-filter/opendmarc:= )
-   srs? ( srs-alt? ( mail-filter/libsrs_alt ) )
X? (
x11-libs/libX11
x11-libs/libXmu
@@ -491,22 +487,11 @@ src_configure() {
 
# Sender Rewriting Scheme
if use srs; then
-   # NOTE: we currently USE-default to srs-alt, because this is
-   # what USE=srs used to be.  Eventually we want to rid ourselves
-   # of this external implementation.
-   if use srs-alt; then
-   # historical default, until 4.95
-   cat >> Makefile <<- EOC
-   EXPERIMENTAL_SRS_ALT=yes
-   EXTRALIBS_EXIM += -lsrs_alt
-   EOC
-   fi
-   if use srs-native; then
-   # this one is the default/supported variant since 4.95
-   cat >> Makefile <<- EOC
-   SUPPORT_SRS=yes
-   EOC
-   fi
+   # this one is the default/supported variant since 4.95, and the
+   # only variant available since 4.96
+   cat >> Makefile <<- EOC
+   SUPPORT_SRS=yes
+   EOC
fi
 
# Delivery Sender Notifications extra information in fail message
@@ -655,13 +640,9 @@ pkg_postinst() {
einfo "documentation at the bottom of this prerelease message:"
einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579;
fi
-   if use srs-alt; then
-   einfo "SRS support using libsrs_alt is experimental in this"
-   einfo "release of Exim"
-   elog "You are using libsrs_alt to implement SRS support."
-   elog "The native SRS implementation (USE=srs-native) is the"
-   elog "default implementation, which means libsrs_alt may go"
-   elog "away in a future release."
+   if use srs; then
+   einfo "SRS support using libsrs_alt was dropped in this"
+   einfo "release of Exim, you are now using the native SRS 
implementation"
fi
use dsn && einfo "extra information in fail DSN message is experimental"
einfo

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

[Fabian Groffen]

commit: 765a79155bed3f7da479f2f595f349250267cf8a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jun 29 09:08:16 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jun 29 09:08:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765a7915

mail-mta/exim-4.96-r1: revbump for pcre2 dep change

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

 mail-mta/exim/{exim-4.96.ebuild => exim-4.96-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.96.ebuild b/mail-mta/exim/exim-4.96-r1.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.96.ebuild
rename to mail-mta/exim/exim-4.96-r1.ebuild
index 58282c3fd043..1d04cbc97f35 100644
--- a/mail-mta/exim/exim-4.96.ebuild
+++ b/mail-mta/exim/exim-4.96-r1.ebuild
@@ -48,7 +48,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 
~x86-solaris"
 
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
-   dev-libs/libpcre:=
+   dev-libs/libpcre2:=
tdb? ( sys-libs/tdb:= )
!tdb? ( berkdb? ( >=sys-libs/db-3.2:= 

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

[Fabian Groffen]

commit: 55e61781cbd303dd196719217da6b0b1a9623ac9
Author: Fabian Groffen  gentoo  org>
AuthorDate: Mon Jun 27 07:28:24 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Mon Jun 27 07:30:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e61781

mail-mta/exim-4.96: version bump

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

 mail-mta/exim/Manifest |  4 ++--
 .../exim/{exim-4.95-r1.ebuild => exim-4.96.ebuild} | 26 +++---
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index b87cdd7fa6a5..254aa57e04a2 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,5 +1,5 @@
 DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 
684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046
 SHA512 
5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
-DIST exim-4.95.tar.xz 1865172 BLAKE2B 
0dc8dbc394c1bf4c6075e6ae1c1609b3f41841b2bb4c210d7353e4ad28ab38f905b6c245539bfa772512e2a9baf2dcc855e31d6ccb14ab49077f8da4fe6f1d0b
 SHA512 
93d09c20d99f27da5edbe3e6dc7d25aa4548faa2b67ca26f2cc0b4aeaf58398dd468e0263714fcf0df97531f05d16fcd3f1f0e9d0656ead7858a66b248a44a65
+DIST exim-4.96.tar.xz 1879152 BLAKE2B 
4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a52cddd24fdd452daa76c84e471d4f8f278cf951d1503b01fd46fc3e6858d6feded09f34253d2cf2ae99b45a
 SHA512 
6b863661465a0b9897c1b71875c5196a1903cf560dd85de45b08242b9731edb2bc10eb56945d62e477e5d15cc7a8d493915bff2ca81689673a8091c66f62c89e
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
-DIST exim-pdf-4.95.tar.xz 2117384 BLAKE2B 
ac310ec7741110a067f2df135b6397a8219e48a1e8989c66118f6c62820467e6f7b1c391799ff9b7ddef7896e1340208c4bed21f126014fa94c24d338f681f94
 SHA512 
47f30f3c82fe2cb5b0836594b325da1d255c53d2514af90e720d4bf6c74cff43d4a6b1ab5fb7b148253e5330da74e8ebb80e29b3a08fbe1faed2f004476c9d6a
+DIST exim-pdf-4.96.tar.xz 2137468 BLAKE2B 
7f61767f91864c43a3b7b6ca36ec7f41da6ad7029687a38cfa9307c444c2ffbd3eb61d45645ffd20ec16ba64a37e1ff08c02e7e4e36499c7783679af9a399081
 SHA512 
05e94579631656330d95d237c58bc9fd52229a067c5846e7c3409b4c83040c9216819bcb0090673d9991fd59e2c2025340592b31b241b557c6775782106854d1
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.95-r1.ebuild b/mail-mta/exim/exim-4.96.ebuild
similarity index 97%
rename from mail-mta/exim/exim-4.95-r1.ebuild
rename to mail-mta/exim/exim-4.96.ebuild
index 79d8f53f3470..58282c3fd043 100644
--- a/mail-mta/exim/exim-4.95-r1.ebuild
+++ b/mail-mta/exim/exim-4.96.ebuild
@@ -126,6 +126,13 @@ src_prepare() {
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply "${FILESDIR}"/exim-4.95-localscan_dlopen.patch
 
+   # oddity, they disable berkdb as hack, and then throw an error when
+   # berkdb isn't enabled
+   sed -i \
+   -e 's/_DB_/_DONTMESS_/' \
+   -e 's/define DB void/define DONTMESS void/' \
+   src/auths/call_radius.c || die
+
# for this reason we have a := dep on opendmarc, they changed their
# API in a minor release
if use dmarc && has_version ">=mail-filter/opendmarc-1.4" ; then
@@ -192,7 +199,14 @@ src_configure() {
EOC
sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
-   elif use berkdb ; then
+   elif use gdbm ; then
+   cat >> Makefile <<- EOC
+   USE_GDBM=yes
+   DBMLIB = -lgdbm
+   EOC
+   sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+   sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+   else # must be berkdb via required_use
# 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"
@@ -204,13 +218,6 @@ src_configure() {
EOC
sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
-   else # must be gdbm via required_use
-   cat >> Makefile <<- EOC
-   USE_GDBM=yes
-

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

[Sam James]

commit: 16e40ce1f4b74fcba474a41c32430e162f873d50
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 23 01:23:14 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 23 01:23:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e40ce1

mail-mta/exim: add subslot dep on hiredis

They break ABI liberally.

Signed-off-by: Sam James  gentoo.org>

 mail-mta/exim/exim-4.94.2-r8.ebuild | 2 +-
 mail-mta/exim/exim-4.95-r1.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-mta/exim/exim-4.94.2-r8.ebuild 
b/mail-mta/exim/exim-4.94.2-r8.ebuild
index dc474e1e9a7e..7cce1a0a02e3 100644
--- a/mail-mta/exim/exim-4.94.2-r8.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r8.ebuild
@@ -76,7 +76,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
mysql? ( dev-db/mysql-connector-c:= )
postgres? ( dev-db/postgresql:= )
sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-   redis? ( dev-libs/hiredis )
+   redis? ( dev-libs/hiredis:= )
spf? ( >=mail-filter/libspf2-1.2.5-r1 )
dmarc? ( mail-filter/opendmarc:= )
srs? ( srs-alt? ( mail-filter/libsrs_alt ) )

diff --git a/mail-mta/exim/exim-4.95-r1.ebuild 
b/mail-mta/exim/exim-4.95-r1.ebuild
index 663bc36a1ce5..79d8f53f3470 100644
--- a/mail-mta/exim/exim-4.95-r1.ebuild
+++ b/mail-mta/exim/exim-4.95-r1.ebuild
@@ -76,7 +76,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
mysql? ( dev-db/mysql-connector-c:= )
postgres? ( dev-db/postgresql:= )
sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 )
-   redis? ( dev-libs/hiredis )
+   redis? ( dev-libs/hiredis:= )
spf? ( >=mail-filter/libspf2-1.2.5-r1 )
dmarc? ( mail-filter/opendmarc:= )
srs? ( srs-alt? ( mail-filter/libsrs_alt ) )

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

[Sam James]

commit: cac5c8a7bdacf5b1b3a4670098c8cda2073505fb
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 23 00:21:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 23 00:44:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac5c8a7

mail-mta/exim: add subslot dep on OpenLDAP

New OpenLDAP breaks ABI (changes SONAME)

Signed-off-by: Sam James  gentoo.org>

 mail-mta/exim/{exim-4.94.2-r4.ebuild => exim-4.94.2-r7.ebuild} | 6 +++---
 mail-mta/exim/{exim-4.94.2-r6.ebuild => exim-4.94.2-r8.ebuild} | 6 +++---
 mail-mta/exim/{exim-4.95.ebuild => exim-4.95-r1.ebuild}| 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mail-mta/exim/exim-4.94.2-r4.ebuild 
b/mail-mta/exim/exim-4.94.2-r7.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.94.2-r4.ebuild
rename to mail-mta/exim/exim-4.94.2-r7.ebuild
index 1e756b4ae797..4d949c4c4c01 100644
--- a/mail-mta/exim/exim-4.94.2-r4.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r7.ebuild
@@ -57,17 +57,17 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/openssl:0=
)
)
-   ldap? ( >=net-nds/openldap-2.0.7 )
+   ldap? ( >=net-nds/openldap-2.0.7:= )
nis? (
elibc_glibc? (
-   net-libs/libtirpc
+   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 )
+   redis? ( dev-libs/hiredis:= )
spf? ( >=mail-filter/libspf2-1.2.5-r1 )
dmarc? ( mail-filter/opendmarc:= )
srs? ( srs-alt? ( mail-filter/libsrs_alt ) )

diff --git a/mail-mta/exim/exim-4.94.2-r6.ebuild 
b/mail-mta/exim/exim-4.94.2-r8.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.94.2-r6.ebuild
rename to mail-mta/exim/exim-4.94.2-r8.ebuild
index d611d18f89d9..dc474e1e9a7e 100644
--- a/mail-mta/exim/exim-4.94.2-r6.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r8.ebuild
@@ -65,11 +65,11 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/openssl:0=
)
)
-   ldap? ( >=net-nds/openldap-2.0.7 )
+   ldap? ( >=net-nds/openldap-2.0.7:= )
elibc_glibc? (
-   net-libs/libnsl
+   net-libs/libnsl:=
nis? (
-   net-libs/libtirpc
+   net-libs/libtirpc:=
>=net-libs/libnsl-1:=
)
)

diff --git a/mail-mta/exim/exim-4.95.ebuild b/mail-mta/exim/exim-4.95-r1.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.95.ebuild
rename to mail-mta/exim/exim-4.95-r1.ebuild
index 240cb0969e01..663bc36a1ce5 100644
--- a/mail-mta/exim/exim-4.95.ebuild
+++ b/mail-mta/exim/exim-4.95-r1.ebuild
@@ -65,11 +65,11 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/openssl:0=
)
)
-   ldap? ( >=net-nds/openldap-2.0.7 )
+   ldap? ( >=net-nds/openldap-2.0.7:= )
elibc_glibc? (
-   net-libs/libnsl
+   net-libs/libnsl:=
nis? (
-   net-libs/libtirpc
+   net-libs/libtirpc:=
>=net-libs/libnsl-1:=
)
)

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

[David Seifert]

commit: 0c742f20a747562eed42d26713f07bdc412de57b
Author: David Seifert  gentoo  org>
AuthorDate: Mon Jan  3 23:26:11 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Jan  3 23:26:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c742f20

mail-mta/exim: remove implicit elibc_* flags

Signed-off-by: David Seifert  gentoo.org>

 mail-mta/exim/exim-4.94.2-r4.ebuild | 4 ++--
 mail-mta/exim/exim-4.94.2-r6.ebuild | 4 ++--
 mail-mta/exim/exim-4.95.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mail-mta/exim/exim-4.94.2-r4.ebuild 
b/mail-mta/exim/exim-4.94.2-r4.ebuild
index 92130e467583..bc3c972ab53c 100644
--- a/mail-mta/exim/exim-4.94.2-r4.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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 lmtp maildir mbx mysql nis pam perl pkcs11 
postgres +prdr proxy radius redis sasl selinux spf sqlite srs +srs-alt 
srs-native +ssl syslog tcpd +tpda X"
+IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn exiscan-acl 
gnutls idn ipv6 ldap lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr 
proxy radius redis sasl selinux spf sqlite srs +srs-alt srs-native +ssl syslog 
tcpd +tpda X"
 REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )

diff --git a/mail-mta/exim/exim-4.94.2-r6.ebuild 
b/mail-mta/exim/exim-4.94.2-r6.ebuild
index fd36c6e44c73..d611d18f89d9 100644
--- a/mail-mta/exim/exim-4.94.2-r6.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -6,7 +6,7 @@ EAPI="7"
 inherit db-use toolchain-funcs multilib pam systemd
 
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
-dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
 mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
 socks5 spf sqlite srs +srs-alt srs-native +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="

diff --git a/mail-mta/exim/exim-4.95.ebuild b/mail-mta/exim/exim-4.95.ebuild
index 43c4cb4797fe..240cb0969e01 100644
--- a/mail-mta/exim/exim-4.95.ebuild
+++ b/mail-mta/exim/exim-4.95.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -6,7 +6,7 @@ EAPI="7"
 inherit db-use toolchain-funcs multilib pam systemd
 
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
-dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+dsn exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
 mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
 socks5 spf sqlite srs srs-alt +srs-native +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="

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

[Fabian Groffen]

commit: 78d56e74ed18bae2388545dd5d0fead806452786
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Sep 29 06:31:54 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Sep 29 06:31:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78d56e74

mail-mta/exim-4.95: version bump, change of srs default

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

 mail-mta/exim/Manifest |   2 +
 .../{exim-4.94.2-r5.ebuild => exim-4.95.ebuild}|  28 ++-
 .../exim/files/exim-4.95-localscan_dlopen.patch| 221 +
 3 files changed, 236 insertions(+), 15 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 3a31f9eb19f..b87cdd7fa6a 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,3 +1,5 @@
 DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 
684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046
 SHA512 
5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
+DIST exim-4.95.tar.xz 1865172 BLAKE2B 
0dc8dbc394c1bf4c6075e6ae1c1609b3f41841b2bb4c210d7353e4ad28ab38f905b6c245539bfa772512e2a9baf2dcc855e31d6ccb14ab49077f8da4fe6f1d0b
 SHA512 
93d09c20d99f27da5edbe3e6dc7d25aa4548faa2b67ca26f2cc0b4aeaf58398dd468e0263714fcf0df97531f05d16fcd3f1f0e9d0656ead7858a66b248a44a65
 DIST exim-pdf-4.94.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
+DIST exim-pdf-4.95.tar.xz 2117384 BLAKE2B 
ac310ec7741110a067f2df135b6397a8219e48a1e8989c66118f6c62820467e6f7b1c391799ff9b7ddef7896e1340208c4bed21f126014fa94c24d338f681f94
 SHA512 
47f30f3c82fe2cb5b0836594b325da1d255c53d2514af90e720d4bf6c74cff43d4a6b1ab5fb7b148253e5330da74e8ebb80e29b3a08fbe1faed2f004476c9d6a
 DIST system_filter.exim.gz 3075 BLAKE2B 
d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79
 SHA512 
cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.94.2-r5.ebuild 
b/mail-mta/exim/exim-4.95.ebuild
similarity index 95%
rename from mail-mta/exim/exim-4.94.2-r5.ebuild
rename to mail-mta/exim/exim-4.95.ebuild
index d664f4b1c8d..43c4cb4797f 100644
--- a/mail-mta/exim/exim-4.94.2-r5.ebuild
+++ b/mail-mta/exim/exim-4.95.ebuild
@@ -8,7 +8,7 @@ inherit db-use toolchain-funcs multilib pam systemd
 IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
 mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
-socks5 spf sqlite srs +srs-alt srs-native +ssl syslog tdb tcpd +tpda X"
+socks5 spf sqlite srs srs-alt +srs-native +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )
@@ -124,7 +124,7 @@ src_prepare() {
eapply "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 
391279
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 "${FILESDIR}"/exim-4.95-localscan_dlopen.patch
 
# for this reason we have a := dep on opendmarc, they changed their
# API in a minor release
@@ -488,17 +488,16 @@ src_configure() {
# what USE=srs used to be.  Eventually we want to rid ourselves
# of this external implementation.
if use srs-alt; then
-   # historical default, from 4.95 this becomes
-   # EXPERIMENTAL_SRS_ALT
+   # historical default, until 4.95
cat >> Makefile <<- EOC
-   EXPERIMENTAL_SRS=yes
+   EXPERIMENTAL_SRS_ALT=yes
EXTRALIBS_EXIM += -lsrs_alt
EOC
fi
if use srs-native; then
-   # this one becomes SUPPORT_SRS in 4.95
+   # this one is the default/supported variant since 4.95
cat >> Makefile <<- EOC
-   EXPERIMENTAL_SRS_NATIVE=yes
+   SUPPORT_SRS=yes
EOC
fi
fi
@@ -646,14 +645,13 @@ pkg_postinst() {
einfo "documentation at the bottom of this prerelease message:"
einfo "  http://article.gmane.org/gmane.mail.exim.devel/3579;
fi
-   if use srs 

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

[Fabian Groffen]

commit: 43159dcf782969bbc4320d786a87f127cb02d5df
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu Jul  1 16:08:18 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu Jul  1 16:08:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43159dcf

mail-mta/exim-4.94.2-r6: add patch to fix crash on resolve

Closes: https://bugs.gentoo.org/799368
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/exim-4.94.2-r6.ebuild| 665 +
 .../exim/files/exim-4.94.2-fix-crash-resolve.patch |  24 +
 2 files changed, 689 insertions(+)

diff --git a/mail-mta/exim/exim-4.94.2-r6.ebuild 
b/mail-mta/exim/exim-4.94.2-r6.ebuild
new file mode 100644
index 000..fd36c6e44c7
--- /dev/null
+++ b/mail-mta/exim/exim-4.94.2-r6.ebuild
@@ -0,0 +1,665 @@
+# Copyright 1999-2021 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 berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
+dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
+socks5 spf sqlite srs +srs-alt srs-native +ssl syslog tdb 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
+   ^^ ( srs-alt srs-native )
+   )
+   || ( berkdb gdbm tdb )
+"
+# 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.
+# We cannot express a required use for berkdb/gdbm/tdb correctly because
+# berkdb and gdbm are both enabled in base profile
+
+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
+   dev-libs/libpcre:=
+   tdb? ( sys-libs/tdb:= )
+   !tdb? ( berkdb? ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 )
+   elibc_glibc? (
+   net-libs/libnsl
+   nis? (
+   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? ( srs-alt? ( 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/libcrypt:=
+   virtual/libiconv
+   "
+   # added X check for #57206
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+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() {
+   # Legacy patches which need a respin for -p1
+   eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+   eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+   eapply "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 
391279
+   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 "${FILESDIR}"/exim-4.94.2-fix-crash-resolve.patch # 

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

[Sam James]

commit: 8004b6f0970e9cd157d623bd599dfc306e2f2a2c
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 24 23:12:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 24 23:27:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8004b6f0

mail-mta/exim: add dependency on virtual/libcrypt

Needed for libxcrypt migration which is upcoming.

Acked-by: David Seifert  gentoo.org>
Reported-by: Ionen Wolkens  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 mail-mta/exim/{exim-4.94.2-r1.ebuild => exim-4.94.2-r4.ebuild} | 1 +
 mail-mta/exim/{exim-4.94.2-r3.ebuild => exim-4.94.2-r5.ebuild} | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mail-mta/exim/exim-4.94.2-r1.ebuild 
b/mail-mta/exim/exim-4.94.2-r4.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.94.2-r1.ebuild
rename to mail-mta/exim/exim-4.94.2-r4.ebuild
index 6d46c0ba652..92130e46758 100644
--- a/mail-mta/exim/exim-4.94.2-r1.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r4.ebuild
@@ -79,6 +79,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
)
sqlite? ( dev-db/sqlite )
radius? ( net-dialup/freeradius-client )
+   virtual/libcrypt:=
virtual/libiconv
elibc_glibc? ( net-libs/libnsl )
"

diff --git a/mail-mta/exim/exim-4.94.2-r3.ebuild 
b/mail-mta/exim/exim-4.94.2-r5.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.94.2-r3.ebuild
rename to mail-mta/exim/exim-4.94.2-r5.ebuild
index d8cfef9d9e8..d664f4b1c8d 100644
--- a/mail-mta/exim/exim-4.94.2-r3.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r5.ebuild
@@ -88,6 +88,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
)
sqlite? ( dev-db/sqlite )
radius? ( net-dialup/freeradius-client )
+   virtual/libcrypt:=
virtual/libiconv
"
# added X check for #57206

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

[Fabian Groffen]

commit: 631499f09682958ceb3d64ee0b7f6b4fca7e756a
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun May 30 14:11:36 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun May 30 14:11:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=631499f0

mail-mta/exim-4.94.2-r3: revbump to bring back berkdb usage as default

because we used to always use berkdb, and berkdb is in standard profile,
prefer berkdb, and don't silently switch to gdbm which would break
existing databases

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

 ...exim-4.94.2-r2.ebuild => exim-4.94.2-r3.ebuild} | 27 +++---
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/mail-mta/exim/exim-4.94.2-r2.ebuild 
b/mail-mta/exim/exim-4.94.2-r3.ebuild
similarity index 97%
rename from mail-mta/exim/exim-4.94.2-r2.ebuild
rename to mail-mta/exim/exim-4.94.2-r3.ebuild
index 1174eca77da..d8cfef9d9e8 100644
--- a/mail-mta/exim/exim-4.94.2-r2.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r3.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
+IUSE="arc berkdb +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
 dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
 mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
 socks5 spf sqlite srs +srs-alt srs-native +ssl syslog tdb tcpd +tpda X"
@@ -21,6 +21,7 @@ REQUIRED_USE="
exiscan-acl
^^ ( srs-alt srs-native )
)
+   || ( berkdb gdbm tdb )
 "
 # 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
@@ -29,8 +30,8 @@ REQUIRED_USE="
 # 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.
-# We cannot express a required use for berkdb/gdbm/tdb because berkdb
-# and gdbm are both enabled in base profile
+# We cannot express a required use for berkdb/gdbm/tdb correctly because
+# berkdb and gdbm are both enabled in base profile
 
 SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
 [[ ${PV} == *.*.*.* ]] && echo /fixes)
@@ -49,8 +50,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 
~sparc ~x86 ~x86-sol
 COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libpcre:=
tdb? ( sys-libs/tdb:= )
-   !tdb? ( gdbm? ( sys-libs/gdbm:= ) )
-   !tdb? ( !gdbm? ( >=sys-libs/db-3.2:= =sys-libs/db-3.2:= > Makefile <<- EOC
-   USE_GDBM=yes
-   DBMLIB = -lgdbm
-   EOC
-   sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
-   sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
-   else
+   elif use berkdb ; then
# 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"
@@ -209,6 +203,13 @@ src_configure() {
EOC
sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+   else # must be gdbm via required_use
+   cat >> Makefile <<- EOC
+   USE_GDBM=yes
+   DBMLIB = -lgdbm
+   EOC
+   sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+   sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
fi
 
# if we use libiconv, now is the time to tell so

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

[Fabian Groffen]

commit: 24c18ee750d5716d8c293ef9677c9876457ef7cd
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat May 29 11:51:22 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat May 29 11:52:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c18ee7

mail-mta/exim-4.94.2-r2: allow moving away from sys-libs/db

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

 mail-mta/exim/exim-4.94.2-r2.ebuild | 59 +
 mail-mta/exim/metadata.xml  |  2 ++
 2 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/mail-mta/exim/exim-4.94.2-r2.ebuild 
b/mail-mta/exim/exim-4.94.2-r2.ebuild
index c825df4517e..1174eca77da 100644
--- a/mail-mta/exim/exim-4.94.2-r2.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r2.ebuild
@@ -5,7 +5,10 @@ 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 lmtp maildir mbx mysql nis pam perl pkcs11 
postgres +prdr proxy radius redis sasl selinux socks5 spf sqlite srs +srs-alt 
srs-native +ssl syslog tcpd +tpda X"
+IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl
+dsn elibc_glibc exiscan-acl gdbm gnutls idn ipv6 ldap lmtp maildir mbx
+mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux
+socks5 spf sqlite srs +srs-alt srs-native +ssl syslog tdb tcpd +tpda X"
 REQUIRED_USE="
arc? ( dkim spf )
dane? ( ssl !gnutls )
@@ -26,6 +29,8 @@ REQUIRED_USE="
 # 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.
+# We cannot express a required use for berkdb/gdbm/tdb because berkdb
+# and gdbm are both enabled in base profile
 
 SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
 [[ ${PV} == *.*.*.* ]] && echo /fixes)
@@ -42,8 +47,10 @@ 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:= =sys-libs/db-3.2:= =sys-apps/sed-4.0.5
sqlite? ( dev-db/sqlite )
radius? ( net-dialup/freeradius-client )
virtual/libiconv
-   elibc_glibc? ( net-libs/libnsl )
"
# added X check for #57206
 BDEPEND="virtual/pkgconfig"
@@ -173,6 +180,37 @@ src_configure() {
HAVE_ICONV=yes
EOC
 
+   # configure db implementation, Exim always needs one for its hints
+   # database, we prefer tdb and gdbm, since bdb is kind of getting
+   # less and less support
+   if use tdb ; then
+   cat >> Makefile <<- EOC
+   USE_TDB=yes
+   DBMLIB = -ltdb
+   EOC
+   sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+   sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
+   elif use gdbm ; then
+   cat >> Makefile <<- EOC
+   USE_GDBM=yes
+   DBMLIB = -lgdbm
+   EOC
+   sed -i -e 's:^USE_DB=yes:# USE_DB=yes:' Makefile || die
+   sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+   else
+   # 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
+   # keep include in CFLAGS because exim.h -> dbstuff.h -> 
db.h
+   CFLAGS += -I$(db_includedir ${DB_VERS})
+   DBMLIB = -l$(db_libname ${DB_VERS})
+   EOC
+   sed -i -e 's:^USE_GDBM=yes:# USE_GDBM=yes:' Makefile || die
+   sed -i -e 's:^USE_TDB=yes:# USE_TDB=yes:' Makefile || die
+   fi
+
# if we use libiconv, now is the time to tell so
if use !elibc_glibc && use !elibc_musl ; then
cat >> Makefile <<- EOC
@@ -221,18 +259,13 @@ src_configure() {
 
#
# lookup methods
+   #
 
-   # 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"
+   # support passwd and directory lookups by default
cat >> Makefile <<- EOC
-   USE_DB=yes
LOOKUP_CDB=yes
LOOKUP_PASSWD=yes
LOOKUP_DSEARCH=yes
-   # keep include in CFLAGS because exim.h -> dbstuff.h -> db.h
-   CFLAGS += -I$(db_includedir ${DB_VERS})
-   DBMLIB = -l$(db_libname ${DB_VERS})
EOC
 
if ! use dnsdb; then

diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index 

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

[Fabian Groffen]

commit: f381c20732ea84d6416b0f703d6c37965f003ef0
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat May 29 09:34:39 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat May 29 09:34:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f381c207

mail-mta/exim4.94.2-r2: add socks5 support, bug #774903

Closes: https://bugs.gentoo.org/774903
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.94.2-r2.ebuild 
b/mail-mta/exim/exim-4.94.2-r2.ebuild
new file mode 100644
index 000..c825df4517e
--- /dev/null
+++ b/mail-mta/exim/exim-4.94.2-r2.ebuild
@@ -0,0 +1,629 @@
+# Copyright 1999-2021 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 lmtp maildir mbx mysql nis pam perl pkcs11 
postgres +prdr proxy radius redis sasl selinux socks5 spf sqlite srs +srs-alt 
srs-native +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
+   ^^ ( srs-alt srs-native )
+   )
+"
+# 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? ( srs-alt? ( 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
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+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() {
+   # Legacy patches which need a respin for -p1
+   eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+   eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+   eapply "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 
391279
+   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
+
+   # for this reason we have a := dep on opendmarc, they changed their
+   # API in a minor release
+   if use dmarc && has_version ">=mail-filter/opendmarc-1.4" ; then
+   eapply "${FILESDIR}"/exim-4.94-opendmarc-1.4.patch
+   fi
+
+   if use maildir ; then
+   eapply "${FILESDIR}"/exim-4.94-maildir.patch
+   else
+   eapply -p0 

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

[Fabian Groffen]

commit: 9a3e0eda4fc04c85c612ee6cdfd45e26e9108209
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat May  8 08:23:13 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat May  8 08:23:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a3e0eda

mail-mta/exim: bump stable release to include SLOT dep for opendmarc

Unfortunately opendmarc broke their API without telling, and we need to
ensure Exim instances are rebuilt that link against an upgraded
opendmarc.  Also, need to ensure that once opendmarc-1.4 goes stable,
Exim is properly rebuilt.  Unfortunately this requires a conditional
patch, so we're all extremely unhappy here.

Closes: https://bugs.gentoo.org/788343
Package-Manager: Portage-3.0.18, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen  gentoo.org>

 .../exim/{exim-4.94.2.ebuild => exim-4.94.2-r1.ebuild} |  8 +++-
 mail-mta/exim/files/exim-4.94-opendmarc-1.4.patch  | 14 ++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.94.2.ebuild 
b/mail-mta/exim/exim-4.94.2-r1.ebuild
similarity index 98%
rename from mail-mta/exim/exim-4.94.2.ebuild
rename to mail-mta/exim/exim-4.94.2-r1.ebuild
index 6458d452535..6d46c0ba652 100644
--- a/mail-mta/exim/exim-4.94.2.ebuild
+++ b/mail-mta/exim/exim-4.94.2-r1.ebuild
@@ -69,7 +69,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
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 )
+   dmarc? ( mail-filter/opendmarc:= )
srs? ( srs-alt? ( mail-filter/libsrs_alt ) )
X? (
x11-libs/libX11
@@ -117,6 +117,12 @@ src_prepare() {
eapply "${FILESDIR}"/exim-4.69-r1.27021.patch
eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch
 
+   # for this reason we have a := dep on opendmarc, they changed their
+   # API in a minor release
+   if use dmarc && has_version ">=mail-filter/opendmarc-1.4" ; then
+   eapply "${FILESDIR}"/exim-4.94-opendmarc-1.4.patch
+   fi
+
if use maildir ; then
eapply "${FILESDIR}"/exim-4.94-maildir.patch
else

diff --git a/mail-mta/exim/files/exim-4.94-opendmarc-1.4.patch 
b/mail-mta/exim/files/exim-4.94-opendmarc-1.4.patch
new file mode 100644
index 000..d37c320d159
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.94-opendmarc-1.4.patch
@@ -0,0 +1,14 @@
+https://bugs.exim.org/show_bug.cgi?id=2728
+
+
+--- a/src/dmarc.c
 b/src/dmarc.c
+@@ -446,7 +446,7 @@
+ vs == PDKIM_VERIFY_INVALID ? 
DMARC_POLICY_DKIM_OUTCOME_TMPFAIL :
+ DMARC_POLICY_DKIM_OUTCOME_NONE;
+ libdm_status = opendmarc_policy_store_dkim(dmarc_pctx, US sig->domain,
+- dkim_result, US"");
++ sig->selector, dkim_result, 
US"");
+ DEBUG(D_receive)
+   debug_printf("DMARC adding DKIM sender domain = %s\n", sig->domain);
+ if (libdm_status != DMARC_PARSE_OKAY)

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

[Fabian Groffen]

commit: 51ce2b02fc364a4a963c913edfc47084c3daa8ad
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed May  5 18:43:16 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed May  5 18:43:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51ce2b02

mail-mta/exim: cleanup

Bug: https://bugs.gentoo.org/786945
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest |   4 -
 mail-mta/exim/exim-4.93.0.4-r2.ebuild  | 592 
 mail-mta/exim/exim-4.94-r2.ebuild  | 593 
 mail-mta/exim/exim-4.94-r3.ebuild  | 617 -
 mail-mta/exim/files/exim-4.20-maildir.patch|  14 -
 mail-mta/exim/files/exim-4.93-CVE-2020-12783.patch |  83 ---
 mail-mta/exim/files/exim-4.93-fno-common.patch |  16 -
 .../exim/files/exim-4.93-localscan_dlopen.patch| 269 -
 mail-mta/exim/files/exim-4.93-radius.patch |  66 ---
 .../exim/files/exim-4.94-taint-pam-expansion.patch |  35 --
 10 files changed, 2289 deletions(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 65f5493bddf..3a31f9eb19f 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,7 +1,3 @@
-DIST exim-4.93.0.4.tar.xz 1804696 BLAKE2B 
721336101104d9c71b3bb6f432e382c28ad17d80cdb50d04213989e65a719d906caf8eb95639bfaf7a1bfdd62c7000d9df14484953446ecfca901fd7c708514e
 SHA512 
84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96
 DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 
684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046
 SHA512 
5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
-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.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
-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.93.0.4-r2.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r2.ebuild
deleted file mode 100644
index 27021c7a2f0..000
--- a/mail-mta/exim/exim-4.93.0.4-r2.ebuild
+++ /dev/null
@@ -1,592 +0,0 @@
-# Copyright 1999-2021 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 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)

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

[Sergei Trofimovich]

commit: 03f5d535348ccf1970a9a0155a2bc279d332bba2
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed May  5 10:13:34 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed May  5 16:09:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03f5d535

mail-mta/exim: stable 4.94.2 for sparc, bug #786945

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

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

diff --git a/mail-mta/exim/exim-4.94.2.ebuild b/mail-mta/exim/exim-4.94.2.ebuild
index 3998c87f860..6458d452535 100644
--- a/mail-mta/exim/exim-4.94.2.ebuild
+++ b/mail-mta/exim/exim-4.94.2.ebuild
@@ -39,7 +39,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/

[Sam James]

commit: f57839b9516ad1ee3af2ab8185a6f2b4006b45e4
Author: Sam James  gentoo  org>
AuthorDate: Tue May  4 19:20:18 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 19:20:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f57839b9

mail-mta/exim: Stabilize 4.94.2 x86, #786945

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.94.2.ebuild b/mail-mta/exim/exim-4.94.2.ebuild
index 5bb4a976163..01b2ae80597 100644
--- a/mail-mta/exim/exim-4.94.2.ebuild
+++ b/mail-mta/exim/exim-4.94.2.ebuild
@@ -39,7 +39,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/

[Sam James]

commit: a22c40a56f3764c7ad7f43d57d7cf1a54f24724e
Author: Sam James  gentoo  org>
AuthorDate: Tue May  4 19:20:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 19:20:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a22c40a5

mail-mta/exim: Stabilize 4.94.2 amd64, #786945

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.94.2.ebuild b/mail-mta/exim/exim-4.94.2.ebuild
index 01b2ae80597..3998c87f860 100644
--- a/mail-mta/exim/exim-4.94.2.ebuild
+++ b/mail-mta/exim/exim-4.94.2.ebuild
@@ -39,7 +39,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/

[Sam James]

commit: ef878a67e5ebf7f698d109f0972d1dc647930df3
Author: Sam James  gentoo  org>
AuthorDate: Tue May  4 19:16:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 19:16:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef878a67

mail-mta/exim: Stabilize 4.94.2 ppc, #786945

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.94.2.ebuild b/mail-mta/exim/exim-4.94.2.ebuild
index 02eb9d9347e..5bb4a976163 100644
--- a/mail-mta/exim/exim-4.94.2.ebuild
+++ b/mail-mta/exim/exim-4.94.2.ebuild
@@ -39,7 +39,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/

[Sam James]

commit: 404a26fd4268a8d507c59dd72be811f333617eca
Author: Sam James  gentoo  org>
AuthorDate: Tue May  4 19:16:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 19:16:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=404a26fd

mail-mta/exim: Stabilize 4.94.2 ppc64, #786945

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.94.2.ebuild b/mail-mta/exim/exim-4.94.2.ebuild
index 8a1188d872a..02eb9d9347e 100644
--- a/mail-mta/exim/exim-4.94.2.ebuild
+++ b/mail-mta/exim/exim-4.94.2.ebuild
@@ -39,7 +39,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/

[Sam James]

commit: d582a9f0485d290b68e2163ef4af2fe56ed04830
Author: Sam James  gentoo  org>
AuthorDate: Tue May  4 19:13:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May  4 19:13:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d582a9f0

mail-mta/exim: Stabilize 4.94.2 arm, #786945

Signed-off-by: Sam James  gentoo.org>

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

diff --git a/mail-mta/exim/exim-4.94.2.ebuild b/mail-mta/exim/exim-4.94.2.ebuild
index 3b90fe06300..8a1188d872a 100644
--- a/mail-mta/exim/exim-4.94.2.ebuild
+++ b/mail-mta/exim/exim-4.94.2.ebuild
@@ -39,7 +39,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/

[Fabian Groffen]

commit: 3ddfa885089b0c76a0c0c57a5fcebf42948203d4
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue May  4 15:47:19 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue May  4 15:47:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ddfa885

mail-mta/exim-4.94.2: version bump

Bug: https://bugs.gentoo.org/786945
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 mail-mta/exim/Manifest   |   2 +
 mail-mta/exim/exim-4.94.2.ebuild | 616 +++
 2 files changed, 618 insertions(+)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index b618d116c98..65f5493bddf 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,5 +1,7 @@
 DIST exim-4.93.0.4.tar.xz 1804696 BLAKE2B 
721336101104d9c71b3bb6f432e382c28ad17d80cdb50d04213989e65a719d906caf8eb95639bfaf7a1bfdd62c7000d9df14484953446ecfca901fd7c708514e
 SHA512 
84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96
+DIST exim-4.94.2.tar.xz 1838076 BLAKE2B 
684e115a7af3efdab15451f8e11f9b53455c9166d8c078216d7a95223d77569cec8a882ed99b9180acbd8a9e747a0bca03d56993d011de15dc35143a989ab046
 SHA512 
5334c236221ed4e03dbc33e6a79d939b06037fa2f4b71971607a360b67af5c85a89681ee13a5eeaf0184382c55a160cf2e89ed7afb2949f025a54f1e88f9e3fc
 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.2.tar.xz 2092248 BLAKE2B 
973ab4f117fdb58afa017bc41b4496fac1277e707a9926d67317c455b0bd617021c17cba6c8d793d8962aacef12c0790d5add7174017512b7b1ea070f8e8533d
 SHA512 
3a661f69d81a992798d4b7e5b7def7cfffa297a7b3c02a6631be426cefff5a6e8783fa322a1bd105d01f7b06968d01e77963e6ab7be3157f63eb62eb6ff172b0
 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.2.ebuild b/mail-mta/exim/exim-4.94.2.ebuild
new file mode 100644
index 000..3b90fe06300
--- /dev/null
+++ b/mail-mta/exim/exim-4.94.2.ebuild
@@ -0,0 +1,616 @@
+# Copyright 1999-2021 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 lmtp maildir mbx mysql nis pam perl pkcs11 
postgres +prdr proxy radius redis sasl selinux spf sqlite srs +srs-alt 
srs-native +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
+   ^^ ( srs-alt srs-native )
+   )
+"
+# 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:= 

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

[Fabian Groffen]

commit: ab350feac6e063247dff08c3159e7bd01a761690
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun May  2 13:14:39 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun May  2 13:14:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab350fea

mail-mta/exim-4.94-r3: revbump for USE=srs-alt and USE=srs-native

Based on the work of Jaco Kroon 

Exim currently supports both the external libsrs_alt as well as its own
implementation to support SRS.  Make the latter available through
USE=srs-native, keeping the libsrs_alt method default for now.

Because USE=srs-alt is a USE-default, enabling USE=srs will
automatically select the current default, such that users of USE=srs
don't get a sudden default change.

In the future USE=srs-alt should go away, allowing to drop both
USE=srs-alt and srs-native again.

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

 mail-mta/exim/exim-4.94-r3.ebuild | 617 ++
 mail-mta/exim/metadata.xml|   4 +
 2 files changed, 621 insertions(+)

diff --git a/mail-mta/exim/exim-4.94-r3.ebuild 
b/mail-mta/exim/exim-4.94-r3.ebuild
new file mode 100644
index 000..7ec16446c71
--- /dev/null
+++ b/mail-mta/exim/exim-4.94-r3.ebuild
@@ -0,0 +1,617 @@
+# Copyright 1999-2021 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 lmtp maildir mbx mysql nis pam perl pkcs11 
postgres +prdr proxy radius redis sasl selinux spf sqlite srs +srs-alt 
srs-native +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
+   ^^ ( srs-alt srs-native )
+   )
+"
+# 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? ( srs-alt? ( 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
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON_DEPEND}"
+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() {
+   # Legacy patches which need a respin for -p1
+   eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch
+   eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426
+   eapply "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 
391279
+   eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591
+   eapply 

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

[Mikle Kolyada]

commit: af7819cc48d6fd7933c951e64c0eb2c655531578
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 08:47:47 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 08:47:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af7819cc

mail-mta/exim: fix spaces

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

 mail-mta/exim/exim-4.93.0.4-r2.ebuild | 2 +-
 mail-mta/exim/exim-4.94-r2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-mta/exim/exim-4.93.0.4-r2.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r2.ebuild
index 80f10ca7a3a..27021c7a2f0 100644
--- a/mail-mta/exim/exim-4.93.0.4-r2.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r2.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="
 # incorrect, but b) is the only "correct" view from repoman.
 
 SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
-   [[ ${PV} == *.*.*.* ]] && echo /fixes)
+   [[ ${PV} == *.*.*.* ]] && echo /fixes)
 COMM_URI="https://downloads.exim.org/exim4${SDIR};
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"

diff --git a/mail-mta/exim/exim-4.94-r2.ebuild 
b/mail-mta/exim/exim-4.94-r2.ebuild
index 0a5ea0060b4..0abf5983259 100644
--- a/mail-mta/exim/exim-4.94-r2.ebuild
+++ b/mail-mta/exim/exim-4.94-r2.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="
 # incorrect, but b) is the only "correct" view from repoman.
 
 SDIR=$([[ ${PV} == *_rc* ]]   && echo /test
-   [[ ${PV} == *.*.*.* ]] && echo /fixes)
+[[ ${PV} == *.*.*.* ]] && echo /fixes)
 COMM_URI="https://downloads.exim.org/exim4${SDIR};
 
 DESCRIPTION="A highly configurable, drop-in replacement for sendmail"

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

[Mikle Kolyada]

commit: 61d0f93720eeeb624193bca1e59ef3b6e46e4660
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun May  2 08:45:22 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun May  2 08:45:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61d0f937

mail-mta/exim: remove libressl support

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

 mail-mta/exim/exim-4.93.0.4-r2.ebuild | 5 ++---
 mail-mta/exim/exim-4.94-r2.ebuild | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mail-mta/exim/exim-4.93.0.4-r2.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r2.ebuild
index b47b3f94f56..80f10ca7a3a 100644
--- a/mail-mta/exim/exim-4.93.0.4-r2.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r2.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 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 )
@@ -51,8 +51,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libtasn1
)
!gnutls? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
+   dev-libs/openssl:0=
)
)
ldap? ( >=net-nds/openldap-2.0.7 )

diff --git a/mail-mta/exim/exim-4.94-r2.ebuild 
b/mail-mta/exim/exim-4.94-r2.ebuild
index 5fb494208b3..0a5ea0060b4 100644
--- a/mail-mta/exim/exim-4.94-r2.ebuild
+++ b/mail-mta/exim/exim-4.94-r2.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 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 )
@@ -51,8 +51,7 @@ COMMON_DEPEND=">=sys-apps/sed-4.0.5
dev-libs/libtasn1
)
!gnutls? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
+   dev-libs/openssl:0=
)
)
ldap? ( >=net-nds/openldap-2.0.7 )

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

[Mikle Kolyada]

commit: 12b0aa97b0c37464ca8f9ee5eb940ee12050f589
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Jan 22 17:54:52 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Jan 23 10:51:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b0aa97

mail-mta/exim: install pam files conditionally

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

 mail-mta/exim/{exim-4.93.0.4-r1.ebuild => exim-4.93.0.4-r2.ebuild} | 6 --
 mail-mta/exim/{exim-4.94-r1.ebuild => exim-4.94-r2.ebuild} | 6 --
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild 
b/mail-mta/exim/exim-4.93.0.4-r2.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.93.0.4-r1.ebuild
rename to mail-mta/exim/exim-4.93.0.4-r2.ebuild
index 19d13cef361..b47b3f94f56 100644
--- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild
+++ b/mail-mta/exim/exim-4.93.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -537,7 +537,9 @@ src_install() {
doins "${WORKDIR}"/system_filter.exim
doins "${FILESDIR}"/auth_conf.sub
 
-   pamd_mimic system-auth exim auth account
+   if use pam; then
+   pamd_mimic system-auth exim auth account
+   fi
 
# headers, #436406
if use dlfunc ; then

diff --git a/mail-mta/exim/exim-4.94-r1.ebuild 
b/mail-mta/exim/exim-4.94-r2.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.94-r1.ebuild
rename to mail-mta/exim/exim-4.94-r2.ebuild
index 52358f32bef..5fb494208b3 100644
--- a/mail-mta/exim/exim-4.94-r1.ebuild
+++ b/mail-mta/exim/exim-4.94-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -535,7 +535,9 @@ src_install() {
doins "${WORKDIR}"/system_filter.exim
doins "${FILESDIR}"/auth_conf.sub
 
-   pamd_mimic system-auth exim auth account
+   if use pam; then
+   pamd_mimic system-auth exim auth account
+   fi
 
# headers, #436406
if use dlfunc ; then

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

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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/

[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:=