CVS commit: pkgsrc/mail/rspamd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Aug 24 19:38:09 UTC 2023

Modified Files:
        pkgsrc/mail/rspamd: Makefile PLIST cfgfiles.mk distinfo
        pkgsrc/mail/rspamd/patches: patch-src_rspamd.c
Removed Files:
        pkgsrc/mail/rspamd/patches: patch-CMakeLists.txt

Log Message:
rspamd: update to 3.6.

3.6: 03 Aug 2023
  * [Conf] Add `one_shot` to some specific multimap rules
  * [Conf] Add language detection configuration
  * [Conf] Add missing attributes for the language detection configuration
  * [Conf] Remove outdated composite rules
  * [Feature] Add `sentinel_password` option
  * [Feature] Add ability to deny specific fuzzy flags by default
  * [Feature] Add controller endpoint to get fuzzy hashes from messages
  * [Feature] Add extra symbol when URL redirector reaches nested limit
  * [Feature] Add function to transliterate utf8 to ascii with some normalisation
  * [Feature] Add html parsing limit
  * [Feature] Add order to urls structure
  * [Feature] Add some missing functions to `lua_rsa` library
  * [Feature] Allow fuzzy workers to exchange blocked information
  * [Feature] Allow to have weak flags in fuzzy storage
  * [Feature] Allow to read options from maps in the multimap plugin
  * [Feature] Allow to use other methods when fasttext detection is enabled
  * [Feature] Count stats per key per flag
  * [Feature] Finish all features of dkim_keygen in Lua
  * [Feature] Khash: Allow static initialisation
  * [Feature] Maps: Add on_load support
  * [Feature] Preliminary implementation of dynamic composites
  * [Feature] Process HTML parts before text ones
  * [Feature] Reorganise struct rspamd_url to be 64 bytes size
  * [Feature] Save fuzzy ratelimit buckets
  * [Feature] Use in-place deflation for strings
  * [Feature] external_relay: add ip_map strategy
  * [Fix] Avoid race between config new/free by using a counter
  * [Fix] Do not use `rspamadm.dkim_keygen`
  * [Fix] Feed fasttext language model with the pre-tokenized words
  * [Fix] Fix `rspamd_has_only_html_part`
  * [Fix] Fix an old issue with order of destruction race between redis pool and lua
  * [Fix] Fix format string usage
  * [Fix] Fix parsing due to old bug revealed
  * [Fix] Fix parsing of the mask values that are invalid
  * [Fix] Ignore non-unique stop words
  * [Fix] Include the last character when parsing the last header with no value
  * [Fix] More fixes to fuzzystat
  * [Fix] Set proper counter
  * [Fix] Try harder to clean pending bucket
  * [Fix] Try harder to remove bad hyperscan files
  * [Fix] Update stats before encryption...
  * [Fix] dmarc gramar - allow spaces before ";"
  * [Fix] rbl: fix dependency registration when symbols_prefixes is used
  * [Fix] remove obsolete rspamd-redirector files
  * [Fix] test external_relay: count should always be the last rule, as it have no matching condition
  * [Project] Allow to register multimap symbols dynamically
  * [Project] Implement fasttext language detection
  * [Rework] Default max shots must not influence options
  * [Rework] Write dkim keygen tool in lua
  * [Rules] Add thread hijacking composite rule


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/mail/rspamd/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mail/rspamd/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/rspamd/cfgfiles.mk
cvs rdiff -u -r1.47 -r1.48 pkgsrc/mail/rspamd/distinfo
cvs rdiff -u -r1.9 -r0 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r1.3 pkgsrc/mail/rspamd/patches/patch-src_rspamd.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/rspamd/Makefile
diff -u pkgsrc/mail/rspamd/Makefile:1.90 pkgsrc/mail/rspamd/Makefile:1.91
--- pkgsrc/mail/rspamd/Makefile:1.90    Tue Jul 18 18:27:34 2023
+++ pkgsrc/mail/rspamd/Makefile Thu Aug 24 19:38:09 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.90 2023/07/18 18:27:34 nia Exp $
+# $NetBSD: Makefile,v 1.91 2023/08/24 19:38:09 wiz Exp $
 
-DISTNAME=      rspamd-3.5
+DISTNAME=      rspamd-3.6
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=rspamd/}
 
