CVS commit: pkgsrc/mail

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/mail
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 3 Nov 2025 09:50:52 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Nov  3 09:50:52 UTC 2025

Modified Files:
        pkgsrc/mail/exim: Makefile distinfo
        pkgsrc/mail/exim-html: Makefile PLIST distinfo
        pkgsrc/mail/exim/patches: patch-Local_Makefile.pkgsrc
            patch-lookups_Makefile
Added Files:
        pkgsrc/mail/exim/patches: patch-src_utils_exicyclog.src
Removed Files:
        pkgsrc/mail/exim/patches: patch-src_exicyclog.src

Log Message:
exim exim-html: updated to 4.99

4.99
This is a security release. It addresses a use-after-free bug. Please check CVE-2025-30232 for more details.


To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 pkgsrc/mail/exim/Makefile
cvs rdiff -u -r1.91 -r1.92 pkgsrc/mail/exim/distinfo
cvs rdiff -u -r1.48 -r1.49 pkgsrc/mail/exim-html/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/mail/exim-html/PLIST
cvs rdiff -u -r1.41 -r1.42 pkgsrc/mail/exim-html/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/exim/patches/patch-Local_Makefile.pkgsrc \
    pkgsrc/mail/exim/patches/patch-lookups_Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/mail/exim/patches/patch-src_exicyclog.src
cvs rdiff -u -r0 -r1.1 pkgsrc/mail/exim/patches/patch-src_utils_exicyclog.src

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/exim/Makefile
diff -u pkgsrc/mail/exim/Makefile:1.212 pkgsrc/mail/exim/Makefile:1.213
--- pkgsrc/mail/exim/Makefile:1.212     Thu Oct 23 20:38:08 2025
+++ pkgsrc/mail/exim/Makefile   Mon Nov  3 09:50:51 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.212 2025/10/23 20:38:08 wiz Exp $
+# $NetBSD: Makefile,v 1.213 2025/11/03 09:50:51 adam Exp $
 
-DISTNAME=      exim-4.98.2
-PKGREVISION=   2
+DISTNAME=      exim-4.99
 CATEGORIES=    mail net
 MASTER_SITES=  https://ftp.exim.org/pub/exim/exim4/
 MASTER_SITES+= https://ftp.exim.org/pub/exim/exim4/fixes/

Index: pkgsrc/mail/exim/distinfo
diff -u pkgsrc/mail/exim/distinfo:1.91 pkgsrc/mail/exim/distinfo:1.92
--- pkgsrc/mail/exim/distinfo:1.91      Wed Mar 26 18:27:27 2025
+++ pkgsrc/mail/exim/distinfo   Mon Nov  3 09:50:51 2025
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.91 2025/03/26 18:27:27 abs Exp $
+$NetBSD: distinfo,v 1.92 2025/11/03 09:50:51 adam Exp $
 
-BLAKE2s (exim-4.98.2.tar.xz) = f9fc9d0c7473f68a5f64ab392a23038c142d8b12070bfeb7937c873ec515c3c0
-SHA512 (exim-4.98.2.tar.xz) = aaa4cfc8aee90818c6d1c2fd0cf64b82668d1a343f462f678b38b2b79e10a467240f2e81786eec7705eec3598d23686a74437c50b68502f29ff67788393c812a
-Size (exim-4.98.2.tar.xz) = 1929020 bytes
-SHA1 (patch-Local_Makefile.pkgsrc) = d9d2296bb5345f0f814b5616af32d2157e29f2aa
+BLAKE2s (exim-4.99.tar.xz) = 32e627725ab0bde8568a59bb3d66e57abec9fef3441c178c7378876f143baf5e
+SHA512 (exim-4.99.tar.xz) = 06521aff437dfe99c015606d2cdde76eaf6e4d2f03779b07fbc0e7d06fe0584366cae9c3fa7d73a86c348f0d25336acd06c42bd5b8f18e5a969de9849088e3aa
+Size (exim-4.99.tar.xz) = 1933348 bytes
+SHA1 (patch-Local_Makefile.pkgsrc) = 9414802bae7ca32eb0639058c5e77795c685f308
 SHA1 (patch-OS_Makefile-Default) = 32681d5114eef2da1f624127655edfdeaaa68d64
-SHA1 (patch-lookups_Makefile) = cfc40dba3f75ef37b9887f7767139ad50cf9d4e5
+SHA1 (patch-lookups_Makefile) = 96fa8cb8561e0d770a7eef91f6c6aa093d44aacd
 SHA1 (patch-scripts_exim__install) = aa0a31e77d5f76e33bc92140c14d39c79f710b95
-SHA1 (patch-src_exicyclog.src) = cea5f04f52c9264fd7d279c046686dac2dc57a65
+SHA1 (patch-src_utils_exicyclog.src) = 587d2a489bb5fc53ecf58fbfa2c8d2d350c7a1ec

