Accepting request 1251444 from server:mail

- Update to 3.11.1

OBS-URL: https://build.opensuse.org/request/show/1251444
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rspamd?expand=0&rev=35

ccb45df90df60fae36b9438cfb2b0088e590306b.patch

@@ -1,26 +0,0 @@
-From ccb45df90df60fae36b9438cfb2b0088e590306b Mon Sep 17 00:00:00 2001
-From: Vsevolod Stakhov <vsevolod@rspamd.com>
-Date: Tue, 17 Dec 2024 13:37:54 +0000
-Subject: [PATCH] [Fix] Fix crash on FreeBSD when Rspamd is built without
- hyperscan
-
----
- src/rspamd.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/rspamd.c b/src/rspamd.c
-index 088bfba49c..dafd9aebeb 100644
---- a/src/rspamd.c
-+++ b/src/rspamd.c
-@@ -56,9 +56,10 @@
- 
- #ifdef WITH_HYPERSCAN
- #include "libserver/hyperscan_tools.h"
--#include "rspamd_simdutf.h"
- #endif
- 
-+#include "rspamd_simdutf.h"
-+
- /* 2 seconds to fork new process in place of dead one */
- #define SOFT_FORK_TIME 2
- 

fix_missing_return.patch

@@ -1,12 +0,0 @@
-Index: rspamd-3.7.5/src/libserver/symcache/symcache_item.hxx
-===================================================================
---- rspamd-3.7.5.orig/src/libserver/symcache/symcache_item.hxx
-+++ rspamd-3.7.5/src/libserver/symcache/symcache_item.hxx
-@@ -78,6 +78,7 @@ constexpr static auto item_type_to_str(s
- 	case symcache_item_type::VIRTUAL:
- 		return "virtual";
- 	}
-+        return "should_not_reach_this_bug_found";
- }
- 
- /**

rspamd-3.11.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6dbe6fc7df4079a64f59cd6e8e996400d02d946d808140a1f30060cea76088a6
-size 6440612

rspamd-3.11.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09c3b90397142539052c826763de4ed8c502976843b5ea9d7ebdc603e23d253b
+size 6455199

rspamd.changes

@@ -1,3 +1,79 @@
+-------------------------------------------------------------------
+Sat Mar  8 19:52:57 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 3.11.1
+  - [Minor] Fix transposed results in rspamadm fuzzy_ping by
+    @fatalbanana in #5260
+  - [Feature] GPT: Add ollama support by @vstakhov in #5262
+  - [Feature] Allow to hash any Lua types by @vstakhov in #5266
+  - [Fix] connIp is not correctly added to request by @corbosman in
+    #5268
+  - Allow to use LLM for anonymize by @vstakhov in #5267
+  - [minor] log queue id with cloudmark analysis string by
+    @corbosman in #5269
+  - Add ability to not send response_format in gpt plugin in order
+    to support gpt4all by @JQuags in #5276
+  - Fix Thunderbird for Android marked with
+    FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN by @towo in #5275
+  - [Feature] Allow to store shingles as opaque Lua data by
+    @vstakhov in #5279
+  - Fix issue with synchronous Redis calls by @vstakhov in #5281
+  - [Minor] Fix some broken links by @fatalbanana in #5283
+  - [Feature] Add 'noop' redis backend for scripts running by
+    @vstakhov in #5290
+  - [Enhancement] Expand Detection of Fake Reply Subjects Across
+    Multiple Languages by @D0LLYNH0 in #5288
+  - [Feature] Allow multiple lua scripts for fuzzy storage by
+    @vstakhov in #5293
+  - [Minor] Add another acceptable mime type for icon by
+    @fatalbanana in #5294
+  - [Minor] Respect ipv4 and ipv6 configurations for rbl resolve_ip
+    by @japc in #5292
+  - remove nixspam by @crpb in #5300
+  - [Minor] rbl check_types was missing images by @japc in #5305
+  - RBL: fix use of content_urls and images inside checks by
+    @fatalbanana in #5310
+  - fix: use sub_utf8 to strip headers value to not break utf8
+    strings by @dragoangel in #5313
+  - [Minor] Set RBL checks to bool true by @japc in #5314
+  - [Minor] Rules regexp url separated and fix no subdomain cases
+    for Google urls by @japc in #5315
+  - [WebUI] Reset dropdown when clearing filters by @moisseev in
+    #5317
+  - [Feature] Support LLM models consensus by @vstakhov in #5320
+  - [Feature] GPT: Support reason adding by @vstakhov in #5326
+  - [Minor] Pass both the multimap and the rules descriptions for
+    combined multimap on create by @japc in #5319
+  - [Fix] properly close multipart/related boundary when adding
+    text footer by @FreddleSpl0it in #5334
+  - [Minor] Some small fixes to statistics_dump by @japc in #5335
+  - [Fix] Verify key type to match DKIM signature type by @vstakhov
+    in #5352
+  - More features to GPT plugin by @vstakhov in #5356
+  - [Fix] Avoid collision hacks in mempool variables hash by
+    @vstakhov in #5357
+  - Allow to disable RBLs via map by @vstakhov in #5359
+  - Add ability to create timers from Lua by @vstakhov in #5363
+  - Prevent option duplicates in rspamd_stats.pl by @jeromelebleu
+    in #5365
+  - Regenerate manpages with recent Pandoc version by @jeromelebleu
+    in #5366
+  - Fix spelling errors in libserver by @jeromelebleu in #5367
+  - [Feature] Add Redis caching framework by @vstakhov in #5369
+  - [Fix] Add expiration for neural ham and spam sets by
+    @dragoangel in #5373
+  - Better support for maps and IP-related fixes/improvements in
+    settings by @amulet1 in #5372
+  - Use caching framework in gpt module by @vstakhov in #5374
+  - [Test] Update JavaScript linters by @moisseev in #5375
+  - [Fix] Properly expire neural ham and spam sets by @dragoangel
+    in #5376
+  - [Feature] Try to check maps earlier if their expires is too
+    long by @vstakhov in #5377
+- drop patches no longer needed:
+  ccb45df90df60fae36b9438cfb2b0088e590306b.patch
+  fix_missing_return.patch
+
 -------------------------------------------------------------------
 Wed Dec 25 20:29:19 UTC 2024 - Marcus Rueckert <mrueckert@suse.de>
 

rspamd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rspamd
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -60,7 +60,7 @@
 %endif
 
 Name:           rspamd
-Version:        3.11.0
+Version:        3.11.1
 Release:        0
 Summary:        Spam filtering system
 License:        Apache-2.0
@@ -70,9 +70,6 @@ Source0:        https://github.com/rspamd/rspamd/archive/%{version}/%{name}-%{ve
 Source1:        usr.bin.rspamd
 Patch0:         rspamd-conf.patch
 Patch1:         rspamd-after-redis-target.patch
-Patch2:         fix_missing_return.patch
-# remove with next version update
-Patch3:         ccb45df90df60fae36b9438cfb2b0088e590306b.patch
 %if !0%{?is_opensuse}
 # because 80-check-malware-scan-clamav triggered in SLE-15-SP2
 BuildRequires:  -post-build-checks-malwarescan
@@ -559,6 +556,7 @@ find /var/lib/rspamd/ -type f -name '*.unser' -delete -print ||:
 %{_datadir}/rspamd/lualib/plugins_stats.lua
 %{_datadir}/rspamd/lualib/tableshape.lua
 %{_datadir}/rspamd/lualib/lua_bayes_redis.lua
+%{_datadir}/rspamd/lualib/lua_cache.lua
 
 %dir %{_datadir}/rspamd/lualib/lua_content
 %{_datadir}/rspamd/lualib/lua_content/ical.lua
@@ -666,6 +664,7 @@ find /var/lib/rspamd/ -type f -name '*.unser' -delete -print ||:
 %{_datadir}/rspamd/rules/parts.lua
 %{_datadir}/rspamd/rules/rspamd.lua
 %{_datadir}/rspamd/rules/subject_checks.lua
+%{_datadir}/rspamd/rules/regexp/urls.lua
 
 %dir %{_datadir}/rspamd/rules/regexp
 %{_datadir}/rspamd/rules/regexp/compromised_hosts.lua