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

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

commit:     c1ee45f74e9ab5f27b279d1a604f6dc71f7685b7
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 19 09:18:29 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 09:20:50 2022 +0000
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 <grobian <AT> 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<n> use-after-free.  Bug 2915
  #endif
 --- exim-4.94.2/src/regex.c	2021-04-30 14:08:21.000000000 +0200
 +++ exim-4.94.2/src/regex.c	2022-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<n> 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.000000000 +0200
 +++ exim-4.94.2/src/smtp_in.c	2022-10-19 09:15:58.613447975 +0200
 @@ -2161,8 +2161,10 @@