On 2019/08/30 18:07, Stuart Henderson wrote:
> I've been running various versions of this locally for a while, thought I'd
> send it out in case anyone else is interested in testing. rspamd has switched
> from libevent to their own copy of libev and the neural network parts (if you
> use them) have changed to a different backend.
Updated, in case anyone is interested. (I have no idea about upstream's
release plans, but fwiw I haven't run into any problems with the devel
code yet).
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/rspamd/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile 3 Jun 2019 16:06:52 -0000 1.71
+++ Makefile 17 Sep 2019 14:36:22 -0000
@@ -4,7 +4,9 @@ COMMENT= event-driven spam filtering sys
GH_ACCOUNT= vstakhov
GH_PROJECT= rspamd
-GH_TAGNAME= 1.9.4
+#GH_TAGNAME= 1.9.4
+GH_COMMIT= 35a0a7e2e02a8b35da0d02f94522aa1294d4da9d
+DISTNAME= rspamd-2.0.0pre20190917
CATEGORIES= mail
@@ -15,8 +17,9 @@ MAINTAINER= Stuart Henderson <sthen@open
# Apache License 2.0
PERMIT_PACKAGE= Yes
-WANTLIB += c crypto event glib-2.0 gthread-2.0 icudata icui18n icuuc
-WANTLIB += intl m magic pcre pthread sqlite3 ssl z
+WANTLIB += ${COMPILER_LIBCXX}
+WANTLIB += blas c crypto glib-2.0 icudata icui18n icuuc intl m
+WANTLIB += pcre sodium sqlite3 ssl z
FLAVORS= no_luajit
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
@@ -30,9 +33,15 @@ MODULES= devel/cmake
LIB_DEPENDS= databases/sqlite3 \
devel/gettext,-runtime \
devel/glib2 \
- devel/libmagic \
devel/pcre \
+ security/libsodium \
textproc/icu4c
+
+# uses cblas headers; pull this in via LDEP and register an "extra" dependency
+# on cblas lib to make sure rspamd gets updated for major changes in cblas
+LIB_DEPENDS+= math/cblas
+WANTLIB+= cblas
+
BUILD_DEPENDS+= devel/ragel
# /var/rspamd needs to exist for tests to run
TEST_DEPENDS= ${FULLPKGNAME}:${FULLPKGPATH}
@@ -48,25 +57,19 @@ CONFIGURE_ARGS+= -DOPENBSD_BUILD=1 \
-DLOGDIR="${LOCALSTATEDIR}/log/rspamd" \
-DMANDIR="${PREFIX}/man" \
-DRUNDIR="${LOCALSTATEDIR}/run/rspamd" \
- -DRSPAMD_USER="_rspamd" \
- -DRSPAMD_GROUP="_rspamd"
+ -DRSPAMD_USER="_rspamd"
.if ${FLAVOR:Mno_luajit}
-CONFIGURE_ARGS+= -DENABLE_LUAJIT=0 \
- -DENABLE_TORCH=0
+CONFIGURE_ARGS+= -DENABLE_LUAJIT=0
MODULES+= lang/lua
MODLUA_VERSION= 5.3
MODLUA_SA= Yes # avoid overwriting FULLPKGNAME
LIB_DEPENDS+= ${MODLUA_LIB_DEPENDS}
WANTLIB+= ${MODLUA_WANTLIB}
.else
-LIB_DEPENDS+= lang/luajit \
- math/lapack
-WANTLIB+= blas lapack luajit-5.1
+LIB_DEPENDS+= lang/luajit
+WANTLIB+= luajit-5.1
.endif
-
-# Make sure we pick up the base libevent, never the ports one!
-CONFIGURE_ARGS+= -DLIBEVENT_ROOT_DIR=/usr
# Make sure you have no rspamd or redis instances running and note that the
# test suite uses the network.
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/rspamd/distinfo,v
retrieving revision 1.48
diff -u -p -r1.48 distinfo
--- distinfo 26 May 2019 12:49:36 -0000 1.48
+++ distinfo 17 Sep 2019 14:36:22 -0000
@@ -1,2 +1,2 @@
-SHA256 (rspamd-1.9.4.tar.gz) = 5HIMH0Xe/QfdF7lWPQ3cSAxwvq28GoMyNcB3lgCS4DA=
-SIZE (rspamd-1.9.4.tar.gz) = 4476230
+SHA256 (rspamd-2.0.0pre20190917-35a0a7e2.tar.gz) =
BHwv2C9RT0K4v2RfopfYN0QfE6orDWgDplyfa8gprTs=
+SIZE (rspamd-2.0.0pre20190917-35a0a7e2.tar.gz) = 4115021
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 18 Apr 2019 16:12:15 -0000 1.22
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,63 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.22 2019/04/18 16:12:15 sthen Exp $
-
-don't pick up libevent2 from ports, otherwise rspamd links against
-both libevent from base *and* libevent2
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -517,14 +517,14 @@ SET(POE_LOOP "Loop::IO_Poll")
- SET(TAR "tar")
-
- # Platform specific configuration
--IF(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly")
-+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly")
- ADD_DEFINITIONS(-DFREEBSD -D_BSD_SOURCE)
- CONFIGURE_FILE(freebsd/rspamd.sh.in freebsd/rspamd @ONLY)
-
- IF(ENABLE_REDIRECTOR MATCHES "ON")
- CONFIGURE_FILE(freebsd/redirector.sh.in freebsd/redirector
@ONLY)
- ENDIF(ENABLE_REDIRECTOR MATCHES "ON")
-- MESSAGE(STATUS "Configuring for BSD system")
-+ MESSAGE(STATUS "Configuring for FreeBSD/DragonFly system")
- # Find util library
- ProcessPackage(LIBUTIL LIBRARY util INCLUDE libutil.h
- ROOT ${LIBUTIL_ROOT_DIR} OPTIONAL)
-@@ -540,8 +540,14 @@ IF(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly")
- ENDIF()
- SET(POE_LOOP "Loop::Kqueue")
- SET(TAR "gtar")
--ENDIF()
-+ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD|DragonFly")
-
-+IF(CMAKE_SYSTEM_NAME MATCHES "NetBSD|OpenBSD")
-+ MESSAGE(STATUS "Configuring for NetBSD/OpenBSD")
-+ SET(POE_LOOP "Loop::Kqueue")
-+ SET(TAR "gtar")
-+ENDIF(CMAKE_SYSTEM_NAME MATCHES "NetBSD|OpenBSD")
-+
- IF(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_BSD_SOURCE -DDARWIN")
- SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS
"${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -undefined dynamic_lookup")
-@@ -655,7 +661,7 @@ ELSE()
- ENDIF()
-
- ProcessPackage(LIBEVENT LIBRARY event INCLUDE event.h INCLUDE_SUFFIXES
include/event
-- ROOT ${LIBEVENT_ROOT_DIR} MODULES event libevent)
-+ ROOT ${LIBEVENT_ROOT_DIR} MODULES event)
- ProcessPackage(SQLITE3 LIBRARY sqlite3 INCLUDE sqlite3.h INCLUDE_SUFFIXES
include/sqlite3 include/sqlite
- ROOT ${SQLITE3_ROOT_DIR} MODULES sqlite3 sqlite)
- ProcessPackage(ICUDATA LIBRARY icudata INCLUDE unicode/ucnv.h
-@@ -1083,9 +1089,9 @@ CHECK_C_SOURCE_COMPILES ("#include <event.h>
- #error Unsupported
- #endif
- int main() { return 0;}" HAVE_LIBEVENT2)
--CHECK_C_SOURCE_COMPILES ("#include <event2/event.h>
-- int main() { return
EVENT_BASE_FLAG_NO_CACHE_TIME; }"
-- HAVE_EVENT_NO_CACHE_TIME_FLAG)
-+#CHECK_C_SOURCE_COMPILES ("#include <event2/event.h>
-+# int main() { return
EVENT_BASE_FLAG_NO_CACHE_TIME; }"
-+# HAVE_EVENT_NO_CACHE_TIME_FLAG)
- LIST(APPEND CMAKE_REQUIRED_LIBRARIES "event")
- CHECK_SYMBOL_EXISTS(event_base_update_cache_time "sys/types.h;event.h"
- HAVE_EVENT_NO_CACHE_TIME_FUNC)
Index: patches/patch-contrib_linenoise_CMakeLists_txt
===================================================================
RCS file: patches/patch-contrib_linenoise_CMakeLists_txt
diff -N patches/patch-contrib_linenoise_CMakeLists_txt
--- patches/patch-contrib_linenoise_CMakeLists_txt 8 Mar 2017 17:02:13
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-contrib_linenoise_CMakeLists_txt,v 1.2 2017/03/08 17:02:13
sthen Exp $
---- contrib/linenoise/CMakeLists.txt.orig Sun Dec 25 11:19:12 2016
-+++ contrib/linenoise/CMakeLists.txt Sun Mar 5 15:27:41 2017
-@@ -4,7 +4,4 @@ ADD_LIBRARY(rspamd-linenoise STATIC ${LINENOISESRC})
- SET_TARGET_PROPERTIES(rspamd-linenoise PROPERTIES VERSION ${RSPAMD_VERSION})
-
- IF(ENABLE_FULL_DEBUG MATCHES "OFF")
--if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}"
STREQUAL "GNU")
-- SET_TARGET_PROPERTIES(rspamd-linenoise PROPERTIES COMPILE_FLAGS "-O3")
--endif ()
- ENDIF()
Index: patches/patch-contrib_lua-torch_torch7_lib_TH_THGeneral_c
===================================================================
RCS file: patches/patch-contrib_lua-torch_torch7_lib_TH_THGeneral_c
diff -N patches/patch-contrib_lua-torch_torch7_lib_TH_THGeneral_c
--- patches/patch-contrib_lua-torch_torch7_lib_TH_THGeneral_c 8 Jul 2018
14:13:56 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-contrib_lua-torch_torch7_lib_TH_THGeneral_c,v 1.2 2018/07/08
14:13:56 sthen Exp $
-
-Index: contrib/lua-torch/torch7/lib/TH/THGeneral.c
---- contrib/lua-torch/torch7/lib/TH/THGeneral.c.orig
-+++ contrib/lua-torch/torch7/lib/TH/THGeneral.c
-@@ -13,14 +13,12 @@
-
- #if defined(__APPLE__)
- #include <malloc/malloc.h>
--#endif
--
--#if defined(__linux__)
-+#elif defined(__linux__)
- #include <malloc.h>
--#endif
--
--#if defined(__FreeBSD__)
-+#elif defined(__FreeBSD__)
- #include <malloc_np.h>
-+#else
-+#include <stdlib.h>
- #endif
-
- /* Torch Error Handling */
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/mail/rspamd/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 26 May 2019 12:49:36 -0000 1.11
+++ patches/patch-src_CMakeLists_txt 17 Sep 2019 14:36:22 -0000
@@ -1,8 +1,9 @@
-$OpenBSD: patch-src_CMakeLists_txt,v 1.11 2019/05/26 12:49:36 sthen Exp $
+$OpenBSD$
+
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
-@@ -216,9 +216,9 @@ IF(USE_CXX_LINKER)
+@@ -215,9 +215,9 @@ IF(USE_CXX_LINKER)
SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE CXX)
SET_TARGET_PROPERTIES(rspamd-server PROPERTIES LINKER_LANGUAGE CXX)
ENDIF()
@@ -12,5 +13,5 @@ Index: src/CMakeLists.txt
-ENDIF(NOT DEBIAN_BUILD)
+ENDIF(NOT DEBIAN_BUILD AND NOT OPENBSD_BUILD)
- TARGET_LINK_LIBRARIES(rspamd ${RSPAMD_REQUIRED_LIBRARIES})
+ #TARGET_LINK_LIBRARIES(rspamd ${RSPAMD_REQUIRED_LIBRARIES})
TARGET_LINK_LIBRARIES(rspamd rspamd-server)
Index: patches/patch-src_rspamadm_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/mail/rspamd/patches/patch-src_rspamadm_CMakeLists_txt,v
retrieving revision 1.10
diff -u -p -r1.10 patch-src_rspamadm_CMakeLists_txt
--- patches/patch-src_rspamadm_CMakeLists_txt 13 Mar 2019 14:46:10 -0000
1.10
+++ patches/patch-src_rspamadm_CMakeLists_txt 17 Sep 2019 14:36:22 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_rspamadm_CMakeLists_
Index: src/rspamadm/CMakeLists.txt
--- src/rspamadm/CMakeLists.txt.orig
+++ src/rspamadm/CMakeLists.txt
-@@ -26,9 +26,9 @@ ENDIF()
+@@ -23,9 +23,9 @@ ENDIF()
ADD_EXECUTABLE(rspamadm ${RSPAMADMSRC})
TARGET_LINK_LIBRARIES(rspamadm rspamd-server)
Index: pkg/PFRAG.no-no_luajit
===================================================================
RCS file: pkg/PFRAG.no-no_luajit
diff -N pkg/PFRAG.no-no_luajit
--- pkg/PFRAG.no-no_luajit 13 Mar 2019 14:46:10 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,263 +0,0 @@
-@comment $OpenBSD: PFRAG.no-no_luajit,v 1.2 2019/03/13 14:46:10 sthen Exp $
-lib/rspamd/libTH.so
-lib/rspamd/libTHNN.so
-lib/rspamd/libdecisiontree.so
-lib/rspamd/libpaths.so
-lib/rspamd/libtorch.so
-share/rspamd/lualib/decisiontree/
-share/rspamd/lualib/decisiontree/CartNode.lua
-share/rspamd/lualib/decisiontree/CartTrainer.lua
-share/rspamd/lualib/decisiontree/CartTree.lua
-share/rspamd/lualib/decisiontree/DFD.lua
-share/rspamd/lualib/decisiontree/DataSet.lua
-share/rspamd/lualib/decisiontree/DecisionForest.lua
-share/rspamd/lualib/decisiontree/DecisionForestTrainer.lua
-share/rspamd/lualib/decisiontree/DecisionTree.lua
-share/rspamd/lualib/decisiontree/GiniState.lua
-share/rspamd/lualib/decisiontree/GradientBoostState.lua
-share/rspamd/lualib/decisiontree/GradientBoostTrainer.lua
-share/rspamd/lualib/decisiontree/LogitBoostCriterion.lua
-share/rspamd/lualib/decisiontree/MSECriterion.lua
-share/rspamd/lualib/decisiontree/RandomForestTrainer.lua
-share/rspamd/lualib/decisiontree/Sparse2Dense.lua
-share/rspamd/lualib/decisiontree/SparseTensor.lua
-share/rspamd/lualib/decisiontree/TreeState.lua
-share/rspamd/lualib/decisiontree/WorkPool.lua
-share/rspamd/lualib/decisiontree/_env.lua
-share/rspamd/lualib/decisiontree/benchmark.lua
-share/rspamd/lualib/decisiontree/init.lua
-share/rspamd/lualib/decisiontree/math.lua
-share/rspamd/lualib/decisiontree/test.lua
-share/rspamd/lualib/decisiontree/utils.lua
-share/rspamd/lualib/moses.lua
-share/rspamd/lualib/nn/
-share/rspamd/lualib/nn/Abs.lua
-share/rspamd/lualib/nn/AbsCriterion.lua
-share/rspamd/lualib/nn/Add.lua
-share/rspamd/lualib/nn/AddConstant.lua
-share/rspamd/lualib/nn/BCECriterion.lua
-share/rspamd/lualib/nn/BatchNormalization.lua
-share/rspamd/lualib/nn/Bilinear.lua
-share/rspamd/lualib/nn/Bottle.lua
-share/rspamd/lualib/nn/CAdd.lua
-share/rspamd/lualib/nn/CAddTable.lua
-share/rspamd/lualib/nn/CAddTensorTable.lua
-share/rspamd/lualib/nn/CDivTable.lua
-share/rspamd/lualib/nn/CMaxTable.lua
-share/rspamd/lualib/nn/CMinTable.lua
-share/rspamd/lualib/nn/CMul.lua
-share/rspamd/lualib/nn/CMulTable.lua
-share/rspamd/lualib/nn/CReLU.lua
-share/rspamd/lualib/nn/CSubTable.lua
-share/rspamd/lualib/nn/Clamp.lua
-share/rspamd/lualib/nn/ClassNLLCriterion.lua
-share/rspamd/lualib/nn/ClassSimplexCriterion.lua
-share/rspamd/lualib/nn/Collapse.lua
-share/rspamd/lualib/nn/Concat.lua
-share/rspamd/lualib/nn/ConcatTable.lua
-share/rspamd/lualib/nn/Constant.lua
-share/rspamd/lualib/nn/Container.lua
-share/rspamd/lualib/nn/Contiguous.lua
-share/rspamd/lualib/nn/Convert.lua
-share/rspamd/lualib/nn/Copy.lua
-share/rspamd/lualib/nn/Cosine.lua
-share/rspamd/lualib/nn/CosineDistance.lua
-share/rspamd/lualib/nn/CosineEmbeddingCriterion.lua
-share/rspamd/lualib/nn/Criterion.lua
-share/rspamd/lualib/nn/CriterionTable.lua
-share/rspamd/lualib/nn/CrossEntropyCriterion.lua
-share/rspamd/lualib/nn/Decorator.lua
-share/rspamd/lualib/nn/DepthConcat.lua
-share/rspamd/lualib/nn/DistKLDivCriterion.lua
-share/rspamd/lualib/nn/DistanceRatioCriterion.lua
-share/rspamd/lualib/nn/DontCast.lua
-share/rspamd/lualib/nn/DotProduct.lua
-share/rspamd/lualib/nn/Dropout.lua
-share/rspamd/lualib/nn/ELU.lua
-share/rspamd/lualib/nn/ErrorMessages.lua
-share/rspamd/lualib/nn/Euclidean.lua
-share/rspamd/lualib/nn/Exp.lua
-share/rspamd/lualib/nn/FlattenTable.lua
-share/rspamd/lualib/nn/GPU.lua
-share/rspamd/lualib/nn/GatedLinearUnit.lua
-share/rspamd/lualib/nn/GradientReversal.lua
-share/rspamd/lualib/nn/HardShrink.lua
-share/rspamd/lualib/nn/HardTanh.lua
-share/rspamd/lualib/nn/HingeEmbeddingCriterion.lua
-share/rspamd/lualib/nn/Identity.lua
-share/rspamd/lualib/nn/Index.lua
-share/rspamd/lualib/nn/IndexLinear.lua
-share/rspamd/lualib/nn/Jacobian.lua
-share/rspamd/lualib/nn/JoinTable.lua
-share/rspamd/lualib/nn/Kmeans.lua
-share/rspamd/lualib/nn/L1Cost.lua
-share/rspamd/lualib/nn/L1HingeEmbeddingCriterion.lua
-share/rspamd/lualib/nn/L1Penalty.lua
-share/rspamd/lualib/nn/LayerNormalization.lua
-share/rspamd/lualib/nn/LeakyReLU.lua
-share/rspamd/lualib/nn/Linear.lua
-share/rspamd/lualib/nn/LinearWeightNorm.lua
-share/rspamd/lualib/nn/Log.lua
-share/rspamd/lualib/nn/LogSigmoid.lua
-share/rspamd/lualib/nn/LogSoftMax.lua
-share/rspamd/lualib/nn/LookupTable.lua
-share/rspamd/lualib/nn/MM.lua
-share/rspamd/lualib/nn/MSECriterion.lua
-share/rspamd/lualib/nn/MV.lua
-share/rspamd/lualib/nn/MapTable.lua
-share/rspamd/lualib/nn/MarginCriterion.lua
-share/rspamd/lualib/nn/MarginRankingCriterion.lua
-share/rspamd/lualib/nn/MaskedSelect.lua
-share/rspamd/lualib/nn/Max.lua
-share/rspamd/lualib/nn/Maxout.lua
-share/rspamd/lualib/nn/Mean.lua
-share/rspamd/lualib/nn/Min.lua
-share/rspamd/lualib/nn/MixtureTable.lua
-share/rspamd/lualib/nn/Module.lua
-share/rspamd/lualib/nn/ModuleCriterion.lua
-share/rspamd/lualib/nn/Mul.lua
-share/rspamd/lualib/nn/MulConstant.lua
-share/rspamd/lualib/nn/MultiCriterion.lua
-share/rspamd/lualib/nn/MultiLabelMarginCriterion.lua
-share/rspamd/lualib/nn/MultiLabelSoftMarginCriterion.lua
-share/rspamd/lualib/nn/MultiMarginCriterion.lua
-share/rspamd/lualib/nn/NaN.lua
-share/rspamd/lualib/nn/Narrow.lua
-share/rspamd/lualib/nn/NarrowTable.lua
-share/rspamd/lualib/nn/Normalize.lua
-share/rspamd/lualib/nn/OneHot.lua
-share/rspamd/lualib/nn/PReLU.lua
-share/rspamd/lualib/nn/Padding.lua
-share/rspamd/lualib/nn/PairwiseDistance.lua
-share/rspamd/lualib/nn/Parallel.lua
-share/rspamd/lualib/nn/ParallelCriterion.lua
-share/rspamd/lualib/nn/ParallelTable.lua
-share/rspamd/lualib/nn/PartialLinear.lua
-share/rspamd/lualib/nn/PixelShuffle.lua
-share/rspamd/lualib/nn/Power.lua
-share/rspamd/lualib/nn/PrintSize.lua
-share/rspamd/lualib/nn/Profile.lua
-share/rspamd/lualib/nn/RReLU.lua
-share/rspamd/lualib/nn/ReLU.lua
-share/rspamd/lualib/nn/ReLU6.lua
-share/rspamd/lualib/nn/Replicate.lua
-share/rspamd/lualib/nn/Reshape.lua
-share/rspamd/lualib/nn/Select.lua
-share/rspamd/lualib/nn/SelectTable.lua
-share/rspamd/lualib/nn/Sequential.lua
-share/rspamd/lualib/nn/Sigmoid.lua
-share/rspamd/lualib/nn/SmoothL1Criterion.lua
-share/rspamd/lualib/nn/SoftMarginCriterion.lua
-share/rspamd/lualib/nn/SoftMax.lua
-share/rspamd/lualib/nn/SoftMin.lua
-share/rspamd/lualib/nn/SoftPlus.lua
-share/rspamd/lualib/nn/SoftShrink.lua
-share/rspamd/lualib/nn/SoftSign.lua
-share/rspamd/lualib/nn/SparseJacobian.lua
-share/rspamd/lualib/nn/SparseLinear.lua
-share/rspamd/lualib/nn/SpatialAdaptiveAveragePooling.lua
-share/rspamd/lualib/nn/SpatialAdaptiveMaxPooling.lua
-share/rspamd/lualib/nn/SpatialAutoCropMSECriterion.lua
-share/rspamd/lualib/nn/SpatialAveragePooling.lua
-share/rspamd/lualib/nn/SpatialBatchNormalization.lua
-share/rspamd/lualib/nn/SpatialClassNLLCriterion.lua
-share/rspamd/lualib/nn/SpatialContrastiveNormalization.lua
-share/rspamd/lualib/nn/SpatialConvolution.lua
-share/rspamd/lualib/nn/SpatialConvolutionLocal.lua
-share/rspamd/lualib/nn/SpatialConvolutionMM.lua
-share/rspamd/lualib/nn/SpatialConvolutionMap.lua
-share/rspamd/lualib/nn/SpatialCrossMapLRN.lua
-share/rspamd/lualib/nn/SpatialDepthWiseConvolution.lua
-share/rspamd/lualib/nn/SpatialDilatedConvolution.lua
-share/rspamd/lualib/nn/SpatialDilatedMaxPooling.lua
-share/rspamd/lualib/nn/SpatialDivisiveNormalization.lua
-share/rspamd/lualib/nn/SpatialDropout.lua
-share/rspamd/lualib/nn/SpatialFractionalMaxPooling.lua
-share/rspamd/lualib/nn/SpatialFullConvolution.lua
-share/rspamd/lualib/nn/SpatialFullConvolutionMap.lua
-share/rspamd/lualib/nn/SpatialLPPooling.lua
-share/rspamd/lualib/nn/SpatialLogSoftMax.lua
-share/rspamd/lualib/nn/SpatialMaxPooling.lua
-share/rspamd/lualib/nn/SpatialMaxUnpooling.lua
-share/rspamd/lualib/nn/SpatialReflectionPadding.lua
-share/rspamd/lualib/nn/SpatialReplicationPadding.lua
-share/rspamd/lualib/nn/SpatialSoftMax.lua
-share/rspamd/lualib/nn/SpatialSubSampling.lua
-share/rspamd/lualib/nn/SpatialSubtractiveNormalization.lua
-share/rspamd/lualib/nn/SpatialUpSamplingBilinear.lua
-share/rspamd/lualib/nn/SpatialUpSamplingNearest.lua
-share/rspamd/lualib/nn/SpatialZeroPadding.lua
-share/rspamd/lualib/nn/SplitTable.lua
-share/rspamd/lualib/nn/Sqrt.lua
-share/rspamd/lualib/nn/Square.lua
-share/rspamd/lualib/nn/Squeeze.lua
-share/rspamd/lualib/nn/StochasticGradient.lua
-share/rspamd/lualib/nn/Sum.lua
-share/rspamd/lualib/nn/THNN.lua
-share/rspamd/lualib/nn/THNN_h.lua
-share/rspamd/lualib/nn/Tanh.lua
-share/rspamd/lualib/nn/TanhShrink.lua
-share/rspamd/lualib/nn/TemporalConvolution.lua
-share/rspamd/lualib/nn/TemporalDynamicKMaxPooling.lua
-share/rspamd/lualib/nn/TemporalMaxPooling.lua
-share/rspamd/lualib/nn/TemporalRowConvolution.lua
-share/rspamd/lualib/nn/TemporalSubSampling.lua
-share/rspamd/lualib/nn/Threshold.lua
-share/rspamd/lualib/nn/Transpose.lua
-share/rspamd/lualib/nn/Unsqueeze.lua
-share/rspamd/lualib/nn/View.lua
-share/rspamd/lualib/nn/VolumetricAveragePooling.lua
-share/rspamd/lualib/nn/VolumetricBatchNormalization.lua
-share/rspamd/lualib/nn/VolumetricConvolution.lua
-share/rspamd/lualib/nn/VolumetricDilatedConvolution.lua
-share/rspamd/lualib/nn/VolumetricDilatedMaxPooling.lua
-share/rspamd/lualib/nn/VolumetricDropout.lua
-share/rspamd/lualib/nn/VolumetricFractionalMaxPooling.lua
-share/rspamd/lualib/nn/VolumetricFullConvolution.lua
-share/rspamd/lualib/nn/VolumetricMaxPooling.lua
-share/rspamd/lualib/nn/VolumetricMaxUnpooling.lua
-share/rspamd/lualib/nn/VolumetricReplicationPadding.lua
-share/rspamd/lualib/nn/WeightNorm.lua
-share/rspamd/lualib/nn/WeightedEuclidean.lua
-share/rspamd/lualib/nn/WeightedMSECriterion.lua
-share/rspamd/lualib/nn/WhiteNoise.lua
-share/rspamd/lualib/nn/ZeroGrad.lua
-share/rspamd/lualib/nn/ZipTable.lua
-share/rspamd/lualib/nn/ZipTableOneToMany.lua
-share/rspamd/lualib/nn/hessian.lua
-share/rspamd/lualib/nn/init.lua
-share/rspamd/lualib/nn/test.lua
-share/rspamd/lualib/nn/utils.lua
-share/rspamd/lualib/optim/
-share/rspamd/lualib/optim/ConfusionMatrix.lua
-share/rspamd/lualib/optim/Logger.lua
-share/rspamd/lualib/optim/adadelta.lua
-share/rspamd/lualib/optim/adagrad.lua
-share/rspamd/lualib/optim/adam.lua
-share/rspamd/lualib/optim/adamax.lua
-share/rspamd/lualib/optim/asgd.lua
-share/rspamd/lualib/optim/cg.lua
-share/rspamd/lualib/optim/checkgrad.lua
-share/rspamd/lualib/optim/cmaes.lua
-share/rspamd/lualib/optim/de.lua
-share/rspamd/lualib/optim/fista.lua
-share/rspamd/lualib/optim/init.lua
-share/rspamd/lualib/optim/lbfgs.lua
-share/rspamd/lualib/optim/lswolfe.lua
-share/rspamd/lualib/optim/nag.lua
-share/rspamd/lualib/optim/polyinterp.lua
-share/rspamd/lualib/optim/rmsprop.lua
-share/rspamd/lualib/optim/rprop.lua
-share/rspamd/lualib/optim/sgd.lua
-share/rspamd/lualib/paths/
-share/rspamd/lualib/paths/init.lua
-share/rspamd/lualib/torch/
-share/rspamd/lualib/torch/CmdLine.lua
-share/rspamd/lualib/torch/FFInterface.lua
-share/rspamd/lualib/torch/File.lua
-share/rspamd/lualib/torch/Tensor.lua
-share/rspamd/lualib/torch/TestSuite.lua
-share/rspamd/lualib/torch/Tester.lua
-share/rspamd/lualib/torch/init.lua
-share/rspamd/lualib/torch/paths.lua
-share/rspamd/lualib/torch/test.lua
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/rspamd/pkg/PLIST,v
retrieving revision 1.30
diff -u -p -r1.30 PLIST
--- pkg/PLIST 15 May 2019 08:19:13 -0000 1.30
+++ pkg/PLIST 17 Sep 2019 14:36:22 -0000
@@ -1,7 +1,6 @@
@comment $OpenBSD: PLIST,v 1.30 2019/05/15 08:19:13 sthen Exp $
@newgroup _rspamd:756
@newuser _rspamd:756:_rspamd:daemon:Rspamd Account:/nonexistent:/sbin/nologin
-!%%no_luajit%%
@rcscript ${RCDIR}/rspamd
@sample ${SYSCONFDIR}/rspamd/
@bin bin/rspamadm
@@ -10,13 +9,14 @@
bin/rspamd_stats
lib/rspamd/
lib/rspamd/librspamd-actrie.so
+lib/rspamd/librspamd-ev.so
+lib/rspamd/librspamd-kann.so
+lib/rspamd/librspamd-replxx.so
lib/rspamd/librspamd-server.so
@man man/man1/rspamadm.1
@man man/man1/rspamc.1
@man man/man8/rspamd.8
share/examples/rspamd/
-share/examples/rspamd/2tld.inc
-@sample ${SYSCONFDIR}/rspamd/2tld.inc
share/examples/rspamd/actions.conf
@sample ${SYSCONFDIR}/rspamd/actions.conf
share/examples/rspamd/cgp.inc
@@ -78,8 +78,6 @@ share/examples/rspamd/modules.d/hfilter.
@sample ${SYSCONFDIR}/rspamd/modules.d/hfilter.conf
share/examples/rspamd/modules.d/history_redis.conf
@sample ${SYSCONFDIR}/rspamd/modules.d/history_redis.conf
-share/examples/rspamd/modules.d/ip_score.conf
-@sample ${SYSCONFDIR}/rspamd/modules.d/ip_score.conf
share/examples/rspamd/modules.d/maillist.conf
@sample ${SYSCONFDIR}/rspamd/modules.d/maillist.conf
share/examples/rspamd/modules.d/metadata_exporter.conf
@@ -100,6 +98,8 @@ share/examples/rspamd/modules.d/neural.c
@sample ${SYSCONFDIR}/rspamd/modules.d/neural.conf
share/examples/rspamd/modules.d/once_received.conf
@sample ${SYSCONFDIR}/rspamd/modules.d/once_received.conf
+share/examples/rspamd/modules.d/p0f.conf
+@sample ${SYSCONFDIR}/rspamd/modules.d/p0f.conf
share/examples/rspamd/modules.d/phishing.conf
@sample ${SYSCONFDIR}/rspamd/modules.d/phishing.conf
share/examples/rspamd/modules.d/ratelimit.conf
@@ -128,10 +128,6 @@ share/examples/rspamd/modules.d/trie.con
@sample ${SYSCONFDIR}/rspamd/modules.d/trie.conf
share/examples/rspamd/modules.d/url_redirector.conf
@sample ${SYSCONFDIR}/rspamd/modules.d/url_redirector.conf
-share/examples/rspamd/modules.d/url_reputation.conf
-@sample ${SYSCONFDIR}/rspamd/modules.d/url_reputation.conf
-share/examples/rspamd/modules.d/url_tags.conf
-@sample ${SYSCONFDIR}/rspamd/modules.d/url_tags.conf
share/examples/rspamd/modules.d/whitelist.conf
@sample ${SYSCONFDIR}/rspamd/modules.d/whitelist.conf
share/examples/rspamd/options.inc
@@ -242,6 +238,7 @@ share/rspamd/lualib/fun.lua
share/rspamd/lualib/global_functions.lua
share/rspamd/lualib/lpegre.lua
share/rspamd/lualib/lua_auth_results.lua
+share/rspamd/lualib/lua_bayes_learn.lua
share/rspamd/lualib/lua_cfg_transform.lua
share/rspamd/lualib/lua_clickhouse.lua
share/rspamd/lualib/lua_dkim_tools.lua
@@ -252,9 +249,16 @@ share/rspamd/lualib/lua_ffi/init.lua
share/rspamd/lualib/lua_ffi/spf.lua
share/rspamd/lualib/lua_fuzzy.lua
share/rspamd/lualib/lua_ical.lua
+share/rspamd/lualib/lua_lexer.lua
+share/rspamd/lualib/lua_magic/
+share/rspamd/lualib/lua_magic/heuristics.lua
+share/rspamd/lualib/lua_magic/init.lua
+share/rspamd/lualib/lua_magic/patterns.lua
+share/rspamd/lualib/lua_magic/types.lua
share/rspamd/lualib/lua_maps.lua
+share/rspamd/lualib/lua_maps_expressions.lua
share/rspamd/lualib/lua_meta.lua
-share/rspamd/lualib/lua_nn.lua
+share/rspamd/lualib/lua_mime.lua
share/rspamd/lualib/lua_redis.lua
share/rspamd/lualib/lua_scanners/
share/rspamd/lualib/lua_scanners/clamav.lua
@@ -265,12 +269,18 @@ share/rspamd/lualib/lua_scanners/icap.lu
share/rspamd/lualib/lua_scanners/init.lua
share/rspamd/lualib/lua_scanners/kaspersky_av.lua
share/rspamd/lualib/lua_scanners/oletools.lua
+share/rspamd/lualib/lua_scanners/p0f.lua
share/rspamd/lualib/lua_scanners/savapi.lua
share/rspamd/lualib/lua_scanners/sophos.lua
share/rspamd/lualib/lua_scanners/spamassassin.lua
share/rspamd/lualib/lua_scanners/vadesecure.lua
-share/rspamd/lualib/lua_selectors.lua
-share/rspamd/lualib/lua_squeeze_rules.lua
+share/rspamd/lualib/lua_selectors/
+share/rspamd/lualib/lua_selectors/extractors.lua
+share/rspamd/lualib/lua_selectors/init.lua
+share/rspamd/lualib/lua_selectors/maps.lua
+share/rspamd/lualib/lua_selectors/transforms.lua
+share/rspamd/lualib/lua_settings.lua
+share/rspamd/lualib/lua_smtp.lua
share/rspamd/lualib/lua_stat.lua
share/rspamd/lualib/lua_tcp_sync.lua
share/rspamd/lualib/lua_util.lua
@@ -326,6 +336,7 @@ share/rspamd/plugins/multimap.lua
share/rspamd/plugins/mx_check.lua
share/rspamd/plugins/neural.lua
share/rspamd/plugins/once_received.lua
+share/rspamd/plugins/p0f.lua
share/rspamd/plugins/phishing.lua
share/rspamd/plugins/ratelimit.lua
share/rspamd/plugins/rbl.lua
@@ -337,10 +348,9 @@ share/rspamd/plugins/spamassassin.lua
share/rspamd/plugins/spamtrap.lua
share/rspamd/plugins/trie.lua
share/rspamd/plugins/url_redirector.lua
-share/rspamd/plugins/url_reputation.lua
-share/rspamd/plugins/url_tags.lua
share/rspamd/plugins/whitelist.lua
share/rspamd/rules/
+share/rspamd/rules/bitcoin.lua
share/rspamd/rules/forwarding.lua
share/rspamd/rules/headers_checks.lua
share/rspamd/rules/html.lua
@@ -352,7 +362,6 @@ share/rspamd/rules/regexp/compromised_ho
share/rspamd/rules/regexp/headers.lua
share/rspamd/rules/regexp/misc.lua
share/rspamd/rules/regexp/upstream_spam_filters.lua
-share/rspamd/rules/rspamd.classifiers.lua
share/rspamd/rules/rspamd.lua
share/rspamd/rules/subject_checks.lua
share/rspamd/www/
@@ -387,10 +396,9 @@ share/rspamd/www/js/lib/bootstrap.min.js
share/rspamd/www/js/lib/d3.min.js
share/rspamd/www/js/lib/d3evolution.min.js
share/rspamd/www/js/lib/d3pie.min.js
-share/rspamd/www/js/lib/domReady.js
share/rspamd/www/js/lib/footable.min.js
share/rspamd/www/js/lib/humanize.min.js
-share/rspamd/www/js/lib/jquery-3.3.1.min.js
+share/rspamd/www/js/lib/jquery-3.4.1.min.js
share/rspamd/www/js/lib/jquery.stickytabs.min.js
share/rspamd/www/js/lib/nprogress.min.js
share/rspamd/www/js/lib/require.min.js
