diff options
Diffstat (limited to 'mail-mta')
| -rw-r--r-- | mail-mta/Manifest.gz | bin | 2381 -> 2380 bytes | |||
| -rw-r--r-- | mail-mta/exim/Manifest | 4 | ||||
| -rw-r--r-- | mail-mta/exim/exim-4.97.1-r3.ebuild (renamed from mail-mta/exim/exim-4.97.1-r2.ebuild) | 0 | ||||
| -rw-r--r-- | mail-mta/exim/files/exim-4.97.1-memory-usage-bug-3047.patch | 35 |
4 files changed, 36 insertions, 3 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz Binary files differindex 719f8e72e2cf..2d0a0f9370ea 100644 --- a/mail-mta/Manifest.gz +++ b/mail-mta/Manifest.gz diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest index 5dfa7437310e..6823cc4ce109 100644 --- a/mail-mta/exim/Manifest +++ b/mail-mta/exim/Manifest @@ -8,7 +8,7 @@ AUX exim-4.94-maildir.patch 316 BLAKE2B fe0b27712e77eba83244434c33372cec47fa3170 AUX exim-4.97-as-needed-ldflags.patch 6032 BLAKE2B ba3e78e49435581eba3fa238c4e660acf9e4bc91c47110f6932675eb0c33568c03ee00a91cef6de93f5acb4611ad6ac1bf465a90f4bc055ac2528d77b588822c SHA512 b7f1e84e3c788d1a9c56339c5dc7eb14eff39b8efaf90d32fd66ddd589f60d4bfab5f36cae51cb84646c1f0b0f7523e56d6a898116b72dc108e89f33d8919333 AUX exim-4.97-localscan_dlopen.patch 6429 BLAKE2B 166c44c93730ef4a0cecd9c8cc556ce2c53dcc21d85b2cb7663fc01d445eab3ecba20f3525b1206238e2b6508a58fe79c72ad86c1722b7c4e1164a6bf9534d6d SHA512 f1d29829f4d7159227476bed377a01a4db6d9aad021bda476d9c1ad1dc4fe7a621260a9e1e4ff9b2686c46575a553a96af7f75f625cb99a5941aa4562f01646a AUX exim-4.97-no-exim_id_update.patch 402 BLAKE2B 0c2f7ec1fe995f8ee58c6907e149367082c5ce837d1508b9e61f10681825fdcc78a52316184629aa6a80021fbfa21aa0ee90eee6b8fae5a1b05efb77337dd2c5 SHA512 07c062f042176b108444b9a163a309b3186fc19f2953dbb7ad066874189417684b0934fe1300933d04231cc59eeeacfb22ad42b0f328212585908c2e9eae5a8b -AUX exim-4.97.1-memory-usage-bug-3047.patch 6622 BLAKE2B 54cba844bc14c8cee4600e4c5c721c6fa97f8d871d15e345cef41e284ea28b2fd7c0fe155cb543e2e4d20dacc6ba12f73a643cbe372708eed9b7206ed14c7ca8 SHA512 ded12661bda511cbe60206494bec5c39925f4e24932ad80ebe2c5de10dd2d49b129d0451e1e853a7c2b378e12a085849c649387dd3d9b747667c412b986cf6c2 +AUX exim-4.97.1-memory-usage-bug-3047.patch 7759 BLAKE2B 3c63cf9ffebeba41576882ab246e9644a3c5d9b44f9c0f116431cc9e53fda63a2d9120e197d4629c3eadc7bcc0e819d3c81fa9dda7448aa78ee75d5f6c531c60 SHA512 90b0c0f0e862df404e5af7b32da50110052070e5e089d842f4de4801120530f60d58e3305e58f995bcd694d364f01922e7da957049bc8f8508c598205cfb07d1 AUX exim-submission.socket 161 BLAKE2B 409a5a687897af369a6a2ff0c30564096cc6b308dbc5d0afb6742df44d2aa972e45bad9681d2cb72be9731b260d23fdadb80bae644e7b875af5e34e9c8b8b40f SHA512 4a233761793e3510e9efa5aad3a6098c41b757f13133a7ea825680f2b393aba8d7935f16bf1dd065dde884fe7ba45639a8d398333a7d9bf0a6b72f88c8f2a09d AUX exim-submission_at.service 360 BLAKE2B 9ebcac1ab0f01a8264141843a4e711d77f634bdd910406bd466a0c197fdad8a9ff4bc31b9b28ef73c810aaff3e549eb60c0a2546507910dfc800da154eb1da00 SHA512 dc28698f15e8eaa4614ae81fc8cb76d92fed1110ce02f7a6ee8feace418dbb194711eb2d4dd444cf818628c11721e21d80b7b974879ab6ddd78cc717cce17c2f AUX exim.confd 141 BLAKE2B bc200e6121544d17e7feb0e162b5f6a5157647c3323492218da1556a19f3a2febf89a698e157a6dc657540d2f46088a9b1e34700655c715fbeaf0c201bc4aa9f SHA512 cb5e4aa71d3f0b7945e9806064f6a3ab64cb894381654ead40c73a49ae2d1bbb3dc587919952a09b2c81b9fcf8784f73d59c12081cda96a5b7210442f5088998 @@ -20,6 +20,6 @@ AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076ae DIST exim-4.97.1.tar.xz 1919308 BLAKE2B ea41bf851185c7330e648c7757f2bf0b0aea3133e399630a40d220f5f542e9055e3ed0cd67c9ee5dcede281ccc17919a4ac328abd8f05d4d828e0381f10df0b8 SHA512 eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc DIST exim-pdf-4.97.1.tar.xz 2139688 BLAKE2B baadbb6ca7b88b11ea88f6b5ce0c96d9d713a1f5b358e4dfb52647ccc2bb1a9a6f74e75341839a8ee7df327f2f5645dbf223e4e5923631b02aa53a777701b436 SHA512 6aa733b1d48b6237f458939ff53e484e702f47a0c10ba781ba101db404d39667bd2ddc876af4f597deda1991e534d5b8b874c549e6a86b5325ebd624a6713183 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 -EBUILD exim-4.97.1-r2.ebuild 15278 BLAKE2B cddf310530897026a229e90a13233735eb66a1f35baeee6639808a851268c49dd6617525d751ae8b18b3cf962ae0c1d6036029dacc9d0c9d5cf66b0bb06b7618 SHA512 295c92b931956056c111fb8567b5c0fa3e47430865f75b9e2c918f94c7b9814accac6b4b468aa733bda1786334a151f8364387a932e59fd0621f51e503ed031c +EBUILD exim-4.97.1-r3.ebuild 15278 BLAKE2B cddf310530897026a229e90a13233735eb66a1f35baeee6639808a851268c49dd6617525d751ae8b18b3cf962ae0c1d6036029dacc9d0c9d5cf66b0bb06b7618 SHA512 295c92b931956056c111fb8567b5c0fa3e47430865f75b9e2c918f94c7b9814accac6b4b468aa733bda1786334a151f8364387a932e59fd0621f51e503ed031c EBUILD exim-4.97.1.ebuild 15198 BLAKE2B 70f91735480772c11ad7134b7cdb92a114b2ae39a51268f5ebae52f74c8d81cea5b26d2d27e562048c11b5a23aa7845cf07a2a13463912fdd9c8e689420a9728 SHA512 3f58ad80687cb6e19f5184603705e34ec90749666b903ae400ae0d0ec8838fbd5bf063507cd544a7c2bab208a3af24ffed5795ac39bf9b23749f56f87d2ca551 MISC metadata.xml 2488 BLAKE2B 2b6eee3c45210da4bb79ed1a01801cabbdf2be353652602b60cb7c512426197eb14defb2382dd71bcbf0101685a8e5d2f58d52fbee402894f2d86e51329d2165 SHA512 1b3f9fe9cbff738595101b32179f5c8230b5afefcce5266e06db97a3a07a73ad842f0a8be44f421a71e120cdff11e262ba1893f1c7117a0a4c42cf5f37a44d7b diff --git a/mail-mta/exim/exim-4.97.1-r2.ebuild b/mail-mta/exim/exim-4.97.1-r3.ebuild index 8ac924524bb1..8ac924524bb1 100644 --- a/mail-mta/exim/exim-4.97.1-r2.ebuild +++ b/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 +0000 Subject: [PATCH] ACL: in "regex" condition, release store every thousand lines. Bug 3047 +From: Jeremy Harris <jgh146exb@wizmail.org> +Date: Sun, 11 Feb 2024 13:57:18 +0000 (+0000) +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(&list, &sep, NULL, 0))) -@@ -58,7 +57,9 @@ while ((regex_string = string_nextinlist(&list, &sep, NULL, 0))) +@@ -58,10 +57,19 @@ while ((regex_string = string_nextinlist(&list, &sep, 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; |