Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1715872934176170"
MIME-Version: 1.0
Date: Thu, 16 May 2024 15:22:14 +0000
From: "Takahiro Kambe" <taca@netbsd.org>
Subject: CVS commit: pkgsrc/mail/rspamd
To: pkgsrc-changes@NetBSD.org
Reply-To: taca@netbsd.org
Message-Id: <20240516152214.46AD8FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1715872934176170
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	taca
Date:		Thu May 16 15:22:14 UTC 2024

Modified Files:
	pkgsrc/mail/rspamd: Makefile cfgfiles.mk distinfo
Added Files:
	pkgsrc/mail/rspamd/patches: patch-src_plugins_lua_dmarc.lua

Log Message:
mail/rspamd: fix DMARC report on NetBSD

Fix DMARC report on NetBSD.

os.date() require integer as second argument but get_date() returns
float on NetBSD.  So, convert return value of get_date() to integer.

Without this change, data required for DMARC report would not be stored to
Redis.

This fix is provided from Yoshitaka Tokugawa <toku at tokugawa.org>.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/mail/rspamd/cfgfiles.mk
cvs rdiff -u -r1.57 -r1.58 pkgsrc/mail/rspamd/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/rspamd/patches/patch-src_plugins_lua_dmarc.lua

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


--_----------=_1715872934176170
Content-Disposition: inline
Content-Length: 5152
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.104 pkgsrc/mail/rspamd/Makefile:1.105
--- pkgsrc/mail/rspamd/Makefile:1.104	Thu Apr 25 15:19:22 2024
+++ pkgsrc/mail/rspamd/Makefile	Thu May 16 15:22:13 2024
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2024/04/25 15:19:22 taca Exp $
+# $NetBSD: Makefile,v 1.105 2024/05/16 15:22:13 taca Exp $
 
 DISTNAME=	rspamd-3.8.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=rspamd/}
 

Index: pkgsrc/mail/rspamd/cfgfiles.mk
diff -u pkgsrc/mail/rspamd/cfgfiles.mk:1.9 pkgsrc/mail/rspamd/cfgfiles.mk:1.10
--- pkgsrc/mail/rspamd/cfgfiles.mk:1.9	Sun Jan 21 20:22:57 2024
+++ pkgsrc/mail/rspamd/cfgfiles.mk	Thu May 16 15:22:13 2024
@@ -1,4 +1,3 @@
-# $NetBSD: cfgfiles.mk,v 1.9 2024/01/21 20:22:57 wiz Exp $
+# $NetBSD: cfgfiles.mk,v 1.10 2024/05/16 15:22:13 taca Exp $
 # Do not edit, regenerate using 'make cfgfiles'
 CFGFILES=	actions.conf cgp.inc common.conf composites.conf groups.conf lang_detection.inc logging.inc maps.d/dmarc_whitelist.inc maps.d/maillist.inc maps.d/mid.inc maps.d/mime_types.inc maps.d/redirectors.inc maps.d/spf_dkim_whitelist.inc maps.d/surbl-whitelist.inc metrics.conf modules.conf modules.d/antivirus.conf modules.d/arc.conf modules.d/asn.conf modules.d/aws_s3.conf modules.d/bimi.conf modules.d/chartable.conf modules.d/clickhouse.conf modules.d/dcc.conf modules.d/dkim.conf modules.d/dkim_signing.conf modules.d/dmarc.conf modules.d/elastic.conf modules.d/emails.conf modules.d/external_relay.conf modules.d/external_services.conf modules.d/force_actions.conf modules.d/forged_recipients.conf modules.d/fuzzy_check.conf modules.d/greylist.conf modules.d/hfilter.conf modules.d/history_redis.conf modules.d/http_headers.conf modules.d/known_senders.conf modules.d/maillist.conf modules.d/metadata_exporter.conf modules.d/metric_exporter.conf modules.d/mid.conf modules.d/milter_headers
 .conf modules.d/mime_types.conf modules.d/multimap.conf modules.d/mx_check.conf modules.d/neural.conf modules.d/once_received.conf modules.d/p0f.conf modules.d/phishing.conf modules.d/ratelimit.conf modules.d/rbl.conf modules.d/redis.conf modules.d/regexp.conf modules.d/replies.conf modules.d/reputation.conf modules.d/rspamd_update.conf modules.d/spamassassin.conf modules.d/spamtrap.conf modules.d/spf.conf modules.d/surbl.conf modules.d/trie.conf modules.d/url_redirector.conf modules.d/whitelist.conf options.inc rspamd.conf scores.d/content_group.conf scores.d/fuzzy_group.conf scores.d/headers_group.conf scores.d/hfilter_group.conf scores.d/mime_types_group.conf scores.d/mua_group.conf scores.d/phishing_group.conf scores.d/policies_group.conf scores.d/rbl_group.conf scores.d/statistics_group.conf scores.d/subject_group.conf scores.d/surbl_group.conf scores.d/whitelist_group.conf settings.conf statistic.conf worker-controller.inc worker-fuzzy.inc worker-normal.inc worker-proxy.inc
