5 files changed, 377 insertions, 45 deletions

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 55694b5328cb..f72d417704d7 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.5.4.a1.20170328
-PORTREVISION=	2
+PORTVERSION=	1.7.0.a1.20180302
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -21,18 +20,22 @@ BUILD_DEPENDS=	ragel:devel/ragel
 
 CONFLICTS_INSTALL=	rspamd
 
-RSPAMD_VERSION=	1.5.4
+RSPAMD_VERSION=	1.7.0
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
-GH_TAGNAME=	56b2c0c5
+GH_TAGNAME=	b47a5b367
 
-OPTIONS_DEFINE=	GPERF REDIRECTOR HYPERSCAN GD CGP
-OPTIONS_DEFAULT=	GD
+OPTIONS_DEFINE=		GPERF GD CGP TORCH
+OPTIONS_DEFINE_amd64=	HYPERSCAN
+OPTIONS_SUB=	yes
+
+CGP_DESC=		Install Communigate Pro(tm) helper
+GD_DESC=		Enable libgd support for images fuzzy hashes
 GPERF_DESC=		Google perf-tools profiling
-REDIRECTOR_DESC=	Install HTTP redirector
 HYPERSCAN_DESC=		Use hyperscan optimizations (amd64 only)
-GD_DESC=		Enable libgd support for images fuzzy hashes
-CGP_DESC=		Install Communigate Pro(tm) helper
+TORCH_DESC=		Build with embedded Torch7
+
+OPTIONS_DEFAULT=	TORCH
 
 USE_RC_SUBR=	rspamd
 
@@ -52,10 +55,10 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DGIT_ID=${GH_TAGNAME} \
 		-DENABLE_FANN=ON
 
-USES=		cmake:outsource gettext iconv pkgconfig perl5 \
+USES=		cmake:outsource pkgconfig perl5 \
 		compiler:c11 sqlite ssl
 USE_LDCONFIG=	yes
-USE_PERL5=	build
+USE_PERL5=	build run
 
 USE_GNOME=	glib20
 DEBUG_FLAGS=	-g -O0
@@ -78,31 +81,9 @@ WITH_DEBUG=	yes
 .if ${PORT_OPTIONS:MHYPERSCAN}
  CMAKE_ARGS+=		-DENABLE_HYPERSCAN=ON
  LIB_DEPENDS+=		libhs.so:devel/hyperscan
- ONLY_FOR_ARCHS=	amd64
-.endif
-
-.if ${PORT_OPTIONS:MREDIRECTOR}
- USE_PERL5+=	run
- CMAKE_ARGS+=	-DENABLE_REDIRECTOR=ON
- PLIST_SUB+=	REDIRECTOR=""
- USE_RC_SUBR+=	rspamd_redirector
- RUN_DEPENDS+=	\
-	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL \
-	p5-IO-String>=0:devel/p5-IO-String \
-	p5-XML-Parser>=0:textproc/p5-XML-Parser \
-	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
-	p5-POE-Component-Client-DNS>=0:dns/p5-POE-Component-Client-DNS \
-	p5-POE-Component-Client-HTTP>=0:www/p5-POE-Component-Client-HTTP \
-	p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \
-	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
-	p5-Proc-PidUtil>=0:sysutils/p5-Proc-PidUtil \
-	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon
-.else
- PLIST_SUB+=	REDIRECTOR="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCGP}
- USE_PERL5+=	run
  PLIST_SUB+=	CGP=""
  RUN_DEPENDS+=	\
 	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
@@ -113,6 +94,13 @@ WITH_DEBUG=	yes
  PLIST_SUB+=	CGP="@comment "
 .endif
 
