Index: UPDATING
===================================================================
--- UPDATING	(revision 495448)
+++ UPDATING	(working copy)
@@ -5,6 +5,16 @@
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20190314:
+  AFFECTS: users of mail/rspamd, mail/rspamd-devel
+  AUTHOR: vsevolod@FreeBSD.org
+
+  User and group that rspamd run as are changed from nobody:nobody to
+  rspamd:rspamd. Unless it is clean install you need to execute following
+  command.
+
+  # chown -R rspamd:rspamd /var/db/rspamd /var/log/rspamd /var/run/rspamd
+
 20190311:
   AFFECTS: users of x11/xorg, x11-fonts/mkfontscale, x11-fonts/mkfontdir
   AUTHOR: zeising@FreeBSD.org
Index: mail/rspamd/Makefile
===================================================================
--- mail/rspamd/Makefile	(revision 495448)
+++ mail/rspamd/Makefile	(working copy)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.8.3
-PORTREVISION=	1
+PORTVERSION=	1.9.0
 CATEGORIES=	mail
 
 MAINTAINER=	vsevolod@FreeBSD.org
@@ -26,6 +25,9 @@
 
 CONFLICTS_INSTALL=	rspamd-devel
 
+USERS=		rspamd
+GROUPS=		rspamd
+
 OPTIONS_DEFINE=		GPERF GD CGP TORCH_BLAS
 OPTIONS_DEFINE_amd64=	HYPERSCAN
 OPTIONS_DEFAULT_amd64=	TORCH
Index: mail/rspamd/distinfo
===================================================================
--- mail/rspamd/distinfo	(revision 495448)
+++ mail/rspamd/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544107155
-SHA256 (rspamd-rspamd-1.8.3_GH0.tar.gz) = 09ad1808e8b56db954b29622976efca54785223beaa7b859b2cdb900408de8d7
-SIZE (rspamd-rspamd-1.8.3_GH0.tar.gz) = 4319623
+TIMESTAMP = 1552425143
+SHA256 (rspamd-rspamd-1.9.0_GH0.tar.gz) = 0273b7b40b4e9260bc5454e328e90b035d70154c2054b1f93490f24cde2d93e4
+SIZE (rspamd-rspamd-1.9.0_GH0.tar.gz) = 4402395
Index: mail/rspamd/files/rspamd.in
===================================================================
--- mail/rspamd/files/rspamd.in	(revision 495448)
+++ mail/rspamd/files/rspamd.in	(working copy)
@@ -12,9 +12,9 @@
 # rspamd_enable (bool):		Set to "NO" by default.
 #				Set it to "YES" to enable rspamd.
 #
-# rspamd_user (str):		Default to "nobody".
+# rspamd_user (str):		Default to "rspamd".
 #
-# rspamd_group (str):		Default to "nobody".
+# rspamd_group (str):		Default to "rspamd".
 #
 # rspamd_flags (str):		Default to "-c %%PREFIX%%/etc/rspamd.conf".
 
@@ -26,8 +26,8 @@
 load_rc_config $name
 
 : ${rspamd_enable:="NO"}
-: ${rspamd_user="nobody"}
-: ${rspamd_group="nobody"}
+: ${rspamd_user="rspamd"}
+: ${rspamd_group="rspamd"}
 : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"}
 
 pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"}
Index: mail/rspamd/files/rspamd.newsyslog.conf.sample.in
===================================================================
--- mail/rspamd/files/rspamd.newsyslog.conf.sample.in	(revision 495448)
+++ mail/rspamd/files/rspamd.newsyslog.conf.sample.in	(working copy)
@@ -8,4 +8,4 @@
 # See newsyslog.conf(5) for details.
 #
 # logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
