[pkgsrc/trunk]: pkgsrc/mail/rspamd rspamd: update to 2.2

[triaxx <triaxx%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d24e89d1117
branches:  trunk
changeset: 418912:1d24e89d1117
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Sun Dec 08 09:32:05 2019 +0000

description:
rspamd: update to 2.2

upstream changes:
-----------------
    [Conf] Antivirus: Fix the default config
    [Feature] Add verdict library in lua
    [Feature] Allow exception when choosing upstream
    [Feature] Allow to disable symbols from the metric config
    [Feature] Allow to limit maps per specific worker
    [Feature] Always validate Rspamd protocol output
    [Feature] Antivirus: Add preliminary virustotal support
    [Feature] Clickhouse: Rework Clickhouse collection logic
    [Feature] Improve base64 usage
    [Feature] Shutdown timeout is now associated with task timeout
    [Fix] #3129 Multiple classifiers on redis working incorrectly
    [Fix] Allow real upstreams configuration
    [Fix] Another try to fix slow callbacks and timers
    [Fix] Check results of write message as SSL can bork them
    [Fix] Clickhouse: Avoid potential races in collection
    [Fix] Clickhouse: Fix periodic script
    [Fix] Fail DNS upstream on each retransmit attempt
    [Fix] Fix consistent hashing when upstreams are marked inactive
    [Fix] Fix issues found
    [Fix] Fix off-by-one in retries for the proxy
    [Fix] Fix termination
    [Fix] Fix upstreams exclusion logic
    [Fix] Fix utf8 validation for symbols options and empty strings
    [Fix] Oops, fix maps reload
    [Fix] Rbl: Allow utf8 lookups for IDN domains
    [Fix] Sigh, another try to fix brain-damaged openssl
    [Project] Add fast utf8 validation library
    [Project] Use own utf8 validation instead of glib
    [Rework] Another phase of finish actions rework
    [Rework] Further cmake system rework
    [Rework] Further isolation of the controller?s functions
    [Rework] Make cmake structure more modular
    [Rework] Move cmake modules to a dedicated path
    [Rework] Replace controller functions by any scanner worker if needed
    [Rework] Rework final scripts logic
    [Rework] Rewrite rspamd_str_make_utf_valid function

diffstat:

 mail/rspamd/Makefile                         |   4 ++--
 mail/rspamd/PLIST                            |   4 +++-
 mail/rspamd/distinfo                         |  14 +++++++-------
 mail/rspamd/patches/patch-CMakeLists.txt     |  19 +++++--------------
 mail/rspamd/patches/patch-src_CMakeLists.txt |  10 ++++------
 5 files changed, 21 insertions(+), 30 deletions(-)

diffs (111 lines):

diff -r aa6aeaa68b8a -r 1d24e89d1117 mail/rspamd/Makefile
--- a/mail/rspamd/Makefile      Sun Dec 08 03:55:22 2019 +0000
+++ b/mail/rspamd/Makefile      Sun Dec 08 09:32:05 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2019/12/06 16:37:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.60 2019/12/08 09:32:05 triaxx Exp $
 
-DISTNAME=      rspamd-2.1
+DISTNAME=      rspamd-2.2
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vstakhov/}
 
diff -r aa6aeaa68b8a -r 1d24e89d1117 mail/rspamd/PLIST
--- a/mail/rspamd/PLIST Sun Dec 08 03:55:22 2019 +0000
+++ b/mail/rspamd/PLIST Sun Dec 08 09:32:05 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2019/11/03 18:19:32 triaxx Exp $
+@comment $NetBSD: PLIST,v 1.18 2019/12/08 09:32:05 triaxx Exp $
 bin/rspamadm
 bin/rspamadm-${PKGVERSION}
 bin/rspamc
@@ -184,6 +184,7 @@
 share/rspamd/lualib/lua_scanners/sophos.lua
 share/rspamd/lualib/lua_scanners/spamassassin.lua
 share/rspamd/lualib/lua_scanners/vadesecure.lua
+share/rspamd/lualib/lua_scanners/virustotal.lua
 share/rspamd/lualib/lua_selectors/extractors.lua
 share/rspamd/lualib/lua_selectors/init.lua
 share/rspamd/lualib/lua_selectors/maps.lua
@@ -193,6 +194,7 @@
 share/rspamd/lualib/lua_stat.lua
 share/rspamd/lualib/lua_tcp_sync.lua
 share/rspamd/lualib/lua_util.lua
+share/rspamd/lualib/lua_verdict.lua
 share/rspamd/lualib/lupa.lua
 share/rspamd/lualib/plugins_stats.lua
 share/rspamd/lualib/rescore_utility.lua
