gentoo auto-resync : 19:10:2022 - 19:58:53

3 files changed, 5 insertions, 3 deletions

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 11fe0cc93240..64b517add3f6 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -5,7 +5,7 @@ AUX exim-4.74-radius-db-ENV-clash.patch 667 BLAKE2B 3cc03dd925333774c08484efbb5d
 AUX exim-4.76-crosscompile.patch 462 BLAKE2B de78322f93760cef0d5a768b8be6c723f00d5c7557da6189ffa6ee34215c41ebe8896a2457b2e6a704d05a1730eab09c8cc73e3ba3140954f9ac32423210b612 SHA512 d4fd4417c1ce727f139999c399795312cdbbb9735d0793d68f8e3150240bc53b31277cb26f9946ba549b34c661fc0a61147d376bda09aa6763cab55d80d62343
 AUX exim-4.80-spool-mail-group.patch 946 BLAKE2B a3b6783b77823c5a8373623d16b85e2ba209b419b6724f307c46bf961bc5195690453208cdd40e45bc36e5a070892414c7737a97fa04e653e78050c153c59079 SHA512 24f30e9a9d90dc0f1fe8b3db26f8bc2649182b4e78110dc28a9c0f3a3feb7589f923144a4f1c54a1c46ff8cfe40826a1f2212787753be752f4d15a72d54a143b
 AUX exim-4.93-as-needed-ldflags.patch 6013 BLAKE2B 2de473f089a36cabd5481020524dcb2efb7a5681b224608a8454aebc70e07f7776fe812f02fa5d81fb80b25bc2cc154924953d173d65664b1e576176a01191b9 SHA512 df6c18a7d092d9069dd6d4177154681197de86ab41dbd399055ad663cbd0c7da149f8bbcb7c888965851475ee2cf891dc934f1d5ad7a4ea3dc46a54ece582418
-AUX exim-4.94-CVE-2022-3559.patch 3251 BLAKE2B e23e7ddeb36a2fec3dd3a3cfc2b858af45464c6b538650e8f7d376e85e6561dcb5d048c280d6f27f28367d16862a32fe0fd9d31a966b5e50ad9f51bd12fc487b SHA512 ebde747a12dfddb3c6250dff4a79b1ffb307468ae5fa8630bfb7720c1354e2fdc4d2c908bcb314769825724720acdfde55b8a182839883abfaa714a2ebdd0762
+AUX exim-4.94-CVE-2022-3559.patch 3285 BLAKE2B 1758d3aa8e4bee3a66e4d1a20a243d6bc04ed1a204f172e976b660fb70d1661e1593106d377766b074c93e6c365e6848464074adff0bf3cc0c1c1c76ae07c470 SHA512 a170f83e99e330294c7604797e2dd2e02034d2301ccc4de190cdecbf39ac64bb30600f70e1875eb177be9a18ef2ae092874b39ca33a56df368dd38d803f8291b
 AUX exim-4.94-localscan_dlopen.patch 9595 BLAKE2B c48eaaf486585890dc4028beaca7a39d5b1d965323468c4c317d099ccf0e2e983e9366cb923e0b34546a66ac718ee15e8f682a65cdcd771de8164f76b86c0aa2 SHA512 bd7872473ad1ab9eca41757ca6ee7dd8628bddfa145191aea6a5ac4b62b0e4e3539803cf75fcb22b8bfdcca33a7d2f71ff58ca1862f456960e6b7e4d262ba6ef
 AUX exim-4.94-maildir.patch 316 BLAKE2B fe0b27712e77eba83244434c33372cec47fa317026d159de7a0ac37f2563999a6470df2dc203c1fcda8e7074c949133a0311c2b94c4b48bbc46d64c7c486202c SHA512 13863226883f79dcc781fe8eb3b50ad3c5511af130cf6e41ce40e8543d46832668bd7d746a2cc67842748cdf26144bef4aece49397d3168819215eac93ca1e6e
 AUX exim-4.94-opendmarc-1.4.patch 506 BLAKE2B d8ba66e1165dffb9ba367b997d69090fa8b31aa6ce3cb17d6ade4bd3b3dabf2a2d93223106eeb7f39754397eb17979e66d52de8dc2d524de9019c9598cd89af6 SHA512 6145f07c0b5b4234160fd3480329759a06500b658643523f32bcfa9158258a9b708095725f2e56d5538567f888c5e0e954c4ac51c8f2d16921dc4950241cd2fc
@@ -25,7 +25,7 @@ DIST exim-4.96.tar.xz 1879152 BLAKE2B 4b424f2ebc661bd0db35d7f6da86300c6d5cb5b9a5
 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
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3
-EBUILD exim-4.94.2-r10.ebuild 16180 BLAKE2B a619a8de75342115eb107b1d9e2430718703181a24603097cf532227b801b67a3995902239166e8510ae7f6578f726aa38bab14825cd1521b91c827e7a96cbdd SHA512 8345dbf0b128b39c7cab4ff2e20e196f746bd70176d584cff29640276c5abd6962148d7d93ced58796b144d8386810dc03de1882a6f7d3510031c6cc6ca7629b
+EBUILD exim-4.94.2-r11.ebuild 16180 BLAKE2B a619a8de75342115eb107b1d9e2430718703181a24603097cf532227b801b67a3995902239166e8510ae7f6578f726aa38bab14825cd1521b91c827e7a96cbdd SHA512 8345dbf0b128b39c7cab4ff2e20e196f746bd70176d584cff29640276c5abd6962148d7d93ced58796b144d8386810dc03de1882a6f7d3510031c6cc6ca7629b
 EBUILD exim-4.94.2-r7.ebuild 14840 BLAKE2B beec43c20d547763f805f10531a5cddf46e2339760dbb8545c9715b4031dc6325b16e1f3e79c20be364bfc681bdb652ee316b2653c5ed6ae2eea2dfad5872ba2 SHA512 6598f7597787e1eef199aebae2aba4213c8059d1246b4418ea03c786c24923342285ad4208c076cdfec37645d9781e2aa7573b18dd8e28aefb06af964ef616b0
 EBUILD exim-4.96-r2.ebuild 15788 BLAKE2B c35234d38a5cb58ec4d82bc4eaf20e536f855f783cb4c9f324ad0db3555ecd4d45f2ddfa0d6b05e7c90ac294598a516134d6b8d81d9394b0d7472def7f183871 SHA512 3513a65e2958be49bd6e3e33a3ca093307aa7e1008f70a7d460896e916fb3f2e6a97aba790df9fa562e4b8d01dfe275569bece1f5795b5a0b1d5af9d859557e0
 MISC metadata.xml 2759 BLAKE2B 4f5d0d9fbd244b0836de4bd0d3b84f45376628a12e019c89e49e6dbd7128c19f16281fdfb401d852f57f27f547184351000382cc7333a524f7be280e0799d8d8 SHA512 85a2eaef07eb68d51a1307c6d76bef6620e7311ffda593750ebee5fe84affac2e026c971818500004c0ab9722a8e84c8eb0394fb66bb2ba6cd3465cf7e1f1a73
diff --git a/mail-mta/exim/exim-4.94.2-r10.ebuild b/mail-mta/exim/exim-4.94.2-r11.ebuild
index c62c296b2534..c62c296b2534 100644
--- a/mail-mta/exim/exim-4.94.2-r10.ebuild
+++ b/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<n> 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<n> 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;
 +}
 +