-/var/log/rspamd/rspamd.log	nobody:nobody	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
+/var/log/rspamd/rspamd.log	rspamd:rspamd	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
Index: mail/rspamd/files/rspamd_redirector.in
===================================================================
--- mail/rspamd/files/rspamd_redirector.in	(revision 495448)
+++ mail/rspamd/files/rspamd_redirector.in	(nonexistent)
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: rspamd_redirector
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable rspamd_redirector:
-#
-# rspamd_redirector_enable (bool):	Set to "NO" by default.
-# 					Set it to "YES" to enable redirector.
-
-. /etc/rc.subr
-
-name="rspamd_redirector"
-rcvar=rspamd_redirector_enable
-
-load_rc_config $name
-
-: ${rspamd_redirector_enable:="NO"}
-
-pidfile=${rspamd_redirector_pidfile:-"/var/run/rspamd/redirector.pid"}
-
-command="%%PREFIX%%/bin/rspamd-redirector"
-command_interpreter="%%PREFIX%%/bin/perl"
-extra_commands="reload"
-sig_reload="USR1"
-stop_postcmd="rm -f $pidfile"
-
-run_rc_command "$1"
Index: mail/rspamd/pkg-plist
===================================================================
--- mail/rspamd/pkg-plist	(revision 495448)
+++ mail/rspamd/pkg-plist	(working copy)
@@ -31,6 +31,7 @@
 %%ETCDIR%%/modules.d/dmarc.conf
 %%ETCDIR%%/modules.d/elastic.conf
 %%ETCDIR%%/modules.d/emails.conf
+%%ETCDIR%%/modules.d/external_services.conf
 %%ETCDIR%%/modules.d/force_actions.conf
 %%ETCDIR%%/modules.d/forged_recipients.conf
 %%ETCDIR%%/modules.d/fuzzy_check.conf
@@ -90,6 +91,7 @@
 @sample %%ETCDIR%%/worker-normal.inc.sample
 @sample %%ETCDIR%%/worker-proxy.inc.sample
 lib/rspamd/librspamd-actrie.so
+lib/rspamd/librspamd-server.so
 %%TORCH%%lib/rspamd/libTH.so
 %%TORCH%%lib/rspamd/libTHNN.so
 %%TORCH%%lib/rspamd/libdecisiontree.so
@@ -148,334 +150,351 @@
 %%DATADIR%%/languages/uk.json
 %%DATADIR%%/languages/ur.json
 %%DATADIR%%/languages/vi.json
