Sun Dec 8 09:32:05 2019 UTC ()
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窶冱 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


(triaxx)
diff -r1.59 -r1.60 pkgsrc/mail/rspamd/Makefile
diff -r1.17 -r1.18 pkgsrc/mail/rspamd/PLIST
diff -r1.30 -r1.31 pkgsrc/mail/rspamd/distinfo
diff -r1.4 -r1.5 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt
diff -r1.2 -r1.3 pkgsrc/mail/rspamd/patches/patch-src_CMakeLists.txt
cvs diff -r1.59 -r1.60 pkgsrc/mail/rspamd/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/Makefile 2019/12/06 16:37:52 1.59
+++ pkgsrc/mail/rspamd/Makefile 2019/12/08 09:32:05 1.60
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.59 2019/12/06 16:37:52 jperkin Exp $ 1# $NetBSD: Makefile,v 1.60 2019/12/08 09:32:05 triaxx Exp $
2 2
3DISTNAME= rspamd-2.1 3DISTNAME= rspamd-2.2
4CATEGORIES= mail 4CATEGORIES= mail
5MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/}
6 6
7MAINTAINER= bartosz.kuzma@gmail.com 7MAINTAINER= bartosz.kuzma@gmail.com
8HOMEPAGE= https://www.rspamd.com/ 8HOMEPAGE= https://www.rspamd.com/
9COMMENT= Fast, free and open-source spam filtering system 9COMMENT= Fast, free and open-source spam filtering system
10LICENSE= 2-clause-bsd 10LICENSE= 2-clause-bsd
11 11
12.include "options.mk" 12.include "options.mk"
13 13
14DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg 14DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
15DEPENDS+= ragel-[0-9]*:../../devel/ragel 15DEPENDS+= ragel-[0-9]*:../../devel/ragel
16 16
cvs diff -r1.17 -r1.18 pkgsrc/mail/rspamd/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/PLIST 2019/11/03 18:19:32 1.17
+++ pkgsrc/mail/rspamd/PLIST 2019/12/08 09:32:05 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.17 2019/11/03 18:19:32 triaxx Exp $ 1@comment $NetBSD: PLIST,v 1.18 2019/12/08 09:32:05 triaxx Exp $
2bin/rspamadm 2bin/rspamadm
3bin/rspamadm-${PKGVERSION} 3bin/rspamadm-${PKGVERSION}
4bin/rspamc 4bin/rspamc
5bin/rspamc-${PKGVERSION} 5bin/rspamc-${PKGVERSION}
6bin/rspamd 6bin/rspamd
7bin/${PKGNAME} 7bin/${PKGNAME}
8bin/rspamd_stats 8bin/rspamd_stats
9lib/rspamd/librspamd-actrie.so 9lib/rspamd/librspamd-actrie.so
10lib/rspamd/librspamd-ev.so 10lib/rspamd/librspamd-ev.so
11lib/rspamd/librspamd-kann.so 11lib/rspamd/librspamd-kann.so
12lib/rspamd/librspamd-replxx.so 12lib/rspamd/librspamd-replxx.so
13lib/rspamd/librspamd-server.so 13lib/rspamd/librspamd-server.so
14man/man1/rspamadm.1 14man/man1/rspamadm.1
@@ -174,35 +174,37 @@ share/rspamd/lualib/lua_scanners/common. @@ -174,35 +174,37 @@ share/rspamd/lualib/lua_scanners/common.
174share/rspamd/lualib/lua_scanners/dcc.lua 174share/rspamd/lualib/lua_scanners/dcc.lua
175share/rspamd/lualib/lua_scanners/fprot.lua 175share/rspamd/lualib/lua_scanners/fprot.lua
176share/rspamd/lualib/lua_scanners/icap.lua 176share/rspamd/lualib/lua_scanners/icap.lua
177share/rspamd/lualib/lua_scanners/init.lua 177share/rspamd/lualib/lua_scanners/init.lua
178share/rspamd/lualib/lua_scanners/kaspersky_av.lua 178share/rspamd/lualib/lua_scanners/kaspersky_av.lua
179share/rspamd/lualib/lua_scanners/kaspersky_se.lua 179share/rspamd/lualib/lua_scanners/kaspersky_se.lua
180share/rspamd/lualib/lua_scanners/oletools.lua 180share/rspamd/lualib/lua_scanners/oletools.lua
181share/rspamd/lualib/lua_scanners/p0f.lua 181share/rspamd/lualib/lua_scanners/p0f.lua
182share/rspamd/lualib/lua_scanners/razor.lua 182share/rspamd/lualib/lua_scanners/razor.lua
183share/rspamd/lualib/lua_scanners/savapi.lua 183share/rspamd/lualib/lua_scanners/savapi.lua
184share/rspamd/lualib/lua_scanners/sophos.lua 184share/rspamd/lualib/lua_scanners/sophos.lua
185share/rspamd/lualib/lua_scanners/spamassassin.lua 185share/rspamd/lualib/lua_scanners/spamassassin.lua
186share/rspamd/lualib/lua_scanners/vadesecure.lua 186share/rspamd/lualib/lua_scanners/vadesecure.lua
 187share/rspamd/lualib/lua_scanners/virustotal.lua
