Mon May 18 11:10:56 2020 UTC ()
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


(nia)
diff -r1.65 -r1.66 pkgsrc/mail/rspamd/Makefile
diff -r1.19 -r1.20 pkgsrc/mail/rspamd/PLIST
diff -r1.32 -r1.33 pkgsrc/mail/rspamd/distinfo
diff -r0 -r1.1 pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake

cvs diff -r1.65 -r1.66 pkgsrc/mail/rspamd/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/Makefile 2020/04/12 08:28:57 1.65
+++ pkgsrc/mail/rspamd/Makefile 2020/05/18 11:10:56 1.66
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.65 2020/04/12 08:28:57 adam Exp $ 1# $NetBSD: Makefile,v 1.66 2020/05/18 11:10:56 nia Exp $
2 2
3DISTNAME= rspamd-2.3 3DISTNAME= rspamd-2.5
4PKGREVISION= 2 
5CATEGORIES= mail 4CATEGORIES= mail
6MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/}
7 6
8MAINTAINER= bartosz.kuzma@gmail.com 7MAINTAINER= bartosz.kuzma@gmail.com
9HOMEPAGE= https://www.rspamd.com/ 8HOMEPAGE= https://www.rspamd.com/
10COMMENT= Fast, free and open-source spam filtering system 9COMMENT= Fast, free and open-source spam filtering system
11LICENSE= 2-clause-bsd 10LICENSE= 2-clause-bsd
12 11
13.include "options.mk" 12.include "options.mk"
14 13
15DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg 14DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
16DEPENDS+= ragel-[0-9]*:../../devel/ragel 15DEPENDS+= ragel-[0-9]*:../../devel/ragel
17 16

cvs diff -r1.19 -r1.20 pkgsrc/mail/rspamd/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/PLIST 2020/02/11 20:39:48 1.19
+++ pkgsrc/mail/rspamd/PLIST 2020/05/18 11:10:56 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.19 2020/02/11 20:39:48 triaxx Exp $ 1@comment $NetBSD: PLIST,v 1.20 2020/05/18 11:10:56 nia 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
@@ -187,26 +187,27 @@ share/rspamd/lualib/lua_scanners/razor.l @@ -187,26 +187,27 @@ share/rspamd/lualib/lua_scanners/razor.l
187share/rspamd/lualib/lua_scanners/savapi.lua 187share/rspamd/lualib/lua_scanners/savapi.lua
188share/rspamd/lualib/lua_scanners/sophos.lua 188share/rspamd/lualib/lua_scanners/sophos.lua
189share/rspamd/lualib/lua_scanners/spamassassin.lua 189share/rspamd/lualib/lua_scanners/spamassassin.lua
190share/rspamd/lualib/lua_scanners/vadesecure.lua 190share/rspamd/lualib/lua_scanners/vadesecure.lua
191share/rspamd/lualib/lua_scanners/virustotal.lua 191share/rspamd/lualib/lua_scanners/virustotal.lua
192share/rspamd/lualib/lua_selectors/extractors.lua 192share/rspamd/lualib/lua_selectors/extractors.lua
193share/rspamd/lualib/lua_selectors/init.lua 193share/rspamd/lualib/lua_selectors/init.lua
194share/rspamd/lualib/lua_selectors/maps.lua 194share/rspamd/lualib/lua_selectors/maps.lua
195share/rspamd/lualib/lua_selectors/transforms.lua 195share/rspamd/lualib/lua_selectors/transforms.lua
196share/rspamd/lualib/lua_settings.lua 196share/rspamd/lualib/lua_settings.lua
197share/rspamd/lualib/lua_smtp.lua 197share/rspamd/lualib/lua_smtp.lua
198share/rspamd/lualib/lua_stat.lua 198share/rspamd/lualib/lua_stat.lua
199share/rspamd/lualib/lua_tcp_sync.lua 199share/rspamd/lualib/lua_tcp_sync.lua
 200share/rspamd/lualib/lua_urls_compose.lua