+.if ! ${PORT_OPTIONS:MTORCH}
+ CMAKE_ARGS+=	-DENABLE_TORCH=OFF
+.else
+ LIB_DEPENDS+=	libopenblas.so:math/openblas
+ USE_GCC=	yes
+.endif
+
 post-install:
 	@${MKDIR} \
 		${STAGEDIR}/var/log/rspamd \
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index 47d4bd4c7039..b6c0fb3cc9b1 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490713079
-SHA256 (vstakhov-rspamd-1.5.4.a1.20170328-56b2c0c5_GH0.tar.gz) = 07bef3062cfdc8722bdcfe9d308e235689da380160cf3fef09ca856787c91c76
-SIZE (vstakhov-rspamd-1.5.4.a1.20170328-56b2c0c5_GH0.tar.gz) = 2373912
+TIMESTAMP = 1520004564
+SHA256 (vstakhov-rspamd-1.7.0.a1.20180302-b47a5b367_GH0.tar.gz) = 51e807c7b2009d6e3f839785f42b592b2b1700ecceacf6edf49a450bcf3355b8
+SIZE (vstakhov-rspamd-1.7.0.a1.20180302-b47a5b367_GH0.tar.gz) = 4414972
diff --git a/mail/rspamd-devel/files/patch-CMakeLists.txt b/mail/rspamd-devel/files/patch-CMakeLists.txt
index 065ba11b3a10..35f693df5990 100644
--- a/mail/rspamd-devel/files/patch-CMakeLists.txt
+++ b/mail/rspamd-devel/files/patch-CMakeLists.txt
@@ -1,15 +1,18 @@
---- CMakeLists.txt.orig	2016-10-19 16:09:11 UTC
+--- CMakeLists.txt.orig	2017-06-06 15:07:59 UTC
 +++ CMakeLists.txt
-@@ -1261,6 +1261,23 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
+@@ -1302,6 +1302,26 @@ ELSE(WANT_SYSTEMD_UNITS MATCHES "ON")
  ENDIF(WANT_SYSTEMD_UNITS MATCHES "ON")
  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/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")
 +	INSTALL_IF_NOT_EXISTS("conf/options.inc" ${CONFDIR} "options.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/worker-controller.inc" ${CONFDIR} "worker-controller.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/worker-fuzzy.inc" ${CONFDIR} "worker-fuzzy.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/worker-normal.inc" ${CONFDIR} "worker-normal.inc" ".sample")
++	INSTALL_IF_NOT_EXISTS("conf/worker-proxy.inc" ${CONFDIR} "worker-proxy.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/2tld.inc" ${CONFDIR} "2tld.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/mime_types.inc" ${CONFDIR} "mime_types.inc" ".sample")
 +	INSTALL_IF_NOT_EXISTS("conf/composites.conf" ${CONFDIR} "composites.conf" ".sample")
diff --git a/mail/rspamd-devel/pkg-descr b/mail/rspamd-devel/pkg-descr
index 6de2ae9d8193..aa60f447a497 100644
--- a/mail/rspamd-devel/pkg-descr
+++ b/mail/rspamd-devel/pkg-descr
@@ -1,5 +1,5 @@
 Rspamd is fast, modular and lightweight spam filter. It is designed to work
-with big ammount of mail and can be easily extended with own filters written in
+with big amount of mail and can be easily extended with own filters written in
 lua. This port provides development version of rspamd.
 
 WWW: https://rspamd.com/
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index cf88e73784ac..07323b104035 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -5,19 +5,21 @@ bin/rspamadm-%%RSPAMDVERSION%%
 bin/rspamadm
 bin/rspamc-%%RSPAMDVERSION%%
 bin/rspamc
-%%REDIRECTOR%%bin/rspamd-redirector
 %%CGP%%bin/rspamd-cgp-helper
 @sample %%ETCDIR%%/2tld.inc.sample
+@sample %%ETCDIR%%/actions.conf.sample
 @sample %%ETCDIR%%/mime_types.inc.sample
 @sample %%ETCDIR%%/common.conf.sample
 @sample %%ETCDIR%%/composites.conf.sample
 @sample %%ETCDIR%%/dmarc_whitelist.inc.sample
+@sample %%ETCDIR%%/groups.conf.sample
 @sample %%ETCDIR%%/logging.inc.sample
 @sample %%ETCDIR%%/maillist.inc.sample
 @sample %%ETCDIR%%/metrics.conf.sample
 @sample %%ETCDIR%%/mid.inc.sample
 @sample %%ETCDIR%%/modules.conf.sample
 %%ETCDIR%%/modules.d/antivirus.conf