187share/rspamd/lualib/lua_selectors/extractors.lua 188share/rspamd/lualib/lua_selectors/extractors.lua
188share/rspamd/lualib/lua_selectors/init.lua 189share/rspamd/lualib/lua_selectors/init.lua
189share/rspamd/lualib/lua_selectors/maps.lua 190share/rspamd/lualib/lua_selectors/maps.lua
190share/rspamd/lualib/lua_selectors/transforms.lua 191share/rspamd/lualib/lua_selectors/transforms.lua
191share/rspamd/lualib/lua_settings.lua 192share/rspamd/lualib/lua_settings.lua
192share/rspamd/lualib/lua_smtp.lua 193share/rspamd/lualib/lua_smtp.lua
193share/rspamd/lualib/lua_stat.lua 194share/rspamd/lualib/lua_stat.lua
194share/rspamd/lualib/lua_tcp_sync.lua 195share/rspamd/lualib/lua_tcp_sync.lua
195share/rspamd/lualib/lua_util.lua 196share/rspamd/lualib/lua_util.lua
 197share/rspamd/lualib/lua_verdict.lua
196share/rspamd/lualib/lupa.lua 198share/rspamd/lualib/lupa.lua
197share/rspamd/lualib/plugins_stats.lua 199share/rspamd/lualib/plugins_stats.lua
198share/rspamd/lualib/rescore_utility.lua 200share/rspamd/lualib/rescore_utility.lua
199share/rspamd/lualib/rspamadm/configgraph.lua 201share/rspamd/lualib/rspamadm/configgraph.lua
200share/rspamd/lualib/rspamadm/confighelp.lua 202share/rspamd/lualib/rspamadm/confighelp.lua
201share/rspamd/lualib/rspamadm/configwizard.lua 203share/rspamd/lualib/rspamadm/configwizard.lua
202share/rspamd/lualib/rspamadm/cookie.lua 204share/rspamd/lualib/rspamadm/cookie.lua
203share/rspamd/lualib/rspamadm/corpus_test.lua 205share/rspamd/lualib/rspamadm/corpus_test.lua
204share/rspamd/lualib/rspamadm/dns_tool.lua 206share/rspamd/lualib/rspamadm/dns_tool.lua
205share/rspamd/lualib/rspamadm/fuzzy_convert.lua 207share/rspamd/lualib/rspamadm/fuzzy_convert.lua
206share/rspamd/lualib/rspamadm/fuzzy_stat.lua 208share/rspamd/lualib/rspamadm/fuzzy_stat.lua
207share/rspamd/lualib/rspamadm/grep.lua 209share/rspamd/lualib/rspamadm/grep.lua
208share/rspamd/lualib/rspamadm/keypair.lua 210share/rspamd/lualib/rspamadm/keypair.lua
cvs diff -r1.30 -r1.31 pkgsrc/mail/rspamd/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/distinfo 2019/11/03 18:19:32 1.30
+++ pkgsrc/mail/rspamd/distinfo 2019/12/08 09:32:05 1.31
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.30 2019/11/03 18:19:32 triaxx Exp $ 1$NetBSD: distinfo,v 1.31 2019/12/08 09:32:05 triaxx Exp $
2 2
3SHA1 (rspamd-2.1.tar.gz) = 17e7e7025c66bf7c15313a58adc1bd9ee0fac4b0 3SHA1 (rspamd-2.2.tar.gz) = 06de7849611ab6024af7bfb886aeced3a245ab23
4RMD160 (rspamd-2.1.tar.gz) = 223eadaa92fc6bf9ca0c25f83dccd2d5a9acb2cc 4RMD160 (rspamd-2.2.tar.gz) = a68863cf34da19e178469123ce687b4a814c54a1
5SHA512 (rspamd-2.1.tar.gz) = 7ecd42e9196ccad29a18bb3e6153fd13d3564c1630c4ec88c712d180f789ad2c36755bfeff65e8dd82737debfb5530a6ec4eb401b49dd82b9eb1dbdea991f84f 5SHA512 (rspamd-2.2.tar.gz) = e62367b9d663a005686e3eef216a7913c6050125e96582e2a58ef459e14512c1bcf09108050ff8ef524ba5e7a3c78559805353a25510654d8764f985757b32fe
6Size (rspamd-2.1.tar.gz) = 4232297 bytes 6Size (rspamd-2.2.tar.gz) = 4257574 bytes
7SHA1 (patch-CMakeLists.txt) = 1d3e66b52ef38638674baf4c10b68c97b2ca38ad 7SHA1 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded
8SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 8SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6
9SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a 9SHA1 (patch-src_CMakeLists.txt) = 672873307ee1f30236e53298a6c0d422c7a79b0e
cvs diff -r1.4 -r1.5 pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt 2017/06/23 13:47:06 1.4
+++ pkgsrc/mail/rspamd/patches/patch-CMakeLists.txt 2019/12/08 09:32:05 1.5
@@ -1,27 +1,18 @@ @@ -1,27 +1,18 @@
1$NetBSD: patch-CMakeLists.txt,v 1.4 2017/06/23 13:47:06 wiz Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.5 2019/12/08 09:32:05 triaxx Exp $
2 2
3For pkgsrc. Install config files to examples directory. 3For pkgsrc. Install config files to examples directory.
4 4
5--- CMakeLists.txt.orig 2017-06-14 14:45:41.000000000 +0000 5--- CMakeLists.txt.orig 2019-11-19 17:31:43.000000000 +0000
6+++ CMakeLists.txt 6+++ CMakeLists.txt
7@@ -1289,16 +1289,16 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$ 7@@ -641,9 +641,9 @@ FILE(GLOB_RECURSE CONF_FILES RELATIVE "$
8 "${CMAKE_CURRENT_SOURCE_DIR}/conf/*" ) 8 "${CMAKE_SOURCE_DIR}/conf/*" )
9 FOREACH(CONF_FILE ${CONF_FILES}) 9 FOREACH(CONF_FILE ${CONF_FILES})
10 GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH) 10 GET_FILENAME_COMPONENT(_rp ${CONF_FILE} PATH)
11- INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${CONFDIR}/${_rp})") 11- INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${CONFDIR}/${_rp})")
12+ INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${EXAMPLESDIR}/${_rp})") 12+ INSTALL(CODE "FILE(MAKE_DIRECTORY \$ENV{DESTDIR}${EXAMPLESDIR}/${_rp})")
13 INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/conf/${CONF_FILE}" 13 INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/conf/${CONF_FILE}"
14- DESTINATION ${CONFDIR}/${_rp}) 14- DESTINATION ${CONFDIR}/${_rp})
15+ DESTINATION ${EXAMPLESDIR}/${_rp}) 15+ DESTINATION ${EXAMPLESDIR}/${_rp})
16 ENDFOREACH(CONF_FILE) 16 ENDFOREACH(CONF_FILE)
17  17
18 SET(MAIN_CONF "conf/rspamd.conf") 18 # Lua plugins
19 IF(BUILD_PORT) 
20- INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample") 
21+ INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" ".sample") 
22 ELSE(BUILD_PORT) 
23- INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" "") 
24+ INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${EXAMPLESDIR} "rspamd.conf" "") 
25 ENDIF(BUILD_PORT) 
26 IF(INSTALL_EXAMPLES MATCHES "ON") 
27 INSTALL(FILES ${MAIN_CONF} DESTINATION ${EXAMPLESDIR}) 
cvs diff -r1.2 -r1.3 pkgsrc/mail/rspamd/patches/Attic/patch-src_CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/patches/Attic/patch-src_CMakeLists.txt 2017/02/17 15:01:33 1.2
+++ pkgsrc/mail/rspamd/patches/Attic/patch-src_CMakeLists.txt 2019/12/08 09:32:05 1.3
@@ -1,16 +1,14 @@ @@ -1,16 +1,14 @@
1$NetBSD: patch-src_CMakeLists.txt,v 1.2 2017/02/17 15:01:33 wiz Exp $ 1$NetBSD: patch-src_CMakeLists.txt,v 1.3 2019/12/08 09:32:05 triaxx Exp $
2 2
3Add librt to link line for shm_open(). 3--- src/CMakeLists.txt.orig 2019-11-19 17:31:43.000000000 +0000
4 
5--- src/CMakeLists.txt.orig 2016-10-17 14:30:59.000000000 +0000 
6+++ src/CMakeLists.txt 4+++ src/CMakeLists.txt
7@@ -141,6 +141,9 @@ TARGET_LINK_LIBRARIES(rspamd-server rspa 5@@ -186,6 +186,9 @@ TARGET_LINK_LIBRARIES(rspamd-server lcbt
8 TARGET_LINK_LIBRARIES(rspamd-server lcbtrie) 
9 TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) 6 TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd)
 7 TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8)
10  8
11+# for shm_open 9+# for shm_open
12+TARGET_LINK_LIBRARIES(rspamd-server rt) 10+TARGET_LINK_LIBRARIES(rspamd-server rt)
13+ 11+
14 IF (ENABLE_CLANG_PLUGIN MATCHES "ON") 12 IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
15 ADD_DEPENDENCIES(rspamd-server rspamd-clang) 13 ADD_DEPENDENCIES(rspamd-server rspamd-clang)
16 ENDIF() 14 ENDIF()