rspamd: Update to 2.7

upstream changes:
-----------------
* Fixed issues with DKIM and ARC verification
    It was possible for some DKIM checks to fail where multiple signatures are
    present due to a canonicalisation bug. This issue has now been fixed. Arc
    plugin has also been fixed to support certain CV values.

* Added support for S/MIME containers
    From this version, Rspamd supports .p7 containers and extracting signed
    parts during the checks. For details see the following issue.

* Several important rules rework
    Anton Yuzhaninov has reworked many old rules in Rspamd improving their
    quality and has removed several outdated rules as well.

* Support of caching for regexp multimaps
    Regexp maps can now be cached on disk which should improve loading speed of
    large maps on reload/restart of Rspamd if they are unchanged.

* Neural plugin offline learning
    In this mode, Rspamd can train neural network from Clickhouse so it is
    possible to define better training conditions and manage learning for large
    systems with more fine grained control. Please refer to the corresponding
    documentation section for more details. Thanks to Andrew Lewis for
    implementing this functionality.

* Other changes
    Here is the list of the important changes:

    [Conf] Add R_DKIM_PERMFAIL to the metric
    [CritFix] Dkim: Fix simple canonicalisation if multiple signatures are presented
    [CritFix] Fix controller paths normalisation
    [Feature] Add INVALID_DATE rule
    [Feature] Add controller endpoint for training neural
    [Feature] Add sanity checks for actions thresholds
    [Feature] Add support of ‘==’ and ‘!=’ in Rspamd expressions
    [Feature] Composites: Improve composite atoms parser
    [Feature] Docker: use Debian slim variant
    [Feature] Elastic: Add some missing fields
    [Feature] Extract text from img alt attributes
    [Feature] Improve charset detection logic
    [Feature] Lua_clickhouse: Add optional row callback for large selections
    [Feature] Lua_dns_resolver: Add idna_convert_utf8 method
    [Feature] Lua_mime: Add ability to do multipattern replacement
    [Feature] Lua_trie: Allow to report start of the match
    [Feature] Multimap: support adding map values as extra options
    [Feature] Neural: Move PCA learning to a subprocess
    [Feature] RBL: support matching content/image URLs only
    [Feature] RBL: support use of multiple selectors
    [Feature] Reputation: Allow to specify ip masks
    [Feature] Support SMIME signed messages container
    [Feature] Support multiple conditions for symbols
    [Feature] Support ping in milter mode
    [Feature] Support rspamd_text in selector regexps
    [Feature] Use own daemonization routine
    [Feature] Vadesecure: Implement settings_outbound feature as recommended by Vade
    [Feature] rspamadm clickhouse command
    [Feature] allow hyperscan for aarch64
    [Fix] Allow to set priorities between post init scripts
    [Fix] Allow to use maps for strings that are not zero terminated
    [Fix] Apply max_lua_urls limit for emails as well
    [Fix] Arc: Fix CV check on signing
    [Fix] Arc: Fix signing of the broken ARC chains
    [Fix] Clickhouse: escape carriage return
    [Fix] Composites: Allow partial match
    [Fix] Deduct type of a table methods
    [Fix] Do not load errored hyperscan database
    [Fix] Do not process links in ignored html tags
    [Fix] Fix ClamAV result for cached encrypted file (#3395)
    [Fix] Fix canonicalisation when l= tag is presented
    [Fix] Fix flag shift
    [Fix] Fix handling of skip/skip_process http flags
    [Fix] Fix html attachments checks
    [Fix] Fix issue with pushing binary formats to Lua strings
    [Fix] Fix logging for rspamadm
    [Fix] Fix off-by-one with init check
    [Fix] Fix parsing of escape characters in quoted pairs
    [Fix] Fix pushing ucl strings with \0 inside
    [Fix] Fix quoted-printable soft newlines bugged case
    [Fix] Fix settings in case actions are set to null (#3415)
    [Fix] Fix several issues with auth results producing
    [Fix] Fix smtp comments exclusion
    [Fix] Fix smtp date syntax definition
    [Fix] Fix substring search in case if srchlen == inlen
    [Fix] Fix text selectors
    [Fix] Honour systemd setting when logging to console (#3514)
    [Fix] Html: Add entities collisions prevention logic (e.g. for mathml entities)
    [Fix] Lua_auth_results: Quote potentially bad values in AR header
    [Fix] Multimap: Fix flags usage
    [Fix] Multimap: Fix scoring for combined maps
    [Fix] Plug GList * leak in redis pool
    [Fix] RBL: allow for multiple matches of the same label if types are different
    [Fix] Rely on libev checks for file maps
    [Fix] Restore simple dkim canonicalisation mode
    [Fix] Return MimeCharset as we work with emails…
    [Fix] Spamassassin: Fix pcre_only flags
    [Fix] Spamassassin: Preserve ‘pcre_only’ flag when dealing with regexp replacements
    [Fix] Try to fix GError leak
    [Fix] Try to fix a mess with settings loading by adding priorities
    [Fix] Try to move setings initialisation to a later stage
    [Fix] Use dup fd in milter handler to avoid races with the proxy
    [Fix] Use message pointer to avoid obsolete data to be cached
    [Project] Rbl: Migrate to checks
    [Project] Rbl: Move config code outside of the plugin
    [Project] Ressurect empty prefilters as connection filters
    [Project] Support connection filters registration from Lua
    [Rework] Add final cleanup logic
    [Rework] Add preliminary support of hyperscan caching for re maps
    [Rework] Add stale cache removal
    [Rework] Clickhouse: Improve performance
    [Rework] Distinguish between strict config test mode
    [Rework] Furhter logging improvements
    [Rework] Milter_headers: improve extended_headers_rcpt support
    [Rework] Move parsers to a separate lua library
    [Rework] Neural: Skip composite symbols
    [Rework] Rbl: Rework defaults logic
    [Rework] Some tunes to cache saving
    [Rework] Track maps origins
    [Rework] Use full crypto hash for regexp maps
    [Rules] Remove broken rule

3 files changed, 14 insertions, 10 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index c4157314b95..cd9d6bec238 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2020/11/05 09:08:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.74 2021/01/21 16:53:30 triaxx Exp $
 
-DISTNAME=	rspamd-2.6
-PKGREVISION=	1
+DISTNAME=	rspamd-2.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=vstakhov/}
 
diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST
index 98797d8bbca..0b3b0f02f4d 100644
--- a/mail/rspamd/PLIST
+++ b/mail/rspamd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2020/10/03 16:49:27 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.22 2021/01/21 16:53:30 triaxx Exp $
 bin/rspamadm
 bin/rspamadm-${PKGVERSION}
 bin/rspamc
@@ -47,6 +47,7 @@ share/examples/rspamd/modules.d/fuzzy_check.conf
 share/examples/rspamd/modules.d/greylist.conf
 share/examples/rspamd/modules.d/hfilter.conf
 share/examples/rspamd/modules.d/history_redis.conf
+share/examples/rspamd/modules.d/http_headers.conf
 share/examples/rspamd/modules.d/maillist.conf
 share/examples/rspamd/modules.d/metadata_exporter.conf
 share/examples/rspamd/modules.d/metric_exporter.conf
@@ -203,8 +204,11 @@ share/rspamd/lualib/lua_urls_compose.lua
 share/rspamd/lualib/lua_util.lua
 share/rspamd/lualib/lua_verdict.lua
 share/rspamd/lualib/lupa.lua
+share/rspamd/lualib/plugins/neural.lua
+share/rspamd/lualib/plugins/rbl.lua
 share/rspamd/lualib/plugins_stats.lua
 share/rspamd/lualib/rescore_utility.lua
+share/rspamd/lualib/rspamadm/clickhouse.lua
 share/rspamd/lualib/rspamadm/configgraph.lua
 share/rspamd/lualib/rspamadm/confighelp.lua
 share/rspamd/lualib/rspamadm/configwizard.lua
@@ -240,6 +244,7 @@ share/rspamd/plugins/fuzzy_collect.lua
 share/rspamd/plugins/greylist.lua
 share/rspamd/plugins/hfilter.lua
 share/rspamd/plugins/history_redis.lua
+share/rspamd/plugins/http_headers.lua
 share/rspamd/plugins/ip_score.lua
 share/rspamd/plugins/maillist.lua
 share/rspamd/plugins/maps_stats.lua
@@ -271,11 +276,11 @@ share/rspamd/rules/bounce.lua
 share/rspamd/rules/content.lua
 share/rspamd/rules/controller/init.lua
 share/rspamd/rules/controller/maps.lua
+share/rspamd/rules/controller/neural.lua
 share/rspamd/rules/controller/selectors.lua
 share/rspamd/rules/forwarding.lua
 share/rspamd/rules/headers_checks.lua
 share/rspamd/rules/html.lua
-share/rspamd/rules/http_headers.lua
 share/rspamd/rules/mid.lua
 share/rspamd/rules/misc.lua
 share/rspamd/rules/regexp/compromised_hosts.lua
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 4e98fd7993b..9141fe3a043 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.36 2020/10/07 00:04:40 schmonz Exp $
+$NetBSD: distinfo,v 1.37 2021/01/21 16:53:30 triaxx Exp $
 
-SHA1 (rspamd-2.6.tar.gz) = 56622201f414de9d4f06f28e799b22bd699616a0
-RMD160 (rspamd-2.6.tar.gz) = 4e37802bdff8eaed12ec2d85438997d65e2fe861
-SHA512 (rspamd-2.6.tar.gz) = 79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d033a3bf19cb94c89809fd92edec25192cffe97de9e5251681e1a71216b734a
-Size (rspamd-2.6.tar.gz) = 5079444 bytes
+SHA1 (rspamd-2.7.tar.gz) = 55a490066f1d8564c759151c1d0f12f7647abf5f
+RMD160 (rspamd-2.7.tar.gz) = 5ce1143a00d48ce0fb05bc1aac61311fadfeba59
+SHA512 (rspamd-2.7.tar.gz) = 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
+Size (rspamd-2.7.tar.gz) = 5126227 bytes
 SHA1 (patch-CMakeLists.txt) = 16f653a7bea23cd2440ebf730c5c7879af395f62
 SHA1 (patch-cmake_Toolset.cmake) = d4900720b85a8e3078c4fdaa76757fcbbd4f89bd
 SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6