diff -r aa6aeaa68b8a -r 1d24e89d1117 mail/rspamd/distinfo
--- a/mail/rspamd/distinfo      Sun Dec 08 03:55:22 2019 +0000
+++ b/mail/rspamd/distinfo      Sun Dec 08 09:32:05 2019 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.30 2019/11/03 18:19:32 triaxx Exp $
+$NetBSD: distinfo,v 1.31 2019/12/08 09:32:05 triaxx Exp $
 
-SHA1 (rspamd-2.1.tar.gz) = 17e7e7025c66bf7c15313a58adc1bd9ee0fac4b0
-RMD160 (rspamd-2.1.tar.gz) = 223eadaa92fc6bf9ca0c25f83dccd2d5a9acb2cc
-SHA512 (rspamd-2.1.tar.gz) = 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f
-Size (rspamd-2.1.tar.gz) = 4232297 bytes
-SHA1 (patch-CMakeLists.txt) = 1d3e66b52ef38638674baf4c10b68c97b2ca38ad
+SHA1 (rspamd-2.2.tar.gz) = 06de7849611ab6024af7bfb886aeced3a245ab23
+RMD160 (rspamd-2.2.tar.gz) = a68863cf34da19e178469123ce687b4a814c54a1
+SHA512 (rspamd-2.2.tar.gz) = e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
+Size (rspamd-2.2.tar.gz) = 4257574 bytes
+SHA1 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded
 SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6
-SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a
+SHA1 (patch-src_CMakeLists.txt) = 672873307ee1f30236e53298a6c0d422c7a79b0e
diff -r aa6aeaa68b8a -r 1d24e89d1117 mail/rspamd/patches/patch-CMakeLists.txt
--- a/mail/rspamd/patches/patch-CMakeLists.txt  Sun Dec 08 03:55:22 2019 +0000
+++ b/mail/rspamd/patches/patch-CMakeLists.txt  Sun Dec 08 09:32:05 2019 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2017/06/23 13:47:06 wiz Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2019/12/08 09:32:05 triaxx Exp $
 
 For pkgsrc. Install config files to examples directory.
 
---- CMakeLists.txt.orig        2017-06-14 14:45:41.000000000 +0000
+--- CMakeLists.txt.orig        2019-11-19 17:31:43.000000000 +0000
 +++ CMakeLists.txt
-@@ -1289,16 +1289,16 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
-       "${CMAKE_CURRENT_SOURCE_DIR}/conf/*" )
+@@ -641,9 +641,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
+       "${CMAKE_SOURCE_DIR}/conf/*" )
  FOREACH(CONF_FILE ${CONF_FILES})
        GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH)
 -      INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${CONFDIR}/${_rp})")
@@ -15,13 +15,4 @@
 +              DESTINATION ${EXAMPLESDIR}/${_rp})
  ENDFOREACH(CONF_FILE)
  
- SET(MAIN_CONF "conf/rspamd.conf")
- IF(BUILD_PORT)
--      INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
-+      INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" ".sample")
- ELSE(BUILD_PORT)
--      INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "")
-+      INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" "")
- ENDIF(BUILD_PORT)
- IF(INSTALL_EXAMPLES MATCHES "ON")
-       INSTALL(FILES ${MAIN_CONF} DESTINATION ${EXAMPLESDIR})
+ # Lua plugins
diff -r aa6aeaa68b8a -r 1d24e89d1117 mail/rspamd/patches/patch-src_CMakeLists.txt
--- a/mail/rspamd/patches/patch-src_CMakeLists.txt      Sun Dec 08 03:55:22 2019 +0000
+++ b/mail/rspamd/patches/patch-src_CMakeLists.txt      Sun Dec 08 09:32:05 2019 +0000
@@ -1,12 +1,10 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.2 2017/02/17 15:01:33 wiz Exp $
-
-Add librt to link line for shm_open().
+$NetBSD: patch-src_CMakeLists.txt,v 1.3 2019/12/08 09:32:05 triaxx Exp $
 
---- src/CMakeLists.txt.orig    2016-10-17 14:30:59.000000000 +0000
+--- src/CMakeLists.txt.orig    2019-11-19 17:31:43.000000000 +0000
 +++ src/CMakeLists.txt
-@@ -141,6 +141,9 @@ TARGET_LINK_LIBRARIES(rspamd-server rspa
- TARGET_LINK_LIBRARIES(rspamd-server lcbtrie)
+@@ -186,6 +186,9 @@ TARGET_LINK_LIBRARIES(rspamd-server lcbt
  TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
+ TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
  
 +# for shm_open
 +TARGET_LINK_LIBRARIES(rspamd-server rt)