@@ -46,6 +46,8 @@ RUNDIR=               ${VARBASE}/run/rspamd
 FILES_SUBST+=  RSPAMD_USER=${RSPAMD_USER}
 FILES_SUBST+=  RSPAMD_GROUP=${RSPAMD_GROUP}
 
+INSTALLATION_DIRS+=    share/examples
+
 RCD_SCRIPTS=   rspamd
 SMF_METHODS=   rspamd
 
@@ -96,6 +98,9 @@ post-extract:
        ${FIND} ${WRKSRC}/conf -type d -exec ${CHMOD} ${PKGDIRMODE} {} \;
        ${FIND} ${WRKSRC}/conf -type f -exec ${CHMOD} ${DOCMODE} {} \;
 
+post-install:
+       ${MV} ${DESTDIR}${PREFIX}/etc/rspamd ${DESTDIR}${PREFIX}/share/examples/rspamd
+
 .include "../../devel/cmake/build.mk"
 .include "../../databases/hiredis/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"

Index: pkgsrc/mail/rspamd/PLIST
diff -u pkgsrc/mail/rspamd/PLIST:1.26 pkgsrc/mail/rspamd/PLIST:1.27
--- pkgsrc/mail/rspamd/PLIST:1.26       Wed Apr 26 19:54:42 2023
+++ pkgsrc/mail/rspamd/PLIST    Thu Aug 24 19:38:09 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2023/04/26 19:54:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.27 2023/08/24 19:38:09 wiz Exp $
 bin/rspamadm
 bin/rspamadm-${PKGVERSION}
 bin/rspamc
@@ -19,6 +19,7 @@ share/examples/rspamd/cgp.inc
 share/examples/rspamd/common.conf
 share/examples/rspamd/composites.conf
 share/examples/rspamd/groups.conf
+share/examples/rspamd/lang_detection.inc
 share/examples/rspamd/logging.inc
 share/examples/rspamd/maps.d/dmarc_whitelist.inc
 share/examples/rspamd/maps.d/maillist.inc
@@ -216,6 +217,13 @@ share/rspamd/lualib/plugins/dmarc.lua
 share/rspamd/lualib/plugins/neural.lua
 share/rspamd/lualib/plugins/rbl.lua
 share/rspamd/lualib/plugins_stats.lua
+share/rspamd/lualib/redis_scripts/neural_maybe_invalidate.lua
+share/rspamd/lualib/redis_scripts/neural_maybe_lock.lua
+share/rspamd/lualib/redis_scripts/neural_save_unlock.lua
+share/rspamd/lualib/redis_scripts/neural_train_size.lua
+share/rspamd/lualib/redis_scripts/ratelimit_check.lua
+share/rspamd/lualib/redis_scripts/ratelimit_cleanup_pending.lua
+share/rspamd/lualib/redis_scripts/ratelimit_update.lua
 share/rspamd/lualib/rescore_utility.lua
 share/rspamd/lualib/rspamadm/clickhouse.lua
 share/rspamd/lualib/rspamadm/configgraph.lua
@@ -223,6 +231,7 @@ share/rspamd/lualib/rspamadm/confighelp.
 share/rspamd/lualib/rspamadm/configwizard.lua
 share/rspamd/lualib/rspamadm/cookie.lua
 share/rspamd/lualib/rspamadm/corpus_test.lua
+share/rspamd/lualib/rspamadm/dkim_keygen.lua
 share/rspamd/lualib/rspamadm/dmarc_report.lua
 share/rspamd/lualib/rspamadm/dns_tool.lua
 share/rspamd/lualib/rspamadm/fuzzy_convert.lua
@@ -290,6 +299,7 @@ share/rspamd/plugins/whitelist.lua
 share/rspamd/rules/bitcoin.lua
 share/rspamd/rules/bounce.lua
 share/rspamd/rules/content.lua
+share/rspamd/rules/controller/fuzzy.lua
 share/rspamd/rules/controller/init.lua
 share/rspamd/rules/controller/maps.lua
 share/rspamd/rules/controller/neural.lua
@@ -354,4 +364,3 @@ share/rspamd/www/js/lib/visibility.min.j
 share/rspamd/www/js/main.js
 share/rspamd/www/mstile-150x150.png
 share/rspamd/www/safari-pinned-tab.svg
-@pkgdir etc/rspamd