-%%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_fuzzy.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/plugins_stats.lua
-%%DATADIR%%/lib/rescore_utility.lua
-%%DATADIR%%/lib/rspamadm/confighelp.lua
-%%DATADIR%%/lib/rspamadm/configwizard.lua
-%%DATADIR%%/lib/rspamadm/cookie.lua
-%%DATADIR%%/lib/rspamadm/corpus_test.lua
-%%DATADIR%%/lib/rspamadm/fuzzy_convert.lua
-%%DATADIR%%/lib/rspamadm/fuzzy_stat.lua
-%%DATADIR%%/lib/rspamadm/grep.lua
-%%DATADIR%%/lib/rspamadm/keypair.lua
-%%DATADIR%%/lib/rspamadm/mime.lua
-%%DATADIR%%/lib/rspamadm/rescore.lua
-%%DATADIR%%/lib/rspamadm/stat_convert.lua
-%%DATADIR%%/lib/tableshape.lua
-%%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/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
-%%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
-%%DATADIR%%/lua/antivirus.lua
-%%DATADIR%%/lua/arc.lua
-%%DATADIR%%/lua/asn.lua
-%%DATADIR%%/lua/bayes_expiry.lua
-%%DATADIR%%/lua/clickhouse.lua
-%%DATADIR%%/lua/clustering.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%%/lualib/ansicolors.lua
+%%DATADIR%%/lualib/argparse.lua
+%%DATADIR%%/lualib/fun.lua
+%%DATADIR%%/lualib/global_functions.lua
+%%DATADIR%%/lualib/lua_auth_results.lua
+%%DATADIR%%/lualib/lua_cfg_transform.lua
+%%DATADIR%%/lualib/lua_clickhouse.lua
+%%DATADIR%%/lualib/lua_dkim_tools.lua
+%%DATADIR%%/lualib/lua_ffi/common.lua
+%%DATADIR%%/lualib/lua_ffi/dkim.lua
+%%DATADIR%%/lualib/lua_ffi/init.lua
+%%DATADIR%%/lualib/lua_fuzzy.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
+%%DATADIR%%/lualib/lua_scanners/dcc.lua
+%%DATADIR%%/lualib/lua_scanners/fprot.lua
+%%DATADIR%%/lualib/lua_scanners/icap.lua
+%%DATADIR%%/lualib/lua_scanners/init.lua
+%%DATADIR%%/lualib/lua_scanners/kaspersky_av.lua
+%%DATADIR%%/lualib/lua_scanners/oletools.lua
+%%DATADIR%%/lualib/lua_scanners/savapi.lua
+%%DATADIR%%/lualib/lua_scanners/sophos.lua
+%%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_stat.lua
+%%DATADIR%%/lualib/lua_tcp_sync.lua
+%%DATADIR%%/lualib/lua_util.lua
+%%DATADIR%%/lualib/plugins_stats.lua
+%%DATADIR%%/lualib/rescore_utility.lua
+%%DATADIR%%/lualib/rspamadm/configgraph.lua
+%%DATADIR%%/lualib/rspamadm/confighelp.lua
+%%DATADIR%%/lualib/rspamadm/configwizard.lua
+%%DATADIR%%/lualib/rspamadm/cookie.lua
+%%DATADIR%%/lualib/rspamadm/corpus_test.lua
+%%DATADIR%%/lualib/rspamadm/fuzzy_convert.lua
+%%DATADIR%%/lualib/rspamadm/fuzzy_stat.lua
+%%DATADIR%%/lualib/rspamadm/grep.lua
+%%DATADIR%%/lualib/rspamadm/keypair.lua
+%%DATADIR%%/lualib/rspamadm/mime.lua
+%%DATADIR%%/lualib/rspamadm/rescore.lua
+%%DATADIR%%/lualib/rspamadm/stat_convert.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
+%%DATADIR%%/plugins/bayes_expiry.lua
+%%DATADIR%%/plugins/clickhouse.lua
+%%DATADIR%%/plugins/clustering.lua
+%%DATADIR%%/plugins/dcc.lua
+%%DATADIR%%/plugins/dkim_signing.lua
+%%DATADIR%%/plugins/dmarc.lua
+%%DATADIR%%/plugins/dynamic_conf.lua
+%%DATADIR%%/plugins/elastic.lua
+%%DATADIR%%/plugins/emails.lua
+%%DATADIR%%/plugins/external_services.lua
+%%DATADIR%%/plugins/force_actions.lua
+%%DATADIR%%/plugins/forged_recipients.lua
+%%DATADIR%%/plugins/fuzzy_collect.lua
+%%DATADIR%%/plugins/greylist.lua
+%%DATADIR%%/plugins/hfilter.lua
+%%DATADIR%%/plugins/history_redis.lua
+%%DATADIR%%/plugins/ip_score.lua
+%%DATADIR%%/plugins/maillist.lua
+%%DATADIR%%/plugins/maps_stats.lua
+%%DATADIR%%/plugins/metadata_exporter.lua
+%%DATADIR%%/plugins/metric_exporter.lua
+%%DATADIR%%/plugins/mid.lua
+%%DATADIR%%/plugins/milter_headers.lua
+%%DATADIR%%/plugins/mime_types.lua
+%%DATADIR%%/plugins/multimap.lua
+%%DATADIR%%/plugins/mx_check.lua
+%%DATADIR%%/plugins/neural.lua
+%%DATADIR%%/plugins/once_received.lua
+%%DATADIR%%/plugins/phishing.lua
+%%DATADIR%%/plugins/ratelimit.lua
+%%DATADIR%%/plugins/rbl.lua
+%%DATADIR%%/plugins/replies.lua
+%%DATADIR%%/plugins/reputation.lua
+%%DATADIR%%/plugins/rspamd_update.lua
+%%DATADIR%%/plugins/settings.lua
+%%DATADIR%%/plugins/spamassassin.lua
+%%DATADIR%%/plugins/spamtrap.lua
+%%DATADIR%%/plugins/trie.lua
+%%DATADIR%%/plugins/url_redirector.lua
+%%DATADIR%%/plugins/url_reputation.lua
+%%DATADIR%%/plugins/url_tags.lua
+%%DATADIR%%/plugins/whitelist.lua
 %%DATADIR%%/rules/forwarding.lua
 %%DATADIR%%/rules/headers_checks.lua
 %%DATADIR%%/rules/html.lua
@@ -524,8 +543,8 @@
 %%DATADIR%%/www/js/main.js
 %%DATADIR%%/www/plugins.txt
 %%DATADIR%%/www/react-index.html
