3 files changed, 40 insertions, 16 deletions

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 1520a95ac69b..6eaf407f32a8 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.5.0.a3.20170120
-PORTREVISION=	2
+PORTVERSION=	1.5.0.b1.20170301
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -15,7 +14,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libevent.so:devel/libevent \
 		libluajit-5.1.so:lang/luajit \
-		libfann.so:math/fann
+		libfann.so:math/fann \
+		libicui18n.so:devel/icu
 BUILD_DEPENDS=	ragel:devel/ragel
 
 CONFLICTS_INSTALL=	rspamd
@@ -23,7 +23,7 @@ CONFLICTS_INSTALL=	rspamd
 RSPAMD_VERSION=	1.5.0
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
-GH_TAGNAME=	a037e79
+GH_TAGNAME=	fa5bd55
 
 OPTIONS_DEFINE=	GPERF REDIRECTOR HYPERSCAN GD
 OPTIONS_DEFAULT=	GD
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index 84ac85ac1f0a..589045754878 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484931842
-SHA256 (vstakhov-rspamd-1.5.0.a3.20170120-a037e79_GH0.tar.gz) = 8da47a2112ff454769aecc3d689bee863e28660e223869b01b70e759124a1c49
-SIZE (vstakhov-rspamd-1.5.0.a3.20170120-a037e79_GH0.tar.gz) = 2323468
+TIMESTAMP = 1488362335
+SHA256 (vstakhov-rspamd-1.5.0.b1.20170301-fa5bd55_GH0.tar.gz) = 406b66588fb2f9f22f450612a2cfd1b445d7ae21aac2ed61c27ecc4c6abbee27
+SIZE (vstakhov-rspamd-1.5.0.b1.20170301-fa5bd55_GH0.tar.gz) = 2362114
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index 32fec3aa92eb..9a79edb4e478 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -16,16 +16,23 @@ bin/rspamc
 @sample %%ETCDIR%%/metrics.conf.sample
 @sample %%ETCDIR%%/mid.inc.sample
 @sample %%ETCDIR%%/modules.conf.sample
+%%ETCDIR%%/modules.d/asn.conf
 %%ETCDIR%%/modules.d/chartable.conf
+%%ETCDIR%%/modules.d/clickhouse.conf
+%%ETCDIR%%/modules.d/dcc.conf
 %%ETCDIR%%/modules.d/dkim.conf
 %%ETCDIR%%/modules.d/dmarc.conf
 %%ETCDIR%%/modules.d/emails.conf
 %%ETCDIR%%/modules.d/fann_redis.conf
+%%ETCDIR%%/modules.d/force_actions.conf
 %%ETCDIR%%/modules.d/forged_recipients.conf
 %%ETCDIR%%/modules.d/fuzzy_check.conf
+%%ETCDIR%%/modules.d/greylist.conf
 %%ETCDIR%%/modules.d/hfilter.conf
 %%ETCDIR%%/modules.d/ip_score.conf
 %%ETCDIR%%/modules.d/maillist.conf
+%%ETCDIR%%/modules.d/metadata_exporter.conf
+%%ETCDIR%%/modules.d/metric_exporter.conf
 %%ETCDIR%%/modules.d/mime_types.conf
 %%ETCDIR%%/modules.d/mid.conf
 %%ETCDIR%%/modules.d/multimap.conf
@@ -35,9 +42,13 @@ bin/rspamc
 %%ETCDIR%%/modules.d/rbl.conf
 %%ETCDIR%%/modules.d/redis.conf
 %%ETCDIR%%/modules.d/regexp.conf
+%%ETCDIR%%/modules.d/rmilter_headers.conf
 %%ETCDIR%%/modules.d/rspamd_update.conf
 %%ETCDIR%%/modules.d/spf.conf
 %%ETCDIR%%/modules.d/surbl.conf
+%%ETCDIR%%/modules.d/url_redirector.conf
+%%ETCDIR%%/modules.d/url_reputation.conf
+%%ETCDIR%%/modules.d/url_tags.conf
 %%ETCDIR%%/modules.d/whitelist.conf
 @sample %%ETCDIR%%/options.inc.sample
 %%ETCDIR%%/redirectors.inc
@@ -63,8 +74,10 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/lua/fann_classifier.lua
 %%DATADIR%%/lua/fann_redis.lua
 %%DATADIR%%/lua/fann_scores.lua
+%%DATADIR%%/lua/force_actions.lua
 %%DATADIR%%/lua/forged_recipients.lua
 %%DATADIR%%/lua/fun.lua
+%%DATADIR%%/lua/fuzzy_collect.lua
 %%DATADIR%%/lua/greylist.lua
 %%DATADIR%%/lua/hfilter.lua
 %%DATADIR%%/lua/ip_score.lua
@@ -78,6 +91,8 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/lua/once_received.lua
 %%DATADIR%%/lua/phishing.lua
 %%DATADIR%%/lua/ratelimit.lua
+%%DATADIR%%/lua/url_redirector.lua
+%%DATADIR%%/lua/url_tags.lua
 %%DATADIR%%/lua/replies.lua
 %%DATADIR%%/lua/rbl.lua
 %%DATADIR%%/lua/rmilter_headers.lua
@@ -115,15 +130,24 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/www/img/desc.png
 %%DATADIR%%/www/img/rspamd_logo_navbar.png
 %%DATADIR%%/www/index.html
-%%DATADIR%%/www/js/d3evolution.min.js
-%%DATADIR%%/www/js/d3pie.min.js
-%%DATADIR%%/www/js/datatables.min.js
-%%DATADIR%%/www/js/humanize.min.js
-%%DATADIR%%/www/js/bootstrap.min.js
-%%DATADIR%%/www/js/d3.min.js
-%%DATADIR%%/www/js/jquery-3.1.1.min.js
-%%DATADIR%%/www/js/rspamd.js
-%%DATADIR%%/www/js/visibility.min.js
+%%DATADIR%%/www/js/app/config.js
+%%DATADIR%%/www/js/app/graph.js
+%%DATADIR%%/www/js/app/history.js
+%%DATADIR%%/www/js/app/rspamd.js
+%%DATADIR%%/www/js/app/stats.js
+%%DATADIR%%/www/js/app/symbols.js
+%%DATADIR%%/www/js/app/upload.js
+%%DATADIR%%/www/js/lib/bootstrap.min.js
+%%DATADIR%%/www/js/lib/d3.min.js
+%%DATADIR%%/www/js/lib/d3evolution.min.js
+%%DATADIR%%/www/js/lib/d3pie.min.js
+%%DATADIR%%/www/js/lib/datatables.min.js
+%%DATADIR%%/www/js/lib/domReady.js
+%%DATADIR%%/www/js/lib/humanize.min.js
+%%DATADIR%%/www/js/lib/jquery-3.1.1.min.js
+%%DATADIR%%/www/js/lib/visibility.min.js
+%%DATADIR%%/www/js/main.js
+%%DATADIR%%/www/js/require.js
 %%DATADIR%%/www/plugins.txt
 %%DATADIR%%/www/react-index.html
 man/man1/rspamadm.1.gz