-

Index: pkgsrc/mail/rspamd/distinfo
diff -u pkgsrc/mail/rspamd/distinfo:1.57 pkgsrc/mail/rspamd/distinfo:1.58
--- pkgsrc/mail/rspamd/distinfo:1.57	Sun Mar  3 11:36:53 2024
+++ pkgsrc/mail/rspamd/distinfo	Thu May 16 15:22:13 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.57 2024/03/03 11:36:53 wiz Exp $
+$NetBSD: distinfo,v 1.58 2024/05/16 15:22:13 taca Exp $
 
 BLAKE2s (rspamd-3.8.4.tar.gz) = 00fd3204252f90d9c3293410f3d4026bcd049e84552ce610828ecc3a0c9b9e81
 SHA512 (rspamd-3.8.4.tar.gz) = dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
@@ -10,4 +10,5 @@ SHA1 (patch-contrib_fpconv_fpconv.c) = b
 SHA1 (patch-src_libserver_cfg__utils.cxx) = 7122f06adeaaa9a362606ef38147b7e39f66393c
 SHA1 (patch-src_libserver_symcache_symcache__impl.cxx) = 8a5c69ab343409427619a9cbc0dc080d548b9c53
 SHA1 (patch-src_libstat_backends_redis__backend.cxx) = 4c60287a574066a841c76081cd88512a57f0b27f
+SHA1 (patch-src_plugins_lua_dmarc.lua) = 61b36989b16ad8fea25bafcfd96cd83f57a44bd3
 SHA1 (patch-src_rspamd.c) = 1903994d5970af57de9c5d522df3dd12576c8418

Added files:

Index: pkgsrc/mail/rspamd/patches/patch-src_plugins_lua_dmarc.lua
diff -u /dev/null pkgsrc/mail/rspamd/patches/patch-src_plugins_lua_dmarc.lua:1.1
--- /dev/null	Thu May 16 15:22:14 2024
+++ pkgsrc/mail/rspamd/patches/patch-src_plugins_lua_dmarc.lua	Thu May 16 15:22:14 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_plugins_lua_dmarc.lua,v 1.1 2024/05/16 15:22:14 taca Exp $
+
+os.date() require integer as second argument but get_date() returns
+float on NetBSD.  So, convert return value of get_date() to integer.
+
+This fix is provided from Yoshitaka Tokugawa <toku at tokugawa.org>.
+
+--- src/plugins/lua/dmarc.lua.orig	2024-02-26 09:36:56.000000000 +0000
++++ src/plugins/lua/dmarc.lua
+@@ -310,7 +310,7 @@ local function dmarc_validate_policy(tas
+ 
+     -- Prepare and send redis report element
+     local period = os.date('%Y%m%d',
+-        task:get_date({ format = 'connect', gmt = false }))
++        math.floor(task:get_date({ format = 'connect', gmt = false })))
+ 
+     -- Dmarc domain key must include dmarc domain, rua and period
+     local dmarc_domain_key = table.concat(


--_----------=_1715872934176170--