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 UTF8diff -r1.65 -r1.66 pkgsrc/mail/rspamd/Makefile
(nia)
@@ -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 | |||
3 | DISTNAME= rspamd-2.3 | 3 | DISTNAME= rspamd-2.5 | |
4 | PKGREVISION= 2 | |||
5 | CATEGORIES= mail | 4 | CATEGORIES= mail | |
6 | MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} | 5 | MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} | |
7 | 6 | |||
8 | MAINTAINER= bartosz.kuzma@gmail.com | 7 | MAINTAINER= bartosz.kuzma@gmail.com | |
9 | HOMEPAGE= https://www.rspamd.com/ | 8 | HOMEPAGE= https://www.rspamd.com/ | |
10 | COMMENT= Fast, free and open-source spam filtering system | 9 | COMMENT= Fast, free and open-source spam filtering system | |
11 | LICENSE= 2-clause-bsd | 10 | LICENSE= 2-clause-bsd | |
12 | 11 | |||
13 | .include "options.mk" | 12 | .include "options.mk" | |
14 | 13 | |||
15 | DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg | 14 | DEPENDS+= ${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg | |
16 | DEPENDS+= ragel-[0-9]*:../../devel/ragel | 15 | DEPENDS+= ragel-[0-9]*:../../devel/ragel | |
17 | 16 |
@@ -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 $ | |
2 | bin/rspamadm | 2 | bin/rspamadm | |
3 | bin/rspamadm-${PKGVERSION} | 3 | bin/rspamadm-${PKGVERSION} | |
4 | bin/rspamc | 4 | bin/rspamc | |
5 | bin/rspamc-${PKGVERSION} | 5 | bin/rspamc-${PKGVERSION} | |
6 | bin/rspamd | 6 | bin/rspamd | |
7 | bin/${PKGNAME} | 7 | bin/${PKGNAME} | |
8 | bin/rspamd_stats | 8 | bin/rspamd_stats | |
9 | lib/rspamd/librspamd-actrie.so | 9 | lib/rspamd/librspamd-actrie.so | |
10 | lib/rspamd/librspamd-ev.so | 10 | lib/rspamd/librspamd-ev.so | |
11 | lib/rspamd/librspamd-kann.so | 11 | lib/rspamd/librspamd-kann.so | |
12 | lib/rspamd/librspamd-replxx.so | 12 | lib/rspamd/librspamd-replxx.so | |
13 | lib/rspamd/librspamd-server.so | 13 | lib/rspamd/librspamd-server.so | |
14 | man/man1/rspamadm.1 | 14 | man/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 | |||
187 | share/rspamd/lualib/lua_scanners/savapi.lua | 187 | share/rspamd/lualib/lua_scanners/savapi.lua | |
188 | share/rspamd/lualib/lua_scanners/sophos.lua | 188 | share/rspamd/lualib/lua_scanners/sophos.lua | |
189 | share/rspamd/lualib/lua_scanners/spamassassin.lua | 189 | share/rspamd/lualib/lua_scanners/spamassassin.lua | |
190 | share/rspamd/lualib/lua_scanners/vadesecure.lua | 190 | share/rspamd/lualib/lua_scanners/vadesecure.lua | |
191 | share/rspamd/lualib/lua_scanners/virustotal.lua | 191 | share/rspamd/lualib/lua_scanners/virustotal.lua | |
192 | share/rspamd/lualib/lua_selectors/extractors.lua | 192 | share/rspamd/lualib/lua_selectors/extractors.lua | |
193 | share/rspamd/lualib/lua_selectors/init.lua | 193 | share/rspamd/lualib/lua_selectors/init.lua | |
194 | share/rspamd/lualib/lua_selectors/maps.lua | 194 | share/rspamd/lualib/lua_selectors/maps.lua | |
195 | share/rspamd/lualib/lua_selectors/transforms.lua | 195 | share/rspamd/lualib/lua_selectors/transforms.lua | |
196 | share/rspamd/lualib/lua_settings.lua | 196 | share/rspamd/lualib/lua_settings.lua | |
197 | share/rspamd/lualib/lua_smtp.lua | 197 | share/rspamd/lualib/lua_smtp.lua | |
198 | share/rspamd/lualib/lua_stat.lua | 198 | share/rspamd/lualib/lua_stat.lua | |
199 | share/rspamd/lualib/lua_tcp_sync.lua | 199 | share/rspamd/lualib/lua_tcp_sync.lua | |
200 | share/rspamd/lualib/lua_urls_compose.lua | |||
200 | share/rspamd/lualib/lua_util.lua | 201 | share/rspamd/lualib/lua_util.lua | |
201 | share/rspamd/lualib/lua_verdict.lua | 202 | share/rspamd/lualib/lua_verdict.lua | |
202 | share/rspamd/lualib/lupa.lua | 203 | share/rspamd/lualib/lupa.lua | |
203 | share/rspamd/lualib/plugins_stats.lua | 204 | share/rspamd/lualib/plugins_stats.lua | |
204 | share/rspamd/lualib/rescore_utility.lua | 205 | share/rspamd/lualib/rescore_utility.lua | |
205 | share/rspamd/lualib/rspamadm/configgraph.lua | 206 | share/rspamd/lualib/rspamadm/configgraph.lua | |
206 | share/rspamd/lualib/rspamadm/confighelp.lua | 207 | share/rspamd/lualib/rspamadm/confighelp.lua | |
207 | share/rspamd/lualib/rspamadm/configwizard.lua | 208 | share/rspamd/lualib/rspamadm/configwizard.lua | |
208 | share/rspamd/lualib/rspamadm/cookie.lua | 209 | share/rspamd/lualib/rspamadm/cookie.lua | |
209 | share/rspamd/lualib/rspamadm/corpus_test.lua | 210 | share/rspamd/lualib/rspamadm/corpus_test.lua | |
210 | share/rspamd/lualib/rspamadm/dns_tool.lua | 211 | share/rspamd/lualib/rspamadm/dns_tool.lua | |
211 | share/rspamd/lualib/rspamadm/fuzzy_convert.lua | 212 | share/rspamd/lualib/rspamadm/fuzzy_convert.lua | |
212 | share/rspamd/lualib/rspamadm/fuzzy_stat.lua | 213 | share/rspamd/lualib/rspamadm/fuzzy_stat.lua | |
@@ -268,26 +269,27 @@ share/rspamd/rules/content.lua | @@ -268,26 +269,27 @@ share/rspamd/rules/content.lua | |||
268 | share/rspamd/rules/forwarding.lua | 269 | share/rspamd/rules/forwarding.lua | |
269 | share/rspamd/rules/headers_checks.lua | 270 | share/rspamd/rules/headers_checks.lua | |
270 | share/rspamd/rules/html.lua | 271 | share/rspamd/rules/html.lua | |
271 | share/rspamd/rules/http_headers.lua | 272 | share/rspamd/rules/http_headers.lua | |
272 | share/rspamd/rules/mid.lua | 273 | share/rspamd/rules/mid.lua | |
273 | share/rspamd/rules/misc.lua | 274 | share/rspamd/rules/misc.lua | |
274 | share/rspamd/rules/regexp/compromised_hosts.lua | 275 | share/rspamd/rules/regexp/compromised_hosts.lua | |
275 | share/rspamd/rules/regexp/headers.lua | 276 | share/rspamd/rules/regexp/headers.lua | |
276 | share/rspamd/rules/regexp/misc.lua | 277 | share/rspamd/rules/regexp/misc.lua | |
277 | share/rspamd/rules/regexp/upstream_spam_filters.lua | 278 | share/rspamd/rules/regexp/upstream_spam_filters.lua | |
278 | share/rspamd/rules/rspamd.lua | 279 | share/rspamd/rules/rspamd.lua | |
279 | share/rspamd/rules/subject_checks.lua | 280 | share/rspamd/rules/subject_checks.lua | |
280 | share/rspamd/www/README.md | 281 | share/rspamd/www/README.md | |
282 | share/rspamd/www/apple-touch-icon.png | |||
281 | share/rspamd/www/browserconfig.xml | 283 | share/rspamd/www/browserconfig.xml | |
282 | share/rspamd/www/css/bootstrap.min.css | 284 | share/rspamd/www/css/bootstrap.min.css | |
283 | share/rspamd/www/css/d3evolution.css | 285 | share/rspamd/www/css/d3evolution.css | |
284 | share/rspamd/www/css/footable.bootstrap.min.css | 286 | share/rspamd/www/css/footable.bootstrap.min.css | |
285 | share/rspamd/www/css/nprogress.css | 287 | share/rspamd/www/css/nprogress.css | |
286 | share/rspamd/www/css/rspamd.css | 288 | share/rspamd/www/css/rspamd.css | |
287 | share/rspamd/www/favicon-16x16.png | 289 | share/rspamd/www/favicon-16x16.png | |
288 | share/rspamd/www/favicon-32x32.png | 290 | share/rspamd/www/favicon-32x32.png | |
289 | share/rspamd/www/favicon.ico | 291 | share/rspamd/www/favicon.ico | |
290 | share/rspamd/www/fonts/glyphicons-halflings-regular.ttf | 292 | share/rspamd/www/fonts/glyphicons-halflings-regular.ttf | |
291 | share/rspamd/www/fonts/glyphicons-halflings-regular.woff | 293 | share/rspamd/www/fonts/glyphicons-halflings-regular.woff | |
292 | share/rspamd/www/fonts/glyphicons-halflings-regular.woff2 | 294 | share/rspamd/www/fonts/glyphicons-halflings-regular.woff2 | |
293 | share/rspamd/www/img/asc.png | 295 | share/rspamd/www/img/asc.png |
@@ -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 | |||
3 | SHA1 (rspamd-2.3.tar.gz) = 6c651be94a88ae965a21bd8bf5f7e3fdfa3054b4 | 3 | SHA1 (rspamd-2.5.tar.gz) = e3c3afb0cbdb50763421be73d7d3cab187a8fdb5 | |
4 | RMD160 (rspamd-2.3.tar.gz) = 76718ad53dcdfa5a0fe85b63aa1002618a30a1f5 | 4 | RMD160 (rspamd-2.5.tar.gz) = a6ae3429f5b439e8067b7b50bd3b5f55d72101f5 | |
5 | SHA512 (rspamd-2.3.tar.gz) = 20fae1b088acafaaaa406980dc10da5efa66680f10ca8f0d262ddc735a0498f2026091806206995430d28ae27a7d348556eb1586a9217a02c39dfcf0f7c6eb95 | 5 | SHA512 (rspamd-2.5.tar.gz) = 6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540 | |
6 | Size (rspamd-2.3.tar.gz) = 4409924 bytes | 6 | Size (rspamd-2.5.tar.gz) = 4490310 bytes | |
7 | SHA1 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded | 7 | SHA1 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded | |
8 | SHA1 (patch-cmake_Toolset.cmake) = d4900720b85a8e3078c4fdaa76757fcbbd4f89bd | |||
8 | SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 | 9 | SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 | |
9 | SHA1 (patch-src_CMakeLists.txt) = 672873307ee1f30236e53298a6c0d422c7a79b0e | 10 | SHA1 (patch-src_CMakeLists.txt) = 672873307ee1f30236e53298a6c0d422c7a79b0e |
$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)