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

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

commit:     1f99d3ec97d00fbf7938720e294e3a40b54e76a3
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  5 08:35:59 2025 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Apr  5 08:37:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f99d3ec

mail-mta/exim-4.98.2: version bump (CVE-2025-30232)

Bug: https://bugs.gentoo.org/952139
Bug: https://bugs.gentoo.org/947916
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 mail-mta/exim/Manifest                                 |  2 ++
 mail-mta/exim/{exim-4.98.ebuild => exim-4.98.2.ebuild} |  3 ++-
 mail-mta/exim/files/exim-4.98-tidydb-crash.patch       | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 0648fb78c2d2..4f0d14c53280 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -1,5 +1,7 @@
 DIST exim-4.97.1.tar.xz 1919308 BLAKE2B ea41bf851185c7330e648c7757f2bf0b0aea3133e399630a40d220f5f542e9055e3ed0cd67c9ee5dcede281ccc17919a4ac328abd8f05d4d828e0381f10df0b8 SHA512 eab7ca28b37f1635c48f5e963ab69fcbad539b2c35a84286ecaad7d7ff5210bbefce86452302e08099afdc0710f9cb7ca6d9b152b0ba88a19292f7c5541e0cfc
+DIST exim-4.98.2.tar.xz 1929020 BLAKE2B 7e8b11de364735a0d3d1d1d269ec0a8030530daca141163fb5a57c6f2a93dbd6298cbb0fc422d9e9f4ca363e675923fe952ba52080767a6f9c21ace9d01821ab SHA512 aaa4cfc8aee90818c6d1c2fd0cf64b82668d1a343f462f678b38b2b79e10a467240f2e81786eec7705eec3598d23686a74437c50b68502f29ff67788393c812a
 DIST exim-4.98.tar.xz 1936984 BLAKE2B 927108e25eb60fb97e390916a4623339ccdd2dc9aaa1de1f913855f04f2372da765c12cc03c97b0ad49e47ea6200370490100407898ad3881ca41ade0940461a SHA512 13dd963dd0899bb4d64bee44c20883e720e469a4d77456b877d6693cfc4419805a045cb561508cdf763dbb37cc84fbdc6177d68acc2183934c3224fbd03caf15
 DIST exim-pdf-4.97.1.tar.xz 2139688 BLAKE2B baadbb6ca7b88b11ea88f6b5ce0c96d9d713a1f5b358e4dfb52647ccc2bb1a9a6f74e75341839a8ee7df327f2f5645dbf223e4e5923631b02aa53a777701b436 SHA512 6aa733b1d48b6237f458939ff53e484e702f47a0c10ba781ba101db404d39667bd2ddc876af4f597deda1991e534d5b8b874c549e6a86b5325ebd624a6713183
+DIST exim-pdf-4.98.2.tar.xz 2139176 BLAKE2B 7ac5a0e4107ce3928417bcc39fef6ad6ab817ad415290dc2be913f5df56ee24ee89b26ed7be07b10580b14690b89548ef9c14ed98ddaa57133ec4d6940e2014d SHA512 ca33c47911e44f1d3918180389259e9f2e7256a2186130667dfbe71d244eb3d8df5d56136fe48b564cc756c776678780d444afc99f3163e2852f9e067739fd34
 DIST exim-pdf-4.98.tar.xz 2148892 BLAKE2B 032660d946d54684ab495fd93fc600f2c2611ed87cfae2f15b4dc1e4e2a1de2eea4ba273f25085b7f8a5be481848129c366daad9447bd185ca087800a3ea1c9f SHA512 e9abce5c37fd102243c08f3eb25fe44d2fb79a9e41b23aa8f72b87d26fdb8ab13d2da8d0a7bf2ee4f9ce84d69c72f80483ca375710cd4ab87c32270ce1392641
 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3

diff --git a/mail-mta/exim/exim-4.98.ebuild b/mail-mta/exim/exim-4.98.2.ebuild
similarity index 99%
rename from mail-mta/exim/exim-4.98.ebuild
rename to mail-mta/exim/exim-4.98.2.ebuild
index 44fa0a5c60e0..f83e14bb48d4 100644
--- a/mail-mta/exim/exim-4.98.ebuild
+++ b/mail-mta/exim/exim-4.98.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -119,6 +119,7 @@ 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     "${FILESDIR}"/exim-4.98-tidydb-crash.patch # upstream #3144
 
 	# oddity, they disable berkdb as hack, and then throw an error when
 	# berkdb isn't enabled

diff --git a/mail-mta/exim/files/exim-4.98-tidydb-crash.patch b/mail-mta/exim/files/exim-4.98-tidydb-crash.patch
new file mode 100644
index 000000000000..7f109688c41b
--- /dev/null
+++ b/mail-mta/exim/files/exim-4.98-tidydb-crash.patch
@@ -0,0 +1,16 @@
+https://bugs.exim.org/show_bug.cgi?id=3144
+
+--- a/src/hintsdb.h
++++ b/src/hintsdb.h
+@@ -596,7 +596,11 @@
+ /* EXIM_DBDELETE_CURSOR - terminate scanning operation. */
+ static inline void
+ exim_dbdelete_cursor(EXIM_CURSOR * cursor)
++# ifdef COMPILE_UTILITY
++{ free(cursor); }
++# else
+ { store_free(cursor); }
++# endif
+ 
+ /* EXIM_DBCLOSE */
+ static inline void