-@owner nobody
-@group nobody
+@owner rspamd
+@group rspamd
 @dir /var/db/rspamd
 @dir /var/log/rspamd
 @dir /var/run/rspamd
Index: mail/rspamd-devel/Makefile
===================================================================
--- mail/rspamd-devel/Makefile	(revision 495448)
+++ mail/rspamd-devel/Makefile	(working copy)
@@ -2,7 +2,7 @@
 
 PORTNAME=	rspamd
 PORTVERSION=	1.8.0.a1.20180920
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -27,6 +27,9 @@
 
 CONFLICTS_INSTALL=	rspamd
 
+USERS=		rspamd
+GROUPS=		rspamd
+
 OPTIONS_DEFINE=		GPERF GD CGP TORCH_BLAS
 OPTIONS_DEFINE_amd64=	HYPERSCAN
 OPTIONS_DEFAULT_amd64=	TORCH
Index: mail/rspamd-devel/files/rspamd.in
===================================================================
--- mail/rspamd-devel/files/rspamd.in	(revision 495448)
+++ mail/rspamd-devel/files/rspamd.in	(working copy)
@@ -12,9 +12,9 @@
 # rspamd_enable (bool):		Set to "NO" by default.
 #				Set it to "YES" to enable rspamd.
 #
-# rspamd_user (str):		Default to "nobody".
+# rspamd_user (str):		Default to "rspamd".
 #
-# rspamd_group (str):		Default to "nobody".
+# rspamd_group (str):		Default to "rspamd".
 #
 # rspamd_flags (str):		Default to "-c %%PREFIX%%/etc/rspamd.conf".
 
@@ -26,8 +26,8 @@
 load_rc_config $name
 
 : ${rspamd_enable:="NO"}
-: ${rspamd_user="nobody"}
-: ${rspamd_group="nobody"}
+: ${rspamd_user="rspamd"}
+: ${rspamd_group="rspamd"}
 : ${rspamd_flags="-c %%PREFIX%%/etc/rspamd/rspamd.conf"}
 
 pidfile=${rspamd_pidfile:-"/var/run/rspamd/rspamd.pid"}
Index: mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in
===================================================================
--- mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in	(revision 495448)
+++ mail/rspamd-devel/files/rspamd.newsyslog.conf.sample.in	(working copy)
@@ -8,4 +8,4 @@
 # See newsyslog.conf(5) for details.
 #
 # logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
-/var/log/rspamd/rspamd.log	nobody:nobody	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
+/var/log/rspamd/rspamd.log	rspamd:rspamd	644   7	   *	@T00  JC    /var/run/rspamd/rspamd.pid 30
Index: mail/rspamd-devel/files/rspamd_redirector.in
===================================================================
--- mail/rspamd-devel/files/rspamd_redirector.in	(revision 495448)
+++ mail/rspamd-devel/files/rspamd_redirector.in	(nonexistent)
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD$
-#
-# PROVIDE: rspamd_redirector
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-#
-# Add the following line to /etc/rc.conf to enable rspamd_redirector:
-#
-# rspamd_redirector_enable (bool):	Set to "NO" by default.
-# 					Set it to "YES" to enable redirector.
-
-. /etc/rc.subr
-
-name="rspamd_redirector"
-rcvar=rspamd_redirector_enable
-
-load_rc_config $name
-
-: ${rspamd_redirector_enable:="NO"}
-
-pidfile=${rspamd_redirector_pidfile:-"/var/run/rspamd/redirector.pid"}
-
-command="%%PREFIX%%/bin/rspamd-redirector"
-command_interpreter="%%PREFIX%%/bin/perl"
-extra_commands="reload"
-sig_reload="USR1"
-stop_postcmd="rm -f $pidfile"
-
-run_rc_command "$1"
Index: mail/rspamd-devel/pkg-plist
===================================================================
--- mail/rspamd-devel/pkg-plist	(revision 495448)
+++ mail/rspamd-devel/pkg-plist	(working copy)
@@ -520,8 +520,8 @@
 %%DATADIR%%/www/js/main.js
 %%DATADIR%%/www/plugins.txt
 %%DATADIR%%/www/react-index.html
-@owner nobody
-@group nobody
+@owner rspamd
+@group rspamd
 @dir /var/db/rspamd
 @dir /var/log/rspamd
 @dir /var/run/rspamd