diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2022-10-19 11:18:29 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2022-10-19 11:20:50 +0200 |
| commit | c1ee45f74e9ab5f27b279d1a604f6dc71f7685b7 (patch) | |
| tree | 2cbc4c84974d4650228444bebdbc751b7441bdba /mail-mta/exim | |
| parent | dev-python/uncertainties: enable py3.11, nose --> pytest (diff) | |
| download | gentoo-c1ee45f74e9ab5f27b279d1a604f6dc71f7685b7.tar.gz gentoo-c1ee45f74e9ab5f27b279d1a604f6dc71f7685b7.tar.bz2 gentoo-c1ee45f74e9ab5f27b279d1a604f6dc71f7685b7.zip | |
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@gentoo.org>
Diffstat (limited to 'mail-mta/exim')
| -rw-r--r-- | mail-mta/exim/exim-4.94.2-r10.ebuild (renamed from mail-mta/exim/exim-4.94.2-r9.ebuild) | 0 | ||||
| -rw-r--r-- | 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 index c62c296b2534..c62c296b2534 100644 --- a/mail-mta/exim/exim-4.94.2-r9.ebuild +++ b/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 @@ |