5 files changed, 202 insertions, 187 deletions

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index eac014b9ddb0..3cd49dd68534 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.7.0.a2.20180302
-PORTREVISION=	4
+PORTVERSION=	1.8.0.a1.20180920
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -15,34 +14,38 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libevent.so:devel/libevent \
 		libluajit-5.1.so:lang/luajit \
-		libfann.so:math/fann \
 		libicui18n.so:devel/icu
 BUILD_DEPENDS=	ragel:devel/ragel
+RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
 
-CONFLICTS_INSTALL=	rspamd
+USES=		cmake:outsource pkgconfig perl5 \
+		compiler:c11 sqlite ssl
+USE_LDCONFIG=	yes
+USE_PERL5=	build run
+USE_GNOME=	glib20
 
-RSPAMD_VERSION=	1.7.0
-USE_GITHUB=	yes
-GH_ACCOUNT=	vstakhov
-GH_TAGNAME=	0fed6e67d
+CONFLICTS_INSTALL=	rspamd
 
-OPTIONS_DEFINE=		GPERF GD CGP TORCH
+OPTIONS_DEFINE=		GPERF GD CGP TORCH_BLAS
 OPTIONS_DEFINE_amd64=	HYPERSCAN
+OPTIONS_DEFAULT_amd64=	TORCH
 OPTIONS_SUB=	yes
 
+OPTIONS_RADIO=	NEURAL_NETWORK
+OPTIONS_RADIO_NEURAL_NETWORK=	FANN TORCH
+
 CGP_DESC=		Install Communigate Pro(tm) helper
 GD_DESC=		Enable libgd support for images fuzzy hashes
 GPERF_DESC=		Google perf-tools profiling
 HYPERSCAN_DESC=		Use hyperscan optimizations (amd64 only)
-TORCH_DESC=		Build with embedded Torch7
-
-OPTIONS_DEFAULT=	TORCH
-
-USE_RC_SUBR=	rspamd
+FANN_DESC=		Use Fast Artificial Neural Network Library (FANN)
+TORCH_DESC=		Machine learning support using torch
+TORCH_BLAS_DESC=	Build torch with OpenBLAS
+TORCH_BLAS_IMPLIES=	TORCH
 
 SUB_FILES=	pkg-message rspamd.newsyslog.conf.sample
 PLIST_SUB+=	ETCDIR=etc/rspamd \
-		RSPAMDVERSION=${RSPAMD_VERSION}
+		RSPAMDVERSION=${PORTVERSION:C/^([^.]+\.[^.]+\.[^.]+).*/\1/}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DLOGDIR=/var/log/rspamd \
 		-DDBDIR=/var/db/rspamd \
@@ -53,53 +56,44 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DLIBDIR=${PREFIX}/lib/rspamd \
 		-DNO_SHARED=ON \
 		-DDEBUG=ON \
-		-DGIT_ID=${GH_TAGNAME} \
-		-DENABLE_FANN=ON
-
-USES=		cmake:outsource pkgconfig perl5 \
-		compiler:c11 sqlite ssl
-USE_LDCONFIG=	yes
-USE_PERL5=	build run
+		-DGIT_ID=${GH_TAGNAME}
+USE_GITHUB=	yes
+GH_ACCOUNT=	vstakhov
+GH_TAGNAME=	571ce4f
 
-USE_GNOME=	glib20
 DEBUG_FLAGS=	-g -O0
 WITH_DEBUG=	yes
 
-.include <bsd.port.options.mk>
+USE_RC_SUBR=	rspamd
 
-.if ${PORT_OPTIONS:MGD}
- CMAKE_ARGS+=	-DENABLE_GD=ON
- LIB_DEPENDS+=	libgd.so:graphics/gd
-.else
- CMAKE_ARGS+=	-DENABLE_GD=OFF
-.endif
+GD_CMAKE_ON=	-DENABLE_GD=ON
+GD_LIB_DEPENDS=	libgd.so:graphics/gd
 