Index: pkgsrc/mail/exim-html/Makefile
diff -u pkgsrc/mail/exim-html/Makefile:1.48 pkgsrc/mail/exim-html/Makefile:1.49
--- pkgsrc/mail/exim-html/Makefile:1.48 Fri Jul 12 07:04:45 2024
+++ pkgsrc/mail/exim-html/Makefile      Mon Nov  3 09:50:52 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2024/07/12 07:04:45 adam Exp $
+# $NetBSD: Makefile,v 1.49 2025/11/03 09:50:52 adam Exp $
 
-DISTNAME=      exim-html-4.98
+DISTNAME=      exim-html-4.99
 CATEGORIES=    mail net
 MASTER_SITES=  ftp://ftp.exim.org/pub/exim/exim4/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/mail/exim-html/PLIST
diff -u pkgsrc/mail/exim-html/PLIST:1.24 pkgsrc/mail/exim-html/PLIST:1.25
--- pkgsrc/mail/exim-html/PLIST:1.24    Sun Nov 14 20:19:08 2021
+++ pkgsrc/mail/exim-html/PLIST Mon Nov  3 09:50:52 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2021/11/14 20:19:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2025/11/03 09:50:52 adam Exp $
 share/doc/exim/html/spec_html/ch-access_control_lists.html
 share/doc/exim/html/spec_html/ch-adding_a_local_scan_function_to_exim.html
 share/doc/exim/html/spec_html/ch-adding_new_drivers_or_lookup_types.html
@@ -185,4 +185,8 @@ share/doc/exim/html/static/doc/security/
 share/doc/exim/html/static/doc/security/CVE-2020-qualys/patches1.txt
 share/doc/exim/html/static/doc/security/CVE-2020-qualys/patches2.txt
 share/doc/exim/html/static/doc/security/CVE-2020-qualys/patches3.txt
+share/doc/exim/html/static/doc/security/CVE-2021-38371.txt
+share/doc/exim/html/static/doc/security/CVE-2023-zdi.txt
+share/doc/exim/html/static/doc/security/CVE-2025-26794.txt
+share/doc/exim/html/static/doc/security/CVE-2025-30232.txt
 share/doc/exim/html/static/js/common.js

Index: pkgsrc/mail/exim-html/distinfo
diff -u pkgsrc/mail/exim-html/distinfo:1.41 pkgsrc/mail/exim-html/distinfo:1.42
--- pkgsrc/mail/exim-html/distinfo:1.41 Fri Jul 12 07:04:45 2024
+++ pkgsrc/mail/exim-html/distinfo      Mon Nov  3 09:50:52 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.41 2024/07/12 07:04:45 adam Exp $
+$NetBSD: distinfo,v 1.42 2025/11/03 09:50:52 adam Exp $
 
-BLAKE2s (exim-html-4.98.tar.xz) = 7c1608700f73439d51cdb9e18b67cda4c0728557c065df4413896d3a9cfacf06
-SHA512 (exim-html-4.98.tar.xz) = 8ce5b208890c844178b7724e95f077a7afb05133c696ad18b2970126dcce8013a2f77112b24952c015df75a73759526eda80340d3b3f28f0cddadd306ebf4801
-Size (exim-html-4.98.tar.xz) = 575720 bytes
+BLAKE2s (exim-html-4.99.tar.xz) = 71b002eb3c2223ed7670d745542641cb6050c35ea6b9681785ba54898041883d
+SHA512 (exim-html-4.99.tar.xz) = 763a4f0a4803156d6fa4d14cccfbdc1c25fb5d11f2cbdc3cd56ad4675e04fb20cf4f83d798a619201c6d9dce6f5d7bbd554a968616758ca01c159b5dbec39283
+Size (exim-html-4.99.tar.xz) = 584244 bytes

Index: pkgsrc/mail/exim/patches/patch-Local_Makefile.pkgsrc
diff -u pkgsrc/mail/exim/patches/patch-Local_Makefile.pkgsrc:1.3 pkgsrc/mail/exim/patches/patch-Local_Makefile.pkgsrc:1.4
--- pkgsrc/mail/exim/patches/patch-Local_Makefile.pkgsrc:1.3    Tue Feb 25 18:22:23 2025
+++ pkgsrc/mail/exim/patches/patch-Local_Makefile.pkgsrc        Mon Nov  3 09:50:51 2025
@@ -1,10 +1,10 @@
-$NetBSD: patch-Local_Makefile.pkgsrc,v 1.3 2025/02/25 18:22:23 nia Exp $
+$NetBSD: patch-Local_Makefile.pkgsrc,v 1.4 2025/11/03 09:50:51 adam Exp $
 
 Avoid hardcoded paths.
 
