Accepting request 1286320 from server:mail

- Update to 3.12.1
  - Remove aweber.com from spf_dkim_whitelist.inc by @TaaviE in
    #5500
  - [Fix] Fix several issues with the lua_logger by @vstakhov in
    #5503
  - [Test] Detect libicu idna behaviour and select the appropriate
    tests by @vstakhov in #5506
  - [Fix] Fix proxy headers duplication by @vstakhov in #5507
  - [Minor] Treat *.library-ms and *.search-ms attachments as
    harmful by @twesterhever in #5509
  - Revert "[Minor] Treat *.library-ms and *.search-ms attachments
    as harmful" by @vstakhov in #5511
  - [Fix] Another fix for maps concurrent load by @vstakhov in
    #5512
  - [Feature] Add /bayes/classifiers HTTP endpoint by @moisseev in
    #5517

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

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.12.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8739aa96db5ff6214595ba0a6f0d90ff46d9f11e5c5e164bbdd749b5cfbd65ed
+size 6482214

rspamd.changes

@@ -1,3 +1,185 @@
+-------------------------------------------------------------------
+Tue Jun 17 09:47:07 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 3.12.1
+  - Remove aweber.com from spf_dkim_whitelist.inc by @TaaviE in
+    #5500
+  - [Fix] Fix several issues with the lua_logger by @vstakhov in
+    #5503
+  - [Test] Detect libicu idna behaviour and select the appropriate
+    tests by @vstakhov in #5506
+  - [Fix] Fix proxy headers duplication by @vstakhov in #5507
+  - [Minor] Treat *.library-ms and *.search-ms attachments as
+    harmful by @twesterhever in #5509
+  - Revert "[Minor] Treat *.library-ms and *.search-ms attachments
+    as harmful" by @vstakhov in #5511
+  - [Fix] Another fix for maps concurrent load by @vstakhov in
+    #5512
+  - [Feature] Add /bayes/classifiers HTTP endpoint by @moisseev in
+    #5517
+
+-------------------------------------------------------------------
+Wed Jun 11 21:27:18 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- as it currently always uses the bundled fmt, disable the requires
+
+-------------------------------------------------------------------
+Wed Jun 11 21:25:25 UTC 2025 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 3.12.0
+  - [Fix] Use bundled libfmt everywhere by @vstakhov in #5380
+  - [Minor] Fix and improve format string processing in
+    lua_logger_log_format() by @amulet1 in #5378
+  - [Fix] initialize ollama result table by @JensErat in #5385
+  - Update AUTHORS.md by @ertyu in #5391
+  - [Fix] Update default URL for openphish by @fatalbanana in #5389
+  - Allow CDB external maps by @vstakhov in #5390
+  - [WebUI] Fix map editor modal handling by @moisseev in #5388
+  - [Minor] gpt.lua improvements and one fix for reason_header by
+    @alex081512 in #5387
+  - [Minor] Lua logging improvements by @amulet1 in #5383
+  - Fix typo on "destionation" -> "destination" by @williamdes in
+    #5400
+  - [Feature] Plugin to integrate with Contextal platform by
+    @fatalbanana in #5360
+  - Improve maps status visibility by @vstakhov in #5386
+  - [WebUI] Update Maps table by @moisseev in #5408
+  - Add R_HTTP_URL_IN_FROM by @dragoangel in #5406
+  - [Project] Modernize cmake by @vstakhov in #5412
+  - [Fix] Greylist: Improve body hash calculations by @vstakhov in
+    #5417
+  - [Feature] Allow to specify Redis version by @vstakhov in #5419
+  - fix(lua_bit) : Prevent lua-bit stack buffer overflow by
+    @KIMDONGYEON00 in #5422
+  - [WebUI] Update Bootstrap, D3 and PrismJS libraries by @moisseev
+    in #5423
+  - [Minor] contextal: conditionally disable timer, minor changes
+    by @fatalbanana in #5426
+  - Add Sieve and cPanel forwarding symbols by @dragoangel in #5407
+  - [Minor] Use module name when calling set_pre_result by
+    @fatalbanana in #5434
+  - Fix writing rules tutorial link by @SuperSandro2000 in #5436
+  - Correct "file.conf" from dist config files by @SuperSandro2000
+    in #5444
+  - [Minor] RPM: fix log directory attributes by @fatalbanana in
+    #5435
+  - Allow to use different servers for fuzzy operations by
+    @vstakhov in #5453
+  - [WebUI] Add Delete hash button by @moisseev in #5454
+  - Added exclusion list for reputation by @kevinzb56 in #5443
+  - Fix librdns maxname limit by @dragoangel in #5455
+  - [Fix] libmime: doctest 2.4.12 compatibilty by @xandris in #5458
+  - [WebUI] Add deletion of specific fuzzy hashes by @moisseev in
+    #5457
+  - Some improvements to the proxy by @vstakhov in #5456
+  - Added --non-default Option to rspamadm configdump for Local
+    Configuration by @kevinzb56 in #5452
+  - gpt.lua: Remove "thinking" and fix errorlog by @NameWeb in
+    #5459
+  - [Minor] Update API docs RE: multiple HTTP headers by
+    @fatalbanana in #5468
+  - [Minor] Fix for docs of lua_redis.redis_make_request_taskless
+    by @left-try in #5470
+  - [Feature] Magic: Support HEIC files by @vstakhov in #5471
+  - Add FREEMAIL_REPLYTO_NEQ_FROM rule by @dragoangel in #5413
+  - Modify documentation for rspamc "-P" parameter by @TwizzyDizzy
+    in #5473
+  - fix(lua_redis): Improve Redis script loading by @jendis in
+    #5464
+  - [Minor] Fix Debian package build by @fatalbanana in #5475
+  - [Rework] Replies: consider all recipients and use smtp ones by
+    @vstakhov in #5428
+  - [Minor] Print error on multimap invalid type by @japc in #5477
+  - [Minor] Fix fuzzy lua callback when there are no shingles by
+    @fatalbanana in #5486
+  - [WebUI] Add file upload to Test selectors by @moisseev in #5483
+  - [Minor] Log the token usage for OpenAI (compatible) plain
+    conversion by @lucasRolff in #5488
+  - Reputation Plugin: Fix comment to correspond the code above by
+    @heptalium in #5489
+  - Fix some issues with libucl by @vstakhov in #5490
+  - [Minor] Correcting the index number for is_spam by @kevinzb56
+    in #5495
+  - Logging improvements by @vstakhov in #5492
+  - [Fix] Correct logic error in milter_headers.lua: skip_wanted()
+    by @drclau in #5496
+
+-------------------------------------------------------------------
+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.12.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
@@ -103,9 +100,16 @@ BuildRequires:  openblas-devel
 %endif
 BuildRequires:  pcre2-devel
 BuildRequires:  pkgconfig