200share/rspamd/lualib/lua_util.lua 201share/rspamd/lualib/lua_util.lua
201share/rspamd/lualib/lua_verdict.lua 202share/rspamd/lualib/lua_verdict.lua
202share/rspamd/lualib/lupa.lua 203share/rspamd/lualib/lupa.lua
203share/rspamd/lualib/plugins_stats.lua 204share/rspamd/lualib/plugins_stats.lua
204share/rspamd/lualib/rescore_utility.lua 205share/rspamd/lualib/rescore_utility.lua
205share/rspamd/lualib/rspamadm/configgraph.lua 206share/rspamd/lualib/rspamadm/configgraph.lua
206share/rspamd/lualib/rspamadm/confighelp.lua 207share/rspamd/lualib/rspamadm/confighelp.lua
207share/rspamd/lualib/rspamadm/configwizard.lua 208share/rspamd/lualib/rspamadm/configwizard.lua
208share/rspamd/lualib/rspamadm/cookie.lua 209share/rspamd/lualib/rspamadm/cookie.lua
209share/rspamd/lualib/rspamadm/corpus_test.lua 210share/rspamd/lualib/rspamadm/corpus_test.lua
210share/rspamd/lualib/rspamadm/dns_tool.lua 211share/rspamd/lualib/rspamadm/dns_tool.lua
211share/rspamd/lualib/rspamadm/fuzzy_convert.lua 212share/rspamd/lualib/rspamadm/fuzzy_convert.lua
212share/rspamd/lualib/rspamadm/fuzzy_stat.lua 213share/rspamd/lualib/rspamadm/fuzzy_stat.lua
@@ -268,26 +269,27 @@ share/rspamd/rules/content.lua @@ -268,26 +269,27 @@ share/rspamd/rules/content.lua
268share/rspamd/rules/forwarding.lua 269share/rspamd/rules/forwarding.lua
269share/rspamd/rules/headers_checks.lua 270share/rspamd/rules/headers_checks.lua
270share/rspamd/rules/html.lua 271share/rspamd/rules/html.lua
271share/rspamd/rules/http_headers.lua 272share/rspamd/rules/http_headers.lua
272share/rspamd/rules/mid.lua 273share/rspamd/rules/mid.lua
273share/rspamd/rules/misc.lua 274share/rspamd/rules/misc.lua
274share/rspamd/rules/regexp/compromised_hosts.lua 275share/rspamd/rules/regexp/compromised_hosts.lua
275share/rspamd/rules/regexp/headers.lua 276share/rspamd/rules/regexp/headers.lua
276share/rspamd/rules/regexp/misc.lua 277share/rspamd/rules/regexp/misc.lua
277share/rspamd/rules/regexp/upstream_spam_filters.lua 278share/rspamd/rules/regexp/upstream_spam_filters.lua
278share/rspamd/rules/rspamd.lua 279share/rspamd/rules/rspamd.lua
279share/rspamd/rules/subject_checks.lua 280share/rspamd/rules/subject_checks.lua
280share/rspamd/www/README.md 281share/rspamd/www/README.md
 282share/rspamd/www/apple-touch-icon.png
281share/rspamd/www/browserconfig.xml 283share/rspamd/www/browserconfig.xml
282share/rspamd/www/css/bootstrap.min.css 284share/rspamd/www/css/bootstrap.min.css
283share/rspamd/www/css/d3evolution.css 285share/rspamd/www/css/d3evolution.css
284share/rspamd/www/css/footable.bootstrap.min.css 286share/rspamd/www/css/footable.bootstrap.min.css
285share/rspamd/www/css/nprogress.css 287share/rspamd/www/css/nprogress.css
286share/rspamd/www/css/rspamd.css 288share/rspamd/www/css/rspamd.css
287share/rspamd/www/favicon-16x16.png 289share/rspamd/www/favicon-16x16.png
288share/rspamd/www/favicon-32x32.png 290share/rspamd/www/favicon-32x32.png
289share/rspamd/www/favicon.ico 291share/rspamd/www/favicon.ico
290share/rspamd/www/fonts/glyphicons-halflings-regular.ttf 292share/rspamd/www/fonts/glyphicons-halflings-regular.ttf
291share/rspamd/www/fonts/glyphicons-halflings-regular.woff 293share/rspamd/www/fonts/glyphicons-halflings-regular.woff
292share/rspamd/www/fonts/glyphicons-halflings-regular.woff2 294share/rspamd/www/fonts/glyphicons-halflings-regular.woff2
293share/rspamd/www/img/asc.png 295share/rspamd/www/img/asc.png

cvs diff -r1.32 -r1.33 pkgsrc/mail/rspamd/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/rspamd/distinfo 2020/02/11 20:39:48 1.32
+++ pkgsrc/mail/rspamd/distinfo 2020/05/18 11:10:56 1.33
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.32 2020/02/11 20:39:48 triaxx Exp $ 1$NetBSD: distinfo,v 1.33 2020/05/18 11:10:56 nia Exp $
2 2
3SHA1 (rspamd-2.3.tar.gz) = 6c651be94a88ae965a21bd8bf5f7e3fdfa3054b4 3SHA1 (rspamd-2.5.tar.gz) = e3c3afb0cbdb50763421be73d7d3cab187a8fdb5
4RMD160 (rspamd-2.3.tar.gz) = 76718ad53dcdfa5a0fe85b63aa1002618a30a1f5 4RMD160 (rspamd-2.5.tar.gz) = a6ae3429f5b439e8067b7b50bd3b5f55d72101f5
5SHA512 (rspamd-2.3.tar.gz) = 20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95 5SHA512 (rspamd-2.5.tar.gz) = 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540
6Size (rspamd-2.3.tar.gz) = 4409924 bytes 6Size (rspamd-2.5.tar.gz) = 4490310 bytes
7SHA1 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded 7SHA1 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded
 8SHA1 (patch-cmake_Toolset.cmake) = d4900720b85a8e3078c4fdaa76757fcbbd4f89bd
8SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 9SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6
9SHA1 (patch-src_CMakeLists.txt) = 672873307ee1f30236e53298a6c0d422c7a79b0e 10SHA1 (patch-src_CMakeLists.txt) = 672873307ee1f30236e53298a6c0d422c7a79b0e

File Added: pkgsrc/mail/rspamd/patches/patch-cmake_Toolset.cmake
$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)