From 50b0857a6a81f819e80cb3f8ea935877d05b40a2f1f4d2c8dea12010a9c480b2 Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Fri, 19 Oct 2018 18:29:48 +0000
Subject: [PATCH] - update to 1.8.1

OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=25
---
 rspamd.changes | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++
 rspamd.spec    |  8 ++++----
 2 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/rspamd.changes b/rspamd.changes
index c721a08..32592a0 100644
--- a/rspamd.changes
+++ b/rspamd.changes
@@ -1,3 +1,54 @@
+-------------------------------------------------------------------
+Fri Oct 19 18:20:09 UTC 2018 - Marcus Rueckert <mrueckert@suse.de>
+
+- update to 1.8.1
+  - [CritFix] Fix options insertion
+  - [CritFix] Fix words decay one more time (affects long messages)
+  - [CritFix] Increase default words_decay
+  - [CritFix] Plug memory leak in redis pool
+  - [Feature] Add `check_violation` feature to DKIM/ARC signing
+  - [Feature] Add only unique elements to Clickhouse url arrays
+  - [Feature] Allow `g+:` and `g-:` composite atoms
+  - [Feature] Allow dkim domains check in surbl
+  - [Feature] Allow maps with HTTP auth
+  - [Feature] Allow to disable actions by users settings
+  - [Feature] Extend whitelisting options
+  - [Feature] Store url object in images
+  - [Feature] Use verdict instead of the plain action in plugins
+  - [Fix] Allow to call fstring append with NULL string
+  - [Fix] DCC - luacheck
+  - [Fix] Do not load torch on each rspamadm invocation
+  - [Fix] Fix boundaries detection and rework stop words algorithm
+  - [Fix] Fix dependencies for DNS_SIGNED symbol
+  - [Fix] Fix errors when dealing with dynamic rates/bursts in
+    Ratelimit
+  - [Fix] Fix groups mess
+  - [Fix] Fix groups mess
+  - [Fix] Fix parsing address with comments
+  - [Fix] Fix resolving in DMARC reports
+  - [Fix] Fix various issues with parsing of the received headers
+  - [Fix] Fix watchers issue in lua_tcp when doing no resolving
+  - [Fix] Plug memory leak in language detector (affects reloads)
+  - [Fix] Remove one letter stop words
+  - [Fix] Slashing: backport chunk logic from libucl
+  - [Fix] Stop libevent from using cached time in rspamadm
+  - [Fix] Try to fix watchers chaining
+  - [Fix] Various fixes in redis sync interface
+  - [Fix] ip_score - respect check_authed and check_local settings
+    from config
+  - [Project] Rework passthrough actions
+  - [Project] Clustering module
+  - [Rework] Always create result for a task
+  - [Rework] Completely rewrite DMARC checks logic
+  - [Rework] Rework and fix whitelist plugin
+  - [WebUI] Add symbols sorting buttons
+  - [WebUI] Change symbols order without updating history
+  - [WebUI] Colorize symbols
+  - [WebUI] Do not display password form when secure_ip is set
+  - [WebUI] Fix symbol description tooltips display
+  - [WebUI] History: add sorting by symbol score value
+- drop 5093631ddd4d3389cddaaa95865dc4a23143a10f.patch
+
 -------------------------------------------------------------------
 Mon Oct  1 14:48:13 UTC 2018 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/rspamd.spec b/rspamd.spec
index 40f9a6b..76745c6 100644
--- a/rspamd.spec
+++ b/rspamd.spec
@@ -79,7 +79,7 @@
 %global _wwwdir /srv/www/webapps
 
 Name:           rspamd
-Version:        1.8.0
+Version:        1.8.1
 Release:        0
 License:        Apache-2.0
 Summary:        Spam filtering system
@@ -87,7 +87,6 @@ Url:            https://rspamd.com/
 Group:          Productivity/Networking/Email/Utilities
 Source0:        https://github.com/vstakhov/rspamd/archive/%{version}/%{name}-%{version}.tar.gz
 Patch0:         rspamd-conf.patch
-Patch1:         5093631ddd4d3389cddaaa95865dc4a23143a10f.patch
 
 BuildRequires:  cmake
 BuildRequires:  curl-devel
@@ -176,9 +175,8 @@ This package holds the client tools (rspamc and rspamadm)
 %endif
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %cmake                                      \
@@ -383,6 +381,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d
 %config(noreplace) %{_sysconfdir}/rspamd/scores.d/statistics_group.conf
 %config(noreplace) %{_sysconfdir}/rspamd/scores.d/subject_group.conf
 %config(noreplace) %{_sysconfdir}/rspamd/scores.d/surbl_group.conf
+%config(noreplace) %{_sysconfdir}/rspamd/scores.d/whitelist_group.conf
 
 %dir %{_sysconfdir}/rspamd/modules.d
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/antivirus.conf
@@ -453,6 +452,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d
 %{_datadir}/rspamd/lua/asn.lua
 %{_datadir}/rspamd/lua/bayes_expiry.lua
 %{_datadir}/rspamd/lua/clickhouse.lua
+%{_datadir}/rspamd/lua/clustering.lua
 %{_datadir}/rspamd/lua/dcc.lua
 %{_datadir}/rspamd/lua/dkim_signing.lua
 %{_datadir}/rspamd/lua/dmarc.lua