Updated rspamd to 1.5.5.

1.5.5:
	* [CritFix] Fix classifier learning with Redis backend
	* [CritFix] Fix issue when parsing encoded rfc822/messages
	* [Feature] Add escaped version of lua_ucl import
	* [Feature] Add task:headers_foreach function
	* [Feature] Allow to process filenames from content type
	* [Feature] Allow to query hashed emails
	* [Feature] Ignore bayes with mostly metatokens or with too few text
	* [Feature] Probabilistically skip metatokens
	* [Feature] Retrieve all virus names from SAVAPI
	* [Feature] Rework classifiers lua metatokens
	* [Feature] Store headers order
	* [Feature] Store text tokens inside bayes tokens
	* [Feature] Use cached shingles keys
	* [Fix] Add missing score normalisation for HFILTER_URL_ONLY
	* [Fix] Avoid lookup in absent hash
	* [Fix] Check return values from Lua functions called from C
	* [Fix] Do not count sending and loading time in rspamc
	* [Fix] Escape json strings for controller rejplies from Lua
	* [Fix] Fix archive scans for savapi
	* [Fix] Fix domain_only emails RBL
	* [Fix] Fix ip_score map configuration
	* [Fix] Fix JSON output for history_redis
	* [Fix] Fix one character length substrings search
	* [Fix] Fix parsing of non-RFC compatible Exim received
	* [Fix] Fix parsing of options for workers with the same type
	* [Fix] Fix processing of small tokens vectors
	* [Fix] Fix rfc2047 tokenization
	* [Fix] Fix typo
	* [Fix] More fixes for inplace decoding
	* [Fix] Try to avoid modifications of the original data
	* [Fix] URL redirector: Fix call to is_redirector
	* [Rework] Set token data as uint64_t instead of chars array
	* [WebUI] Check if neighbours' history backend versions match
	* [WebUI] Disable phrase connectors replacement in history filtering
	* [WebUI] Disable phrase connectors replacement in symbols filtering
	* [WebUI] Do not hide messages with bad subject, just replace it with '???'
	* [WebUI] Fix error message
	* [WebUI] Fix history v2 display
	* [WebUI] Fix legacy history
	* [WebUI] history: break To address lists on commas
	* [WebUI] Increase default timeout to 20 seconds
	* [WebUI] Save some history table space

1.5.4:
	* [Conf] Add history_redis default configuration
	* [Feature] Add spoofed rules
	* [Feature] Add URL_IN_SUBJECT rule
	* [Feature] Allow to get task's subject
	* [Feature] Allow to specify maximum number of shots for symbols
	* [Feature] Distinguish URLs found in Subject
	* [Feature] Memoize LPEG grammars
	* [Feature] Parse else parts in SA rules
	* [Feature] Process subject for mixed characters
	* [Feature] Resolve url chains in url_redirector module
	* [Feature] Stat greylisted messages as greylisted not soft-rejected
	* [Feature] Support checking for redirector in Lua SURBL
	* [Feature] Support tag_exists SA function
	* [Feature] Work with broken rfc2047 tokens
	* [Fix] Check all watcher's dependencies
	* [Fix] Do not compile hyperscan with no SSSE3 support
	* [Fix] Do not crash if cannot decode qp encoded part
	* [Fix] Fix dependencies of DKIM when multiple signatures are found
	* [Fix] Fix lists in whitelist plugin
	* [Fix] Fix one-shot symbols weight calculations
	* [Fix] Fix options and shots match
	* [Fix] Fix order of symbol options
	* [Fix] Fix parsing of dot at the end of the address
	* [Fix] Fix parsing of lua table arguments
	* [Fix] Fix processing of subject words
	* [Fix] Fix string split memoization
	* [Fix] Fix templates grammar usage
	* [Fix] Fix various issues related to Lua stack manipulation
	* [Fix] Force actions: Use postfilter if we have honor_action / require_action
	* [Fix] Further fixes to avoid PHISHING FP
	* [Fix] Preserve order of options in symbols
	* [Fix] Rspamadm grep: deal with unusually-formatted logs
	* [Fix] Use hostname suffix when dealing with history
	* [Rework] Remove outdated SA rules
	* [WebUI] Add flexible columns
	* [WebUI] Add footable
	* [WebUI] Add sender, recipients and subject columns
	* [WebUI] Allow message-id break
	* [WebUI] Fix history clustering
	* [WebUI] Fix history display
	* [WebUI] Fix sorting
	* [WebUI] Humanize sizes
	* [WebUI] Initial move towards footable
	* [WebUI] Remove datatables
	* [WebUI] Replace `.values` method with `.map`
	* [WebUI] Rework v2 symbols display
	* [WebUI] Try to normalize frequencies
	* [WebUI] Unbreak WebUI
	* [WebUI] Use Footable to draw Throughput summary table

