Accepting request 838944 from home:bmwiedemann:branches:server:mail

ToDo: check if the moonjit patch was really not needed ToDo: test - update to 2.6 * https://rspamd.com/announce/2020/09/30/rspamd-2.6.html * Rework neural network plugin * Rework bitcoin detection library * Fix IDNA bugs * Send more fuzzy module telemetry data to rspamd servers * Drop upstream rspamd-gcc10-buildfix.patch * Drop rspamd-moonjit.patch OBS-URL: https://build.opensuse.org/request/show/838944 OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=45
2020-10-01 10:03:58 +00:00 · 2020-10-01 10:03:58 +00:00 · bd9a6e295b
commit bd9a6e295b
parent e2db76a976
6 changed files with 23 additions and 91 deletions
--- a/rspamd-2.5.tar.gz
+++ b/rspamd-2.5.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef66073079cf02bda8f31e861ff3a34467a957d6c3958c118e142915ef960038
-size 4490310
--- a/rspamd-2.6.tar.gz
+++ b/rspamd-2.6.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:002aee47dc4d6f8c6c0572b58ccb0cbcbb9bb7689442c33a5a5cf893e72506db
+size 5079444
--- a/rspamd-gcc10-buildfix.patch
+++ b/rspamd-gcc10-buildfix.patch
@ -1,23 +0,0 @@
-commit 06c6c939ae59516a720f0cfc5a29e214b6569476
-Author: Heiko Becker <heirecka@exherbo.org>
-Date:   Sat Apr 4 00:15:28 2020 +0200
-
-    [Minor] Cherry-pick a fix for replxx to build with gcc10
-    
-    723d9c84869511dfb5e63f5c3d3372ac38114713 in replxx's git.
-    
-    Building rspamd with gcc10 errors out with "'runtime_error' is not a
-    member of 'std'" otherwise.
-
-diff --git a/contrib/replxx/src/io.cxx b/contrib/replxx/src/io.cxx
-index a09886701..8df176d1c 100644
--- a/contrib/replxx/src/io.cxx
-+++ b/contrib/replxx/src/io.cxx
-@@ -3,6 +3,7 @@
- #include <cstdlib>
- #include <cstring>
- #include <array>
-+#include <stdexcept>
- 
- #ifdef _WIN32
- 
--- a/rspamd-moonjit.patch
+++ b/rspamd-moonjit.patch
@ -1,40 +0,0 @@
-Index: b/cmake/FindLua.cmake
-===================================================================
--- a/cmake/FindLua.cmake
-+++ b/cmake/FindLua.cmake
-@@ -16,6 +16,7 @@ MACRO(FindLua)
-                 "${RSPAMD_SEARCH_PATH}" "${LUA_ROOT}"
-                 $ENV{LUA_DIR}
-                 PATH_SUFFIXES "include/luajit-2.0"
-+		"include/moonjit-2.2"
-                 "include/luajit-2.1"
-                 "include/luajit${LUA_VERSION_MAJOR}${LUA_VERSION_MINOR}"
-                 "include/luajit${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}"
-@@ -111,4 +112,4 @@ MACRO(FindLua)
-             MESSAGE(STATUS "Found lua ${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR} in lib:${LUA_LIBRARY}, headers:${LUA_INCLUDE_DIR}")
-         ENDIF(ENABLE_LUAJIT MATCHES "ON")
-     ENDIF(LUA_LIBRARY AND LUA_INCLUDE_DIR)
-ENDMACRO()
-\ No newline at end of file
-+ENDMACRO()
-Index: b/src/lua/lua_common.h
-===================================================================
--- a/src/lua/lua_common.h
-+++ b/src/lua/lua_common.h
-@@ -41,11 +41,16 @@ luaL_register (lua_State *L, const gchar
- #endif
- 
- #if defined(LUA_VERSION_NUM) && LUA_VERSION_NUM == 501
-+#if 0
-+/* FIXME: need to check for LUAJIT_VERSION_NUM for moonjit
-+          but cannot just include luajit.h unconditionally here 
-+*/
- static inline int lua_absindex (lua_State *L, int i) {
- 	if (i < 0 && i > LUA_REGISTRYINDEX)
- 		i += lua_gettop(L) + 1;
- 	return i;
- }
-+#endif
- static inline int lua_rawgetp (lua_State *L, int i, const void *p) {
- 	int abs_i = lua_absindex(L, i);
- 	lua_pushlightuserdata(L, (void*)p);
--- a/rspamd.changes
+++ b/rspamd.changes
@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Oct  1 09:39:29 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- update to 2.6
+  * https://rspamd.com/announce/2020/09/30/rspamd-2.6.html
+  * Rework neural network plugin
+  * Rework bitcoin detection library
+  * Fix IDNA bugs
+  * Send more fuzzy module telemetry data to rspamd servers
+  * Drop upstream rspamd-gcc10-buildfix.patch
+  * Drop rspamd-moonjit.patch
+
 -------------------------------------------------------------------
 Wed Aug 12 03:34:28 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com>

--- a/rspamd.spec
+++ b/rspamd.spec
@ -60,7 +60,7 @@
 %endif

 Name:           rspamd
-Version:        2.5
+Version:        2.6
 Release:        0
 License:        Apache-2.0
 Summary:        Spam filtering system
@ -69,9 +69,6 @@ Group:          Productivity/Networking/Email/Utilities
 Source0:        https://github.com/rspamd/rspamd/archive/%{version}/%{name}-%{version}.tar.gz
 Patch0:         rspamd-conf.patch
 Patch1:         rspamd-after-redis-target.patch
-Patch2:         rspamd-moonjit.patch
-# PATCH-FIX-UPSTREAM
-Patch3:         rspamd-gcc10-buildfix.patch
 BuildRequires:  cmake
 BuildRequires:  curl-devel
 BuildRequires:  db-devel
@ -161,10 +158,6 @@ This package holds the client tools (rspamc and rspamadm)
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%if %{with moonjit}
-%patch2 -p1
-%endif
-%patch3 -p1

 %build
 %if 0%{?force_gcc_version}
@ -506,6 +499,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/override.d
 %{_datadir}/rspamd/lualib/lua_ffi/common.lua
 %{_datadir}/rspamd/lualib/lua_ffi/dkim.lua
 %{_datadir}/rspamd/lualib/lua_ffi/init.lua
+%{_datadir}/rspamd/lualib/lua_ffi/linalg.lua
 %{_datadir}/rspamd/lualib/lua_ffi/spf.lua

 %dir %{_datadir}/rspamd/lualib/lua_magic
@ -534,6 +528,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/override.d
 %{_datadir}/rspamd/lualib/lua_scanners/virustotal.lua

 %dir %{_datadir}/rspamd/lualib/lua_selectors
+%{_datadir}/rspamd/lualib/lua_selectors/common.lua
 %{_datadir}/rspamd/lualib/lua_selectors/extractors.lua
 %{_datadir}/rspamd/lualib/lua_selectors/init.lua
 %{_datadir}/rspamd/lualib/lua_selectors/maps.lua
@ -558,6 +553,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/override.d

 %dir %{_datadir}/rspamd/rules
 %{_datadir}/rspamd/rules/bitcoin.lua
+%{_datadir}/rspamd/rules/bounce.lua
 %{_datadir}/rspamd/rules/content.lua
 %{_datadir}/rspamd/rules/forwarding.lua
 %{_datadir}/rspamd/rules/headers_checks.lua
@ -573,6 +569,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/override.d
 %{_datadir}/rspamd/rules/regexp/headers.lua
 %{_datadir}/rspamd/rules/regexp/misc.lua
 %{_datadir}/rspamd/rules/regexp/upstream_spam_filters.lua
+%{_datadir}/rspamd/rules/controller

 %{_mandir}/man8/rspamd.8*

@ -593,12 +590,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/override.d
 %{_wwwdir}/%{name}/mstile-150x150.png
 %{_wwwdir}/%{name}/safari-pinned-tab.svg

-%dir %{_wwwdir}/%{name}/css
-%{_wwwdir}/%{name}/css/bootstrap.min.css
-%{_wwwdir}/%{name}/css/d3evolution.css
-%{_wwwdir}/%{name}/css/footable.bootstrap.min.css
-%{_wwwdir}/%{name}/css/nprogress.css
-%{_wwwdir}/%{name}/css/rspamd.css
+%{_wwwdir}/%{name}/css

 %dir %{_wwwdir}/%{name}/fonts
 %{_wwwdir}/%{name}/fonts/glyphicons-halflings-regular.ttf
@ -618,21 +610,12 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/override.d
 %{_wwwdir}/%{name}/js/app/graph.js
 %{_wwwdir}/%{name}/js/app/history.js
 %{_wwwdir}/%{name}/js/app/rspamd.js
+%{_wwwdir}/%{name}/js/app/selectors.js
 %{_wwwdir}/%{name}/js/app/stats.js
 %{_wwwdir}/%{name}/js/app/symbols.js
 %{_wwwdir}/%{name}/js/app/upload.js

-%dir %{_wwwdir}/%{name}/js/lib
-%{_wwwdir}/%{name}/js/lib/bootstrap.min.js
-%{_wwwdir}/%{name}/js/lib/d3.min.js
-%{_wwwdir}/%{name}/js/lib/d3evolution.min.js
-%{_wwwdir}/%{name}/js/lib/d3pie.min.js
-%{_wwwdir}/%{name}/js/lib/footable.min.js
-%{_wwwdir}/%{name}/js/lib/jquery-3.4.1.min.js
-%{_wwwdir}/%{name}/js/lib/jquery.stickytabs.min.js
-%{_wwwdir}/%{name}/js/lib/nprogress.min.js
-%{_wwwdir}/%{name}/js/lib/require.min.js
-%{_wwwdir}/%{name}/js/lib/visibility.min.js
+%{_wwwdir}/%{name}/js/lib

 %if 0%{?with split_out_client}
 %files client