From d7e7bb9f37ab3a7d83a3b1ca1121526d17f4bf63 Mon Sep 17 00:00:00 2001 From: Dima Panov Date: Thu, 27 Mar 2025 17:02:42 +0300 Subject: [PATCH] mail/exim*: update to 4.98.2 release (+) This is a security release, addressing CVE-2025-30232 JH/01 Fix use-after-free notified by Trend Micro (ref: ZDI-CAN-26250). Null out debug_pretrigger_buf pointer before freeing the buffer; the use of this buffer by the storage management checks the pointer for non-null before using it. Security: CVE-2025-30232 --- mail/exim-doc-html/Makefile | 2 +- mail/exim-doc-html/distinfo | 14 +++++++------- mail/exim/Makefile | 7 ++++--- mail/exim/distinfo | 6 +++--- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile index 05cdc7552426..f6fa251abc2b 100644 --- a/mail/exim-doc-html/Makefile +++ b/mail/exim-doc-html/Makefile @@ -1,5 +1,5 @@ PORTNAME= exim -PORTVERSION= 4.98.1 +PORTVERSION= 4.98.2 CATEGORIES= mail MASTER_SITES= EXIM MASTER_SITE_SUBDIR= /exim4/ \ diff --git a/mail/exim-doc-html/distinfo b/mail/exim-doc-html/distinfo index 2019aabfa6a0..b4a00b4e33e1 100644 --- a/mail/exim-doc-html/distinfo +++ b/mail/exim-doc-html/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1740152332 -SHA256 (exim/exim-html-4.98.1.tar.bz2) = 442e71abf5a9e83b44d97594579b8e1f207228ac86c6b7780c97762ac01f0099 -SIZE (exim/exim-html-4.98.1.tar.bz2) = 650644 -SHA256 (exim/exim-pdf-4.98.1.tar.bz2) = 1f91bb6129a226c4b7ada2efe20e9ef35d73dc650a99ce140af303dafae94a04 -SIZE (exim/exim-pdf-4.98.1.tar.bz2) = 2179378 -SHA256 (exim/exim-postscript-4.98.1.tar.bz2) = 23a783a21b0a374ee03c72b2a290a55ecb17a10f7649ca230a5f1644671d53b7 -SIZE (exim/exim-postscript-4.98.1.tar.bz2) = 1154076 +TIMESTAMP = 1743094429 +SHA256 (exim/exim-html-4.98.2.tar.bz2) = 05ed4a95f2f6b0ee3295e7f85e7f494669dd27ae6a27c90e0f47de29a388c593 +SIZE (exim/exim-html-4.98.2.tar.bz2) = 648688 +SHA256 (exim/exim-pdf-4.98.2.tar.bz2) = e546db84a2489a1ea35abb5abb9efaa91663fa0df2eff7e1458d2b0db4bb06b0 +SIZE (exim/exim-pdf-4.98.2.tar.bz2) = 2174509 +SHA256 (exim/exim-postscript-4.98.2.tar.bz2) = 6d0dc9c36bf6af6ba2c7f5d42ceea24472e823d5fe9a94f69996ed36e64bb33a +SIZE (exim/exim-postscript-4.98.2.tar.bz2) = 1153229 diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 6b1fddf04005..20c5eda544a6 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -52,7 +52,7 @@ EXIMON_USES= xorg EXIMON_USE= xorg=x11,xaw,xext,xmu,xt GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls ICONV_USES= iconv:lib,build -INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn +INTERNATIONAL_LIB_DEPENDS= libidn.so:dns/libidn libidn2.so:dns/libidn2 LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb MYSQL_USES= mysql OPENLDAP_USES= ldap @@ -109,7 +109,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Local-sa-exim.conf .endif -EXIM_VERSION= 4.98.1 +EXIM_VERSION= 4.98.2 SA_EXIM_VERSION=4.2.1 EXIM_INSTALL_ARG+= "-no_chown" "-no_symlink" EXTRA_PATCHES+= `${FIND} ${PATCHDIR} -name '74_*.patch'|${SORT} -h` @@ -239,7 +239,8 @@ SEDLIST+= -e 's,^\# (DISABLE_EVENT=),\1,' .if ${PORT_OPTIONS:MINTERNATIONAL} SEDLIST+= -e 's,^\# (SUPPORT_I18N=),\1,' \ - -e 's,XX_IDN_LIBS_XX,-L${LOCALBASE}/lib -lidn,' + -e 's,^\# (SUPPORT_I18N_2008=),\1,' \ + -e 's,XX_IDN_LIBS_XX,-L${LOCALBASE}/lib -lidn -lidn2,' .else SEDLIST+= -e 's,XX_IDN_LIBS_XX,,' .endif diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 2575af317c0b..0ca53f8594f3 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1740147997 -SHA256 (exim/exim-4.98.1.tar.bz2) = d7384c83738ebab1d34128028c3d08c2ce009ee191dc55d7ad383ff1a9e58e6e -SIZE (exim/exim-4.98.1.tar.bz2) = 2098576 +TIMESTAMP = 1743093330 +SHA256 (exim/exim-4.98.2.tar.bz2) = 14d7ead473394c8712f2d28835ea93c475603cbc2b3200b6188eac8782985cf1 +SIZE (exim/exim-4.98.2.tar.bz2) = 2098693 SHA256 (exim/sa-exim-4.2.1.tar.gz) = 24d4bf7b0fdddaea11f132981cebb6a86a4ab20ef54111a8ebd481b421c6e2c1 SIZE (exim/sa-exim-4.2.1.tar.gz) = 68933