- Update to 2.0.a1.20190719

PR:		239300
Submitted by:	Alexander Moisseev <moiseev at mezonplus.ru>

4 files changed, 23 insertions, 340 deletions

diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index d9669b9cdf50..8b30ec773c7e 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.9.1.a1.20190316
-PORTREVISION=	1
+PORTVERSION=	2.0.a1.20190719
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -13,9 +12,9 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
-		libevent.so:devel/libevent \
 		libluajit-5.1.so:lang/luajit \
-		libicui18n.so:devel/icu
+		libicui18n.so:devel/icu \
+		libsodium.so:security/libsodium
 BUILD_DEPENDS=	ragel:devel/ragel
 RUN_DEPENDS=	ca_root_nss>=3.*:security/ca_root_nss
 
@@ -30,26 +29,17 @@ CONFLICTS_INSTALL=	rspamd
 USERS=		rspamd
 GROUPS=		rspamd
 
-OPTIONS_DEFINE=		GPERF GD CGP TORCH_BLAS
+OPTIONS_DEFINE=		CGP GPERF
 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)
-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=${PORTVERSION:C/^([^.]+\.[^.]+\.[^.]+).*/\1/}
+		RSPAMDVERSION=${PORTVERSION:C/^([^.]+\.[^.]+).*/\1/}
 CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DLOGDIR=/var/log/rspamd \
 		-DDBDIR=/var/db/rspamd \
@@ -58,35 +48,22 @@ CMAKE_ARGS+=	-DCONFDIR=${PREFIX}/etc/rspamd \
 		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 		-DBUILD_PORT=yes \
 		-DLIBDIR=${PREFIX}/lib/rspamd \
-		-DNO_SHARED=ON \
 		-DDEBUG=ON \
 		-DGIT_ID=${GH_TAGNAME}
 USE_GITHUB=	yes
-GH_TAGNAME=	dbfdd2b
+GH_TAGNAME=	06a167b
 
 DEBUG_FLAGS=	-g -O0
 WITH_DEBUG=	yes
 
 USE_RC_SUBR=	rspamd
 
-GD_CMAKE_ON=	-DENABLE_GD=ON
-GD_LIB_DEPENDS=	libgd.so:graphics/gd
-
 GPERF_CMAKE_ON=	-DENABLE_GPERF_TOOLS=ON
 GPERF_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 
 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
-
 CGP_RUN_DEPENDS+=	\
 	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
 	p5-AnyEvent>=0:devel/p5-AnyEvent \