4 files changed, 24 insertions, 27 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 5417b53c8ce..c78ecbe313c 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2017/03/31 10:32:18 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2017/04/19 18:31:30 wiz Exp $
 
-DISTNAME=	rspamd-1.5.3
-PKGREVISION=	1
+DISTNAME=	rspamd-1.5.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rspamd.com/downloads/
 EXTRACT_SUFX=	.tar.xz
diff --git a/mail/rspamd/PLIST b/mail/rspamd/PLIST
index cf912302956..d7e0e379d10 100644
--- a/mail/rspamd/PLIST
+++ b/mail/rspamd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/03/20 14:14:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/04/19 18:31:30 wiz Exp $
 bin/rspamadm
 bin/rspamadm-${PKGVERSION}
 bin/rspamc
@@ -20,17 +20,6 @@ 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
@@ -46,6 +35,7 @@ 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/history_redis.conf
 share/examples/rspamd/modules.d/ip_score.conf
 share/examples/rspamd/modules.d/maillist.conf
 share/examples/rspamd/modules.d/metadata_exporter.conf
@@ -71,6 +61,17 @@ 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
@@ -120,10 +121,7 @@ share/rspamd/rules/http_headers.lua
 share/rspamd/rules/mid.lua
 share/rspamd/rules/misc.lua
 share/rspamd/rules/regexp/compromised_hosts.lua
-share/rspamd/rules/regexp/drugs.lua
-share/rspamd/rules/regexp/fraud.lua
 share/rspamd/rules/regexp/headers.lua
-share/rspamd/rules/regexp/lotto.lua
 share/rspamd/rules/regexp/misc.lua
 share/rspamd/rules/regexp/upstream_spam_filters.lua
 share/rspamd/rules/rspamd.classifiers.lua
@@ -132,7 +130,7 @@ 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/footable.bootstrap.min.css
 share/rspamd/www/css/rspamd.css
 share/rspamd/www/favicon.ico
 share/rspamd/www/fonts/glyphicons-halflings-regular.ttf
@@ -153,8 +151,8 @@ 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/footable.min.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
@@ -162,3 +160,4 @@ share/rspamd/www/js/main.js
 share/rspamd/www/js/require.js
 share/rspamd/www/plugins.txt
 share/rspamd/www/react-index.html
+@pkgdir etc/rspamd
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index c410a115764..d546ebdc528 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.12 2017/03/20 14:14:41 wiz Exp $
+$NetBSD: distinfo,v 1.13 2017/04/19 18:31:30 wiz Exp $
 
-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 (rspamd-1.5.5.tar.xz) = 97450ffd6d91ee455ab0a661b9fe96a48429ada8
+RMD160 (rspamd-1.5.5.tar.xz) = 000d4b614ea89e5d66ae81ba62fc8a47d0ee8e2c
+SHA512 (rspamd-1.5.5.tar.xz) = 74757e8a7a0153b576d524917921f74a255cc4e1e21a97963ef38d0c332e4c8c439eff451386d345de3cb7c781167eb74053ae716a8b990b4e242cba714663bb
+Size (rspamd-1.5.5.tar.xz) = 1850920 bytes
 SHA1 (patch-CMakeLists.txt) = 81b847220b8c8736b13209fb5bedf0020a8d7acf
 SHA1 (patch-src_CMakeLists.txt) = c80015bb275ba8b9ad31491311275bf353f8f30a
diff --git a/mail/rspamd/options.mk b/mail/rspamd/options.mk
index e4fa9b0b2cf..cbf1abd95ef 100644
--- a/mail/rspamd/options.mk
+++ b/mail/rspamd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2017/03/20 14:15:16 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2017/04/19 18:31:30 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.rspamd
 
@@ -15,4 +15,3 @@ CMAKE_ARGS+=	-DENABLE_GD=ON
 .else
 CMAKE_ARGS+=	-DENABLE_GD=OFF
 .endif
-