- Update to 1.6.0

3 files changed, 21 insertions, 11 deletions

diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 019db030e680..f797bd3fa714 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.5.9
+PORTVERSION=	1.6.0
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
@@ -19,7 +19,6 @@ BUILD_DEPENDS=	ragel:devel/ragel
 CONFLICTS_INSTALL=	rspamd-devel
 
 OPTIONS_DEFINE=	GPERF HYPERSCAN GD CGP
-OPTIONS_DEFAULT=	GD
 GPERF_DESC=		Google perf-tools profiling
 HYPERSCAN_DESC=		Use hyperscan optimizations (amd64 only)
 GD_DESC=		Enable libgd support for images fuzzy hashes
@@ -44,7 +43,7 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 USES=		cmake:outsource pkgconfig perl5 \
 		compiler:c11 sqlite ssl
 USE_LDCONFIG=	yes
-USE_PERL5=	build
+USE_PERL5=	build run
 
 USE_GNOME=	glib20
 
@@ -72,7 +71,6 @@ GH_ACCOUNT=	vstakhov
 .endif
 
 .if ${PORT_OPTIONS:MCGP}
- USE_PERL5+=	run
  PLIST_SUB+=	CGP=""
  RUN_DEPENDS+=	\
 	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo
index 47c10026e84c..47419cf2e7a7 100644
--- a/mail/rspamd/distinfo
+++ b/mail/rspamd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496352567
-SHA256 (vstakhov-rspamd-1.5.9_GH0.tar.gz) = 864705c09733257449ffc52740f380c1edeb56bb4be6e0ad0a8ab8c0cdf6cbe6
-SIZE (vstakhov-rspamd-1.5.9_GH0.tar.gz) = 2386813
+TIMESTAMP = 1497338753
+SHA256 (vstakhov-rspamd-1.6.0_GH0.tar.gz) = 8a4df7115193fce8c8147495ef6b25961acd0f9758a12c6c5f6617f227f7153e
+SIZE (vstakhov-rspamd-1.6.0_GH0.tar.gz) = 2461626
diff --git a/mail/rspamd/pkg-plist b/mail/rspamd/pkg-plist
index 18ac095b4b5b..b1b5ca0b082c 100644
--- a/mail/rspamd/pkg-plist
+++ b/mail/rspamd/pkg-plist
@@ -18,6 +18,7 @@ bin/rspamc
 @sample %%ETCDIR%%/modules.conf.sample
 %%ETCDIR%%/modules.d/antivirus.conf
 %%ETCDIR%%/modules.d/asn.conf
+%%ETCDIR%%/modules.d/arc.conf
 %%ETCDIR%%/modules.d/chartable.conf
 %%ETCDIR%%/modules.d/clickhouse.conf
 %%ETCDIR%%/modules.d/dcc.conf
@@ -47,9 +48,10 @@ bin/rspamc
 %%ETCDIR%%/modules.d/redis.conf
 %%ETCDIR%%/modules.d/regexp.conf
 %%ETCDIR%%/modules.d/replies.conf
-%%ETCDIR%%/modules.d/rmilter_headers.conf
+%%ETCDIR%%/modules.d/milter_headers.conf
 %%ETCDIR%%/modules.d/rspamd_update.conf
 %%ETCDIR%%/modules.d/spamassassin.conf
+%%ETCDIR%%/modules.d/spamtrap.conf
 %%ETCDIR%%/modules.d/spf.conf
 %%ETCDIR%%/modules.d/surbl.conf
 %%ETCDIR%%/modules.d/trie.conf
@@ -67,11 +69,14 @@ bin/rspamc
 @sample %%ETCDIR%%/worker-fuzzy.inc.sample
 @sample %%ETCDIR%%/worker-normal.inc.sample
 @sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
+%%ETCDIR%%/worker-proxy.inc
 etc/newsyslog.conf.d/rspamd.newsyslog.conf
 lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/effective_tld_names.dat
 %%DATADIR%%/lua/antivirus.lua
+%%DATADIR%%/lua/arc.lua
 %%DATADIR%%/lua/asn.lua
+%%DATADIR%%/lua/bayes_expiry.lua
 %%DATADIR%%/lua/clickhouse.lua
 %%DATADIR%%/lua/dcc.lua
 %%DATADIR%%/lua/dkim_signing.lua
@@ -83,7 +88,6 @@ lib/rspamd/librspamd-actrie.so
 %%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
@@ -103,14 +107,22 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/lua/url_tags.lua
 %%DATADIR%%/lua/replies.lua
 %%DATADIR%%/lua/rbl.lua
-%%DATADIR%%/lua/rmilter_headers.lua
+%%DATADIR%%/lua/milter_headers.lua
 %%DATADIR%%/lua/rspamd_update.lua
 %%DATADIR%%/lua/settings.lua
 %%DATADIR%%/lua/spamassassin.lua
+%%DATADIR%%/lua/spamtrap.lua
 %%DATADIR%%/lua/trie.lua
 %%DATADIR%%/lua/url_reputation.lua
 %%DATADIR%%/lua/whitelist.lua
-%%DATADIR%%/rules/global_functions.lua
+%%DATADIR%%/lib/auth_results.lua
+%%DATADIR%%/lib/dkim_sign_tools.lua
+%%DATADIR%%/lib/global_functions.lua
+%%DATADIR%%/lib/lua_redis.lua
+%%DATADIR%%/lib/lua_util.lua
+%%DATADIR%%/lib/maps.lua
+%%DATADIR%%/lib/meta_functions.lua
+%%DATADIR%%/lib/fun.lua
 %%DATADIR%%/rules/forwarding.lua
 %%DATADIR%%/rules/headers_checks.lua
 %%DATADIR%%/rules/html.lua