CVS commit: pkgsrc/mail

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Aug 24 11:47:25 UTC 2026

Modified Files:
        pkgsrc/mail/exim: Makefile distinfo
        pkgsrc/mail/exim-html: Makefile PLIST distinfo
        pkgsrc/mail/exim/patches: patch-lookups_Makefile

Log Message:
exim exim-html: updated to 4.100

New stuff added since 4.99

  1. Lookups "psl" and "regdom" for, respectively, the public suffix or the
     registered domain, given a domain and a Public Suffix List file.

  2. EXPERIMENTAL_DMARC_NATIVE optional build feature.  See the experimental.spec
     file.

  3. Log selectors "spf", "spf_verbose", "dmarc", "dmarc_verbose", "dsn".

  4. Commandline option "-bI:modules" for listing installed dynamic-load modules.

  5. Debug channels "start", "regex" and "macro".

  6. The exiwhat utility now includes, on the daemon process line, counts for
     smtp and queue-run children.

  7. Main config option "bounce_charset", for setting Content-type: headers.

  8. Event "proc:deliver".

  9. Commandline option "-oDSN" for DSN options on commandline sourced messages.

10. Nongreedy wildcards for local_parts affixes.

11. Main config option "queue_run_order", obsoleting "queue_run_in_order".

12. The redirection router options "forbid_*" and "allow_filter" are now
     expanded before use.

13. Sieve filtering now supports the "body" extension (RFC 5173).

14. Main config option "tls_eccurve" now accepts a groups tuple list.
      Also, new smtp transport option "tls_eccurve".

15. Smtp transport option "protocol" is now expanded.


To generate a diff of this commit:
cvs rdiff -u -r1.221 -r1.222 pkgsrc/mail/exim/Makefile
cvs rdiff -u -r1.97 -r1.98 pkgsrc/mail/exim/distinfo
cvs rdiff -u -r1.54 -r1.55 pkgsrc/mail/exim-html/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/mail/exim-html/PLIST
cvs rdiff -u -r1.47 -r1.48 pkgsrc/mail/exim-html/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/exim/patches/patch-lookups_Makefile

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.221 pkgsrc/mail/exim/Makefile:1.222
--- pkgsrc/mail/exim/Makefile:1.221     Tue Aug  4 20:29:04 2026
+++ pkgsrc/mail/exim/Makefile   Mon Aug 24 11:47:25 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.221 2026/08/04 20:29:04 wiz Exp $
+# $NetBSD: Makefile,v 1.222 2026/08/24 11:47:25 adam Exp $
 
-DISTNAME=      exim-4.99.5
+DISTNAME=      exim-4.100
 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.97 pkgsrc/mail/exim/distinfo:1.98
--- pkgsrc/mail/exim/distinfo:1.97      Thu Jul 23 06:40:04 2026
+++ pkgsrc/mail/exim/distinfo   Mon Aug 24 11:47:25 2026
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.97 2026/07/23 06:40:04 adam Exp $
+$NetBSD: distinfo,v 1.98 2026/08/24 11:47:25 adam Exp $
 
-BLAKE2s (exim-4.99.5.tar.xz) = 517a1c9c19984e7003dea89587ec5220cb628be5a630dea81f408a451d793c7a
-SHA512 (exim-4.99.5.tar.xz) = 28fd15d0d4e0114129fd42140fb5d5920fcd5cbfb6ac816197e3567c3d2ece6ec73367b43bd8d47d2b543adb89ad28a5e4c58a23210887f867a5c41c24e181b5
-Size (exim-4.99.5.tar.xz) = 1962384 bytes
+BLAKE2s (exim-4.100.tar.xz) = 61884b4de1ec70d64a4579e5fb53906ca0c58aa1e0498f23d5e7bbe84f9073c2
+SHA512 (exim-4.100.tar.xz) = e7f2cc1ba9af4b1113d9a40b384bf2e5439f539381126018fb9a15d3afaf687fd209d06d1cfa96e61426df0d9f4e7988e49e1192510abc02b2aa19b14b051abc
+Size (exim-4.100.tar.xz) = 2007860 bytes
 SHA1 (patch-Local_Makefile.pkgsrc) = 9414802bae7ca32eb0639058c5e77795c685f308
 SHA1 (patch-OS_Makefile-Default) = 32681d5114eef2da1f624127655edfdeaaa68d64
-SHA1 (patch-lookups_Makefile) = 96fa8cb8561e0d770a7eef91f6c6aa093d44aacd
+SHA1 (patch-lookups_Makefile) = ed0c54d1e4ad36944ab5d0947d92f4ebfd98417d
 SHA1 (patch-scripts_exim__install) = aa0a31e77d5f76e33bc92140c14d39c79f710b95
 SHA1 (patch-src_utils_exicyclog.src) = 587d2a489bb5fc53ecf58fbfa2c8d2d350c7a1ec

Index: pkgsrc/mail/exim-html/Makefile
diff -u pkgsrc/mail/exim-html/Makefile:1.54 pkgsrc/mail/exim-html/Makefile:1.55
--- pkgsrc/mail/exim-html/Makefile:1.54 Thu Jul 23 06:40:04 2026
+++ pkgsrc/mail/exim-html/Makefile      Mon Aug 24 11:47:25 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2026/07/23 06:40:04 adam Exp $
+# $NetBSD: Makefile,v 1.55 2026/08/24 11:47:25 adam Exp $
 
