Updated rspamd to 1.5.3.

From Bartosz Kuzma <bartosz.kuzma@gmail.com> via pkgsrc-wip.

1.5.3:
	* [Conf] Add composite for hacked wordpress phishing
	* [CritFix] Fix base64 decoding when there are unparseable characters
	* [Feature] Additional symbol metadata in metadata exporter
	* [Feature] Add method to get protocol reply from Lua
	* [Feature] Add symbols when tagged rcpt/sender are normalised
	* [Feature] Add task:get_symbols_all() function
	* [Feature] Allow multiple formats of DKIM signing key
	* [Feature] Allow to cache and use flexible protocol reply
	* [Feature] Allow to set one_shot flag from register_symbol
	* [Feature] Allow to skip certain types of hashes when learning fuzzy
	* [Feature] Cache and insert scan time into the protocol
	* [Feature] Detect newlines in rspamc --mime
	* [Feature] DKIM signing: support use of maps
	* [Feature] Greylist: Support excluding low-scoring messages from greylisting
	* [Feature] Implement lua history in controller
	* [Feature] Implement redis history querying
	* [Feature] Preliminary implementation of redis history plugin
	* [Feature] Support using request headers in settings
	* [Fix] Change default template to deal with non-ASCII characters
	* [Fix] Deal with lists of maps in whitelist module
	* [Fix] DKIM signing: use domain-specific signing key
	* [Fix] Do not reallocate completed zstd buffer
	* [Fix] Do not use local_addrs in proxy
	* [Fix] Fix crash when resolver is undefined
	* [Fix] Fix double free when closing lua_tcp connections
	* [Fix] Fix for lua 5.3
	* [Fix] Fix freeing of arrays iterators
	* [Fix] Fix issue with task:get_symbol and symbols with no metric
	* [Fix] Fix log line duplication in `rspamadm grep`
	* [Fix] Fix memory corruption on termination
	* [Fix] Fix out-of-bound access in base64 decode
	* [Fix] Fix ratelimit + greylisting
	* [Fix] Fix subject rewriting
	* [Fix] Fix task:set_recipients function
	* [Fix] Fix URI_COUNT_ODD rule
	* [Fix] Follow the traditional symbols conventions in RCPT_COUNT rule
	* [Fix] Greylist: Suppress greylist action for whitelisted hosts too
	* [Fix] Metadata exporter: use rule-specific settings for emails
	* [Fix] Properly set missing fields in exporter
	* [Fix] Proxy: max_retries option
	* [Fix] RCPT_COUNT fixes
	* [Fix] Rework HAS_X_PRIO rule to match symbols conventions
	* [Fix] Update issues in ac-trie
	* [Fix] Use optimised base64 decoding in DKIM
	* [WebUI] Add preliminary v2 history parser
	* [WebUI] Allow different history parsers
	* [WebUI] Display symbols
	* [WebUI] Rework history v2 function

1.5.2:
	* [Conf] Add default config for spamassasssin plugin
	* [Conf] Add default configuration for antivirus module
	* [Conf] Add dkim signing docs
	* [Conf] Add mx_check default config
	* [Conf] Add replies config
	* [Conf] Add trie default config
	* [Feature] Add heuristic to find text parts in files
	* [Feature] Add rule to detect broken content type
	* [Feature] Allow to extract CTE in Lua API
	* [Feature] Allow to set from address for a lua_task
	* [Feature] Allow to set recipients of a task from Lua
	* [Feature] Enchance text_part:get_content method
	* [Feature] Remove + aliases from emails
	* [Feature] Support rmilter block and dkim signature in CGP helper
	* [Feature] Support running event loop from Lua
	* [Fix] Antivirus: use scanner-specific redis prefix
	* [Fix] Couple of fixes for DKIM signing module
	* [Fix] Distinguish missing and broken mandatory headers
	* [Fix] Do more heuristical detection for missing CTE
	* [Fix] Do not resort cache on each check
	* [Fix] Fix CGP escaping
	* [Fix] Fix MISSING_MIME_VERSION rule for plain messages
	* [Fix] Fix parsing of cte in expressions
	* [Fix] Fix partial matches in rspamadm grep
	* [Fix] Fix setting class on style field
	* [WebUI] Auto-switch Throughput units to `msg/min` for very low rate
	* [WebUI] Update D3Evolution to 0.0.2

1.5.1:
	* [CritFix] Fix processing of stop_patterns with `\0` character
	* [CritFix] Fix setting of raw key for signing
	* [Fix] Fix lua exports from plugins during reload
	* [Fix] Fix prefilters action scores
	* [Fix] Fix symbols processing order
	* [Minor] Help cmake find gthread
	* [Minor] Some cmake fixes