@@ -95,10 +72,6 @@ CGP_RUN_DEPENDS+=	\
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTORCH_BLAS}
-USE_GCC=	yes
-.endif
-
 post-install:
 	@${MKDIR} \
 		${STAGEDIR}/var/log/rspamd \
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index 1575f95a9a6c..9bf83e79d7c5 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552743429
-SHA256 (rspamd-rspamd-1.9.1.a1.20190316-dbfdd2b_GH0.tar.gz) = 60dec7a0790134cb9b5f538693fd3f715b84e086f54c7ccf986cd9a259514ca4
-SIZE (rspamd-rspamd-1.9.1.a1.20190316-dbfdd2b_GH0.tar.gz) = 4406052
+TIMESTAMP = 1563546026
+SHA256 (rspamd-rspamd-2.0.a1.20190719-06a167b_GH0.tar.gz) = 8d9f882bb71858cc88746c3ad4d7fe57fda21b8646bc986d8f265830e4fabb62
+SIZE (rspamd-rspamd-2.0.a1.20190719-06a167b_GH0.tar.gz) = 4025312
diff --git a/mail/rspamd-devel/files/patch-contrib_lua-torch_torch7_lib_TH_CMakeLists.txt b/mail/rspamd-devel/files/patch-contrib_lua-torch_torch7_lib_TH_CMakeLists.txt
deleted file mode 100644
index 5578521b2e57..000000000000
--- a/mail/rspamd-devel/files/patch-contrib_lua-torch_torch7_lib_TH_CMakeLists.txt
+++ /dev/null
@@ -1,44 +0,0 @@
---- contrib/lua-torch/torch7/lib/TH/CMakeLists.txt.orig	2018-06-16 00:02:13 UTC
-+++ contrib/lua-torch/torch7/lib/TH/CMakeLists.txt
-@@ -230,22 +230,26 @@ ELSE()
-   ENDIF()
- ENDIF()
- 
--FIND_PACKAGE(BLAS)
--IF(BLAS_FOUND)
--  SET(USE_BLAS 1)
--  TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES})
--  IF(BLAS_INFO STREQUAL "mkl")
--    ADD_DEFINITIONS(-DTH_BLAS_MKL)
--  ELSEIF(BLAS_INFO STREQUAL "open")
--    ADD_DEFINITIONS(-DTH_BLAS_OPEN)
--  ENDIF()
--ENDIF(BLAS_FOUND)
-+IF(WITH_BLAS)
-+  FIND_PACKAGE(BLAS)
-+  IF(BLAS_FOUND)
-+    SET(USE_BLAS 1)
-+    TARGET_LINK_LIBRARIES(TH ${BLAS_LIBRARIES})
-+    IF(BLAS_INFO STREQUAL "mkl")
-+      ADD_DEFINITIONS(-DTH_BLAS_MKL)
-+    ELSEIF(BLAS_INFO STREQUAL "open")
-+      ADD_DEFINITIONS(-DTH_BLAS_OPEN)
-+    ENDIF()
-+  ENDIF(BLAS_FOUND)
-+ENDIF(WITH_BLAS)
- 
--FIND_PACKAGE(LAPACK)
--IF(LAPACK_FOUND)
--  SET(USE_LAPACK 1)
--  TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES})
--ENDIF(LAPACK_FOUND)
-+IF(WITH_LAPACK)
-+  FIND_PACKAGE(LAPACK)
-+  IF(LAPACK_FOUND)
-+    SET(USE_LAPACK 1)
-+    TARGET_LINK_LIBRARIES(TH ${LAPACK_LIBRARIES})
-+  ENDIF(LAPACK_FOUND)
-+ENDIF(WITH_LAPACK)
- 
- IF (UNIX AND NOT APPLE)
-    INCLUDE(CheckLibraryExists)
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index b316bfae7632..a0c30bd1e6cb 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -38,7 +38,6 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
 %%ETCDIR%%/modules.d/greylist.conf
 %%ETCDIR%%/modules.d/hfilter.conf
 %%ETCDIR%%/modules.d/history_redis.conf
-%%ETCDIR%%/modules.d/ip_score.conf
 %%ETCDIR%%/modules.d/maillist.conf
 %%ETCDIR%%/modules.d/metadata_exporter.conf
 %%ETCDIR%%/modules.d/metric_exporter.conf
@@ -91,12 +90,9 @@ etc/newsyslog.conf.d/rspamd.newsyslog.conf
 @sample %%ETCDIR%%/worker-normal.inc.sample
 @sample %%ETCDIR%%/worker-proxy.inc.sample
 lib/rspamd/librspamd-actrie.so
+lib/rspamd/librspamd-ev.so
+lib/rspamd/librspamd-kann.so
 lib/rspamd/librspamd-server.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
@@ -154,6 +150,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/argparse.lua
 %%DATADIR%%/lualib/fun.lua
 %%DATADIR%%/lualib/global_functions.lua
+%%DATADIR%%/lualib/lpegre.lua
 %%DATADIR%%/lualib/lua_auth_results.lua
 %%DATADIR%%/lualib/lua_cfg_transform.lua
 %%DATADIR%%/lualib/lua_clickhouse.lua
@@ -161,10 +158,12 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/lua_ffi/common.lua
 %%DATADIR%%/lualib/lua_ffi/dkim.lua
 %%DATADIR%%/lualib/lua_ffi/init.lua
+%%DATADIR%%/lualib/lua_ffi/spf.lua
 %%DATADIR%%/lualib/lua_fuzzy.lua
+%%DATADIR%%/lualib/lua_ical.lua
+%%DATADIR%%/lualib/lua_maps_expressions.lua
 %%DATADIR%%/lualib/lua_maps.lua
 %%DATADIR%%/lualib/lua_meta.lua
-%%DATADIR%%/lualib/lua_nn.lua
 %%DATADIR%%/lualib/lua_redis.lua
 %%DATADIR%%/lualib/lua_scanners/clamav.lua
 %%DATADIR%%/lualib/lua_scanners/common.lua