-DISTNAME=      exim-html-4.99.5
+DISTNAME=      exim-html-4.100
 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.30 pkgsrc/mail/exim-html/PLIST:1.31
--- pkgsrc/mail/exim-html/PLIST:1.30    Thu Jul 23 06:40:04 2026
+++ pkgsrc/mail/exim-html/PLIST Mon Aug 24 11:47:25 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2026/07/23 06:40:04 adam Exp $
+@comment $NetBSD: PLIST,v 1.31 2026/08/24 11:47:25 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
@@ -200,6 +200,8 @@ share/doc/exim/html/static/doc/security/
 share/doc/exim/html/static/doc/security/EXIM-Security-2026-05-01.1/xbow_correspondence.mbox.xz
 share/doc/exim/html/static/doc/security/EXIM-Security-2026-05-19.1.txt
 share/doc/exim/html/static/doc/security/EXIM-Security-2026-05-19.1/EXIM-Security-2026-05-19.1.txt
+share/doc/exim/html/static/doc/security/EXIM-Security-2026-06-22.1/EXIM-Security-2026-06-22.1.txt
+share/doc/exim/html/static/doc/security/EXIM-Security-2026-06-22.3/EXIM-Security-2026-06-22.3.txt
 share/doc/exim/html/static/doc/security/cve-2025-26794.eml
 share/doc/exim/html/static/doc/security/cve-2025-26974/mail-to-distros
 share/doc/exim/html/static/doc/security/cve-2025-26974/mail-to-oss

Index: pkgsrc/mail/exim-html/distinfo
diff -u pkgsrc/mail/exim-html/distinfo:1.47 pkgsrc/mail/exim-html/distinfo:1.48
--- pkgsrc/mail/exim-html/distinfo:1.47 Thu Jul 23 06:40:04 2026
+++ pkgsrc/mail/exim-html/distinfo      Mon Aug 24 11:47:25 2026
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.47 2026/07/23 06:40:04 adam Exp $
+$NetBSD: distinfo,v 1.48 2026/08/24 11:47:25 adam Exp $
 
-BLAKE2s (exim-html-4.99.5.tar.xz) = 1e26d9766f462247cf278f60e8e599cfac3bb6c59a7f1ed7ebf7f28f5fe6505a
-SHA512 (exim-html-4.99.5.tar.xz) = a6f8b5487c5476c824bcaf626be91f3594c25112cd93e029e20414ab249459ed178e7a6fd22dc0ee891fb5ba80a3bc1144a2f931d39f2fe49f19ef12bf5cbb97
-Size (exim-html-4.99.5.tar.xz) = 637144 bytes
+BLAKE2s (exim-html-4.100.tar.xz) = 50db2090a1e2c14dd2bf132ff3cb769c3605e1269a3d269407c7389bfe695094
+SHA512 (exim-html-4.100.tar.xz) = 56f243dc4adcd7bc0fc4c79e77182fcbc16b564d6e5e2db05bb4a02a619baae2019b36c05ea0a123a2b9566a336bfb1ced32bc29fa63d3e2b05664486c23660a
+Size (exim-html-4.100.tar.xz) = 639384 bytes

Index: pkgsrc/mail/exim/patches/patch-lookups_Makefile
diff -u pkgsrc/mail/exim/patches/patch-lookups_Makefile:1.4 pkgsrc/mail/exim/patches/patch-lookups_Makefile:1.5
--- pkgsrc/mail/exim/patches/patch-lookups_Makefile:1.4 Mon Nov  3 09:50:51 2025
+++ pkgsrc/mail/exim/patches/patch-lookups_Makefile     Mon Aug 24 11:47:25 2026
@@ -1,10 +1,10 @@
-$NetBSD: patch-lookups_Makefile,v 1.4 2025/11/03 09:50:51 adam Exp $
+$NetBSD: patch-lookups_Makefile,v 1.5 2026/08/24 11:47:25 adam Exp $
 
 Avoid use of non-portable "local" keyword.
 
---- scripts/lookups-Makefile.orig      2025-10-27 13:16:13.000000000 +0000
+--- scripts/lookups-Makefile.orig      2026-08-20 08:39:08.000000000 +0000
 +++ scripts/lookups-Makefile
-@@ -92,16 +92,16 @@ fi
+@@ -92,17 +92,17 @@ fi
  # command-line, not just check the Makefile.
  
  want_dynamic() {
@@ -19,13 +19,14 @@ Avoid use of non-portable "local" keywor
  
  want_at_all() {
 -  local want_name="$1"
--  local re="(LOOKUP|EXPERIMENTAL)_${want_name}[ $tab]*=[ $tab]*."
 +  want_name="$1"
-+  re="(LOOKUP|EXPERIMENTAL)_${want_name}[ $tab]*=[ $tab]*."
+   # SUPPORT is here purely for the spf lookup
+-  local re="(LOOKUP|EXPERIMENTAL|SUPPORT)_${want_name}[ $tab]*=[ $tab]*."
++  re="(LOOKUP|EXPERIMENTAL|SUPPORT)_${want_name}[ $tab]*=[ $tab]*."
    env | ${egrep} -q "^$re"
    if [ $? -eq 0 ]; then return 0; fi
    ${egrep} -q "^[ $tab]*$re" "$defs_source"
-@@ -113,8 +113,7 @@ MODS=""
+@@ -114,8 +114,7 @@ MODS=""
  OBJ=""
  
  emit_module_rule() {