CVS commit: pkgsrc/mail/exim

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Tue Oct 13 14:50:26 UTC 2026

Modified Files:
        pkgsrc/mail/exim: Makefile distinfo
Added Files:
        pkgsrc/mail/exim/patches: patch-src_miscmods_dmarc__common.c

Log Message:
mail/exim: Fix syntax error of data file generated by native dmarc support

* Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 pkgsrc/mail/exim/Makefile
cvs rdiff -u -r1.99 -r1.100 pkgsrc/mail/exim/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/exim/patches/patch-src_miscmods_dmarc__common.c

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.226 pkgsrc/mail/exim/Makefile:1.227
--- pkgsrc/mail/exim/Makefile:1.226     Tue Sep 29 06:06:21 2026
+++ pkgsrc/mail/exim/Makefile   Tue Oct 13 14:50:26 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.226 2026/09/29 06:06:21 wiz Exp $
+# $NetBSD: Makefile,v 1.227 2026/10/13 14:50:26 ryoon Exp $
 
 DISTNAME=      exim-4.100.1
-PKGREVISION=   2
+PKGREVISION=   3
 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.99 pkgsrc/mail/exim/distinfo:1.100
--- pkgsrc/mail/exim/distinfo:1.99      Tue Sep 22 07:12:51 2026
+++ pkgsrc/mail/exim/distinfo   Tue Oct 13 14:50:26 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99 2026/09/22 07:12:51 adam Exp $
+$NetBSD: distinfo,v 1.100 2026/10/13 14:50:26 ryoon Exp $
 
 BLAKE2s (exim-4.100.1.tar.xz) = facb6a74fa067aebf9ac3dd24f67a4e0daf38b0fd9b75d80682def51c60787b7
 SHA512 (exim-4.100.1.tar.xz) = 42b7d59bca187e0e8b3cd85d97ff40fe8de9d807fb12ce38749c30056c92689ce98b09874aec06f1d83fde806fe6193312a98681b56c8baff1acfcf91244bbab
@@ -7,4 +7,5 @@ SHA1 (patch-Local_Makefile.pkgsrc) = 941
 SHA1 (patch-OS_Makefile-Default) = 32681d5114eef2da1f624127655edfdeaaa68d64
 SHA1 (patch-lookups_Makefile) = ed0c54d1e4ad36944ab5d0947d92f4ebfd98417d
 SHA1 (patch-scripts_exim__install) = aa0a31e77d5f76e33bc92140c14d39c79f710b95
+SHA1 (patch-src_miscmods_dmarc__common.c) = b76ef65d7542bf3a124744d11ad24f49e922ce6f
 SHA1 (patch-src_utils_exicyclog.src) = 587d2a489bb5fc53ecf58fbfa2c8d2d350c7a1ec

Added files:

Index: pkgsrc/mail/exim/patches/patch-src_miscmods_dmarc__common.c
diff -u /dev/null pkgsrc/mail/exim/patches/patch-src_miscmods_dmarc__common.c:1.1
--- /dev/null   Tue Oct 13 14:50:26 2026
+++ pkgsrc/mail/exim/patches/patch-src_miscmods_dmarc__common.c Tue Oct 13 14:50:26 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_miscmods_dmarc__common.c,v 1.1 2026/10/13 14:50:26 ryoon Exp $
+
+* Fix a parse error by opendmarc-import.
+
+--- src/miscmods/dmarc_common.c.orig   2026-10-13 14:43:59.739228807 +0000
++++ src/miscmods/dmarc_common.c
+@@ -409,7 +409,7 @@ g = string_fmt_append(g, "align_dkim %d\
+           : ARES_RESULT_UNKNOWN;
+ 
+     g = string_fmt_append(g, "arc %d\n"
+-                           "arc_policy %d json[%#Y ]\n",
++                           "arc_policy %d json:[%#Y ]\n",
+                         i,
+                         i == ARES_RESULT_PASS ? DMARC_ARC_POLICY_RESULT_PASS
+                         : i == ARES_RESULT_FAIL ? DMARC_ARC_POLICY_RESULT_FAIL
+@@ -420,7 +420,7 @@ g = string_fmt_append(g, "align_dkim %d\
+   else
+ 
+ # endif
+-    g = string_fmt_append(g, "arc %d\narc_policy %d json[ ]\n",
++    g = string_fmt_append(g, "arc %d\narc_policy %d json:[ ]\n",
+                     ARES_RESULT_UNKNOWN, DMARC_ARC_POLICY_RESULT_UNUSED);
+   }
+ #endif