Index: pkgsrc/mail/rspamd/cfgfiles.mk
diff -u pkgsrc/mail/rspamd/cfgfiles.mk:1.6 pkgsrc/mail/rspamd/cfgfiles.mk:1.7
--- pkgsrc/mail/rspamd/cfgfiles.mk:1.6  Tue Feb 11 20:39:48 2020
+++ pkgsrc/mail/rspamd/cfgfiles.mk      Thu Aug 24 19:38:09 2023
@@ -1,3 +1,3 @@
-# $NetBSD: cfgfiles.mk,v 1.6 2020/02/11 20:39:48 triaxx Exp $
+# $NetBSD: cfgfiles.mk,v 1.7 2023/08/24 19:38:09 wiz Exp $
 # Do not edit, regenerate using 'make cfgfiles'
-CFGFILES=      actions.conf cgp.inc common.conf composites.conf groups.conf 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/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_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/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.con
 f 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
+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/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.co
 nf 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.47 pkgsrc/mail/rspamd/distinfo:1.48
--- pkgsrc/mail/rspamd/distinfo:1.47    Wed Apr 26 19:54:42 2023
+++ pkgsrc/mail/rspamd/distinfo Thu Aug 24 19:38:09 2023
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.47 2023/04/26 19:54:42 wiz Exp $
+$NetBSD: distinfo,v 1.48 2023/08/24 19:38:09 wiz Exp $
 
-BLAKE2s (rspamd-3.5.tar.gz) = 266990e28cdfb2ef4f77099f0dc4fca30b03333f95fc6910549d16595977a1b6
-SHA512 (rspamd-3.5.tar.gz) = 39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623
-Size (rspamd-3.5.tar.gz) = 5806722 bytes
-SHA1 (patch-CMakeLists.txt) = f97a56da19c30a39b927c992c725c8a225049bf4
+BLAKE2s (rspamd-3.6.tar.gz) = 1481638675a661812d45dddb806fada9dbc4f39e51653f7fa4485ccd759c0d68
+SHA512 (rspamd-3.6.tar.gz) = d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
+Size (rspamd-3.6.tar.gz) = 5843907 bytes
 SHA1 (patch-cmake_Toolset.cmake) = fbc4027fedb4261ce913701ebbb32d8395bc7783
 SHA1 (patch-contrib_doctest_doctest_doctest.h) = 5238cb9f837e1d8f402023ddc2f7d02dda3f67ab
 SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6
 SHA1 (patch-src_libserver_symcache_symcache__impl.cxx) = 8a5c69ab343409427619a9cbc0dc080d548b9c53
-SHA1 (patch-src_rspamd.c) = b5b8cc948253526e0cde47ef4c436034f934923c
+SHA1 (patch-src_rspamd.c) = 1903994d5970af57de9c5d522df3dd12576c8418

Index: pkgsrc/mail/rspamd/patches/patch-src_rspamd.c
diff -u pkgsrc/mail/rspamd/patches/patch-src_rspamd.c:1.2 pkgsrc/mail/rspamd/patches/patch-src_rspamd.c:1.3
--- pkgsrc/mail/rspamd/patches/patch-src_rspamd.c:1.2   Mon Mar 13 11:41:57 2023
+++ pkgsrc/mail/rspamd/patches/patch-src_rspamd.c       Thu Aug 24 19:38:09 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_rspamd.c,v 1.2 2023/03/13 11:41:57 triaxx Exp $
+$NetBSD: patch-src_rspamd.c,v 1.3 2023/08/24 19:38:09 wiz Exp $
 
 Avoid sun define.
 
---- src/rspamd.c.orig  2022-10-01 14:19:21.000000000 +0000
+--- src/rspamd.c.orig  2023-08-03 13:56:19.000000000 +0000
 +++ src/rspamd.c
-@@ -455,7 +455,7 @@ systemd_get_socket (struct rspamd_main *
+@@ -456,7 +456,7 @@ systemd_get_socket(struct rspamd_main *r
        union {
                struct sockaddr_storage ss;
                struct sockaddr sa;
@@ -12,4 +12,4 @@ Avoid sun define.
 +              struct sockaddr_un s_un;
                struct sockaddr_in6 s6;
        } addr_storage;
-       socklen_t slen = sizeof (addr_storage);
+       socklen_t slen = sizeof(addr_storage);