@@ -179,10 +178,12 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/lua_scanners/spamassassin.lua
 %%DATADIR%%/lualib/lua_scanners/vadesecure.lua
 %%DATADIR%%/lualib/lua_selectors.lua
-%%DATADIR%%/lualib/lua_squeeze_rules.lua
+%%DATADIR%%/lualib/lua_settings.lua
+%%DATADIR%%/lualib/lua_smtp.lua
 %%DATADIR%%/lualib/lua_stat.lua
 %%DATADIR%%/lualib/lua_tcp_sync.lua
 %%DATADIR%%/lualib/lua_util.lua
+%%DATADIR%%/lualib/lupa.lua
 %%DATADIR%%/lualib/plugins_stats.lua
 %%DATADIR%%/lualib/rescore_utility.lua
 %%DATADIR%%/lualib/rspamadm/configgraph.lua
@@ -190,6 +191,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/rspamadm/configwizard.lua
 %%DATADIR%%/lualib/rspamadm/cookie.lua
 %%DATADIR%%/lualib/rspamadm/corpus_test.lua
+%%DATADIR%%/lualib/rspamadm/dns_tool.lua
 %%DATADIR%%/lualib/rspamadm/fuzzy_convert.lua
 %%DATADIR%%/lualib/rspamadm/fuzzy_stat.lua
 %%DATADIR%%/lualib/rspamadm/grep.lua
@@ -197,259 +199,9 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/lualib/rspamadm/mime.lua
 %%DATADIR%%/lualib/rspamadm/rescore.lua
 %%DATADIR%%/lualib/rspamadm/stat_convert.lua
+%%DATADIR%%/lualib/rspamadm/template.lua
+%%DATADIR%%/lualib/rspamadm/vault.lua
 %%DATADIR%%/lualib/tableshape.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/CartNode.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/CartTrainer.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/CartTree.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/DFD.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/DataSet.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/DecisionForest.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/DecisionForestTrainer.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/DecisionTree.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/GiniState.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/GradientBoostState.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/GradientBoostTrainer.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/LogitBoostCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/MSECriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/RandomForestTrainer.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/Sparse2Dense.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/SparseTensor.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/TreeState.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/WorkPool.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/_env.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/benchmark.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/init.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/math.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/test.lua
