rspamd: Update to 2.5

from GitHub user @sjorge + extra patch from me

Closes NetBSD/pkgsrc#60

2.5: 01 Apr 2020
  * [Conf] Mark Rspamd emailbl as ignore whitelist
  * [Conf] RBL: Add missing emails = true option
  * [Feature] Add support for scripts in fuzzy storage
  * [Feature] Arc: Add whitelisted_signers_map option
  * [Feature] Implement hosts file processing
  * [Feature] Neural: Introduce classes bias that allows non-equal classes learning
  * [Feature] Update libev to 4.33
  * [Fix] Another brain damage html standard adoptions
  * [Fix] Another fix for brain damaged obs-fws state
  * [Fix] Fix flags that caused force_actions failure
  * [Fix] Fix logging issue
  * [Fix] Fix lua symbols scores registration when config does not define scores
  * [Fix] Fix opaque maps logic
  * [Fix] Fix parsing of the html tags with no spaces after attributes
  * [Fix] Fix some corner cases in urls parsing, add limits
  * [Fix] Fix tlds extraction if custom composition rules are used
  * [Fix] Fix variables replacement in mempool
  * [Fix] Improve base64 detection
  * [Fix] Normalize dynamic scores in ANN correctly
  * [Fix] Plug memory leak introduced by #3153
  * [Fix] Stat_redis_backend: Fix memory leak and simplify learn path
  * [Fix] Try hard to deal with ghost workers
  * [Fix] metadata_exporter default formatter
  * [Rework] Change the way to extract URLs when dealing with alternative parts
  * [Rework] Fix various url extraction issues
  * [Rework] Re cache: Load compiled hyperscan in the main process as well
  * [Rework] Re cache: Load hyperscan early
  * [Rework] Rework URL structure: adjust tld part
  * [Rework] Rework URL structure: host field
  * [Rework] Rework URL structure: more structure optimisations
  * [Rework] Rework URL structure: user field
  * [Rework] URL: Another update for urls extraction logic
  * [Rework] Urls: Improve query urls handling
  * [Rework] Urls: adopt html related stuff
  * [Rework] Urls: more rework of the urls sets
  * [Rework] Urls: process query urls in HTML urls correctly
  * [Rework] Urls: rework urls hash structure
  * [Rework] Urls: update lua libraries
  * [Rework] Use multiple search tries for different url extraction types

2.4: 26 Feb 2020
  * [CritFix] Fix parsing of the content type attributes
  * [Feature] Clickhouse: Add extra columns support
  * [Feature] Rbl: Add url_compose_map option for RBL rules
  * [Fix] 'R' flag is for all headers regexp
  * [Fix] Allow to reset settings id from Lua (e.g. because of the priority)
  * [Fix] Avoid collisions in mempool variables by changing fuzzy caching logic
  * [Fix] Avoid strdup usage for symbols options
  * [Fix] Do not trust stat(2) it lies
  * [Fix] Filter all options for symbols to have sane characters
  * [Fix] Fix all headers iteration
  * [Fix] Fix allowed_settings for neural
  * [Fix] Fix listen socket parsing
  * [Fix] Fix maps expressions evaluation
  * [Fix] Fix sentinel connections leak by using async connections
  * [Fix] Fix smtp message on passthrough result
  * [Fix] Fix tld compositon rules
  * [Fix] Fuzzy_storage: Do not check for shingles if a direct hash has been found
  * [Fix] Lua_mime: Do not perform QP encoding for 7bit parts
  * [Fix] Neural: Distinguish missing symbols from symbols with low scores
  * [Fix] Support listening on systemd sockets by name
  * [Project] Add lua_urls_compose library
  * [Project] Allow to set a custom log function to the logger
  * [Project] CDB maps: Start making cdb a first class citizen
  * [Project] Clickhouse: Add extra columns concept
  * [Project] Fix urls composition rules, add unit tests
  * [Project] Unify cdb maps
  * [Rework] Logger infrastructure rework
  * [Rework] Refactor libraries structure
  * [Rework] Rework SSL caching
  * [Rework] Update snowball stemmer to 2.0 and remove all crap aside of UTF8

