From f02c2d2be22122afab672eca271108b1c5649604bd138993a9a34ebcd0210b79 Mon Sep 17 00:00:00 2001
From: Marcus Rueckert <mrueckert@suse.com>
Date: Mon, 19 Nov 2018 13:29:54 +0000
Subject: [PATCH] - update to 1.8.2

OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=28
---
 rspamd-1.8.1.tar.gz |  3 ---
 rspamd-1.8.2.tar.gz |  3 +++
 rspamd.changes      | 60 +++++++++++++++++++++++++++++++++++++++++++++
 rspamd.spec         |  8 +++---
 4 files changed, 68 insertions(+), 6 deletions(-)
 delete mode 100644 rspamd-1.8.1.tar.gz
 create mode 100644 rspamd-1.8.2.tar.gz

diff --git a/rspamd-1.8.1.tar.gz b/rspamd-1.8.1.tar.gz
deleted file mode 100644
index f2970dd..0000000
--- a/rspamd-1.8.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd25dab6fbd2b20b3bf0c871b133d08a5107696e012c798c6e93cd9e53537555
-size 4286637
diff --git a/rspamd-1.8.2.tar.gz b/rspamd-1.8.2.tar.gz
new file mode 100644
index 0000000..91e38ef
--- /dev/null
+++ b/rspamd-1.8.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cacf6ea0cd72eebc085aa70acef9b3c928c100c9d05232e760b94fe41ac90df
+size 4308346
diff --git a/rspamd.changes b/rspamd.changes
index 826fcd9..0e267d6 100644
--- a/rspamd.changes
+++ b/rspamd.changes
@@ -1,3 +1,63 @@
+-------------------------------------------------------------------
+Mon Nov 19 13:17:01 UTC 2018 - Marcus Rueckert <mrueckert@suse.de>
+
+- update to 1.8.2
+  - [Conf] Add DWL support in the default configuration
+  - [Conf] Disable rspamd_update by default (again)
+  - [Conf] Fix configuration sample for ratelimit
+  - [CritFix] Disable broken url tags by default
+  - [CritFix] Fix \0 processing when doing RSA sign
+  - [CritFix] Fix adding symbols to their primary groups
+  - [Feature] Add `rspamadm cookie` utility
+  - [Feature] Add specialised functions for generating encrypted cookies
+  - [Feature] Add support of cookies in replies module
+  - [Feature] Add support of words regexps
+  - [Feature] Allow to add 3rd party clang plugins
+  - [Feature] Allow to create lua regexps from glob or plain patterns
+  - [Feature] Allow to set custom limits for upstream lists
+  - [Feature] Detect orphaned parts and attach them to message
+  - [Feature] Filter tokens in bayes
+  - [Feature] Fold b= value when doing arc sealing
+  - [Feature] Ignore cookies in the future and too old in the past
+  - [Feature] Skip stop words in statistics
+  - [Feature] Store stop words and allow to query them
+  - [Feature] Support query arguments in controller's custom commands
+  - [Feature] Tune upstream limits in Rspamd proxy
+  - [Feature] Use different callback symbols for different uribls
+  - [Feature] Write DKIM selector in dkim allow/reject symbols
+  - [Fix] Add obs_fws state support to eoh state machine
+  - [Fix] Add sanity check when applying mime boundaries heuristic
+  - [Fix] Antivirus - virus names with 0 were recognized as tables
+  - [Fix] Disable headernames in bayes temporarily
+  - [Fix] Do not allow syntax errors in include files...
+  - [Fix] Do not allow to merge an object with an array (or vice versa)
+  - [Fix] Don't perform forged recipients check for missing recipients
+  - [Fix] Fix DKIM based RBLs
+  - [Fix] Fix actrie implementation (sync from upstream), fixed OOB read
+  - [Fix] Fix explicit methods call in selectors
+  - [Fix] Fix extraction of additional parts
+  - [Fix] Fix finalization for internal plugins
+  - [Fix] Fix override_defaults function
+  - [Fix] Fix squeezed symbols when using settings
+  - [Fix] Fix urls insertion in Clickhouse module
+  - [Fix] Furhter fixes to ratelimits logic
+  - [Fix] Ignore signatures when looking for boundaries
+  - [Fix] Properly set learned count
+  - [Fix] Really fix ratelimits configuration and work
+  - [Fix] Remove ambigious format flag from printf
+  - [Fix] Restore URLs exporting in ClickHouse plugin
+  - [Fix] Rework bayes calculations...
+  - [Fix] Switch from chi-square to naive for large Fisher value
+  - [Fix] Treat normal password as enable password if there is no enable password
+  - [Fix] Use proper syntax for making DNS requests
+  - [Fix] Various fixes in embedded plugins
+  - [Project] Change fuzzy check selection logic to lua_fuzzy library
+  - [Project] Rework async events and symbols
+  - [Project] Move all metatokens in Bayes to lua_stat from C
+  - [WebUI] Add history rows per page control
+- somehow the Patch/%patch lines for
+  rspamd-after-redis-target.patch were missing, adding them back.
+
 -------------------------------------------------------------------
 Sat Oct 27 01:54:35 UTC 2018 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/rspamd.spec b/rspamd.spec
index 6f3b0ce..038ad61 100644
--- a/rspamd.spec
+++ b/rspamd.spec
@@ -52,7 +52,7 @@
 %global _wwwdir /srv/www/webapps
 
 Name:           rspamd
-Version:        1.8.1
+Version:        1.8.2
 Release:        0
 License:        Apache-2.0
 Summary:        Spam filtering system
@@ -60,7 +60,7 @@ 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:         rspamd-after-redis-target.patch
 BuildRequires:  cmake
 BuildRequires:  curl-devel
 BuildRequires:  db-devel
@@ -103,7 +103,6 @@ BuildRequires:  ragel
 BuildRequires:  pkgconfig(systemd)
 %{?systemd_requires}
 %endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 
 %if 0%{?suse_version} < 1500
@@ -150,6 +149,7 @@ This package holds the client tools (rspamc and rspamadm)
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if %{with torch}
@@ -478,6 +478,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d
 %{_datadir}/rspamd/lib/lua_cfg_transform.lua
 %{_datadir}/rspamd/lib/lua_clickhouse.lua
 %{_datadir}/rspamd/lib/lua_dkim_tools.lua
+%{_datadir}/rspamd/lib/lua_fuzzy.lua
 %{_datadir}/rspamd/lib/lua_maps.lua
 %{_datadir}/rspamd/lib/lua_meta.lua
 %{_datadir}/rspamd/lib/lua_nn.lua
@@ -747,6 +748,7 @@ install -d -m 0755 %{buildroot}%{_sysconfdir}/%{name}/overrides.d
 %dir %{_datadir}/rspamd/lib/rspamadm
 %{_datadir}/rspamd/lib/rspamadm/confighelp.lua
 %{_datadir}/rspamd/lib/rspamadm/configwizard.lua
+%{_datadir}/rspamd/lib/rspamadm/cookie.lua
 %{_datadir}/rspamd/lib/rspamadm/corpus_test.lua
 %{_datadir}/rspamd/lib/rspamadm/fuzzy_convert.lua
 %{_datadir}/rspamd/lib/rspamadm/fuzzy_stat.lua