-%%TORCH%%%%DATADIR%%/lualib/decisiontree/utils.lua
-%%TORCH%%%%DATADIR%%/lualib/moses.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Abs.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/AbsCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Add.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/AddConstant.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/BCECriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/BatchNormalization.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Bilinear.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Bottle.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CAdd.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CAddTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CAddTensorTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CDivTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CMaxTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CMinTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CMul.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CMulTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CReLU.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CSubTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Clamp.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ClassNLLCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ClassSimplexCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Collapse.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Concat.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ConcatTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Constant.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Container.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Contiguous.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Convert.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Copy.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Cosine.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CosineDistance.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CosineEmbeddingCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Criterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CriterionTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/CrossEntropyCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Decorator.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/DepthConcat.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/DistKLDivCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/DistanceRatioCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/DontCast.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/DotProduct.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Dropout.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ELU.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ErrorMessages.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Euclidean.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Exp.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/FlattenTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/GPU.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/GatedLinearUnit.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/GradientReversal.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/HardShrink.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/HardTanh.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/HingeEmbeddingCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Identity.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Index.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/IndexLinear.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Jacobian.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/JoinTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Kmeans.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/L1Cost.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/L1HingeEmbeddingCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/L1Penalty.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/LayerNormalization.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/LeakyReLU.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Linear.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/LinearWeightNorm.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Log.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/LogSigmoid.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/LogSoftMax.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/LookupTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MM.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MSECriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MV.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MapTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MarginCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MarginRankingCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MaskedSelect.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Max.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Maxout.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Mean.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Min.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MixtureTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Module.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ModuleCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Mul.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MulConstant.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MultiCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MultiLabelMarginCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MultiLabelSoftMarginCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/MultiMarginCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/NaN.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Narrow.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/NarrowTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Normalize.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/OneHot.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/PReLU.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Padding.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/PairwiseDistance.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Parallel.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ParallelCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ParallelTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/PartialLinear.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/PixelShuffle.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Power.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/PrintSize.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Profile.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/RReLU.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ReLU.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ReLU6.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Replicate.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Reshape.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Select.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SelectTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Sequential.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Sigmoid.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SmoothL1Criterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SoftMarginCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SoftMax.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SoftMin.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SoftPlus.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SoftShrink.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SoftSign.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SparseJacobian.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SparseLinear.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialAdaptiveAveragePooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialAdaptiveMaxPooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialAutoCropMSECriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialAveragePooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialBatchNormalization.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialClassNLLCriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialContrastiveNormalization.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialConvolution.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialConvolutionLocal.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialConvolutionMM.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialConvolutionMap.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialCrossMapLRN.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialDepthWiseConvolution.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialDilatedConvolution.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialDilatedMaxPooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialDivisiveNormalization.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialDropout.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialFractionalMaxPooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialFullConvolution.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialFullConvolutionMap.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialLPPooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialLogSoftMax.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialMaxPooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialMaxUnpooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialReflectionPadding.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialReplicationPadding.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialSoftMax.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialSubSampling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialSubtractiveNormalization.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialUpSamplingBilinear.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialUpSamplingNearest.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SpatialZeroPadding.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/SplitTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Sqrt.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Square.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Squeeze.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/StochasticGradient.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Sum.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/THNN.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/THNN_h.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Tanh.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/TanhShrink.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/TemporalConvolution.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/TemporalDynamicKMaxPooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/TemporalMaxPooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/TemporalRowConvolution.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/TemporalSubSampling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Threshold.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Transpose.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/Unsqueeze.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/View.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricAveragePooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricBatchNormalization.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricConvolution.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricDilatedConvolution.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricDilatedMaxPooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricDropout.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricFractionalMaxPooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricFullConvolution.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricMaxPooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricMaxUnpooling.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/VolumetricReplicationPadding.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/WeightNorm.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/WeightedEuclidean.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/WeightedMSECriterion.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/WhiteNoise.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ZeroGrad.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ZipTable.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/ZipTableOneToMany.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/hessian.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/init.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/test.lua
-%%TORCH%%%%DATADIR%%/lualib/nn/utils.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/ConfusionMatrix.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/Logger.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/adadelta.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/adagrad.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/adam.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/adamax.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/asgd.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/cg.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/checkgrad.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/cmaes.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/de.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/fista.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/init.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/lbfgs.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/lswolfe.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/nag.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/polyinterp.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/rmsprop.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/rprop.lua
-%%TORCH%%%%DATADIR%%/lualib/optim/sgd.lua
-%%TORCH%%%%DATADIR%%/lualib/paths/init.lua
-%%TORCH%%%%DATADIR%%/lualib/torch/CmdLine.lua
-%%TORCH%%%%DATADIR%%/lualib/torch/FFInterface.lua
-%%TORCH%%%%DATADIR%%/lualib/torch/File.lua
-%%TORCH%%%%DATADIR%%/lualib/torch/Tensor.lua
-%%TORCH%%%%DATADIR%%/lualib/torch/TestSuite.lua
-%%TORCH%%%%DATADIR%%/lualib/torch/Tester.lua
-%%TORCH%%%%DATADIR%%/lualib/torch/init.lua
-%%TORCH%%%%DATADIR%%/lualib/torch/paths.lua
-%%TORCH%%%%DATADIR%%/lualib/torch/test.lua
 %%DATADIR%%/plugins/antivirus.lua
 %%DATADIR%%/plugins/arc.lua
 %%DATADIR%%/plugins/asn.lua
@@ -495,6 +247,7 @@ man/man8/rspamd.8.gz
 %%DATADIR%%/plugins/url_reputation.lua
 %%DATADIR%%/plugins/url_tags.lua
 %%DATADIR%%/plugins/whitelist.lua
+%%DATADIR%%/rules/bitcoin.lua
 %%DATADIR%%/rules/forwarding.lua
 %%DATADIR%%/rules/headers_checks.lua
 %%DATADIR%%/rules/html.lua
@@ -537,6 +290,7 @@ man/man8/rspamd.8.gz
 %%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/jquery.stickytabs.min.js
 %%DATADIR%%/www/js/lib/nprogress.min.js
 %%DATADIR%%/www/js/lib/require.min.js
 %%DATADIR%%/www/js/lib/visibility.min.js