+%%ETCDIR%%/modules.d/arc.conf
 %%ETCDIR%%/modules.d/asn.conf
 %%ETCDIR%%/modules.d/chartable.conf
 %%ETCDIR%%/modules.d/clickhouse.conf
@@ -25,6 +27,7 @@ bin/rspamc
 %%ETCDIR%%/modules.d/dkim.conf
 %%ETCDIR%%/modules.d/dkim_signing.conf
 %%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
@@ -48,9 +51,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
@@ -61,30 +65,129 @@ bin/rspamc
 @sample %%ETCDIR%%/options.inc.sample
 %%ETCDIR%%/redirectors.inc
 @sample %%ETCDIR%%/rspamd.conf.sample
+%%ETCDIR%%/scores.d/fuzzy_group.conf
+%%ETCDIR%%/scores.d/headers_group.conf
+%%ETCDIR%%/scores.d/hfilter_group.conf
+%%ETCDIR%%/scores.d/mime_types_group.conf
+%%ETCDIR%%/scores.d/mua_group.conf
+%%ETCDIR%%/scores.d/phishing_group.conf
+%%ETCDIR%%/scores.d/policies_group.conf
+%%ETCDIR%%/scores.d/rbl_group.conf
+%%ETCDIR%%/scores.d/statistics_group.conf
+%%ETCDIR%%/scores.d/subject_group.conf
+%%ETCDIR%%/scores.d/surbl_group.conf
 @sample %%ETCDIR%%/spf_dkim_whitelist.inc.sample
 @sample %%ETCDIR%%/statistic.conf.sample
 @sample %%ETCDIR%%/surbl-whitelist.inc.sample
 @sample %%ETCDIR%%/worker-controller.inc.sample
 @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
+%%DATADIR%%/elastic/kibana.json
+%%DATADIR%%/elastic/rspamd_template.json
+%%DATADIR%%/languages/af.json
+%%DATADIR%%/languages/an.json
+%%DATADIR%%/languages/ar.json
+%%DATADIR%%/languages/bg.json
+%%DATADIR%%/languages/bn.json
+%%DATADIR%%/languages/br.json
+%%DATADIR%%/languages/cs.json
+%%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
+%%DATADIR%%/languages/eu.json
+%%DATADIR%%/languages/fa.json
+%%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
+%%DATADIR%%/languages/nl.json
+%%DATADIR%%/languages/no.json
+%%DATADIR%%/languages/pa.json
+%%DATADIR%%/languages/pl.json
+%%DATADIR%%/languages/pt.json
+%%DATADIR%%/languages/ro.json
+%%DATADIR%%/languages/ru.json
+%%DATADIR%%/languages/sl.json
+%%DATADIR%%/languages/so.json
+%%DATADIR%%/languages/sq.json
+%%DATADIR%%/languages/sr.json
+%%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/fun.lua
+%%DATADIR%%/lib/global_functions.lua
+%%DATADIR%%/lib/lua_auth_results.lua
+%%DATADIR%%/lib/lua_cfg_transform.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_stat.lua
+%%DATADIR%%/lib/lua_util.lua
+%%DATADIR%%/lib/rspamadm/ansicolors.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/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/fun.lua
 %%DATADIR%%/lua/fuzzy_collect.lua
 %%DATADIR%%/lua/greylist.lua
 %%DATADIR%%/lua/hfilter.lua
@@ -100,18 +203,19 @@ lib/rspamd/librspamd-actrie.so
 %%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/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%%/rules/forwarding.lua
 %%DATADIR%%/rules/headers_checks.lua
 %%DATADIR%%/rules/html.lua
@@ -152,12 +256,249 @@ lib/rspamd/librspamd-actrie.so
 %%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.1.1.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
