diff options
author | triaxx <triaxx@pkgsrc.org> | 2020-02-11 20:39:48 +0000 |
---|---|---|
committer | triaxx <triaxx@pkgsrc.org> | 2020-02-11 20:39:48 +0000 |
commit | 9cc9df3f4234ed0bbdd717999da3da9f108a56ad (patch) | |
tree | 39ee8a92b4cdd7f8035912c2fa4a8e110a2ae8a5 | |
parent | 86bf36ae8bbd46b0f2f13210690309031d4084be (diff) | |
download | pkgsrc-9cc9df3f4234ed0bbdd717999da3da9f108a56ad.tar.gz |
rspamd: update to 2.3
upstream changes:
-----------------
2.3: 04 Feb 2020
* [Conf] SPF is no longer a C module
* [Conf] Update spamtrap map path example
* [CritFix] Fix html entities decoding
* [CritFix] Fix re cache when mix of pcre and hyperscan is used
* [Feature] Allow milter code to deal with multiple headers
* [Feature] Antivirus: Add avast support
* [Feature] Dkim_signing: Allow to sign via milter_headers
* [Feature] Implement content hashes
* [Feature] Lua_text: Add regexp split iterator method
* [Feature] Lua_text: Implement flattening of the input tables
* [Feature] Send quit command to Redis
* [Feature] Speed up is_ascii function
* [Feature] Spf: Add external_relay option
* [Fix] Avoid double escaping
* [Fix] Fix O(N^2) algorithm
* [Fix] Fix arc seal validation
* [Fix] Fix base tag processing according to stupid HTML renderer behaviour
* [Fix] Fix dealing with `\0` in ucl strings and JSON
* [Fix] Fix gpg parts misdetection
* [Fix] Fix ignored symbols exporting
* [Fix] Fix processing of numeric url's
* [Fix] Fix processing of the closed tcp connections
* [Fix] Fix regexp type check for pcre2
* [Fix] Fix urls encode function
* [Fix] Fix urls shifting when doing decode to include separators
* [Fix] Fix white on white rule and add is_leaf flag
* [Fix] Further fixes in charset detection
* [Fix] Ignore diacritics in chartable module for specific languages
* [Fix] Limit size of symbols options by max_opts_len option
* [Fix] More fixes in html tag content calculations
* [Fix] Plug memory leak in fuzzy storage
* [Fix] Process high priority settings even if settings/id has been specified
* [Fix] Select a different upstream on last retransmit
* [Fix] Treat soft hyphen as zero width space
* [Fix] Try harder to watch the lifetime of the key_stat
* [Fix] Use ipv6-mapped-ipv4 addresses in radix trie
* [Project] Add logic to break execution when processing symbols*
* [Project] Add methods to set specific content for mime parts from Lua
* [Project] Lua_content: support PDF files
* [Project] Move dns_tool to using of the rspamd_spf from FFI module
* [Project] Preliminary SPF plugin in Lua
* [Project] Show debug stat for memory pool
* [Project] Some rework about specific data that is now tagged
* [Project] Start reworking of the mempool structure
* [Rework] Allow to add userdata as symbols options
* [Rework] Change mime part specifics handling
* [Rework] Move LRU SPF cache from spf plugin
* [Rework] Rework HTML tags content attachment
* [Rework] Rework options hash structure
* [Rework] Start lua_content library
* [Rework] Stop using of uthash for http headers
* [Rework] Use faster hashing approach for memory pools variables
* [Rules] Add PDF related rules
-rw-r--r-- | mail/rspamd/Makefile | 6 | ||||
-rw-r--r-- | mail/rspamd/PLIST | 18 | ||||
-rw-r--r-- | mail/rspamd/cfgfiles.mk | 7 | ||||
-rw-r--r-- | mail/rspamd/distinfo | 10 |
4 files changed, 24 insertions, 17 deletions
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index c0e0f0e6c60..93fb13440c3 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.62 2020/01/18 21:49:54 jperkin Exp $ +# $NetBSD: Makefile,v 1.63 2020/02/11 20:39:48 triaxx Exp $ -DISTNAME= rspamd-2.2 -PKGREVISION= 2 +DISTNAME= rspamd-2.3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} @@ -57,6 +56,7 @@ CMAKE_ARGS+= -DLOGDIR:PATH=${LOGDIR} CMAKE_ARGS+= -DRUNDIR:PATH=${VARBASE}/run/rspamd CMAKE_ARGS+= -DDBDIR:PATH=${DBDIR} CMAKE_ARGS+= -DCONFDIR:PATH=${PKG_SYSCONFDIR} +CMAKE_ARGS+= -DEXAMPLESDIR:PATH=${EGDIR} CMAKE_ARGS+= -DRSPAMD_USER=${RSPAMD_USER} CMAKE_ARGS+= -DRSPAMD_GROUP=${RSPAMD_GROUP} CMAKE_ARGS+= -DENABLE_SQLITE=ON diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST index 2cf030a1145..71ec68effb5 100644 --- a/mail/rspamd/PLIST +++ b/mail/rspamd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2019/12/08 09:32:05 triaxx Exp $ +@comment $NetBSD: PLIST,v 1.19 2020/02/11 20:39:48 triaxx Exp $ bin/rspamadm bin/rspamadm-${PKGVERSION} bin/rspamc @@ -75,6 +75,7 @@ share/examples/rspamd/modules.d/url_redirector.conf share/examples/rspamd/modules.d/whitelist.conf share/examples/rspamd/options.inc share/examples/rspamd/rspamd.conf +share/examples/rspamd/scores.d/content_group.conf share/examples/rspamd/scores.d/fuzzy_group.conf share/examples/rspamd/scores.d/headers_group.conf share/examples/rspamd/scores.d/hfilter_group.conf @@ -152,13 +153,15 @@ share/rspamd/lualib/lua_auth_results.lua share/rspamd/lualib/lua_bayes_learn.lua share/rspamd/lualib/lua_cfg_transform.lua share/rspamd/lualib/lua_clickhouse.lua +share/rspamd/lualib/lua_content/ical.lua +share/rspamd/lualib/lua_content/init.lua +share/rspamd/lualib/lua_content/pdf.lua share/rspamd/lualib/lua_dkim_tools.lua share/rspamd/lualib/lua_ffi/common.lua share/rspamd/lualib/lua_ffi/dkim.lua share/rspamd/lualib/lua_ffi/init.lua share/rspamd/lualib/lua_ffi/spf.lua share/rspamd/lualib/lua_fuzzy.lua -share/rspamd/lualib/lua_ical.lua share/rspamd/lualib/lua_lexer.lua share/rspamd/lualib/lua_magic/heuristics.lua share/rspamd/lualib/lua_magic/init.lua @@ -169,6 +172,7 @@ share/rspamd/lualib/lua_maps_expressions.lua share/rspamd/lualib/lua_meta.lua share/rspamd/lualib/lua_mime.lua share/rspamd/lualib/lua_redis.lua +share/rspamd/lualib/lua_scanners/avast.lua share/rspamd/lualib/lua_scanners/clamav.lua share/rspamd/lualib/lua_scanners/common.lua share/rspamd/lualib/lua_scanners/dcc.lua @@ -255,10 +259,12 @@ share/rspamd/plugins/rspamd_update.lua share/rspamd/plugins/settings.lua share/rspamd/plugins/spamassassin.lua share/rspamd/plugins/spamtrap.lua +share/rspamd/plugins/spf.lua share/rspamd/plugins/trie.lua share/rspamd/plugins/url_redirector.lua share/rspamd/plugins/whitelist.lua share/rspamd/rules/bitcoin.lua +share/rspamd/rules/content.lua share/rspamd/rules/forwarding.lua share/rspamd/rules/headers_checks.lua share/rspamd/rules/html.lua @@ -272,11 +278,14 @@ 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/browserconfig.xml share/rspamd/www/css/bootstrap.min.css share/rspamd/www/css/d3evolution.css share/rspamd/www/css/footable.bootstrap.min.css share/rspamd/www/css/nprogress.css share/rspamd/www/css/rspamd.css +share/rspamd/www/favicon-16x16.png +share/rspamd/www/favicon-32x32.png share/rspamd/www/favicon.ico share/rspamd/www/fonts/glyphicons-halflings-regular.ttf share/rspamd/www/fonts/glyphicons-halflings-regular.woff @@ -297,13 +306,12 @@ share/rspamd/www/js/lib/d3.min.js share/rspamd/www/js/lib/d3evolution.min.js share/rspamd/www/js/lib/d3pie.min.js share/rspamd/www/js/lib/footable.min.js -share/rspamd/www/js/lib/humanize.min.js share/rspamd/www/js/lib/jquery-3.4.1.min.js share/rspamd/www/js/lib/jquery.stickytabs.min.js share/rspamd/www/js/lib/nprogress.min.js share/rspamd/www/js/lib/require.min.js share/rspamd/www/js/lib/visibility.min.js share/rspamd/www/js/main.js -share/rspamd/www/plugins.txt -share/rspamd/www/react-index.html +share/rspamd/www/mstile-150x150.png +share/rspamd/www/safari-pinned-tab.svg @pkgdir etc/rspamd diff --git a/mail/rspamd/cfgfiles.mk b/mail/rspamd/cfgfiles.mk index 5cea9aac445..d22dd8e1a76 100644 --- a/mail/rspamd/cfgfiles.mk +++ b/mail/rspamd/cfgfiles.mk @@ -1,4 +1,3 @@ -# $NetBSD: cfgfiles.mk,v 1.5 2019/11/05 19:16:31 rillig Exp $ -# Do not edit, regenerate post-extract using 'make cfgfiles' -CFGFILES= actions.conf cgp.inc common.conf composites.conf groups.conf logging.inc maps.d/dmarc_whitelist.inc maps.d/maillist.inc maps.d/mid.inc maps.d/mime_types.inc maps.d/redirectors.inc maps.d/spf_dkim_whitelist.inc maps.d/surbl-whitelist.inc metrics.conf modules.conf modules.d/antivirus.conf modules.d/arc.conf modules.d/asn.conf modules.d/chartable.conf modules.d/clickhouse.conf modules.d/dcc.conf modules.d/dkim.conf modules.d/dkim_signing.conf modules.d/dmarc.conf modules.d/elastic.conf modules.d/emails.conf modules.d/external_services.conf modules.d/force_actions.conf modules.d/forged_recipients.conf modules.d/fuzzy_check.conf modules.d/greylist.conf modules.d/hfilter.conf modules.d/history_redis.conf modules.d/maillist.conf modules.d/metadata_exporter.conf modules.d/metric_exporter.conf modules.d/mid.conf modules.d/milter_headers.conf modules.d/mime_types.conf modules.d/multimap.conf modules.d/mx_check.conf modules.d/neural.conf modules.d/once_received.conf modules.d/p0f.conf modules.d/phishing.conf modules.d/ratelimit.conf modules.d/rbl.conf modules.d/redis.conf modules.d/regexp.conf modules.d/replies.conf modules.d/reputation.conf modules.d/rspamd_update.conf modules.d/spamassassin.conf modules.d/spamtrap.conf modules.d/spf.conf modules.d/surbl.conf modules.d/trie.conf modules.d/url_redirector.conf modules.d/whitelist.conf options.inc rspamd.conf scores.d/fuzzy_group.conf scores.d/headers_group.conf scores.d/hfilter_group.conf scores.d/mime_types_group.conf scores.d/mua_group.conf scores.d/phishing_group.conf scores.d/policies_group.conf scores.d/rbl_group.conf scores.d/statistics_group.conf scores.d/subject_group.conf scores.d/surbl_group.conf scores.d/whitelist_group.conf settings.conf statistic.conf worker-controller.inc worker-fuzzy.inc worker-normal.inc worker-proxy.inc - +# $NetBSD: cfgfiles.mk,v 1.6 2020/02/11 20:39:48 triaxx Exp $ +# Do not edit, regenerate using 'make cfgfiles' +CFGFILES= actions.conf cgp.inc common.conf composites.conf groups.conf logging.inc maps.d/dmarc_whitelist.inc maps.d/maillist.inc maps.d/mid.inc maps.d/mime_types.inc maps.d/redirectors.inc maps.d/spf_dkim_whitelist.inc maps.d/surbl-whitelist.inc metrics.conf modules.conf modules.d/antivirus.conf modules.d/arc.conf modules.d/asn.conf modules.d/chartable.conf modules.d/clickhouse.conf modules.d/dcc.conf modules.d/dkim.conf modules.d/dkim_signing.conf modules.d/dmarc.conf modules.d/elastic.conf modules.d/emails.conf modules.d/external_services.conf modules.d/force_actions.conf modules.d/forged_recipients.conf modules.d/fuzzy_check.conf modules.d/greylist.conf modules.d/hfilter.conf modules.d/history_redis.conf modules.d/maillist.conf modules.d/metadata_exporter.conf modules.d/metric_exporter.conf modules.d/mid.conf modules.d/milter_headers.conf modules.d/mime_types.conf modules.d/multimap.conf modules.d/mx_check.conf modules.d/neural.conf modules.d/once_received.conf modules.d/p0f.conf modules.d/phishing.conf modules.d/ratelimit.conf modules.d/rbl.conf modules.d/redis.conf modules.d/regexp.conf modules.d/replies.conf modules.d/reputation.conf modules.d/rspamd_update.conf modules.d/spamassassin.conf modules.d/spamtrap.conf modules.d/spf.conf modules.d/surbl.conf modules.d/trie.conf modules.d/url_redirector.conf modules.d/whitelist.conf options.inc rspamd.conf scores.d/content_group.conf scores.d/fuzzy_group.conf scores.d/headers_group.conf scores.d/hfilter_group.conf scores.d/mime_types_group.conf scores.d/mua_group.conf scores.d/phishing_group.conf scores.d/policies_group.conf scores.d/rbl_group.conf scores.d/statistics_group.conf scores.d/subject_group.conf scores.d/surbl_group.conf scores.d/whitelist_group.conf settings.conf statistic.conf worker-controller.inc worker-fuzzy.inc worker-normal.inc worker-proxy.inc diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index 14b0c9498c0..19811d0cbdb 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.31 2019/12/08 09:32:05 triaxx Exp $ +$NetBSD: distinfo,v 1.32 2020/02/11 20:39:48 triaxx Exp $ -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 (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 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 SHA1 (patch-src_CMakeLists.txt) = 672873307ee1f30236e53298a6c0d422c7a79b0e |