Re: preview, rspamd update

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
-