1.5.0:
	* [Conf] Add configurations for asn, clickhouse and dcc
	* [Conf] Add default config for url redirector plugin
	* [Conf] Add the default config for greylist module
	* [Conf] Allow to edit all local maps from WebUI by default
	* [CritFix] Deal with absent headers in DKIM
	* [CritFix] Do not trust remote shingles count
	* [CritFix] Fix bad memory leak in TLS certificates validation
	* [CritFix] Fix critical memory issues with radix maps
	* [CritFix] Fix descriptors leak on reload
	* [CritFix] Fix headers selection in DKIM verification
	* [CritFix] Fix parsing of boundaries that end with `--`
	* [CritFix] Repair PTR_ARRAY_FOREACH macro
	* [Feature] Add CORS support to the controller
	* [Feature] Add FROM_NAME_EXCESS_SPACE rule
	* [Feature] Add REPLYTO_EMAIL_HAS_TITLE rule
	* [Feature] Add `caseless_hash` method to `lua_util`
	* [Feature] Add `rip` keyword to ratelimit module
	* [Feature] Add a simple benchmark for content type parsing
	* [Feature] Add boundaries parsing in content type
	* [Feature] Add charset detection for text parts
	* [Feature] Add content disposition parser
	* [Feature] Add fallback if too many updates are failing
	* [Feature] Add function to convert struct tm to time using timezone
	* [Feature] Add function to normalize HTTP paths
	* [Feature] Add fuzzy collection plugin
	* [Feature] Add fuzzy logic for images
	* [Feature] Add gmime parser to mime_tool
	* [Feature] Add heuristic to detect broken messages
	* [Feature] Add heuristic to find displayed URLs
	* [Feature] Add heuristic to process broken email addresses
	* [Feature] Add images normalization
	* [Feature] Add mechanism for disabling composites (Fixes #1270)
	* [Feature] Add method to create regexp from a glob pattern
	* [Feature] Add mime encoding manipulation routines
	* [Feature] Add mime tool to explore messages
	* [Feature] Add more meta tokens from received headers
	* [Feature] Add neighbours option to support Rspamd cluster in WebUI
	* [Feature] Add new function to parse mime addresses
	* [Feature] Add new methods for lua_tcp
	* [Feature] Add own headers decoding routine
	* [Feature] Add own routine to generate a message id
	* [Feature] Add parser for SMTP date
	* [Feature] Add per-task lua cache to reuse 'heavy' objects
	* [Feature] Add plugins list path in WebUI
	* [Feature] Add preliminary multipart support
	* [Feature] Add preliminary version of DKIM signing module
	* [Feature] Add profiling support in client output
	* [Feature] Add rfc2047 grammar
	* [Feature] Add rfc2047 variant for QP decoding
	* [Feature] Add rmilter_headers module (Fixes #1227)
	* [Feature] Add sse42 version of base64 decoding
	* [Feature] Add ssse3 and avx2 base64 decoders
	* [Feature] Add support of libgd
	* [Feature] Add the preliminary version of redirects resolver in Lua
	* [Feature] Add ucl_object_iterate_full function
	* [Feature] Add url encoding function
	* [Feature] Allow SOA requests in lua dns
	* [Feature] Allow custom parse types in lua ucl
	* [Feature] Allow plugins to register webui handlers
	* [Feature] Allow to add options explicitly to symbols
	* [Feature] Allow to call a callback when symbol frequency is on peak
	* [Feature] Allow to call redirector script from SURBL
	* [Feature] Allow to create variable length dkim keys
	* [Feature] Allow to have module specific options for Redis in plugins
	* [Feature] Allow to pass sign key directly from Lua
	* [Feature] Allow to register configuration docs from Lua API
	* [Feature] Allow to return options as a table
	* [Feature] Allow to set peak callbacks from Lua
	* [Feature] Allow to specify custom method for a message
	* [Feature] Allow to store dkim keys in Redis
	* [Feature] Allow to store messages in files
	* [Feature] Apply DCT using AAN for fuzzy signature
	* [Feature] Avira SAVAPI support
	* [Feature] Cache and simplify DCT and jpeg decode
	* [Feature] Cache libicu convertors
	* [Feature] Detect URLs with suspicious omographs
	* [Feature] Do not increase score for duplicate options
	* [Feature] Do not trust CTE, check base64 and qp strictly
	* [Feature] Dynamic reputation in URL reputation plugin
	* [Feature] Extend redis lock when learning spawned
	* [Feature] Filter non-utf chars from all decoded headers
	* [Feature] Fix phishing detection for IDNA urls
	* [Feature] Ignore bad symbols on base64 decoding
	* [Feature] Ignore too wide elements in SPF
	* [Feature] Implement fuzzy collection mode
	* [Feature] Implement helo maps in multimap
	* [Feature] Implement human readable buckets configuration
	* [Feature] Implement min-hash shingles for DCT data from images
	* [Feature] Implement new algorithm for fuzzy hashes of images
	* [Feature] Implement new unicode normalizer
	* [Feature] Implement quoted printable decoding
	* [Feature] Implement received headers flags
	* [Feature] Implement rspamdgrep tool
	* [Feature] Implement sane checksum for config file
	* [Feature] Implement url tags concept
	* [Feature] Improve detection of omographs using libicu
	* [Feature] Improve url redirector module
	* [Feature] Multimap: Received header processing
	* [Feature] Multiple improvements in the maps
	* [Feature] New URL filters in multimap
	* [Feature] Plugin to force actions on selected symbols
	* [Feature] RBL module: support hashing for emails and helo RBL
	* [Feature] Reuse URL tags in SURBL module
	* [Feature] Rework RRD ds count, add conversion path
	* [Feature] Rework surbl module to avoid extra redirector calls
	* [Feature] Send config id to the WebUI
	* [Feature] Simplify HTTPCrypt client support
	* [Feature] Skip processing for large images
	* [Feature] Start collection only mode implementation for fuzzy storage
	* [Feature] Start import of the optimized base64 decode
	* [Feature] Store all received headers in lua
	* [Feature] Store relational order of all headers in a message
	* [Feature] Support DKIM signing in Lua plugins
	* [Feature] Support HTTPCrypt client in lua_http
	* [Feature] Support setting SMTP message in multimap
	* [Feature] Support setting metric subject from Lua
	* [Feature] Support setting subject in force actions module
	* [Feature] Treat v6 mapped addresses as v4 addresses
	* [Feature] URL reputation plugin
	* [Feature] Use Redis instead of memcached in URLs redirector
	* [Feature] Use Rspamd rfc2047 decoder instead of gmime one
	* [Feature] Use a different normalization for fuzzy images
	* [Feature] Use normalized images in fuzzy hashes
	* [Feature] Use own code for parsing of date
	* [Feature] Use shingles for images fuzzying
	* [Feature] Use t1ha for hashes, allow inlining
	* [Feature] Use t1ha instead of metrohash and xxhash32
	* [Feature] Various new features in metadata exporter module
	* [Feature] rmilter_headers: authentication-results (#78)
	* [Fix] Add additional check to mark redis connection inactive
	* [Fix] Add packed attribute for protocol structure
	* [Fix] Adopt OMOGRAPH_URL rule
	* [Fix] Allow static maps
	* [Fix] Allow to disable classifiers checks using settings and conditions
	* [Fix] Another try to fix 0 length maps
	* [Fix] Another try to fix corruption during maps reload
	* [Fix] Another try to fix descriptors leak
	* [Fix] Another try to fix reload and logger
	* [Fix] Antivirus module: register virtual symbols for patterns
	* [Fix] Avoid extensive reallocs
	* [Fix] Avoid mempool leak in SA plugin on reload
	* [Fix] Avoid race condition on saving cache and reload
	* [Fix] Avoid reusing g_error (Fixes #1262)
	* [Fix] Break pool connection on fatal redis errors
	* [Fix] Check for NaN properly
	* [Fix] Couple of fixes for date parsing
	* [Fix] Date header timezone adjustments (#1279)
	* [Fix] Deal with EOF properly
	* [Fix] Decode filename in content disposition
	* [Fix] Disable fuzzy images by default
	* [Fix] Disable zero-copy mode for text parts to avoid crashes
	* [Fix] Do not destroy session when not all finish scripts are done
	* [Fix] Do not greyscale images
	* [Fix] Do not leave parent-less workers processes on fatal errors
	* [Fix] Do not lowercase Content-Disposition to perform decoding
	* [Fix] Do not penalize characters just after numeric prefix
	* [Fix] Do not refork workers that are intended to die
	* [Fix] Do not set pre-result and update records for no `Queue-ID` messages
	* [Fix] Do not skip post-filters when pre-filters have set some results
	* [Fix] Do not stop symbols planning if async events are pending
	* [Fix] Do not try to set keys for unencrypted requests in proxy
	* [Fix] Encode URLs according to rfc3986
	* [Fix] Encode URLs before sending them to the protocol
	* [Fix] Filter bad characters from message id
	* [Fix] Fix CTE detection heuristic
	* [Fix] Fix Content-Type in HTTP requests
	* [Fix] Fix IDN eslds phishing checks
	* [Fix] Fix adding maps from config in Lua
	* [Fix] Fix another reload memory issue
	* [Fix] Fix argument returned on redis backend errors
	* [Fix] Fix assertion in graph handling
	* [Fix] Fix body trie matching
	* [Fix] Fix build
	* [Fix] Fix byte array expansion during toutf8 conversion
	* [Fix] Fix charset normalisation
	* [Fix] Fix checking of DKIM bodies that needs just `\n` to be added
	* [Fix] Fix couple of cornercases with email addresses
	* [Fix] Fix couple of issues
	* [Fix] Fix dependencies tracking for callback symbols
	* [Fix] Fix detection of jpeg size
	* [Fix] Fix errors handling in fuzzy backend initialization
	* [Fix] Fix fuzzy hashes count
	* [Fix] Fix globbing and convert lists to arrays in fuzzy_check
	* [Fix] Fix heuristical CTE detection for QP encoding
	* [Fix] Fix ignoring of bad text parts
	* [Fix] Fix indexes in array access, interleave loop
	* [Fix] Fix int64 -> double conversion
	* [Fix] Fix invalid memory access on reload
	* [Fix] Fix issues with empty updates
	* [Fix] Fix issues with quoted-printable encoding
	* [Fix] Fix keys names
	* [Fix] Fix lots of issues in mime parser code
	* [Fix] Fix lua maps load
	* [Fix] Fix macro name
	* [Fix] Fix mas group score calculations
	* [Fix] Fix matching of the same patterns from different tries
	* [Fix] Fix memory corruprtion and leak
	* [Fix] Fix memory leak in HTTP maps
	* [Fix] Fix memory leak in expression destroying
	* [Fix] Fix memory leak in parsing of mime names
	* [Fix] Fix memory leak in safe ucl iterators
	* [Fix] Fix memory leak on reload in plugins
	* [Fix] Fix modules reconfigure on reload
	* [Fix] Fix monitored setup fro URLBLs with IP addresses
	* [Fix] Fix name of var
	* [Fix] Fix new rrd updates
	* [Fix] Fix out of bounds access
	* [Fix] Fix parsing messages with no body
	* [Fix] Fix parsing of '=' character in headers
	* [Fix] Fix parsing of messages with no content type
	* [Fix] Fix plugins callbacks in webui
	* [Fix] Fix possible memory corruption in redis pool
	* [Fix] Fix probability calculations for fuzzy redis backend
	* [Fix] Fix processing errors in lua_tcp
	* [Fix] Fix processing of emails with name only
	* [Fix] Fix processing of non-multipart messages
	* [Fix] Fix processing of parts with no valid content type
	* [Fix] Fix race condition in SIGUSR2 handler
	* [Fix] Fix redis options parsing when no redis servers are defined
	* [Fix] Fix reload and hyperscan ready event
	* [Fix] Fix reload memory issue
	* [Fix] Fix rra_ptr conversion
	* [Fix] Fix rrd file conversion
	* [Fix] Fix setting of content-type attributes
	* [Fix] Fix signing headers creation in DKIM
	* [Fix] Fix stddev calculations
	* [Fix] Fix surbl plugin to work with composite maps
	* [Fix] Fix timezones parsing
	* [Fix] Fix tokens usage
	* [Fix] Fix urls and emails hashes
	* [Fix] Fix usage of unsafe ucl iterators
	* [Fix] Fix work with broken utf8 tokens
	* [Fix] Fix writing of user to roll history
	* [Fix] Forgotten worker
	* [Fix] Further memory leaks fixes
	* [Fix] Ignore lua metatokens in bayes for now
	* [Fix] Improve OMOGRAPH_URL rule
	* [Fix] Lua IP from string should be invalid if parsing failed
	* [Fix] Miltiple fixes to new lua_tcp, add debugging
	* [Fix] More fixes for iterators cleanup
	* [Fix] More fixes to logger initialization
	* [Fix] More heuristic fixes for phishing detection
	* [Fix] More leaks eliminated
	* [Fix] More leaks...
	* [Fix] More random fixes for reload...
	* [Fix] Multimap: Fixes for email filters
	* [Fix] Multiple fixes for fann module
	* [Fix] Multiple memory corruption fixes
	* [Fix] Normalize path in HTTP router
	* [Fix] Plug memory leak
	* [Fix] Plug memory leak in adding radix trees
	* [Fix] Plug memory leak in configuration parser
	* [Fix] Plug memory leak in expressions parsing during reload
	* [Fix] Plug memory leak in learning fuzzy storage
	* [Fix] Plug memory leak in lua_tcp
	* [Fix] Plug reload leaks
	* [Fix] Plug termination memory leaks
	* [Fix] Really increase lock lifetime
	* [Fix] Replies module: fix symbol weight
	* [Fix] Restore content type params related functions
	* [Fix] Set task's subject from mime subject
	* [Fix] Sigh, one more reload leak
	* [Fix] Simplify images shingles
	* [Fix] Some more memory issues are fixed
	* [Fix] Stop hardcoding of lua in C
	* [Fix] Stop processing of bad parts as text parts
	* [Fix] Strictly filter bad characters when emittin json
	* [Fix] Strings returned from lua are ephemeral
	* [Fix] Support unix sockets for lua redis
	* [Fix] Try to fix issues with reloading config
	* [Fix] Try to fix race condition in redis_pool
	* [Fix] Use checksum to avoid intersection between different ANNs
	* [Fix] Use rspamd hashes in embedded ucl
	* [Fix] Use sane default rewrite subject (*** SPAM *** %s)
	* [Fix] Various collection mode fixes
	* [Fix] Various fixes to mime parser
	* [Fix] Various reload leak fixing
	* [Fix] Whitelist certain extensions from archive checks
	* [Rework] Add preliminary implementation of the mime parser
	* [Rework] Adopt code for the new options
	* [Rework] Change logger setup interface
	* [Rework] Composite configuration (#1270)
	* [Rework] Finally remove gmime dependency from Rspamd
	* [Rework] Further fixes to symbols frequencies
	* [Rework] Implement content type parser for mime
	* [Rework] Kill all InternetAddressList usages
	* [Rework] Multiple fixes for symbols cache statistics
	* [Rework] Refactor struct names
	* [Rework] Rework images fuzzy hashes algorithm
	* [Rework] Rework lua_tcp to allow TCP dialog
	* [Rework] Start massive rework to get rid of gmime
	* [Rework] Start new approach for multiparts parsing
	* [Rework] Start rework of mime addresses
	* [Rework] Start rework of symbols cache updates
	* [Rework] Start switching to libicu
	* [Rework] Use a special structure for stats tokens
	* [Rework] Use hash tables for symbols options
	* [Rework] Use libicu instead of iconv for conversions
	* [Rework] Use new scheme to parse mime parts
	* [WebUI] Add Access-Control-Allow-Origin for cluster management
	* [WebUI] Add Throughput graph autorefreshing (#820)
	* [WebUI] Add Visibility.js library
	* [WebUI] Add basic cluster support to Throughput tab
	* [WebUI] Add graph legend entries for new DSes
	* [WebUI] Add graph tab
	* [WebUI] Add neighbours RRD data consolidation
	* [WebUI] Add preliminary save symbols clustering
	* [WebUI] Add server selector to navbar
	* [WebUI] Add soft reject to auth stats
	* [WebUI] Add summary to the Throughput tab
	* [WebUI] Allow to save maps on the cluster
	* [WebUI] Avoid extra graph redraw and alerts glitching
	* [WebUI] Be more generous with AJAX timeout
	* [WebUI] Disable error ring loading in `read only` mode
	* [WebUI] Enclose table header cells with `tr`s
	* [WebUI] Finish interface rework
	* [WebUI] Fix RRD summary pie chart position
	* [WebUI] Fix `All SERVERS` graph fot just one available server
	* [WebUI] Fix case when no cluster is defined
	* [WebUI] Fix compatibility with non-ES6 compliant browsers
	* [WebUI] Fix config ID
	* [WebUI] Fix configuration page partially
	* [WebUI] Fix disabled state
	* [WebUI] Fix graph dataset selector initialization
	* [WebUI] Fix graph selectors state resetting
	* [WebUI] Fix mouse events on throughput summary table area
	* [WebUI] Fix multiple JS issues
	* [WebUI] Fix pie chart displaying
	* [WebUI] Fix read only
	* [WebUI] Fix read only2
	* [WebUI] Fix retarded datatables
	* [WebUI] Fix soft reject in pie chart
	* [WebUI] Fix stat widgets timers multiplication on `Refresh` click
	* [WebUI] Fix symbols config
	* [WebUI] Fix various errors with login form
	* [WebUI] Further fixes
	* [WebUI] Hide learning tab in read-only mode
	* [WebUI] Initial clusters support
	* [WebUI] Make legend entry colours more contrast
	* [WebUI] Move configuration tab to a separate module
	* [WebUI] Move history tab
	* [WebUI] Move symbols config as well
	* [WebUI] New sec to time function
	* [WebUI] Prevent multiple clicks on `Refresh`
	* [WebUI] RRD summary: Hide inner labels of tiny pie sectors
	* [WebUI] RRD summary: Respect undefined values
	* [WebUI] Reduce font size of graph's legend
	* [WebUI] Remove orphaned font duplicates
	* [WebUI] Remove unused code
	* [WebUI] Replace spinner with animated glyphicon
	* [WebUI] Reset refresh timer on server switching
	* [WebUI] Rework interface to use requirejs
	* [WebUI] Rework neighbours query function
	* [WebUI] Separate attributes by space
	* [WebUI] Set focus to password field (#1230)
	* [WebUI] Simplify neighbours table populating
	* [WebUI] Start rework of modules
	* [WebUI] Stop stats refreshing if the page is hidden
	* [WebUI] Turn d3pie's stuff into a reusable function,
	* [WebUI] Unify send data functions
	* [WebUI] Update D3Evolution to 0.0.1
	* [WebUI] Update d3.js
	* [WebUI] Update datatables to work with the requirejs
	* [WebUI] Use unified tab click event handler,
	* [WebUI] clusters for the chart
	* [WebUI] fix uptime

3 files changed, 122 insertions, 80 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index a83a38d864f..d9fd025f0b8 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2017/02/22 11:48:49 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2017/03/20 14:14:41 wiz Exp $
 
-DISTNAME=	rspamd-1.4.4
+DISTNAME=	rspamd-1.5.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rspamd.com/downloads/
 EXTRACT_SUFX=	.tar.xz
@@ -10,6 +10,9 @@ HOMEPAGE=	https://www.rspamd.com/
 COMMENT=	Fast, free and open-source spam filtering system
 LICENSE=	2-clause-bsd
 
+.include "options.mk"
+
+DEPENDS+=	${LUA_PKGPREFIX}-lpeg-[0-9]*:../../devel/lua-lpeg
 DEPENDS+=	ragel-[0-9]*:../../devel/ragel
 
 USE_CMAKE=	yes
@@ -39,6 +42,8 @@ LOGDIR=		${VARBASE}/log/rspamd
 DBDIR=		${VARBASE}/db/rspamd
 RUNDIR=		${VARBASE}/run/rspamd
 
+RCD_SCRIPTS=	rspamd
+
 CMAKE_ARGS+=	-DMANDIR:PATH=${PREFIX}/${PKGMANDIR}
 CMAKE_ARGS+=	-DLOGDIR:PATH=${LOGDIR}
 CMAKE_ARGS+=	-DRUNDIR:PATH=${VARBASE}/run/rspamd
@@ -59,61 +64,62 @@ OWN_DIRS_PERMS+=	${RUNDIR} ${RSPAMD_USER} ${RSPAMD_GROUP} 0755
 CONF_FILES=	${EGDIR}/2tld.inc ${PKG_SYSCONFDIR}/2tld.inc
 CONF_FILES+=	${EGDIR}/common.conf ${PKG_SYSCONFDIR}/common.conf
 CONF_FILES+=	${EGDIR}/composites.conf ${PKG_SYSCONFDIR}/composites.conf
+CONF_FILES+=	${EGDIR}/dmarc_whitelist.inc ${PKG_SYSCONFDIR}/dmarc_whitelist.inc
 CONF_FILES+=	${EGDIR}/logging.inc ${PKG_SYSCONFDIR}/logging.inc
+CONF_FILES+=	${EGDIR}/maillist.inc ${PKG_SYSCONFDIR}/maillist.inc
 CONF_FILES+=	${EGDIR}/metrics.conf ${PKG_SYSCONFDIR}/metrics.conf
+CONF_FILES+=	${EGDIR}/mid.inc ${PKG_SYSCONFDIR}/mic.inc
+CONF_FILES+=	${EGDIR}/mime_types.inc ${PKG_SYSCONFDIR}/mime_types.inc
 CONF_FILES+=	${EGDIR}/modules.conf ${PKG_SYSCONFDIR}/modules.conf
 CONF_FILES+=	${EGDIR}/options.inc ${PKG_SYSCONFDIR}/options.inc
 CONF_FILES+=	${EGDIR}/redirectors.inc ${PKG_SYSCONFDIR}/redirectors.inc
 CONF_FILES+=	${EGDIR}/rspamd.conf ${PKG_SYSCONFDIR}/rspamd.conf
+CONF_FILES+=	${EGDIR}/spf_dkim_whitelist.inc ${PKG_SYSCONFDIR}/spf_dkim_whitelist.inc
 CONF_FILES+=	${EGDIR}/statistic.conf ${PKG_SYSCONFDIR}/statistic.conf
-CONF_FILES+=	${EGDIR}/surbl-whitelist.inc \
-	${PKG_SYSCONFDIR}/surbl-whitelist.inc
-CONF_FILES+=	${EGDIR}/worker-controller.inc \
-	${PKG_SYSCONFDIR}/worker-controller.inc
-CONF_FILES+=	${EGDIR}/worker-fuzzy.inc \
-	${PKG_SYSCONFDIR}/worker-fuzzy.inc
-CONF_FILES+=	${EGDIR}/worker-normal.inc \
-	${PKG_SYSCONFDIR}/worker-normal.inc
-CONF_FILES+=	${EGDIR}/modules.d/chartable.conf \
-	${PKG_SYSCONFDIR}/modules.d/chartable.conf
-CONF_FILES+=	${EGDIR}/modules.d/dkim.conf \
-	${PKG_SYSCONFDIR}/modules.d/dkim.conf
-CONF_FILES+=	${EGDIR}/modules.d/dmarc.conf \
-	${PKG_SYSCONFDIR}/modules.d/dmarc.conf
-CONF_FILES+=	${EGDIR}/modules.d/emails.conf \
-	${PKG_SYSCONFDIR}/modules.d/emails.conf
-CONF_FILES+=	${EGDIR}/modules.d/forged_recipients.conf \
-	${PKG_SYSCONFDIR}/modules.d/forged_recipients.conf
-CONF_FILES+=	${EGDIR}/modules.d/fuzzy_check.conf \
-	${PKG_SYSCONFDIR}/modules.d/fuzzy_check.conf
-CONF_FILES+=	${EGDIR}/modules.d/hfilter.conf \
-	${PKG_SYSCONFDIR}/modules.d/hfilter.conf
-CONF_FILES+=	${EGDIR}/modules.d/ip_score.conf \
-	${PKG_SYSCONFDIR}/modules.d/ip_score.conf
-CONF_FILES+=	${EGDIR}/modules.d/maillist.conf \
-	${PKG_SYSCONFDIR}/modules.d/maillist.conf
-CONF_FILES+=	${EGDIR}/modules.d/mime_types.conf \
-	${PKG_SYSCONFDIR}/modules.d/mime_types.conf
-CONF_FILES+=	${EGDIR}/modules.d/multimap.conf \
-	${PKG_SYSCONFDIR}/modules.d/multimap.conf
-CONF_FILES+=	${EGDIR}/modules.d/once_received.conf \
-	${PKG_SYSCONFDIR}/modules.d/once_received.conf
-CONF_FILES+=	${EGDIR}/modules.d/phishing.conf \
-	${PKG_SYSCONFDIR}/modules.d/phishing.conf
-CONF_FILES+=	${EGDIR}/modules.d/ratelimit.conf \
-	${PKG_SYSCONFDIR}/modules.d/ratelimit.conf
-CONF_FILES+=	${EGDIR}/modules.d/rbl.conf \
-	${PKG_SYSCONFDIR}/modules.d/rbl.conf
-CONF_FILES+=	${EGDIR}/modules.d/regexp.conf \
-	${PKG_SYSCONFDIR}/modules.d/regexp.conf
-CONF_FILES+=	${EGDIR}/modules.d/rspamd_update.conf \
-	${PKG_SYSCONFDIR}/modules.d/rspamd_update.conf
-CONF_FILES+=	${EGDIR}/modules.d/spf.conf \
-	${PKG_SYSCONFDIR}/modules.d/spf.conf
-CONF_FILES+=	${EGDIR}/modules.d/surbl.conf \
-	${PKG_SYSCONFDIR}/modules.d/surbl.conf
-CONF_FILES+=	${EGDIR}/modules.d/whitelist.conf \
-	${PKG_SYSCONFDIR}/modules.d/whitelist.conf
+CONF_FILES+=	${EGDIR}/surbl-whitelist.inc ${PKG_SYSCONFDIR}/surbl-whitelist.inc
+CONF_FILES+=	${EGDIR}/worker-controller.inc ${PKG_SYSCONFDIR}/worker-controller.inc
+CONF_FILES+=	${EGDIR}/worker-fuzzy.inc ${PKG_SYSCONFDIR}/worker-fuzzy.inc
+CONF_FILES+=	${EGDIR}/worker-normal.inc ${PKG_SYSCONFDIR}/worker-normal.inc
+CONF_FILES+=	${EGDIR}/modules.d/antivirus.conf ${PKG_SYSCONFDIR}/modules.d/antivirus.conf
+CONF_FILES+=	${EGDIR}/modules.d/asn.conf ${PKG_SYSCONFDIR}/modules.d/asn.conf
+CONF_FILES+=	${EGDIR}/modules.d/chartable.conf ${PKG_SYSCONFDIR}/modules.d/chartable.conf
+CONF_FILES+=	${EGDIR}/modules.d/clickhouse.conf ${PKG_SYSCONFDIR}/modules.d/clickhouse.conf
+CONF_FILES+=	${EGDIR}/modules.d/dcc.conf ${PKG_SYSCONFDIR}/modules.d/dcc.conf
+CONF_FILES+=	${EGDIR}/modules.d/dkim.conf ${PKG_SYSCONFDIR}/modules.d/dkim.conf
+CONF_FILES+=	${EGDIR}/modules.d/dkim_signing.conf ${PKG_SYSCONFDIR}/modules.d/dkim_signing.conf
+CONF_FILES+=	${EGDIR}/modules.d/dmarc.conf ${PKG_SYSCONFDIR}/modules.d/dmarc.conf
+CONF_FILES+=	${EGDIR}/modules.d/emails.conf ${PKG_SYSCONFDIR}/modules.d/emails.conf
+CONF_FILES+=	${EGDIR}/modules.d/fann_redis.conf ${PKG_SYSCONFDIR}/modules.d/fann_redis.conf
+CONF_FILES+=	${EGDIR}/modules.d/force_actions.conf ${PKG_SYSCONFDIR}/modules.d/force_actions.conf
+CONF_FILES+=	${EGDIR}/modules.d/forged_recipients.conf ${PKG_SYSCONFDIR}/modules.d/forged_recipients.conf
+CONF_FILES+=	${EGDIR}/modules.d/fuzzy_check.conf ${PKG_SYSCONFDIR}/modules.d/fuzzy_check.conf
+CONF_FILES+=	${EGDIR}/modules.d/greylist.conf ${PKG_SYSCONFDIR}/modules.d/greylist.conf
+CONF_FILES+=	${EGDIR}/modules.d/hfilter.conf ${PKG_SYSCONFDIR}/modules.d/hfilter.conf
+CONF_FILES+=	${EGDIR}/modules.d/ip_score.conf ${PKG_SYSCONFDIR}/modules.d/ip_score.conf
+CONF_FILES+=	${EGDIR}/modules.d/maillist.conf ${PKG_SYSCONFDIR}/modules.d/maillist.conf
+CONF_FILES+=	${EGDIR}/modules.d/metadata_exporter.conf ${PKG_SYSCONFDIR}/modules.d/metadata_exporter.conf
+CONF_FILES+=	${EGDIR}/modules.d/metric_exporter.conf ${PKG_SYSCONFDIR}/modules.d/metric_exporter.conf
+CONF_FILES+=	${EGDIR}/modules.d/mid.conf ${PKG_SYSCONFDIR}/modules.d/mid.conf
+CONF_FILES+=	${EGDIR}/modules.d/mime_types.conf ${PKG_SYSCONFDIR}/modules.d/mime_types.conf
+CONF_FILES+=	${EGDIR}/modules.d/multimap.conf ${PKG_SYSCONFDIR}/modules.d/multimap.conf
+CONF_FILES+=	${EGDIR}/modules.d/mx_check.conf ${PKG_SYSCONFDIR}/modules.d/mx_check.conf
+CONF_FILES+=	${EGDIR}/modules.d/once_received.conf ${PKG_SYSCONFDIR}/modules.d/once_received.conf
+CONF_FILES+=	${EGDIR}/modules.d/phishing.conf ${PKG_SYSCONFDIR}/modules.d/phishing.conf
+CONF_FILES+=	${EGDIR}/modules.d/ratelimit.conf ${PKG_SYSCONFDIR}/modules.d/ratelimit.conf
+CONF_FILES+=	${EGDIR}/modules.d/rbl.conf ${PKG_SYSCONFDIR}/modules.d/rbl.conf
+CONF_FILES+=	${EGDIR}/modules.d/redis.conf ${PKG_SYSCONFDIR}/modules.d/redis.conf
+CONF_FILES+=	${EGDIR}/modules.d/regexp.conf ${PKG_SYSCONFDIR}/modules.d/regexp.conf
+CONF_FILES+=	${EGDIR}/modules.d/replies.conf ${PKG_SYSCONFDIR}/modules.d/replies.conf
+CONF_FILES+=	${EGDIR}/modules.d/rmilter_headers.conf ${PKG_SYSCONFDIR}/modules.d/rmilter_headers.conf
+CONF_FILES+=	${EGDIR}/modules.d/rspamd_update.conf ${PKG_SYSCONFDIR}/modules.d/rspamd_update.conf
+CONF_FILES+=	${EGDIR}/modules.d/spamassassin.conf ${PKG_SYSCONFDIR}/modules.d/spamassassin.conf
+CONF_FILES+=	${EGDIR}/modules.d/spf.conf ${PKG_SYSCONFDIR}/modules.d/spf.conf
+CONF_FILES+=	${EGDIR}/modules.d/surbl.conf ${PKG_SYSCONFDIR}/modules.d/surbl.conf
+CONF_FILES+=	${EGDIR}/modules.d/trie.conf ${PKG_SYSCONFDIR}/modules.d/trie.conf
+CONF_FILES+=	${EGDIR}/modules.d/url_redirector.conf ${PKG_SYSCONFDIR}/modules.d/url_redirector.conf
+CONF_FILES+=	${EGDIR}/modules.d/url_reputation.conf ${PKG_SYSCONFDIR}/modules.d/url_reputation.conf
+CONF_FILES+=	${EGDIR}/modules.d/url_tags.conf ${PKG_SYSCONFDIR}/modules.d/url_tags.conf
+CONF_FILES+=	${EGDIR}/modules.d/whitelist.conf ${PKG_SYSCONFDIR}/modules.d/whitelist.conf
 
 post-extract:
 	${FIND} ${WRKSRC}/conf -type d -exec ${CHMOD} ${PKGDIRMODE} {} \;
@@ -121,9 +127,12 @@ post-extract:
 
 .include "../../databases/hiredis/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/fann/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../mail/gmime/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../sysutils/file/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST
index 4f00f7fd147..cf912302956 100644
--- a/mail/rspamd/PLIST
+++ b/mail/rspamd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/02/17 15:01:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/03/20 14:14:41 wiz Exp $
 bin/rspamadm
 bin/rspamadm-${PKGVERSION}
 bin/rspamc
@@ -20,55 +20,76 @@ share/examples/rspamd/metrics.conf
 share/examples/rspamd/mid.inc
 share/examples/rspamd/mime_types.inc
 share/examples/rspamd/modules.conf
+share/examples/rspamd/options.inc
+share/examples/rspamd/redirectors.inc
+share/examples/rspamd/rspamd.conf
+share/examples/rspamd/rspamd.systemd.conf
+share/examples/rspamd/rspamd.sysvinit.conf
+share/examples/rspamd/spf_dkim_whitelist.inc
+share/examples/rspamd/statistic.conf
+share/examples/rspamd/surbl-whitelist.inc
+share/examples/rspamd/worker-controller.inc
+share/examples/rspamd/worker-fuzzy.inc
+share/examples/rspamd/worker-normal.inc
+share/examples/rspamd/modules.d/antivirus.conf
+share/examples/rspamd/modules.d/asn.conf
 share/examples/rspamd/modules.d/chartable.conf
+share/examples/rspamd/modules.d/clickhouse.conf
+share/examples/rspamd/modules.d/dcc.conf
 share/examples/rspamd/modules.d/dkim.conf
+share/examples/rspamd/modules.d/dkim_signing.conf
 share/examples/rspamd/modules.d/dmarc.conf
 share/examples/rspamd/modules.d/emails.conf
 share/examples/rspamd/modules.d/fann_redis.conf
+share/examples/rspamd/modules.d/force_actions.conf
 share/examples/rspamd/modules.d/forged_recipients.conf
 share/examples/rspamd/modules.d/fuzzy_check.conf
+share/examples/rspamd/modules.d/greylist.conf
 share/examples/rspamd/modules.d/hfilter.conf
 share/examples/rspamd/modules.d/ip_score.conf
 share/examples/rspamd/modules.d/maillist.conf
+share/examples/rspamd/modules.d/metadata_exporter.conf
+share/examples/rspamd/modules.d/metric_exporter.conf
 share/examples/rspamd/modules.d/mid.conf
 share/examples/rspamd/modules.d/mime_types.conf
 share/examples/rspamd/modules.d/multimap.conf
+share/examples/rspamd/modules.d/mx_check.conf
 share/examples/rspamd/modules.d/once_received.conf
 share/examples/rspamd/modules.d/phishing.conf
 share/examples/rspamd/modules.d/ratelimit.conf
 share/examples/rspamd/modules.d/rbl.conf
 share/examples/rspamd/modules.d/redis.conf
 share/examples/rspamd/modules.d/regexp.conf
+share/examples/rspamd/modules.d/replies.conf
+share/examples/rspamd/modules.d/rmilter_headers.conf
 share/examples/rspamd/modules.d/rspamd_update.conf
+share/examples/rspamd/modules.d/spamassassin.conf
 share/examples/rspamd/modules.d/spf.conf
 share/examples/rspamd/modules.d/surbl.conf
+share/examples/rspamd/modules.d/trie.conf
+share/examples/rspamd/modules.d/url_redirector.conf
+share/examples/rspamd/modules.d/url_reputation.conf
+share/examples/rspamd/modules.d/url_tags.conf
 share/examples/rspamd/modules.d/whitelist.conf
-share/examples/rspamd/options.inc
-share/examples/rspamd/redirectors.inc
-share/examples/rspamd/rspamd.conf
-share/examples/rspamd/rspamd.systemd.conf
-share/examples/rspamd/rspamd.sysvinit.conf
-share/examples/rspamd/spf_dkim_whitelist.inc
-share/examples/rspamd/statistic.conf
-share/examples/rspamd/surbl-whitelist.inc
-share/examples/rspamd/worker-controller.inc
-share/examples/rspamd/worker-fuzzy.inc
-share/examples/rspamd/worker-normal.inc
 share/rspamd/effective_tld_names.dat
 share/rspamd/lua/antivirus.lua
 share/rspamd/lua/asn.lua
 share/rspamd/lua/clickhouse.lua
 share/rspamd/lua/dcc.lua
+share/rspamd/lua/dkim_signing.lua
 share/rspamd/lua/dmarc.lua
 share/rspamd/lua/dynamic_conf.lua
 share/rspamd/lua/emails.lua
 share/rspamd/lua/fann_classifier.lua
 share/rspamd/lua/fann_redis.lua
 share/rspamd/lua/fann_scores.lua
+share/rspamd/lua/force_actions.lua
 share/rspamd/lua/forged_recipients.lua
 share/rspamd/lua/fun.lua
+share/rspamd/lua/fuzzy_collect.lua
 share/rspamd/lua/greylist.lua
 share/rspamd/lua/hfilter.lua
+share/rspamd/lua/history_redis.lua
 share/rspamd/lua/ip_score.lua
 share/rspamd/lua/maillist.lua
 share/rspamd/lua/metadata_exporter.lua
@@ -82,12 +103,18 @@ share/rspamd/lua/phishing.lua
 share/rspamd/lua/ratelimit.lua
 share/rspamd/lua/rbl.lua
 share/rspamd/lua/replies.lua
+share/rspamd/lua/rmilter_headers.lua
 share/rspamd/lua/rspamd_update.lua
 share/rspamd/lua/settings.lua
 share/rspamd/lua/spamassassin.lua
 share/rspamd/lua/trie.lua
+share/rspamd/lua/url_redirector.lua
+share/rspamd/lua/url_reputation.lua
+share/rspamd/lua/url_tags.lua
 share/rspamd/lua/whitelist.lua
 share/rspamd/rules/forwarding.lua
+share/rspamd/rules/global_functions.lua
+share/rspamd/rules/headers_checks.lua
 share/rspamd/rules/html.lua
 share/rspamd/rules/http_headers.lua
 share/rspamd/rules/mid.lua
@@ -101,12 +128,11 @@ share/rspamd/rules/regexp/misc.lua
 share/rspamd/rules/regexp/upstream_spam_filters.lua
 share/rspamd/rules/rspamd.classifiers.lua
 share/rspamd/rules/rspamd.lua
+share/rspamd/rules/subject_checks.lua
 share/rspamd/www/README.md
 share/rspamd/www/css/bootstrap.min.css
 share/rspamd/www/css/d3evolution.css
 share/rspamd/www/css/datatables.min.css
-share/rspamd/www/css/glyphicons-halflings-regular.woff
-share/rspamd/www/css/glyphicons-halflings-regular.woff2
 share/rspamd/www/css/rspamd.css
 share/rspamd/www/favicon.ico
 share/rspamd/www/fonts/glyphicons-halflings-regular.ttf
@@ -115,17 +141,24 @@ share/rspamd/www/fonts/glyphicons-halflings-regular.woff2
 share/rspamd/www/img/asc.png
 share/rspamd/www/img/desc.png
 share/rspamd/www/img/rspamd_logo_navbar.png
-share/rspamd/www/img/spinner.gif
-share/rspamd/www/img/spinner.png
 share/rspamd/www/index.html
-share/rspamd/www/js/bootstrap.min.js
-share/rspamd/www/js/d3.min.js
-share/rspamd/www/js/d3evolution.min.js
-share/rspamd/www/js/d3pie.min.js
-share/rspamd/www/js/datatables.min.js
-share/rspamd/www/js/humanize.min.js
-share/rspamd/www/js/jquery-3.1.1.min.js
-share/rspamd/www/js/jquery.cookie.min.js
-share/rspamd/www/js/rspamd.js
+share/rspamd/www/js/app/config.js
+share/rspamd/www/js/app/graph.js
+share/rspamd/www/js/app/history.js
+share/rspamd/www/js/app/rspamd.js
+share/rspamd/www/js/app/stats.js
+share/rspamd/www/js/app/symbols.js
+share/rspamd/www/js/app/upload.js
+share/rspamd/www/js/lib/bootstrap.min.js
+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/datatables.min.js
+share/rspamd/www/js/lib/domReady.js
+share/rspamd/www/js/lib/humanize.min.js
+share/rspamd/www/js/lib/jquery-3.1.1.min.js
+share/rspamd/www/js/lib/visibility.min.js
+share/rspamd/www/js/main.js
+share/rspamd/www/js/require.js
 share/rspamd/www/plugins.txt
 share/rspamd/www/react-index.html
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 97348b14435..c410a115764 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2017/02/22 11:48:49 wiz Exp $
+$NetBSD: distinfo,v 1.12 2017/03/20 14:14:41 wiz Exp $
 
-SHA1 (rspamd-1.4.4.tar.xz) = d12051a4fb1f70965be383df0b24766d4dba5d7b
-RMD160 (rspamd-1.4.4.tar.xz) = 06748219bc3c1d7690de3dfd5866051d2e9e5743
-SHA512 (rspamd-1.4.4.tar.xz) = df2260de6585699a5b6692aa210647270b7132372ae6a2437f8532265018fe4db8270a8989ce0c0664cad17cbc281ae92f935c4f0974dc2f8da309e54c234b14
-Size (rspamd-1.4.4.tar.xz) = 1780816 bytes
+SHA1 (rspamd-1.5.3.tar.xz) = bfadf6162dcf3d6c9dad85a607b631cb7f2fcea0
+RMD160 (rspamd-1.5.3.tar.xz) = 8b88e883aaf38db030cc0c4c3f5f2d357088be7a
+SHA512 (rspamd-1.5.3.tar.xz) = 68bdd593b03c299285d2cd56e945dbd38f823fbf7e9300318e7b05a3084eb751cb48134e69c13705e462838d814dd29bdca4631933eb23c0febf4d2fd223a153
+Size (rspamd-1.5.3.tar.xz) = 1854812 bytes
 SHA1 (patch-CMakeLists.txt) = 81b847220b8c8736b13209fb5bedf0020a8d7acf
 SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a