+%if %{with system_fmt}
 BuildRequires:  pkgconfig(fmt)
+%global with_system_fmt 1
 %if !%{pkg_vcmp fmt-devel > 11}
 Provides:       bundled(fmt) = 11.0.0
+%global with_system_fmt 0
+%endif
+%else
+Provides:       bundled(fmt) = 11.0.0
+%global with_system_fmt 0
 %endif
 BuildRequires:  pkgconfig(glib-2.0) >= 2.28
 %if %{with ext_hiredis}
@@ -246,7 +250,7 @@ export CXX="g++-%{?force_gcc_version}"
   %if %{with jemalloc}
   -DENABLE_JEMALLOC=ON                      \
   %endif
-  %if %{pkg_vcmp fmt-devel > 11}
+  %if 0%{?with_system_fmt}
   -DSYSTEM_FMT=ON                           \
   %else
   -DSYSTEM_FMT=OFF                          \
@@ -417,6 +421,7 @@ find /var/lib/rspamd/ -type f -name '*.unser' -delete -print ||:
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/bimi.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/chartable.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/clickhouse.conf
+%config(noreplace) %{_sysconfdir}/rspamd/modules.d/contextal.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/dcc.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/dkim.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/dkim_signing.conf
@@ -484,6 +489,7 @@ find /var/lib/rspamd/ -type f -name '*.unser' -delete -print ||:
 %{_datadir}/rspamd/plugins/asn.lua
 %{_datadir}/rspamd/plugins/bayes_expiry.lua
 %{_datadir}/rspamd/plugins/clickhouse.lua
+%{_datadir}/rspamd/plugins/contextal.lua
 %{_datadir}/rspamd/plugins/clustering.lua
 %{_datadir}/rspamd/plugins/dcc.lua
 %{_datadir}/rspamd/plugins/dkim_signing.lua
@@ -559,6 +565,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 +673,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