---- Local/Makefile.pkgsrc.orig 2019-12-09 08:46:14.000000000 +0000
+--- Local/Makefile.pkgsrc.orig 2025-11-03 09:32:03.488732270 +0000
 +++ Local/Makefile.pkgsrc
-@@ -100,7 +100,7 @@
+@@ -104,7 +104,7 @@
  # /usr/local/sbin. The installation script will try to create this directory,
  # and any superior directories, if they do not exist.
  
@@ -13,7 +13,7 @@ Avoid hardcoded paths.
  
  
  #------------------------------------------------------------------------------
-@@ -116,7 +116,7 @@ BIN_DIRECTORY=/usr/exim/bin
+@@ -120,7 +120,7 @@ BIN_DIRECTORY=/usr/exim/bin
  # don't exist. It will also install a default runtime configuration if this
  # file does not exist.
  
@@ -22,7 +22,7 @@ Avoid hardcoded paths.
  
  # It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
  # In this case, Exim will use the first of them that exists when it is run.
-@@ -133,7 +133,7 @@ CONFIGURE_FILE=/usr/exim/configure
+@@ -137,7 +137,7 @@ CONFIGURE_FILE=/usr/exim/configure
  # deliveries. (Local deliveries run as various non-root users, typically as the
  # owner of a local mailbox.) Specifying these values as root is not supported.
  
@@ -31,7 +31,7 @@ Avoid hardcoded paths.
  
  # If you specify EXIM_USER as a name, this is looked up at build time, and the
  # uid number is built into the binary. However, you can specify that this
-@@ -154,7 +154,7 @@ EXIM_USER=
+@@ -158,7 +158,7 @@ EXIM_USER=
  # for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless
  # you want to use a group other than the default group for the given user.
  
@@ -40,7 +40,7 @@ Avoid hardcoded paths.
  
  # Many sites define a user called "exim", with an appropriate default group,
  # and use
-@@ -175,7 +175,7 @@ EXIM_USER=
+@@ -179,7 +179,7 @@ EXIM_USER=
  
  # Almost all installations choose this:
  
@@ -49,16 +49,16 @@ Avoid hardcoded paths.
  
  
  
-@@ -752,7 +752,7 @@ FIXED_NEVER_USERS=root
- # included in the Exim binary. You will then need to set up the run time
- # configuration to make use of the mechanism(s) selected.
+@@ -879,7 +879,7 @@ FIXED_NEVER_USERS=root
+ # core exim build.  This gets them linked with the module instead.
+ # The heimdal does build but we have no test coverage so it is not know to work.
  
 -# AUTH_CRAM_MD5=yes
 +AUTH_CRAM_MD5=yes
  # AUTH_CYRUS_SASL=yes
  # AUTH_DOVECOT=yes
  # AUTH_EXTERNAL=yes
-@@ -761,8 +761,8 @@ FIXED_NEVER_USERS=root
+@@ -888,8 +888,8 @@ FIXED_NEVER_USERS=root
  # AUTH_HEIMDAL_GSSAPI=yes
  # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi
  # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi heimdal-krb5
@@ -69,7 +69,7 @@ Avoid hardcoded paths.
  # AUTH_TLS=yes
  
  # Heimdal through 1.5 required pkg-config 'heimdal-gssapi'; Heimdal 7.1
-@@ -896,7 +896,7 @@ HEADERS_CHARSET="ISO-8859-1"
+@@ -1026,7 +1026,7 @@ HEADERS_CHARSET="ISO-8859-1"
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -78,7 +78,7 @@ Avoid hardcoded paths.
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -1201,13 +1201,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
+@@ -1326,13 +1326,13 @@ SYSTEM_ALIASES_FILE=/etc/aliases
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
@@ -99,7 +99,7 @@ Avoid hardcoded paths.
  
  
  #------------------------------------------------------------------------------
-@@ -1409,7 +1409,7 @@ EXIM_TMPDIR="/tmp"
+@@ -1534,7 +1534,7 @@ EXIM_TMPDIR="/tmp"
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
@@ -108,7 +108,7 @@ Avoid hardcoded paths.
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-@@ -1465,6 +1465,13 @@ EXIM_TMPDIR="/tmp"
+@@ -1590,6 +1590,13 @@ EXIM_TMPDIR="/tmp"
  
  # EXPAND_LISTMATCH_RHS=yes
  