+%%TORCH%%%%DATADIR%%/lib/decisiontree/CartNode.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/CartTrainer.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/CartTree.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/DFD.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/DataSet.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/DecisionForest.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/DecisionForestTrainer.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/DecisionTree.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/GiniState.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/GradientBoostState.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/GradientBoostTrainer.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/LogitBoostCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/MSECriterion.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/RandomForestTrainer.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/Sparse2Dense.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/SparseTensor.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/TreeState.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/WorkPool.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/_env.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/benchmark.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/init.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/math.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/test.lua
+%%TORCH%%%%DATADIR%%/lib/decisiontree/utils.lua
+%%TORCH%%%%DATADIR%%/lib/moses.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Abs.lua
+%%TORCH%%%%DATADIR%%/lib/nn/AbsCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Add.lua
+%%TORCH%%%%DATADIR%%/lib/nn/AddConstant.lua
+%%TORCH%%%%DATADIR%%/lib/nn/BCECriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/BatchNormalization.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Bilinear.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Bottle.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CAdd.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CAddTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CAddTensorTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CDivTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CMaxTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CMinTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CMul.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CMulTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CReLU.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CSubTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Clamp.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ClassNLLCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ClassSimplexCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Collapse.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Concat.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ConcatTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Constant.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Container.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Contiguous.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Convert.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Copy.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Cosine.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CosineDistance.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CosineEmbeddingCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Criterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CriterionTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/CrossEntropyCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Decorator.lua
+%%TORCH%%%%DATADIR%%/lib/nn/DepthConcat.lua
+%%TORCH%%%%DATADIR%%/lib/nn/DistKLDivCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/DistanceRatioCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/DontCast.lua
+%%TORCH%%%%DATADIR%%/lib/nn/DotProduct.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Dropout.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ELU.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ErrorMessages.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Euclidean.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Exp.lua
+%%TORCH%%%%DATADIR%%/lib/nn/FlattenTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/GPU.lua
+%%TORCH%%%%DATADIR%%/lib/nn/GatedLinearUnit.lua
+%%TORCH%%%%DATADIR%%/lib/nn/GradientReversal.lua
+%%TORCH%%%%DATADIR%%/lib/nn/HardShrink.lua
+%%TORCH%%%%DATADIR%%/lib/nn/HardTanh.lua
+%%TORCH%%%%DATADIR%%/lib/nn/HingeEmbeddingCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Identity.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Index.lua
+%%TORCH%%%%DATADIR%%/lib/nn/IndexLinear.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Jacobian.lua
+%%TORCH%%%%DATADIR%%/lib/nn/JoinTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Kmeans.lua
+%%TORCH%%%%DATADIR%%/lib/nn/L1Cost.lua
+%%TORCH%%%%DATADIR%%/lib/nn/L1HingeEmbeddingCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/L1Penalty.lua
+%%TORCH%%%%DATADIR%%/lib/nn/LayerNormalization.lua
+%%TORCH%%%%DATADIR%%/lib/nn/LeakyReLU.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Linear.lua
+%%TORCH%%%%DATADIR%%/lib/nn/LinearWeightNorm.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Log.lua
+%%TORCH%%%%DATADIR%%/lib/nn/LogSigmoid.lua
+%%TORCH%%%%DATADIR%%/lib/nn/LogSoftMax.lua
+%%TORCH%%%%DATADIR%%/lib/nn/LookupTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MM.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MSECriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MV.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MapTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MarginCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MarginRankingCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MaskedSelect.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Max.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Maxout.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Mean.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Min.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MixtureTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Module.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ModuleCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Mul.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MulConstant.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MultiCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MultiLabelMarginCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MultiLabelSoftMarginCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/MultiMarginCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/NaN.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Narrow.lua
+%%TORCH%%%%DATADIR%%/lib/nn/NarrowTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Normalize.lua
+%%TORCH%%%%DATADIR%%/lib/nn/OneHot.lua
+%%TORCH%%%%DATADIR%%/lib/nn/PReLU.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Padding.lua
+%%TORCH%%%%DATADIR%%/lib/nn/PairwiseDistance.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Parallel.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ParallelCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ParallelTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/PartialLinear.lua
+%%TORCH%%%%DATADIR%%/lib/nn/PixelShuffle.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Power.lua
+%%TORCH%%%%DATADIR%%/lib/nn/PrintSize.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Profile.lua
+%%TORCH%%%%DATADIR%%/lib/nn/RReLU.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ReLU.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ReLU6.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Replicate.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Reshape.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Select.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SelectTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Sequential.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Sigmoid.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SmoothL1Criterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SoftMarginCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SoftMax.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SoftMin.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SoftPlus.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SoftShrink.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SoftSign.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SparseJacobian.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SparseLinear.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialAdaptiveAveragePooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialAdaptiveMaxPooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialAutoCropMSECriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialAveragePooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialBatchNormalization.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialClassNLLCriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialContrastiveNormalization.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialConvolution.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialConvolutionLocal.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialConvolutionMM.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialConvolutionMap.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialCrossMapLRN.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialDepthWiseConvolution.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialDilatedConvolution.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialDilatedMaxPooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialDivisiveNormalization.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialDropout.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialFractionalMaxPooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialFullConvolution.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialFullConvolutionMap.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialLPPooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialLogSoftMax.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialMaxPooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialMaxUnpooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialReflectionPadding.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialReplicationPadding.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialSoftMax.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialSubSampling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialSubtractiveNormalization.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialUpSamplingBilinear.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialUpSamplingNearest.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SpatialZeroPadding.lua
+%%TORCH%%%%DATADIR%%/lib/nn/SplitTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Sqrt.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Square.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Squeeze.lua
+%%TORCH%%%%DATADIR%%/lib/nn/StochasticGradient.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Sum.lua
+%%TORCH%%%%DATADIR%%/lib/nn/THNN.lua
+%%TORCH%%%%DATADIR%%/lib/nn/THNN_h.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Tanh.lua
+%%TORCH%%%%DATADIR%%/lib/nn/TanhShrink.lua
+%%TORCH%%%%DATADIR%%/lib/nn/TemporalConvolution.lua
+%%TORCH%%%%DATADIR%%/lib/nn/TemporalDynamicKMaxPooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/TemporalMaxPooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/TemporalRowConvolution.lua
+%%TORCH%%%%DATADIR%%/lib/nn/TemporalSubSampling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Threshold.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Transpose.lua
+%%TORCH%%%%DATADIR%%/lib/nn/Unsqueeze.lua
+%%TORCH%%%%DATADIR%%/lib/nn/View.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricAveragePooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricBatchNormalization.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricConvolution.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricDilatedConvolution.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricDilatedMaxPooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricDropout.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricFractionalMaxPooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricFullConvolution.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricMaxPooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricMaxUnpooling.lua
+%%TORCH%%%%DATADIR%%/lib/nn/VolumetricReplicationPadding.lua
+%%TORCH%%%%DATADIR%%/lib/nn/WeightNorm.lua
+%%TORCH%%%%DATADIR%%/lib/nn/WeightedEuclidean.lua
+%%TORCH%%%%DATADIR%%/lib/nn/WeightedMSECriterion.lua
+%%TORCH%%%%DATADIR%%/lib/nn/WhiteNoise.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ZeroGrad.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ZipTable.lua
+%%TORCH%%%%DATADIR%%/lib/nn/ZipTableOneToMany.lua
+%%TORCH%%%%DATADIR%%/lib/nn/hessian.lua
+%%TORCH%%%%DATADIR%%/lib/nn/init.lua
+%%TORCH%%%%DATADIR%%/lib/nn/test.lua
+%%TORCH%%%%DATADIR%%/lib/nn/utils.lua
+%%TORCH%%%%DATADIR%%/lib/paths/init.lua
+%%TORCH%%%%DATADIR%%/lib/torch/CmdLine.lua
+%%TORCH%%%%DATADIR%%/lib/torch/FFInterface.lua
+%%TORCH%%%%DATADIR%%/lib/torch/File.lua
+%%TORCH%%%%DATADIR%%/lib/torch/Tensor.lua
+%%TORCH%%%%DATADIR%%/lib/torch/TestSuite.lua
+%%TORCH%%%%DATADIR%%/lib/torch/Tester.lua
+%%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