4 files changed, 29 insertions, 9 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 4eb2895b8dc..60ce46f7b03 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2020/04/12 08:28:57 adam Exp $
+# $NetBSD: Makefile,v 1.66 2020/05/18 11:10:56 nia Exp $
 
-DISTNAME=	rspamd-2.3
-PKGREVISION=	2
+DISTNAME=	rspamd-2.5
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=vstakhov/}
 
diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST
index 71ec68effb5..68282a69b5c 100644
--- a/mail/rspamd/PLIST
+++ b/mail/rspamd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2020/02/11 20:39:48 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.20 2020/05/18 11:10:56 nia Exp $
 bin/rspamadm
 bin/rspamadm-${PKGVERSION}
 bin/rspamc
@@ -197,6 +197,7 @@ share/rspamd/lualib/lua_settings.lua
 share/rspamd/lualib/lua_smtp.lua
 share/rspamd/lualib/lua_stat.lua
 share/rspamd/lualib/lua_tcp_sync.lua
+share/rspamd/lualib/lua_urls_compose.lua
 share/rspamd/lualib/lua_util.lua
 share/rspamd/lualib/lua_verdict.lua
 share/rspamd/lualib/lupa.lua
@@ -278,6 +279,7 @@ share/rspamd/rules/regexp/upstream_spam_filters.lua
 share/rspamd/rules/rspamd.lua
 share/rspamd/rules/subject_checks.lua
 share/rspamd/www/README.md
+share/rspamd/www/apple-touch-icon.png
 share/rspamd/www/browserconfig.xml
 share/rspamd/www/css/bootstrap.min.css
 share/rspamd/www/css/d3evolution.css
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 19811d0cbdb..7fcbed2acfb 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.32 2020/02/11 20:39:48 triaxx Exp $
+$NetBSD: distinfo,v 1.33 2020/05/18 11:10:56 nia Exp $
 
-SHA1 (rspamd-2.3.tar.gz) = 6c651be94a88ae965a21bd8bf5f7e3fdfa3054b4
-RMD160 (rspamd-2.3.tar.gz) = 76718ad53dcdfa5a0fe85b63aa1002618a30a1f5
-SHA512 (rspamd-2.3.tar.gz) = 20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95
-Size (rspamd-2.3.tar.gz) = 4409924 bytes
+SHA1 (rspamd-2.5.tar.gz) = e3c3afb0cbdb50763421be73d7d3cab187a8fdb5
+RMD160 (rspamd-2.5.tar.gz) = a6ae3429f5b439e8067b7b50bd3b5f55d72101f5
+SHA512 (rspamd-2.5.tar.gz) = 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540
+Size (rspamd-2.5.tar.gz) = 4490310 bytes
 SHA1 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded
+SHA1 (patch-cmake_Toolset.cmake) = d4900720b85a8e3078c4fdaa76757fcbbd4f89bd
 SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6
 SHA1 (patch-src_CMakeLists.txt) = 672873307ee1f30236e53298a6c0d422c7a79b0e
diff --git a/mail/rspamd/patches/patch-cmake_Toolset.cmake b/mail/rspamd/patches/patch-cmake_Toolset.cmake
new file mode 100644
index 00000000000..b0d8cdb954e
--- /dev/null
+++ b/mail/rspamd/patches/patch-cmake_Toolset.cmake
@@ -0,0 +1,18 @@
+$NetBSD: patch-cmake_Toolset.cmake,v 1.1 2020/05/18 11:10:56 nia Exp $
+
+Avoid specifying a custom linker:
+gcc: error: unrecognized command line option '-fuse-ld=lld'; did you mean '-fuse-ld=bfd'?
+
+--- cmake/Toolset.cmake.orig	2020-04-01 13:57:55.000000000 +0000
++++ cmake/Toolset.cmake
+@@ -41,8 +41,8 @@ endif ()
+ 
+ option(LINKER_NAME "Linker name or full path")
+ 
+-find_program(LLD_PATH NAMES "ld.lld" "lld")
+-find_program(GOLD_PATH NAMES "ld.gold" "gold")
++#find_program(LLD_PATH NAMES "ld.lld" "lld")
++#find_program(GOLD_PATH NAMES "ld.gold" "gold")
+ 
+ if(NOT LINKER_NAME)
+     if(LLD_PATH)