Index: pkgsrc/mail/exim/patches/patch-lookups_Makefile
diff -u pkgsrc/mail/exim/patches/patch-lookups_Makefile:1.3 pkgsrc/mail/exim/patches/patch-lookups_Makefile:1.4
--- pkgsrc/mail/exim/patches/patch-lookups_Makefile:1.3 Wed Jul 23 14:09:52 2014
+++ pkgsrc/mail/exim/patches/patch-lookups_Makefile     Mon Nov  3 09:50:51 2025
@@ -1,42 +1,31 @@
-$NetBSD: patch-lookups_Makefile,v 1.3 2014/07/23 14:09:52 adam Exp $
+$NetBSD: patch-lookups_Makefile,v 1.4 2025/11/03 09:50:51 adam Exp $
 
 Avoid use of non-portable "local" keyword.
 
---- scripts/lookups-Makefile.orig      2014-07-21 14:28:07.000000000 +0000
+--- scripts/lookups-Makefile.orig      2025-10-27 13:16:13.000000000 +0000
 +++ scripts/lookups-Makefile
-@@ -87,16 +87,16 @@ fi
+@@ -92,16 +92,16 @@ fi
  # command-line, not just check the Makefile.
  
  want_dynamic() {
 -  local dyn_name="$1"
--  local re="LOOKUP_${dyn_name}[ $tab]*=[ $tab]*2"
+-  local re="(LOOKUP|EXPERIMENTAL)_${dyn_name}[ $tab]*=[ $tab]*2"
 +  dyn_name="$1"
-+  re="LOOKUP_${dyn_name}[ $tab]*=[ $tab]*2"
-   env | grep -q "^$re"
++  re="(LOOKUP|EXPERIMENTAL)_${dyn_name}[ $tab]*=[ $tab]*2"
+   env | ${egrep} -q "^$re"
    if [ $? -eq 0 ]; then return 0; fi
-   grep -q "^[ $tab]*$re" "$defs_source"
+   ${egrep} -q "^[ $tab]*$re" "$defs_source"
  }
  
  want_at_all() {
 -  local want_name="$1"
--  local re="LOOKUP_${want_name}[ $tab]*=[ $tab]*."
+-  local re="(LOOKUP|EXPERIMENTAL)_${want_name}[ $tab]*=[ $tab]*."
 +  want_name="$1"
-+  re="LOOKUP_${want_name}[ $tab]*=[ $tab]*."
-   env | grep -q "^$re"
++  re="(LOOKUP|EXPERIMENTAL)_${want_name}[ $tab]*=[ $tab]*."
+   env | ${egrep} -q "^$re"
    if [ $? -eq 0 ]; then return 0; fi
-   grep -q "^[ $tab]*$re" "$defs_source"
-@@ -104,8 +104,8 @@ want_at_all() {
- 
- # Adapted want_at_all above to work for EXPERIMENTAL features
- want_experimental() {
--  local want_name="$1"
--  local re="EXPERIMENTAL_${want_name}[ $tab]*=[ $tab]*."
-+  want_name="$1"
-+  re="EXPERIMENTAL_${want_name}[ $tab]*=[ $tab]*."
-   env | grep -q "^$re"
-   if [ $? -eq 0 ]; then return 0; fi
-   grep -q "^[ $tab]*$re" "$defs_source"
-@@ -117,8 +117,7 @@ MODS=""
+   ${egrep} -q "^[ $tab]*$re" "$defs_source"
+@@ -113,8 +113,7 @@ MODS=""
  OBJ=""
  
  emit_module_rule() {

Added files:

Index: pkgsrc/mail/exim/patches/patch-src_utils_exicyclog.src
diff -u /dev/null pkgsrc/mail/exim/patches/patch-src_utils_exicyclog.src:1.1
--- /dev/null   Mon Nov  3 09:50:52 2025
+++ pkgsrc/mail/exim/patches/patch-src_utils_exicyclog.src      Mon Nov  3 09:50:51 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_utils_exicyclog.src,v 1.1 2025/11/03 09:50:51 adam Exp $
+
+--- src/utils/exicyclog.src.orig       2020-01-03 12:08:52.000000000 +0000
++++ src/utils/exicyclog.src
+@@ -49,15 +49,15 @@
+ # varies from OS to OS. Sigh.
+ 
+ keep=EXICYCLOG_MAX
+-compress=COMPRESS_COMMAND
++compress='COMPRESS_COMMAND'
+ suffix=COMPRESS_SUFFIX
+ 
+-chgrp=CHGRP_COMMAND
+-chmod=CHMOD_COMMAND
+-chown=CHOWN_COMMAND
+-mv=MV_COMMAND
+-rm=RM_COMMAND
+-touch=TOUCH_COMMAND
++chgrp='CHGRP_COMMAND'
++chmod='CHMOD_COMMAND'
++chown='CHOWN_COMMAND'
++mv='MV_COMMAND'
++rm='RM_COMMAND'
++touch='TOUCH_COMMAND'
+ 
+ # End of editable lines
+ #########################################################################

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index