diff --git a/66ffcdfa880daeb3b50c7ef3bcb5511abb6d92f6.patch b/66ffcdfa880daeb3b50c7ef3bcb5511abb6d92f6.patch deleted file mode 100644 index ad07976..0000000 --- a/66ffcdfa880daeb3b50c7ef3bcb5511abb6d92f6.patch +++ /dev/null @@ -1,72 +0,0 @@ ---- a/src/lua/lua_task.c -+++ b/src/lua/lua_task.c -@@ -1244,6 +1244,16 @@ lua_task_unmap_dtor (gpointer p) - } - } - -+static void -+lua_task_free_dtor (gpointer p) -+{ -+ struct rspamd_task *task = (struct rspamd_task *)p; -+ -+ if (task->msg.begin) { -+ g_free ((gpointer)task->msg.begin); -+ } -+} -+ - static gint - lua_task_load_from_file (lua_State * L) - { -@@ -1306,10 +1316,11 @@ static gint - lua_task_load_from_string (lua_State * L) - { - struct rspamd_task *task = NULL, **ptask; -- const gchar *str_message = luaL_checkstring (L, 1), *err = NULL; -- gsize message_len = lua_strlen (L, 1); -+ const gchar *str_message; -+ gsize message_len; - struct rspamd_config *cfg = NULL; -- gboolean res = FALSE; -+ -+ str_message = luaL_checklstring (L, 1, &message_len); - - if (str_message) { - -@@ -1323,31 +1334,19 @@ lua_task_load_from_string (lua_State * L) - } - - task = rspamd_task_new (NULL, cfg, NULL, NULL); -- task->msg.begin = str_message; -+ task->msg.begin = g_strdup (str_message); - task->msg.len = message_len; -- rspamd_mempool_add_destructor (task->task_pool, -- lua_task_unmap_dtor, task); -- res = TRUE; -+ rspamd_mempool_add_destructor (task->task_pool, lua_task_free_dtor, task); - } - else { - return luaL_error (L, "invalid arguments"); - } - -- lua_pushboolean (L, res); -+ lua_pushboolean (L, true); - -- if (res) { -- ptask = lua_newuserdata (L, sizeof (*ptask)); -- *ptask = task; -- rspamd_lua_setclass (L, "rspamd{task}", -1); -- } -- else { -- if (err) { -- lua_pushstring (L, err); -- } -- else { -- lua_pushnil (L); -- } -- } -+ ptask = lua_newuserdata (L, sizeof (*ptask)); -+ *ptask = task; -+ rspamd_lua_setclass (L, "rspamd{task}", -1); - - return 2; - } diff --git a/rspamd-1.7.9.tar.gz b/rspamd-1.7.9.tar.gz deleted file mode 100644 index 81549b6..0000000 --- a/rspamd-1.7.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:03ef95df43709f1a48542e182ca3885c5fe5258d704fb1ac9fd9856fb2ec1846 -size 4700782 diff --git a/rspamd-1.8.0.tar.gz b/rspamd-1.8.0.tar.gz new file mode 100644 index 0000000..6cdab08 --- /dev/null +++ b/rspamd-1.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ced34abe666dba2cf36decbcfb554284016d71fd196852d4ca380cbdf7d06d3 +size 4242518 diff --git a/rspamd.changes b/rspamd.changes index 9098191..17b5c2d 100644 --- a/rspamd.changes +++ b/rspamd.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Mon Sep 24 22:39:44 UTC 2018 - Marcus Rueckert + +- update to 1.8.0 + The most important features and fixes + - New selectors framework + This framework allows to combine and process different data + extracted from messages and use that in different plugins, such + as multimap, reputation or ratelimits. It is also possible to + use data extracted in Rspamd regular expressions. + - Coroutines API support in Lua + Now you can write code in a usual imperative manner but you + still will not block any other tasks. Each potentially blocking + operation creates a yielding-point. In turn, this means the + code is suspended until the operation is done (just like + blocking) and resumes only when there is some result. + Meanwhile, other tasks are processed as usual. + - Clickhouse optimization + Rspamd now uses a flat table to optimize ClickHouse SQL + requests. In fact, joins are not recommended by the ClickHouse + developers as multiple joins have proven to be slow. Hence, + Rspamd has moved all data to a single table. Schema migration + is done automatically, however, please read the migration notes + in case of any doubts. Old data is not migrated nor deleted + automatically. + There is now optional data retention support in the ClickHouse + module. You can set retention policies for the data stored in + Clickhouse to conform different regulations (e.g. GDPR). + - Unicode processing improvements + Rspamd now normalizes all unicode data using NFKC schema prior + to processing. This helps to prevent “glyph” attacks used by + some spammers nowadays. Unicode conversion has also been + improved to continue on bad symbols instead of giving up and + working with raw data. + - Language detection improvements + We have reworked the language detector to use stop-words and + rely on unicode glyphs more extensively. As the result of this + work, the speed of language detection has been increased + significantly (by 10 times in some cases). The preciseness of + the detection has also been improved. + - Fixed various bugs in sesssions handling + We have located and fixed various hidden issues caused by async + rules chaining. It might cause inconsistencies in the + dependencies processing, crashes in rare cases and other “bad + things”. + - Various Web Interface improvements and fixes + There are multiple improvements and fixes in the Web Interface. + In particular, the issues with cluster support and aggregation + have been addressed. + + For all the fixes see + https://rspamd.com/announce/2018/09/24/rspamd-1.8.0.html +- drop patch 66ffcdfa880daeb3b50c7ef3bcb5511abb6d92f6.patch + included in update + ------------------------------------------------------------------- Thu Aug 30 14:06:44 UTC 2018 - Marcus Rueckert diff --git a/rspamd.spec b/rspamd.spec index 5684d8e..95b7c89 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -79,15 +79,14 @@ %global _wwwdir /srv/www/webapps Name: rspamd -Version: 1.7.9 +Version: 1.8.0 Release: 0 License: Apache-2.0 Summary: Spam filtering system Url: https://rspamd.com/ Group: Productivity/Networking/Email/Utilities Source0: https://github.com/vstakhov/rspamd/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: 66ffcdfa880daeb3b50c7ef3bcb5511abb6d92f6.patch -Patch1: rspamd-conf.patch +Patch0: rspamd-conf.patch BuildRequires: cmake BuildRequires: curl-devel @@ -176,9 +175,8 @@ This package holds the client tools (rspamc and rspamadm) %endif %prep -%setup -q +%setup -q -n %{name} %patch0 -p1 -%patch1 -p1 %build %cmake \ @@ -357,6 +355,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d %config %{_sysconfdir}/rspamd/options.inc %config %{_sysconfdir}/rspamd/redirectors.inc %config %{_sysconfdir}/rspamd/rspamd.conf +%config %{_sysconfdir}/rspamd/settings.conf %config %{_sysconfdir}/rspamd/spf_dkim_whitelist.inc %config %{_sysconfdir}/rspamd/statistic.conf %config %{_sysconfdir}/rspamd/surbl-whitelist.inc @@ -498,16 +497,20 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d %{_datadir}/rspamd/lib/global_functions.lua %{_datadir}/rspamd/lib/lua_auth_results.lua %{_datadir}/rspamd/lib/lua_cfg_transform.lua +%{_datadir}/rspamd/lib/lua_clickhouse.lua %{_datadir}/rspamd/lib/lua_dkim_tools.lua %{_datadir}/rspamd/lib/lua_maps.lua %{_datadir}/rspamd/lib/lua_meta.lua %{_datadir}/rspamd/lib/lua_nn.lua %{_datadir}/rspamd/lib/lua_redis.lua +%{_datadir}/rspamd/lib/lua_selectors.lua %{_datadir}/rspamd/lib/lua_stat.lua %{_datadir}/rspamd/lib/lua_squeeze_rules.lua +%{_datadir}/rspamd/lib/lua_tcp_sync.lua %{_datadir}/rspamd/lib/lua_util.lua %{_datadir}/rspamd/lib/plugins_stats.lua %{_datadir}/rspamd/lib/rescore_utility.lua +%{_datadir}/rspamd/lib/tableshape.lua %if %{with torch} %{_datadir}/rspamd/lib/moses.lua @@ -823,6 +826,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d %{_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 %dir %{_wwwdir}/%{name}/fonts @@ -856,6 +860,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d %{_wwwdir}/%{name}/js/lib/footable.min.js %{_wwwdir}/%{name}/js/lib/humanize.min.js %{_wwwdir}/%{name}/js/lib/jquery-3.3.1.min.js +%{_wwwdir}/%{name}/js/lib/nprogress.min.js %{_wwwdir}/%{name}/js/lib/require.min.js %{_wwwdir}/%{name}/js/lib/visibility.min.js