-.if ${PORT_OPTIONS:MGPERF}
- CMAKE_ARGS+=	-DENABLE_GPERF_TOOLS=ON
- LIB_DEPENDS+=	libprofiler.so:devel/google-perftools
-.endif
+GPERF_CMAKE_ON=	-DENABLE_GPERF_TOOLS=ON
+GPERF_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 
-.if ${PORT_OPTIONS:MHYPERSCAN}
- CMAKE_ARGS+=		-DENABLE_HYPERSCAN=ON
- LIB_DEPENDS+=		libhs.so:devel/hyperscan
-.endif
+HYPERSCAN_CMAKE_ON=	-DENABLE_HYPERSCAN=ON
+HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan
+
+FANN_CMAKE_ON=	-DENABLE_FANN=ON
+FANN_LIB_DEPENDS=libfann.so:math/fann
+
+TORCH_CMAKE_ON=	-DENABLE_TORCH=ON
+TORCH_CMAKE_OFF=-DENABLE_TORCH=OFF
+
+TORCH_BLAS_USES=	blaslapack:openblas
+TORCH_BLAS_CMAKE_ON=	-DWITH_BLAS=open
 
-.if ${PORT_OPTIONS:MCGP}
- PLIST_SUB+=	CGP=""
- RUN_DEPENDS+=	\
+CGP_RUN_DEPENDS+=	\
 	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
 	p5-AnyEvent>=0:devel/p5-AnyEvent \
 	p5-EV>=0:devel/p5-EV \
 	p5-JSON-XS>=0:converters/p5-JSON-XS
-.else
- PLIST_SUB+=	CGP="@comment "
-.endif
 
-.if ! ${PORT_OPTIONS:MTORCH}
- CMAKE_ARGS+=	-DENABLE_TORCH=OFF
-.else
- LIB_DEPENDS+=	libopenblas.so:math/openblas
- USE_GCC=	yes
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTORCH_BLAS}
+USE_GCC=	yes
 .endif
 
 post-install:
@@ -111,11 +105,12 @@ post-install:
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.systemd.conf
 	# No need, since rspamd.conf.sample is a same
 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
