On Sat, Sep 03, 2016 at 06:22:00PM +0200, Giovanni Bechis wrote:
> On Fri, Sep 02, 2016 at 06:45:49PM +0100, Edd Barrett wrote:
> > Hi,
> >
> > Here's an update to rspamd.
> >
> > I have not tested this any further than running the test suite, so use
> > at your own risk ;)
> >
> updated diff with TEST_DEPENDS fixed and @sample lines added.
> software and web ui still works.
> ok giovanni@
>
with patch this time.
Giovanni
> To be able to use it with postfix another software is needed:
> https://rspamd.com/rmilter/
> any volunteer ?
>
Index: Makefile
===================================================================
RCS file: /var/cvs/ports/mail/rspamd/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile 25 Jun 2016 12:33:46 -0000 1.19
+++ Makefile 3 Sep 2016 15:55:29 -0000
@@ -3,7 +3,7 @@
BROKEN-macppc= error: unknown register name 'edx' in 'asm'
COMMENT= event-driven spam filtering system in C/Lua
-DISTNAME= rspamd-1.2.8
+DISTNAME = rspamd-1.3.5
EXTRACT_SUFX= .tar.xz
CATEGORIES= mail
@@ -25,6 +25,13 @@ LIB_DEPENDS= devel/libmagic \
devel/pcre \
lang/luajit \
mail/gmime
+BUILD_DEPENDS +=devel/ragel
+# /var/rspamd needs to exist for tests to run
+TEST_DEPENDS = ${FULLPKGNAME}:${FULLPKGPATH}
+TEST_DEPENDS += databases/redis \
+ sysutils/py-psutil \
+ textproc/py-demjson \
+ devel/py-robotframework
CONFIGURE_ARGS+=-DOPENBSD_BUILD=1 \
-DCONFDIR="${SYSCONFDIR}/rspamd" \
@@ -35,11 +42,19 @@ CONFIGURE_ARGS+=-DOPENBSD_BUILD=1 \
-DRSPAMD_USER="_rspamd" \
-DRSPAMD_GROUP="_rspamd"
-# XXX Known problems:
-# - tests currently need clang as an assembler due to use of AVX.
-# - if aio test is run after dns test, it hangs:
-# ${WRKBUILD}/test/rspamd-test -p /rspamd/aio -p /rspamd/dns
-TEST_TARGET= run-test
+# 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.
+#
+# In the event of failing tests, look at log.html in ${WRKSRC}
+do-test:
+ cd ${WRKSRC} && \
+ env RSPAMADM=${WRKBUILD}/src/rspamadm/rspamadm \
+ RSPAMC=${WRKBUILD}/src/client/rspamc \
+ RSPAMD=/usr/local/bin/rspamd \
+ ${LOCALBASE}/bin/robot \
+ test/functional/cases
pre-configure:
${SUBST_CMD} ${WRKSRC}/interface/README.md
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/mail/rspamd/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 25 Jun 2016 12:33:46 -0000 1.11
+++ distinfo 3 Sep 2016 15:26:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (rspamd-1.2.8.tar.xz) = SFQ42MOK2hpulcnqEpjSyJnU7GGPHdX1OWY1IsUG6ys=
-SIZE (rspamd-1.2.8.tar.xz) = 1423888
+SHA256 (rspamd-1.3.5.tar.xz) = 1EE8z8I4wwI+K4qUQbEBpkN/Uh8zP8nbLdkk1HP+5pY=
+SIZE (rspamd-1.3.5.tar.xz) = 1483044
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /var/cvs/ports/mail/rspamd/patches/patch-CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -r1.6 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 27 May 2016 09:18:14 -0000 1.6
+++ patches/patch-CMakeLists_txt 3 Sep 2016 15:26:24 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-CMakeLists_txt,v 1.6 201
don't pick up libevent2 from ports, otherwise rspamd links against
both libevent from base *and* libevent2
---- CMakeLists.txt.orig Fri Apr 22 09:37:43 2016
-+++ CMakeLists.txt Tue Apr 26 01:06:31 2016
-@@ -509,14 +509,14 @@ SET(POE_LOOP "Loop::IO_Poll")
+--- CMakeLists.txt.orig Tue Aug 23 13:19:29 2016
++++ CMakeLists.txt Tue Aug 30 18:07:13 2016
+@@ -520,14 +520,14 @@ SET(POE_LOOP "Loop::IO_Poll")
SET(TAR "tar")
# Platform specific configuration
@@ -22,7 +22,7 @@ both libevent from base *and* libevent2
# Find util library
ProcessPackage(LIBUTIL LIBRARY util INCLUDE libutil.h
ROOT ${LIBUTIL_ROOT_DIR} OPTIONAL)
-@@ -529,8 +529,14 @@ IF(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly")
+@@ -540,8 +540,14 @@ IF(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$|DragonFly")
ENDIF()
SET(POE_LOOP "Loop::Kqueue")
SET(TAR "gtar")
@@ -38,7 +38,7 @@ both libevent from base *and* libevent2
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")
-@@ -662,7 +668,7 @@ ENDIF()
+@@ -668,7 +674,7 @@ ENDIF()
ProcessPackage(GMIME LIBRARY gmime-2.6 gmime-2.4 gmime-2.2 gmime-2 INCLUDE
gmime.h INCLUDE_SUFFIXES include/gmime
ROOT ${GMIME_ROOT_DIR} MODULES gmime-2.6 gmime-2.4 gmime-2.0)
ProcessPackage(LIBEVENT LIBRARY event INCLUDE event.h INCLUDE_SUFFIXES
include/event
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: /var/cvs/ports/mail/rspamd/patches/patch-src_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_CMakeLists_txt
--- patches/patch-src_CMakeLists_txt 27 May 2016 09:18:14 -0000 1.3
+++ patches/patch-src_CMakeLists_txt 3 Sep 2016 15:26:24 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.3 2016/05/27 09:18:14 sthen Exp $
---- src/CMakeLists.txt.orig Mon Apr 4 12:34:33 2016
-+++ src/CMakeLists.txt Wed Apr 13 21:48:16 2016
-@@ -117,9 +117,9 @@ ENDIF()
+--- src/CMakeLists.txt.orig Sat Jul 23 17:14:45 2016
++++ src/CMakeLists.txt Tue Aug 30 18:07:13 2016
+@@ -149,9 +149,9 @@ ADD_DEPENDENCIES(rspamd-server rspamd_lua_preprocess)
ADD_EXECUTABLE(rspamd ${RSPAMDSRC} ${CMAKE_CURRENT_BINARY_DIR}/workers.c)
SET_TARGET_PROPERTIES(rspamd PROPERTIES LINKER_LANGUAGE C)
SET_TARGET_PROPERTIES(rspamd PROPERTIES COMPILE_FLAGS "-DRSPAMD_MAIN")
Index: patches/patch-src_rspamadm_CMakeLists_txt
===================================================================
RCS file: /var/cvs/ports/mail/rspamd/patches/patch-src_rspamadm_CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_rspamadm_CMakeLists_txt
--- patches/patch-src_rspamadm_CMakeLists_txt 27 May 2016 09:18:14 -0000
1.5
+++ patches/patch-src_rspamadm_CMakeLists_txt 3 Sep 2016 15:26:24 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-src_rspamadm_CMakeLists_txt,v 1.5 2016/05/27 09:18:14 sthen
Exp $
---- src/rspamadm/CMakeLists.txt.orig Mon Apr 4 12:37:40 2016
-+++ src/rspamadm/CMakeLists.txt Wed Apr 13 21:48:16 2016
-@@ -44,9 +44,9 @@ IF(ENABLE_HIREDIS MATCHES "ON")
- ENDIF()
- TARGET_LINK_LIBRARIES(rspamadm rspamd-actrie)
+--- src/rspamadm/CMakeLists.txt.orig Fri Jul 22 10:18:48 2016
++++ src/rspamadm/CMakeLists.txt Tue Aug 30 18:07:13 2016
+@@ -39,9 +39,9 @@ TARGET_LINK_LIBRARIES(rspamadm rspamd-server)
+ TARGET_LINK_LIBRARIES(rspamadm ${RSPAMD_REQUIRED_LIBRARIES})
+ TARGET_LINK_LIBRARIES(rspamadm rspamd-linenoise)
-IF (NOT DEBIAN_BUILD)
+IF (NOT DEBIAN_BUILD AND NOT OPENBSD_BUILD)
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/mail/rspamd/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 27 May 2016 09:18:14 -0000 1.6
+++ pkg/PLIST 3 Sep 2016 15:27:32 -0000
@@ -4,6 +4,7 @@
@bin bin/rspamadm
@bin bin/rspamc
@bin bin/rspamd
+bin/rspamd_stats
lib/rspamd/
lib/rspamd/librspamd-actrie.so
@man man/man1/rspamadm.1
@@ -71,6 +72,8 @@ share/examples/rspamd/modules.d/whitelis
@sample ${SYSCONFDIR}/rspamd/modules.d/whitelist.conf
share/examples/rspamd/options.inc
@sample ${SYSCONFDIR}/rspamd/options.inc
+share/examples/rspamd/redirectors.inc
+@sample ${SYSCONFDIR}/rspamd/redirections.inc
share/examples/rspamd/rspamd.conf
@sample ${SYSCONFDIR}/rspamd/rspamd.conf
@comment share/examples/rspamd/rspamd.systemd.conf
@@ -83,17 +86,21 @@ share/examples/rspamd/surbl-whitelist.in
@sample ${SYSCONFDIR}/rspamd/surbl-whitelist.inc
share/examples/rspamd/worker-controller.inc
@sample ${SYSCONFDIR}/rspamd/worker-controller.inc
+share/examples/rspamd/worker-fuzzy.inc
+@sample ${SYSCONFDIR}/rspamd/worker-fuzzy.inc
share/examples/rspamd/worker-normal.inc
@sample ${SYSCONFDIR}/rspamd/worker-normal.inc
share/rspamd/
share/rspamd/effective_tld_names.dat
share/rspamd/lua/
+share/rspamd/lua/asn.lua
share/rspamd/lua/dcc.lua
share/rspamd/lua/dmarc.lua
share/rspamd/lua/emails.lua
share/rspamd/lua/fann_scores.lua
share/rspamd/lua/forged_recipients.lua
share/rspamd/lua/fun.lua
+share/rspamd/lua/greylist.lua
share/rspamd/lua/hfilter.lua
share/rspamd/lua/ip_score.lua
share/rspamd/lua/maillist.lua
@@ -103,12 +110,14 @@ share/rspamd/lua/once_received.lua
share/rspamd/lua/phishing.lua
share/rspamd/lua/ratelimit.lua
share/rspamd/lua/rbl.lua
+share/rspamd/lua/replies.lua
share/rspamd/lua/rspamd_update.lua
share/rspamd/lua/settings.lua
share/rspamd/lua/spamassassin.lua
share/rspamd/lua/trie.lua
share/rspamd/lua/whitelist.lua
share/rspamd/rules/
+share/rspamd/rules/forwarding.lua
share/rspamd/rules/html.lua
share/rspamd/rules/http_headers.lua
share/rspamd/rules/misc.lua
@@ -117,11 +126,13 @@ share/rspamd/rules/regexp/drugs.lua
share/rspamd/rules/regexp/fraud.lua
share/rspamd/rules/regexp/headers.lua
share/rspamd/rules/regexp/lotto.lua
+share/rspamd/rules/regexp/upstream_spam_filters.lua
share/rspamd/rules/rspamd.classifiers.lua
share/rspamd/rules/rspamd.lua
share/rspamd/www/
share/rspamd/www/README.md
share/rspamd/www/css/
+share/rspamd/www/css/d3evolution.css
share/rspamd/www/css/datatables.min.css
share/rspamd/www/css/glyphicons-halflings-regular.woff
share/rspamd/www/css/glyphicons-halflings-regular.woff2
@@ -134,8 +145,10 @@ share/rspamd/www/img/spinner.gif
share/rspamd/www/img/spinner.png
share/rspamd/www/index.html
share/rspamd/www/js/
+share/rspamd/www/js/d3evolution.min.js
share/rspamd/www/js/d3pie.min.js
share/rspamd/www/js/datatables.min.js
+share/rspamd/www/js/humanize.min.js
share/rspamd/www/js/rspamd.js
share/rspamd/www/plugins.txt
share/rspamd/www/react-index.html