+	# No examples installed by the port
+	${RMDIR} ${STAGEDIR}/${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
-.if ${PORT_OPTIONS:MCGP}
+post-install-CGP-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index 6f9c5820801c..6f6885027c85 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520018475
-SHA256 (vstakhov-rspamd-1.7.0.a2.20180302-0fed6e67d_GH0.tar.gz) = 686ccca475b6a3188818336eb1b16a2a6f66c4c9b1ed208e02c08d62680d8d31
-SIZE (vstakhov-rspamd-1.7.0.a2.20180302-0fed6e67d_GH0.tar.gz) = 4414948
+TIMESTAMP = 1537422438
+SHA256 (vstakhov-rspamd-1.8.0.a1.20180920-571ce4f_GH0.tar.gz) = c80bc4acefbd15cfe18e3c1655216e89c7c480667a596b4924342621e8cccc7c
+SIZE (vstakhov-rspamd-1.8.0.a1.20180920-571ce4f_GH0.tar.gz) = 4260326
diff --git a/mail/rspamd-devel/files/patch-CMakeLists.txt b/mail/rspamd-devel/files/patch-CMakeLists.txt
index 35f693df5990..8aa4c87df862 100644
--- a/mail/rspamd-devel/files/patch-CMakeLists.txt
+++ b/mail/rspamd-devel/files/patch-CMakeLists.txt
@@ -1,10 +1,11 @@
---- CMakeLists.txt.orig	2017-06-06 15:07:59 UTC
+--- CMakeLists.txt.orig	2018-05-18 14:14:33 UTC
 +++ CMakeLists.txt
-@@ -1302,6 +1302,26 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
- ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")
+@@ -1309,6 +1309,28 @@ ENDFOREACH(CONF_FILE)
+ SET(MAIN_CONF "conf/rspamd.conf")
  IF(BUILD_PORT)
  	INSTALL_IF_NOT_EXISTS(${MAIN_CONF} ${CONFDIR} "rspamd.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/actions.conf" ${CONFDIR} "actions.conf" ".sample")
++	INSTALL_IF_NOT_EXISTS("conf/cgp.inc" ${CONFDIR} "cgp.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/common.conf" ${CONFDIR} "common.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/groups.conf" ${CONFDIR} "groups.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/logging.inc" ${CONFDIR} "logging.inc" ".sample")
@@ -20,6 +21,7 @@
 +	INSTALL_IF_NOT_EXISTS("conf/metrics.conf" ${CONFDIR} "metrics.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/mid.inc" ${CONFDIR} "mid.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/modules.conf" ${CONFDIR} "modules.conf" ".sample")
++	INSTALL_IF_NOT_EXISTS("conf/settings.conf" ${CONFDIR} "settings.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/statistic.conf" ${CONFDIR} "statistic.conf" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/surbl-whitelist.inc" ${CONFDIR} "surbl-whitelist.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/dmarc_whitelist.inc" ${CONFDIR} "dmarc_whitelist.inc" ".sample")
diff --git a/mail/rspamd-devel/files/rspamd.in b/mail/rspamd-devel/files/rspamd.in
index 945ba5b04d98..a594f0bda034 100644
--- a/mail/rspamd-devel/files/rspamd.in
+++ b/mail/rspamd-devel/files/rspamd.in
@@ -3,7 +3,8 @@
 # $FreeBSD$
 #
 # PROVIDE: rspamd
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN redis
+# BEFORE:  mail
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable rspamd:
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index 07323b104035..7f8624e54e78 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -1,14 +1,15 @@
-bin/rspamd-%%RSPAMDVERSION%%
-bin/rspamd
-bin/rspamd_stats
-bin/rspamadm-%%RSPAMDVERSION%%
 bin/rspamadm
-bin/rspamc-%%RSPAMDVERSION%%
+bin/rspamadm-%%RSPAMDVERSION%%
 bin/rspamc
+bin/rspamc-%%RSPAMDVERSION%%
+bin/rspamd
+bin/rspamd-%%RSPAMDVERSION%%
+bin/rspamd_stats
 %%CGP%%bin/rspamd-cgp-helper
+etc/newsyslog.conf.d/rspamd.newsyslog.conf
 @sample %%ETCDIR%%/2tld.inc.sample
 @sample %%ETCDIR%%/actions.conf.sample
-@sample %%ETCDIR%%/mime_types.inc.sample
+@sample %%ETCDIR%%/cgp.inc.sample
 @sample %%ETCDIR%%/common.conf.sample
 @sample %%ETCDIR%%/composites.conf.sample
 @sample %%ETCDIR%%/dmarc_whitelist.inc.sample
@@ -17,6 +18,7 @@ bin/rspamc
 @sample %%ETCDIR%%/maillist.inc.sample
 @sample %%ETCDIR%%/metrics.conf.sample
 @sample %%ETCDIR%%/mid.inc.sample
+@sample %%ETCDIR%%/mime_types.inc.sample
 @sample %%ETCDIR%%/modules.conf.sample
 %%ETCDIR%%/modules.d/antivirus.conf
 %%ETCDIR%%/modules.d/arc.conf
@@ -29,7 +31,6 @@ bin/rspamc
 %%ETCDIR%%/modules.d/dmarc.conf
 %%ETCDIR%%/modules.d/elastic.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
@@ -40,10 +41,12 @@ bin/rspamc
 %%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/milter_headers.conf
+%%ETCDIR%%/modules.d/mime_types.conf
 %%ETCDIR%%/modules.d/multimap.conf
 %%ETCDIR%%/modules.d/mx_check.conf
+%%ETCDIR%%/modules.d/neural.conf
 %%ETCDIR%%/modules.d/once_received.conf
 %%ETCDIR%%/modules.d/phishing.conf
 %%ETCDIR%%/modules.d/ratelimit.conf
@@ -51,7 +54,7 @@ bin/rspamc
 %%ETCDIR%%/modules.d/redis.conf
 %%ETCDIR%%/modules.d/regexp.conf
 %%ETCDIR%%/modules.d/replies.conf
-%%ETCDIR%%/modules.d/milter_headers.conf
+%%ETCDIR%%/modules.d/reputation.conf
 %%ETCDIR%%/modules.d/rspamd_update.conf
 %%ETCDIR%%/modules.d/spamassassin.conf
 %%ETCDIR%%/modules.d/spamtrap.conf
@@ -65,6 +68,7 @@ bin/rspamc
 @sample %%ETCDIR%%/options.inc.sample
 %%ETCDIR%%/redirectors.inc
 @sample %%ETCDIR%%/rspamd.conf.sample
+@sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
 %%ETCDIR%%/scores.d/fuzzy_group.conf
 %%ETCDIR%%/scores.d/headers_group.conf
 %%ETCDIR%%/scores.d/hfilter_group.conf
@@ -76,6 +80,7 @@ bin/rspamc
 %%ETCDIR%%/scores.d/statistics_group.conf
 %%ETCDIR%%/scores.d/subject_group.conf
 %%ETCDIR%%/scores.d/surbl_group.conf
+@sample %%ETCDIR%%/settings.conf.sample
 @sample %%ETCDIR%%/spf_dkim_whitelist.inc.sample
 @sample %%ETCDIR%%/statistic.conf.sample
 @sample %%ETCDIR%%/surbl-whitelist.inc.sample
@@ -83,9 +88,16 @@ bin/rspamc
 @sample %%ETCDIR%%/worker-fuzzy.inc.sample
 @sample %%ETCDIR%%/worker-normal.inc.sample
 @sample %%ETCDIR%%/worker-proxy.inc.sample
-@sample %%ETCDIR%%/rspamd.newsyslog.conf.sample
-etc/newsyslog.conf.d/rspamd.newsyslog.conf
 lib/rspamd/librspamd-actrie.so
+%%TORCH%%lib/rspamd/libTH.so
+%%TORCH%%lib/rspamd/libTHNN.so
+%%TORCH%%lib/rspamd/libdecisiontree.so
+%%TORCH%%lib/rspamd/libpaths.so
+%%TORCH%%lib/rspamd/libtorch.so
+man/man1/rspamadm.1.gz
+man/man1/rspamc.1.gz
+man/man8/rspamd.8.gz
+%%DATADIR%%/effective_tld_names.dat
 %%DATADIR%%/elastic/kibana.json
 %%DATADIR%%/elastic/rspamd_template.json
 %%DATADIR%%/languages/af.json
@@ -98,7 +110,6 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/languages/cy.json
 %%DATADIR%%/languages/da.json
 %%DATADIR%%/languages/de.json
-%%DATADIR%%/languages/el.json
 %%DATADIR%%/languages/en.json
 %%DATADIR%%/languages/es.json
 %%DATADIR%%/languages/et.json
@@ -107,22 +118,14 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/languages/fi.json
 %%DATADIR%%/languages/fr.json
 %%DATADIR%%/languages/ga.json
-%%DATADIR%%/languages/gl.json
-%%DATADIR%%/languages/gu.json
-%%DATADIR%%/languages/he.json
 %%DATADIR%%/languages/hi.json
 %%DATADIR%%/languages/hr.json
 %%DATADIR%%/languages/hu.json
 %%DATADIR%%/languages/id.json
 %%DATADIR%%/languages/is.json
 %%DATADIR%%/languages/it.json
-%%DATADIR%%/languages/ja.json
-%%DATADIR%%/languages/km.json
-%%DATADIR%%/languages/kn.json
-%%DATADIR%%/languages/ko.json
 %%DATADIR%%/languages/lt.json
 %%DATADIR%%/languages/lv.json
-%%DATADIR%%/languages/ml.json
 %%DATADIR%%/languages/mr.json
 %%DATADIR%%/languages/ms.json
 %%DATADIR%%/languages/ne.json
@@ -137,136 +140,43 @@ lib/rspamd/librspamd-actrie.so
 %%DATADIR%%/languages/so.json
 %%DATADIR%%/languages/sq.json
 %%DATADIR%%/languages/sr.json
+%%DATADIR%%/languages/stop_words
 %%DATADIR%%/languages/sv.json
 %%DATADIR%%/languages/sw.json
-%%DATADIR%%/languages/ta.json
-%%DATADIR%%/languages/te.json
-%%DATADIR%%/languages/th.json
 %%DATADIR%%/languages/tr.json
 %%DATADIR%%/languages/uk.json
 %%DATADIR%%/languages/ur.json
 %%DATADIR%%/languages/vi.json
-%%DATADIR%%/languages/yi.json
-%%DATADIR%%/languages/zh-CN.json
-%%DATADIR%%/effective_tld_names.dat
+%%DATADIR%%/lib/ansicolors.lua
+%%DATADIR%%/lib/argparse.lua
 %%DATADIR%%/lib/fun.lua
 %%DATADIR%%/lib/global_functions.lua
 %%DATADIR%%/lib/lua_auth_results.lua
 %%DATADIR%%/lib/lua_cfg_transform.lua
+%%DATADIR%%/lib/lua_clickhouse.lua
 %%DATADIR%%/lib/lua_dkim_tools.lua
 %%DATADIR%%/lib/lua_maps.lua
 %%DATADIR%%/lib/lua_meta.lua
 %%DATADIR%%/lib/lua_nn.lua
 %%DATADIR%%/lib/lua_redis.lua
+%%DATADIR%%/lib/lua_selectors.lua
+%%DATADIR%%/lib/lua_squeeze_rules.lua
 %%DATADIR%%/lib/lua_stat.lua
+%%DATADIR%%/lib/lua_tcp_sync.lua
 %%DATADIR%%/lib/lua_util.lua
-%%DATADIR%%/lib/rspamadm/ansicolors.lua
+%%DATADIR%%/lib/plugins_stats.lua
+%%DATADIR%%/lib/rescore_utility.lua
 %%DATADIR%%/lib/rspamadm/confighelp.lua
 %%DATADIR%%/lib/rspamadm/configwizard.lua
 %%DATADIR%%/lib/rspamadm/corpus_test.lua
 %%DATADIR%%/lib/rspamadm/fuzzy_convert.lua
 %%DATADIR%%/lib/rspamadm/fuzzy_stat.lua
-%%DATADIR%%/lib/rspamadm/getopt.lua
 %%DATADIR%%/lib/rspamadm/grep.lua
-%%DATADIR%%/lib/rspamadm/plugins_stats.lua
+%%DATADIR%%/lib/rspamadm/keypair.lua
+%%DATADIR%%/lib/rspamadm/mime.lua
 %%DATADIR%%/lib/rspamadm/rescore.lua
-%%DATADIR%%/lib/rspamadm/rescore_utility.lua
 %%DATADIR%%/lib/rspamadm/stat_convert.lua
-%%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
-%%DATADIR%%/lua/dmarc.lua
-%%DATADIR%%/lua/dynamic_conf.lua
-%%DATADIR%%/lua/elastic.lua
-%%DATADIR%%/lua/emails.lua
-%%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/fuzzy_collect.lua
-%%DATADIR%%/lua/greylist.lua
-%%DATADIR%%/lua/hfilter.lua
-%%DATADIR%%/lua/history_redis.lua
-%%DATADIR%%/lua/ip_score.lua
-%%DATADIR%%/lua/maillist.lua
-%%DATADIR%%/lua/metadata_exporter.lua
-%%DATADIR%%/lua/metric_exporter.lua
-%%DATADIR%%/lua/mid.lua
-%%DATADIR%%/lua/mime_types.lua
-%%DATADIR%%/lua/multimap.lua
-%%DATADIR%%/lua/mx_check.lua
-%%DATADIR%%/lua/once_received.lua
-%%DATADIR%%/lua/phishing.lua
-%%DATADIR%%/lua/ratelimit.lua
-%%DATADIR%%/lua/reputation.lua
-%%DATADIR%%/lua/url_redirector.lua
-%%DATADIR%%/lua/url_tags.lua
-%%DATADIR%%/lua/replies.lua
-%%DATADIR%%/lua/rbl.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/forwarding.lua
-%%DATADIR%%/rules/headers_checks.lua
-%%DATADIR%%/rules/html.lua
-%%DATADIR%%/rules/http_headers.lua
-%%DATADIR%%/rules/mid.lua
-%%DATADIR%%/rules/misc.lua
-%%DATADIR%%/rules/regexp/compromised_hosts.lua
-%%DATADIR%%/rules/regexp/headers.lua
-%%DATADIR%%/rules/regexp/misc.lua
-%%DATADIR%%/rules/regexp/upstream_spam_filters.lua
-%%DATADIR%%/rules/rspamd.classifiers.lua
-%%DATADIR%%/rules/rspamd.lua
-%%DATADIR%%/rules/subject_checks.lua
-%%DATADIR%%/www/README.md
-%%DATADIR%%/www/css/bootstrap.min.css
-%%DATADIR%%/www/css/d3evolution.css
-%%DATADIR%%/www/css/footable.bootstrap.min.css
-%%DATADIR%%/www/css/rspamd.css
-%%DATADIR%%/www/favicon.ico
-%%DATADIR%%/www/fonts/glyphicons-halflings-regular.ttf
-%%DATADIR%%/www/fonts/glyphicons-halflings-regular.woff
-%%DATADIR%%/www/fonts/glyphicons-halflings-regular.woff2
-%%DATADIR%%/www/img/asc.png
-%%DATADIR%%/www/img/desc.png
-%%DATADIR%%/www/img/rspamd_logo_navbar.png
-%%DATADIR%%/www/index.html
-%%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/domReady.js
-%%DATADIR%%/www/js/lib/footable.min.js
-%%DATADIR%%/www/js/lib/humanize.min.js
-%%DATADIR%%/www/js/lib/jquery-3.2.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
-%%TORCH%%lib/rspamd/libdecisiontree.so
-%%TORCH%%lib/rspamd/libTH.so
-%%TORCH%%lib/rspamd/libTHNN.so
-%%TORCH%%lib/rspamd/libpaths.so
-%%TORCH%%lib/rspamd/libtorch.so
+%%DATADIR%%/lib/tableshape.lua
 %%TORCH%%%%DATADIR%%/lib/decisiontree/CartNode.lua
 %%TORCH%%%%DATADIR%%/lib/decisiontree/CartTrainer.lua
 %%TORCH%%%%DATADIR%%/lib/decisiontree/CartTree.lua
@@ -489,6 +399,26 @@ lib/rspamd/librspamd-actrie.so
 %%TORCH%%%%DATADIR%%/lib/nn/init.lua
 %%TORCH%%%%DATADIR%%/lib/nn/test.lua
 %%TORCH%%%%DATADIR%%/lib/nn/utils.lua
+%%TORCH%%%%DATADIR%%/lib/optim/ConfusionMatrix.lua
+%%TORCH%%%%DATADIR%%/lib/optim/Logger.lua
+%%TORCH%%%%DATADIR%%/lib/optim/adadelta.lua
+%%TORCH%%%%DATADIR%%/lib/optim/adagrad.lua
+%%TORCH%%%%DATADIR%%/lib/optim/adam.lua
+%%TORCH%%%%DATADIR%%/lib/optim/adamax.lua
+%%TORCH%%%%DATADIR%%/lib/optim/asgd.lua
+%%TORCH%%%%DATADIR%%/lib/optim/cg.lua
+%%TORCH%%%%DATADIR%%/lib/optim/checkgrad.lua
+%%TORCH%%%%DATADIR%%/lib/optim/cmaes.lua
+%%TORCH%%%%DATADIR%%/lib/optim/de.lua
+%%TORCH%%%%DATADIR%%/lib/optim/fista.lua
+%%TORCH%%%%DATADIR%%/lib/optim/init.lua
+%%TORCH%%%%DATADIR%%/lib/optim/lbfgs.lua
+%%TORCH%%%%DATADIR%%/lib/optim/lswolfe.lua
+%%TORCH%%%%DATADIR%%/lib/optim/nag.lua
+%%TORCH%%%%DATADIR%%/lib/optim/polyinterp.lua
+%%TORCH%%%%DATADIR%%/lib/optim/rmsprop.lua
+%%TORCH%%%%DATADIR%%/lib/optim/rprop.lua
+%%TORCH%%%%DATADIR%%/lib/optim/sgd.lua
 %%TORCH%%%%DATADIR%%/lib/paths/init.lua
 %%TORCH%%%%DATADIR%%/lib/torch/CmdLine.lua
 %%TORCH%%%%DATADIR%%/lib/torch/FFInterface.lua
@@ -499,10 +429,97 @@ lib/rspamd/librspamd-actrie.so
 %%TORCH%%%%DATADIR%%/lib/torch/init.lua
 %%TORCH%%%%DATADIR%%/lib/torch/paths.lua
 %%TORCH%%%%DATADIR%%/lib/torch/test.lua
-man/man1/rspamadm.1.gz
-man/man1/rspamc.1.gz
-man/man8/rspamd.8.gz
-@dir %%EXAMPLESDIR%%
+%%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
+%%DATADIR%%/lua/dmarc.lua
+%%DATADIR%%/lua/dynamic_conf.lua
+%%DATADIR%%/lua/elastic.lua
+%%DATADIR%%/lua/emails.lua
+%%DATADIR%%/lua/force_actions.lua
+%%DATADIR%%/lua/forged_recipients.lua
+%%DATADIR%%/lua/fuzzy_collect.lua
+%%DATADIR%%/lua/greylist.lua
+%%DATADIR%%/lua/hfilter.lua
+%%DATADIR%%/lua/history_redis.lua
+%%DATADIR%%/lua/ip_score.lua
+%%DATADIR%%/lua/maillist.lua
+%%DATADIR%%/lua/maps_stats.lua
+%%DATADIR%%/lua/metadata_exporter.lua
+%%DATADIR%%/lua/metric_exporter.lua
+%%DATADIR%%/lua/mid.lua
+%%DATADIR%%/lua/milter_headers.lua
+%%DATADIR%%/lua/mime_types.lua
+%%DATADIR%%/lua/multimap.lua
+%%DATADIR%%/lua/mx_check.lua
+%%DATADIR%%/lua/neural.lua
+%%DATADIR%%/lua/once_received.lua
+%%DATADIR%%/lua/phishing.lua
+%%DATADIR%%/lua/ratelimit.lua
+%%DATADIR%%/lua/rbl.lua
+%%DATADIR%%/lua/replies.lua
+%%DATADIR%%/lua/reputation.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_redirector.lua
+%%DATADIR%%/lua/url_reputation.lua
+%%DATADIR%%/lua/url_tags.lua
+%%DATADIR%%/lua/whitelist.lua
+%%DATADIR%%/rules/forwarding.lua
+%%DATADIR%%/rules/headers_checks.lua
+%%DATADIR%%/rules/html.lua
+%%DATADIR%%/rules/http_headers.lua
+%%DATADIR%%/rules/mid.lua
+%%DATADIR%%/rules/misc.lua
+%%DATADIR%%/rules/regexp/compromised_hosts.lua
+%%DATADIR%%/rules/regexp/headers.lua
+%%DATADIR%%/rules/regexp/misc.lua
+%%DATADIR%%/rules/regexp/upstream_spam_filters.lua
+%%DATADIR%%/rules/rspamd.classifiers.lua
+%%DATADIR%%/rules/rspamd.lua
+%%DATADIR%%/rules/subject_checks.lua
+%%DATADIR%%/www/README.md
+%%DATADIR%%/www/css/bootstrap.min.css
+%%DATADIR%%/www/css/d3evolution.css
+%%DATADIR%%/www/css/footable.bootstrap.min.css
+%%DATADIR%%/www/css/nprogress.css
+%%DATADIR%%/www/css/rspamd.css
+%%DATADIR%%/www/favicon.ico
+%%DATADIR%%/www/fonts/glyphicons-halflings-regular.ttf
+%%DATADIR%%/www/fonts/glyphicons-halflings-regular.woff
+%%DATADIR%%/www/fonts/glyphicons-halflings-regular.woff2
+%%DATADIR%%/www/img/asc.png
+%%DATADIR%%/www/img/desc.png
+%%DATADIR%%/www/img/rspamd_logo_navbar.png
+%%DATADIR%%/www/index.html
+%%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/domReady.js
+%%DATADIR%%/www/js/lib/footable.min.js
+%%DATADIR%%/www/js/lib/humanize.min.js
+%%DATADIR%%/www/js/lib/jquery-3.3.1.min.js
+%%DATADIR%%/www/js/lib/nprogress.min.js
+%%DATADIR%%/www/js/lib/require.min.js
+%%DATADIR%%/www/js/lib/visibility.min.js
+%%DATADIR%%/www/js/main.js
+%%DATADIR%%/www/plugins.txt
+%%DATADIR%%/www/react-index.html
 @owner nobody
 @group nobody
 @dir /var/db/rspamd