Accepting request 930680 from server:mail

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/930680 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rspamd?expand=0&rev=7
2021-11-10 20:47:09 +00:00
parent b05c196340 70d2825ec3
commit 7b22f9d10c
5 changed files with 415 additions and 161 deletions
--- a/rspamd-2.7.tar.gz
+++ b/rspamd-2.7.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e2606c18f0d9b1e7eee86907bd8545e0dcda83b1642ddf58915d5d44a53e3df0
-size 5126227
--- a/rspamd-3.1.tar.gz
+++ b/rspamd-3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7f37514f16f4d194cacaef9f54eeead73ae2c208bc4439fd7f1de4e220f9db30
+size 5566920
--- a/rspamd-add-lua-5.4.patch
+++ b/rspamd-add-lua-5.4.patch
@@ -1,148 +0,0 @@
-From 5aa14ef2279bb9d09d55f93e69c6fbd7d31e4b82 Mon Sep 17 00:00:00 2001
-From: Vsevolod Stakhov <vsevolod@highsecure.ru>
-Date: Fri, 26 Feb 2021 13:40:22 +0000
-Subject: [PATCH] [Minor] Check for Lua 5.4
-
-Issue: #3656
---
- CMakeLists.txt | 37 +++++++++++++++++++++++++------------
- 1 file changed, 25 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a218e28fd..4b4538dd3 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -157,27 +157,40 @@ ELSE(ENABLE_LUAJIT MATCHES "ON")
- 
- 	IF (NOT WITH_LIBLUA)
- 		ProcessPackage(LIBLUA LIBRARY	"lua"
-				"lua-5.2"
-				LIB_SUFFIXES	"lua5.2"
-+				"lua-5.4"
-+				LIB_SUFFIXES	"lua5.4"
- 				INCLUDE lua.h INCLUDE_SUFFIXES
-				"include/lua-5.2"
-				"include/lua5.2"
-				"include/lua52"
-+				"include/lua-5.4"
-+				"include/lua5.4"
-+				"include/lua54"
- 				"include/lua"
- 				ROOT ${LUA_ROOT}
-				MODULES lua52
-+				MODULES lua54
- 				OPTIONAL)
-
- 		IF (NOT WITH_LIBLUA)
- 			ProcessPackage(LIBLUA LIBRARY	"lua"
-					"lua-5.1"
-+					"lua-5.2"
-+					LIB_SUFFIXES	"lua5.2"
- 					INCLUDE lua.h INCLUDE_SUFFIXES
-					"include/lua-5.1"
-					"include/lua5.1"
-					"include/lua51"
-+					"include/lua-5.2"
-+					"include/lua5.2"
-+					"include/lua52"
- 					"include/lua"
- 					ROOT ${LUA_ROOT}
-					MODULES lua51)
-+					MODULES lua52
-+					OPTIONAL)
-+
-+			IF (NOT WITH_LIBLUA)
-+				ProcessPackage(LIBLUA LIBRARY	"lua"
-+						"lua-5.1"
-+						INCLUDE lua.h INCLUDE_SUFFIXES
-+						"include/lua-5.1"
-+						"include/lua5.1"
-+						"include/lua51"
-+						"include/lua"
-+						ROOT ${LUA_ROOT}
-+						MODULES lua51)
-+			ENDIF()
- 		ENDIF()
- 	ENDIF()
- ENDIF(ENABLE_LUAJIT MATCHES "ON")
-From 25a8f48d565a0450aed3417c88dbeeecdad11532 Mon Sep 17 00:00:00 2001
-From: Vsevolod Stakhov <vsevolod@highsecure.ru>
-Date: Wed, 3 Mar 2021 17:17:46 +0000
-Subject: [PATCH] [Minor] More Lua 5.4 compatibility
-
-Issue: #3656
---
- src/lua/lua_thread_pool.c              | 4 ++++
- test/rspamd_lua_pcall_vs_resume_test.c | 6 ++++++
- 2 files changed, 10 insertions(+)
-
-diff --git a/src/lua/lua_thread_pool.c b/src/lua/lua_thread_pool.c
-index 1fa584c51..8220bb3ff 100644
--- a/src/lua/lua_thread_pool.c
-+++ b/src/lua/lua_thread_pool.c
-@@ -239,7 +239,11 @@ lua_do_resume_full (lua_State *L, gint narg, const gchar *loc)
- #if LUA_VERSION_NUM < 502
- 	return lua_resume (L, narg);
- #else
-+	#if LUA_VERSION_NUM >= 504
-+	return lua_resume (L, from, nargs, NULL);
-+	#else
- 	return lua_resume (L, NULL, narg);
-+	#endif
- #endif
- }
- 
-diff --git a/test/rspamd_lua_pcall_vs_resume_test.c b/test/rspamd_lua_pcall_vs_resume_test.c
-index eb945b92f..c06283de1 100644
--- a/test/rspamd_lua_pcall_vs_resume_test.c
-+++ b/test/rspamd_lua_pcall_vs_resume_test.c
-@@ -56,6 +56,8 @@ test_resume(lua_State *L, gint function_call)
- 		lua_rawgeti (L, LUA_REGISTRYINDEX, function_call);
- #if LUA_VERSION_NUM < 502
- 		lua_resume (L, 0);
-+#elif LUA_VERSION_NUM >= 504
-+		lua_resume (L, NULL, 0, NULL);
- #else
- 		lua_resume (L, NULL, 0);
- #endif
-@@ -82,6 +84,8 @@ test_resume_get_thread(gint function_call)
- 		lua_rawgeti (ent->lua_state, LUA_REGISTRYINDEX, function_call);
- #if LUA_VERSION_NUM < 502
- 		lua_resume (ent->lua_state, 0);
-+#elif LUA_VERSION_NUM >= 504
-+		lua_resume (ent->lua_state, NULL, 0, NULL);
- #else
- 		lua_resume (ent->lua_state, NULL, 0);
- #endif
-@@ -110,6 +114,8 @@ test_resume_get_new_thread(gint function_call)
- 		lua_rawgeti (ent->lua_state, LUA_REGISTRYINDEX, function_call);
- #if LUA_VERSION_NUM < 502
- 		lua_resume (ent->lua_state, 0);
-+#elif LUA_VERSION_NUM >= 504
-+		lua_resume (ent->lua_state, NULL, 0, NULL);
- #else
- 		lua_resume (ent->lua_state, NULL, 0);
- #endif
-From fa5a0679bd5d3e2146d2c6d3c70ed6d4447f3925 Mon Sep 17 00:00:00 2001
-From: Vsevolod Stakhov <vsevolod@highsecure.ru>
-Date: Thu, 4 Mar 2021 14:59:40 +0000
-Subject: [PATCH] [Minor] Fix misprint
-
-Issue: #3656
---
- src/lua/lua_thread_pool.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lua/lua_thread_pool.c b/src/lua/lua_thread_pool.c
-index 8220bb3ff..89a516a27 100644
--- a/src/lua/lua_thread_pool.c
-+++ b/src/lua/lua_thread_pool.c
-@@ -240,7 +240,7 @@ lua_do_resume_full (lua_State *L, gint narg, const gchar *loc)
- 	return lua_resume (L, narg);
- #else
- 	#if LUA_VERSION_NUM >= 504
-	return lua_resume (L, from, nargs, NULL);
-+	return lua_resume (L, NULL, narg, NULL);
- 	#else
- 	return lua_resume (L, NULL, narg);
- 	#endif
--- a/rspamd.changes
+++ b/rspamd.changes
@@ -1,3 +1,389 @@
+-------------------------------------------------------------------
+Wed Nov  3 13:39:29 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- Update to 3.1
+  - [Feature] Add junk_threshold for autolearn
+  - [Feature] Add neural test command
+  - [Feature] Antivirus: Allow to set fake eicar patterns for
+    testing AV engines
+  - [Feature] Lua_cdb: Add cdb building interface
+  - [Feature] Ratelimit: Add per bucket configurations
+  - [Feature] S3: Allow to store structured data in messagepack
+  - [Fix] Add concept of uncancellable events to prevent
+    use-after-free
+  - [Fix] Add temporary guard to prevent linked list exploitation
+  - [Fix] Allow spaces in DKIM key records
+  - [Fix] Another rework of the ucl hashing
+  - [Fix] Another try to fix references safety
+  - [Fix] Another try to fix rspamd_text passing in the selectors
+  - [Fix] Avoid copy for received structure as it has raw C
+    pointers
+  - [Fix] Avoid dangling reference
+  - [Fix] Correctly check numeric URLs in URL DNS lists
+  - [Fix] Delete the correct pointer type
+  - [Fix] Dmarc: Always lowercase domain
+  - [Fix] Fix compilation of the hyperscan databases with errors
+  - [Fix] Fix hash table lookup
+  - [Fix] Fix http message flag shift
+  - [Fix] Fix parsing of the from_hostname when it is an IP address
+  - [Fix] Fix parsing of the unquoted attributes in HTML
+  - [Fix] Fix passing of rspamd_text in selectors pipelines
+  - [Fix] Fix rubbish QP sequences decoding
+  - [Fix] Fix some complicated case with the closing tags parsing
+  - [Fix] Fix the case when l tag is too small
+  - [Fix] Html: Fix the case where only bgcolor is explicitly set
+  - [Fix] Libucl: Fix deletion from ucl objects
+  - [Fix] Namespace and add metadata for OpenMetrics, fix
+    interleaving
+  - [Fix] Plug memory leak in http settings reload
+  - [Fix] Preserve SPF top record in the mempool variable
+  - [Fix] Remove aarch64 GC64 workaround
+  - [Fix] Remove bogus G_LIKELY
+  - [Fix] Spf: Do not parse non TXT DNS replies as TXT replies
+  - [Fix] Try to use on_connect/on_disconnect callbacks to handle
+    internal Redis failures
+  - [Fix] buffer overflow in rspamc counters
+  - [Fix] fix static building
+  - [Fix] lua_scanners - message_min_words logic
+  - [Fix] src/lua/lua_mimepart.c: fix null dereference
+  - [Project] Add constant iterators
+  - [Project] Add helper library to handle mime strings in a more
+    safe matter
+  - [Project] Add preliminary support of CDB bayes dump
+  - [Project] Add trim operations
+  - [Project] Allow mempool allocated mime strings
+  - [Project] Cdb: Finish backend implementation
+  - [Project] Cdb: Fix configuration load
+  - [Project] Cdb: Use shared data between cdb statfiles
+  - [Project] Cdb: continue statistics backend implementation
+  - [Project] Finish received headers rework part
+  - [Project] Move C++ specific declarations to C++ header
+  - [Project] Rework received headers parsing to C++
+  - [Project] Start using of the new received structure
+  - [Project] Start work on cdb backend
+  - [Rework] Further rework of the redis pool
+  - [Rework] Redis_pool: fix issues found
+  - [Rework] Rework learn and add classify condition
+  - [Rework] Save invisible content to a separate buffer
+  - [Rework] Start rewriting of the redis pool logic
+  - [Rules] Improve zero font rule
+  Full Changelog: https://github.com/rspamd/rspamd/compare/3.0...3.1
+- drop patches included in this update:
+  https://github.com/onqtam/doctest/commit/099d5414e97244ec44cf46b14cd176b3a3dc52e3.patch
+  https://github.com/rspamd/rspamd/commit/cdedeb9f4.patch
+  https://github.com/rspamd/rspamd/commit/309bb213cf.patch
+
+-------------------------------------------------------------------
+Thu Sep 30 17:58:39 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- backported https://github.com/onqtam/doctest/commit/099d5414e97244ec44cf46b14cd176b3a3dc52e3.patch 
+  slighty modified to match rspamd
+
+-------------------------------------------------------------------
+Fri Sep 17 22:31:22 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- backport https://github.com/rspamd/rspamd/commit/cdedeb9f4.patch 
+  improve lua 5.4 support
+
+-------------------------------------------------------------------
+Fri Sep 17 21:18:15 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- switch to autosetup, all target distros are new enough
+
+-------------------------------------------------------------------
+Fri Sep 17 21:17:54 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- backport https://github.com/rspamd/rspamd/commit/309bb213cf.patch 
+  to actually make it use system fmt
+
+-------------------------------------------------------------------
+Fri Sep 17 20:42:24 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- force gcc 9 all distros before Tumbleweed:
+  leap default compiler is gcc7 which is not enough anymore
+
+-------------------------------------------------------------------
+Fri Sep 17 20:30:05 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
+
+- use system libfmt and libzstd instead of building the intree copy 
+
+-------------------------------------------------------------------
+Thu Aug 19 23:06:34 UTC 2021 - Michael Ströder <michael@stroeder.com>
+
+- removed obsolete rspamd-add-lua-5.4.patch
+- update to 3.0
+  * [Conf] Align ARC scores with DKIM scores
+  * [CritFix] Neural: Fix sorting application
+  * [Feature] Add a simple dumper for bayes tokens
+  * [Feature] Add lua_maps.fill_config_maps function
+  * [Feature] Add preliminary exporter to AWS S3
+  * [Feature] Add preliminary restore bayes support
+  * [Feature] Add race condition protection against hs_helper restarts
+  * [Feature] Add rspamd_utf8_strcmp utility
+  * [Feature] Add zstd streaming API
+  * [Feature] Allow to log severity level explicitly
+  * [Feature] Allow to save and show attachment name when inserting AV scan results
+  * [Feature] Allow to sort urls for Lua
+  * [Feature] Allow to specify different timeouts/retransmits for fuzzy rules
+  * [Feature] Aws_s3: Allow to compress data stored
+  * [Feature] CMakeLists.txt: Change check and run-test to use rspamd-test-cxx * fixes #3807
+  * [Feature] Dmarc_report: allow sending reports in batches
+  * [Feature] Fuzzy_check: Allow to disable subject when making short text hash
+  * [Feature] Lua_cryptobox: Add keyed ssl hash functions via HMAC
+  * [Feature] Lua_task: Add get_urls_filtered method
+  * [Feature] Make monitored checks less frequent
+  * [Feature] Milter_headers: Add x-rspamd-pre-result header
+  * [Feature] Neural: Allow to balance FP/FN for the network
+  * [Feature] Ppopagate monitored errors from rbl module
+  * [Feature] Pyzor calculate score dynamically Count - WL-Count of default_score in percent
+  * [Feature] Rbl: Distinguish flattened and non-flattened selectors in RBL requests
+  * [Feature] Re-add pyzor support
+  * [Feature] Settings: add ip_map check and rework structure slightly
+  * [Feature] Spamassassin: Allow to set the default priority for SA scores
+  * [Feature] Strip smtp comments from message id
+  * [Feature] add SYSTEM_ZSTD cmake option To use the system zstd instead on the bundled version
+  * [Feature] external_relay plugin
+  * [Feature] rspamadm clickhouse neural_train subcommand
+  * [Fix] #3400 milter_headers: fix inverted logic for extended_headers_rcpt
+  * [Fix] ASN: fix _FAIL symbol for when main symbol is disabled
+  * [Fix] Add a special logic for text part with no text extraction
+  * [Fix] Add diacritics flag for several eu languages
+  * [Fix] Another FSM fix to accomodate possibility of multiple consequent ?
+  * [Fix] Avoid curse of dynamic array referencing
+  * [Fix] Avoid reinitialising neural settings
+  * [Fix] Check remain before processing TXT records
+  * [Fix] Enable error multiplier on http errors
+  * [Fix] Finally rework parsing entities logic
+  * [Fix] Fix '==' parsing in the content type attributes parser
+  * [Fix] Fix IPv6 expansion for SPF macros
+  * [Fix] Fix Mozilla Message-ID detection
+  * [Fix] Fix an edge case in BITCOIN_ADDR rule
+  * [Fix] Fix brain-damaged behaviour when http request has a custom Host header
+  * [Fix] Fix check of limits in email address parsing
+  * [Fix] Fix copy&paste error and rework
+  * [Fix] Fix expressions logic for and/or and float values
+  * [Fix] Fix fuzzy retransmits
+  * [Fix] Fix http maps with no or invalid expires data
+  * [Fix] Fix last quote character parsing in the content-type state machine
+  * [Fix] Fix normalisation flags propagation
+  * [Fix] Fix overflow when appending many broken tags
+  * [Fix] Fix parsing of rfc2047 tokens with '?' inside
+  * [Fix] Fix phishing flag set
+  * [Fix] Fix rfc2047 embedded into rfc2231 pieces in special headers
+  * [Fix] Fix round-robin rotation
+  * [Fix] Fix searching for symbols
+  * [Fix] Fix storing of the regexps inside variant
+  * [Fix] Fix tokenization near exceptions
+  * [Fix] Fix visibility calculations
+  * [Fix] Html: Attach inline tags to the structure
+  * [Fix] Html: Do not treat empty tags as block tags
+  * [Fix] Ical: Do not extract urls from all flags using merely specific ones
+  * [Fix] Initialise symcache even if it cannot be loaded properly
+  * [Fix] Lua_fuzzy: Remove text parts check when checking image dimensions
+  * [Fix] Lua_maps: Fix adjustments for the map type in the complex map definitions
+  * [Fix] Lua_task: Fix deleted symbols in has_symbol/get_symbol
+  * [Fix] Move metric and symcache link from validation to the init stage
+  * [Fix] Oletools: Another try to fix table sorting
+  * [Fix] One more default behaviour fix
+  * [Fix] Phishing: Rework urls processing
+  * [Fix] RBL: was missing some config schema
+  * [Fix] Replies: Fix 'Reply-To' handling in task:get_reply_sender
+  * [Fix] Rework metrics handling
+  * [Fix] Save symcache on exit
+  * [Fix] Selectors: Filter nil elements in lists
+  * [Fix] Selectors: Properly fix implicit tostring for nils
+  * [Fix] Try to fix some broken code in DMARC reporting plugin
+  * [Fix] Urls: Fix processing of html urls when it comes to the flags
+  * [Fix] Use proper buffer length
+  * [Fix] Various visibility fixes
+  * [Fix]: ASN: dns cb func should also return in case of an error
+  * [Project] Add a simple css rule definition
+  * [Project] Add css style skeleton
+  * [Project] Add css syntax (adopted from ebnf)
+  * [Project] Add css_selectors
+  * [Project] Add doctest unit testing library
+  * [Project] Add expected library
+  * [Project] Add fmt library for simple string ops
+  * [Project] Add fu2 library to better functions abstractions
+  * [Project] Add hashing method
+  * [Project] Add parsers skeleton
+  * [Project] Add preliminary support of vcard parser
+  * [Project] Add process exceptions for invisible text
+  * [Project] Add some methods for css parser
+  * [Project] Allow static libstdc++
+  * [Project] Another whitespace hack
+  * [Project] CSS: Various fixes in the declarations and values parsing
+  * [Project] Cpp: Add robin-hood hash map library
+  * [Project] Css: Add AST debug
+  * [Project] Css: Add colors conversion functions
+  * [Project] Css: Add dimensions handling
+  * [Project] Css: Add display value support
+  * [Project] Css: Add frozen library from https://github.com/serge-sans-paille/frozen/
+  * [Project] Css: Add opacity support
+  * [Project] Css: Add parser helpers to simplify debugging
+  * [Project] Css: Add preliminary stylesheet support
+  * [Project] Css: Add rules processing functions and tests
+  * [Project] Css: Add simple selectors unit tests
+  * [Project] Css: Add some c++ unit tests
+  * [Project] Css: Add some debug methods
+  * [Project] Css: Add some debug statements for the css parser
+  * [Project] Css: Add some logical skeleton for declarations parser
+  * [Project] Css: Add url/function tokens
+  * [Project] Css: Allow at rules parsing
+  * [Project] Css: Declarations parsing logic skeleton
+  * [Project] Css: Enable conditional css parsing support from the HTML parser
+  * [Project] Css: Finish generic lexer cases
+  * [Project] Css: Fix HSL conversion
+  * [Project] Css: Fix minus parsing
+  * [Project] Css: Fix parser consumers nesting
+  * [Project] Css: Fix parsing of the qualified rules
+  * [Project] Css: Fix rules merging
+  * [Project] Css: Further fixes to lexer
+  * [Project] Css: Further steps to parse css colors + rework
+  * [Project] Css: Further work on parser's methods
+  * [Project] Css: Implement backlog of css tokens
+  * [Project] Css: Implement numbers and ident parsers
+  * [Project] Css: Implement simple css selectors lookup
+  * [Project] Css: Implement styles merging
+  * [Project] Css: Make debug strings json like to simplify tests
+  * [Project] Css: Minor adjustments
+  * [Project] Css: More meat to the lexer
+  * [Project] Css: Move some of the tests to the doctest
+  * [Project] Css: Projected a parser
+  * [Project] Css: Properties attachment logic
+  * [Project] Css: Remove ragel from build targets (maybe keep for reference)
+  * [Project] Css: Rework css block structure
+  * [Project] Css: Rework flags of css properties
+  * [Project] Css: Rework tokens structure
+  * [Project] Css: Several fixes + tests
+  * [Project] Css: Simplify checks
+  * [Project] Css: Simplify debug code
+  * [Project] Css: Start css selectors parsing logic
+  * [Project] Css: Start semantic parsing for rules
+  * [Project] Css: Start stylesheet implementation
+  * [Project] Css: Tidy up lambdas
+  * [Project] Css: rework tokeniser
+  * [Project] Dmarc: Add dmarc report tool (WIP)
+  * [Project] Dmarc: Add munging configuration
+  * [Project] Dmarc: Add preliminary munging logic
+  * [Project] Dmarc: Fix header removal
+  * [Project] Dmarc: Fix munging logic
+  * [Project] Dmarc: Use full recipient address instead of a domain map
+  * [Project] Dmarc: Use zlists for dmarc reports
+  * [Project] Dmarc_report: Add message generation logic
+  * [Project] Dmarc_report: Add preliminary sending support
+  * [Project] Fix lua bindings
+  * [Project] Fix xml/sgml tags processing
+  * [Project] Handle new modification
+  * [Project] Html/CSS: Add transform from a CSS rule to html block
+  * [Project] Html/CSS: Link html and css styles
+  * [Project] Html/CSS: Switch styles parsing to css parser
+  * [Project] Html/Css: Fix some issues found
+  * [Project] Html/Css: Implement visibility rules for a block
+  * [Project] Html: Add more tests cases and fix some more corner issues
+  * [Project] Html: Add rows display type support
+  * [Project] Html: Allow decode entities function to normalise spaces + unit tests
+  * [Project] Html: Another rework of the tags structure
+  * [Project] Html: Another try to fix unbalanced cases
+  * [Project] Html: Fix crossing spans
+  * [Project] Html: Fix parent propagation
+  * [Project] Html: Further rework of the html parsing stuff
+  * [Project] Html: Implement logic for tags pairing
+  * [Project] Html: Implement rawtext state machine
+  * [Project] Html: Insert closing tags as well :(
+  * [Project] Html: More fixes
+  * [Project] Html: More fixes
+  * [Project] Html: More spaces logic fixes
+  * [Project] Html: One more attempt to write text content
+  * [Project] Html: Replace \0 in html content
+  * [Project] Html: Rework img/a tags handling
+  * [Project] Html: Rework propagation method
+  * [Project] Html: Rework tags placement
+  * [Project] Html: Rework transparency logic
+  * [Project] Html: Support 'hidden' attribute
+  * [Project] Html: Try another approach to append tags content
+  * [Project] Html: Try to deal with bad unknown tags properly
+  * [Project] Lua_aws: Add canonicalisation utility
+  * [Project] Lua_aws: Add function to produce AWS Authorisation header
+  * [Project] Lua_aws: Implement request signing
+  * [Project] Lua_mime: Add lua_mime.modify_headers routine
+  * [Project] Lua_task: Add modify_header method
+  * [Project] Lua_task: Allow to extract modified headers
+  * [Project] Make unescape code public for unit testing
+  * [Project] More fixes for closed tags
+  * [Project] More fixes to calculations
+  * [Project] Rework API for the modified headers
+  * [Project] Rework html visibility rule
+  * [Project] Skeleton of the css library
+  * [Project] Start headers modification API structure
+  * [Project] Start working on AWS Lua API
+  * [Project] Use lua_mime to modify headers
+  * [Project] Use modified headers on dkim signing
+  * [Project] Use string_view to constexpr variant unpacking
+  * [Rework] Add composites manager concept
+  * [Rework] Add tags definitions
+  * [Rework] Allow C code to be compiled with C++ compiler
+  * [Rework] Clickhouse: Store url flags
+  * [Rework] Composites: Rewrite the composites logic
+  * [Rework] Composites: Start rework of the composites framework
+  * [Rework] Dmarc: Move check policy function to the common utils
+  * [Rework] Dmarc: Rework reports keys structure
+  * [Rework] Further work to make html content private
+  * [Rework] Html/CSS: Remove css C bindings as they are useless now
+  * [Rework] Html/CSS: Rework Lua bindings
+  * [Rework] Html/Css: Start rework of the html blocks
+  * [Rework] Html: Add images processing logic
+  * [Rework] Html: Add traverse function
+  * [Rework] Html: Another steps to get rid of gnode
+  * [Rework] Html: Convert to variant
+  * [Rework] Html: Deal with the utf_content part
+  * [Rework] Html: Final rework part for the html processing code
+  * [Rework] Html: Fix Lua bindings
+  * [Rework] Html: Forgot to add the internal include
+  * [Rework] Html: Further html urls rework
+  * [Rework] Html: Further rework of the tags content extraction
+  * [Rework] Html: Make parameters as a vector again
+  * [Rework] Html: Move blocks part
+  * [Rework] Html: Move images processing stuff
+  * [Rework] Html: Rework lua bindings
+  * [Rework] Html: Start html text extraction rework
+  * [Rework] Html: Start refactoring of the html tags handling
+  * [Rework] Html: Start removing of GNode stuff
+  * [Rework] Html: Start rework of the html content structure
+  * [Rework] Lua_magic: Try to detect text parts with 8bit characters for non-utf8 encodings
+  * [Rework] Move HTML url functions and rework them
+  * [Rework] Move and adopt entities handling logic
+  * [Rework] Move common and rarely used dmarc code to the library
+  * [Rework] Move compression routines outside of rspamd_util library
+  * [Rework] Move entities/tags handling
+  * [Rework] Phishing: Split from redirectors usage
+  * [Rework] Redesign html blocks propagation logic
+  * [Rework] Remove tag name string
+  * [Rework] Rename phished url to a linked url
+  * [Rework] Reorganize dmarc plugin and remove unsupported reporting code
+  * [Rework] Reputation: Use more flexible types in get/set functions
+  * [Rework] Require proper C++ environment for Rspamd build
+  * [Rework] Rework extended urls output
+  * [Rework] Rework tags parsing machine
+  * [Rework] Slightly improve old regexp API
+  * [Rework] Start conversion of the redis pool code to c++
+  * [Rework] Try to resolve failed upstreams more agressively
+  * [Rework] Use C++ utf8 library with unit tests to trim whitespaces
+  * [Rework] Use C++ version for unicode normalisation
+  * [Rework] Use C++ version of the lua threads pool
+  * [Rules] Add raw addresses to MULTIPLE_FROM options
+  * [Rules] Another fix to HTTP_TO_HTTPS rule
+  * [Rules] Do not trigger HTML_SHORT_LINK_IMG on external images
+  * [Rules] Extend FORGED_X_MAILER
+  * [Rules] Extend OLD_X_MAILER
+  * [Rules] Fix CTYPE_MIXED_BOGUS for text attachments
+  * [Rules] Fix FPs for CTYPE_MIXED_BOGUS
+  * [Rules] Fix HTTP_TO_HTTPS rule
+  * [Rules] Fix HTTP_TO_HTTPS rule
+  * [Rules] Fix zerofont rule (partially)
+  * [Rules] Micro-optimize X_PHP_EVAL
+  * [Rules] Reduce default weight for R_MISSING_CHARSET
+
 -------------------------------------------------------------------
 Wed Jun  2 13:55:50 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>

--- a/rspamd.spec
+++ b/rspamd.spec
@@ -52,12 +52,12 @@

 %global _wwwdir /srv/www/webapps

-%if 0%{?suse_version} && 0%{?suse_version} < 1500
+%if 0%{?suse_version} && 0%{?suse_version} < 1550
 %global force_gcc_version 9
 %endif

 Name:           rspamd
-Version:        2.7
+Version:        3.1
 Release:        0
 Summary:        Spam filtering system
 License:        Apache-2.0
@@ -68,7 +68,6 @@ Source1:        usr.bin.rspamd
 Patch0:         rspamd-conf.patch
 Patch1:         rspamd-after-redis-target.patch
 # PATCH-FIX-UPSTREAM - https://github.com/rspamd/rspamd/issues/3656
-Patch2:         rspamd-add-lua-5.4.patch
 %if !0%{?is_opensuse}
 # because 80-check-malware-scan-clamav triggered in SLE-15-SP2
 BuildRequires:  -post-build-checks-malwarescan
@@ -100,6 +99,7 @@ BuildRequires:  pcre-devel
 BuildRequires:  pcre2-devel
 %endif
 BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(fmt)
 BuildRequires:  pkgconfig(glib-2.0) >= 2.28
 %if %{with ext_hiredis}
 BuildRequires:  pkgconfig(hiredis)
@@ -116,11 +116,16 @@ BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(systemd)
 %{?systemd_ordering}
 %endif
+BuildRequires:  pkgconfig(libzstd)

-%if 0%{?suse_version} < 1500
-Requires:       lua51-LPeg
+%if 0%{?suse_version} >= 1550
+Requires:       lua54-lpeg
 %else
+%if 0%{?suse_version} >= 1500
 Requires:       lua53-lpeg
+%else
+Requires:       lua51-LPeg
+%endif
 %endif
 %if 0%{?with split_out_client}
 Requires:       rspamd-client = %{version}
@@ -163,10 +168,7 @@ This package holds the client tools (rspamc and rspamadm)
 %endif

 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%autosetup -p1

 %build
 %if 0%{?force_gcc_version}
@@ -229,6 +231,8 @@ export CXX="g++-%{?force_gcc_version}"
  %if %{with jemalloc}
  -DENABLE_JEMALLOC=ON                      \
  %endif
+  -DSYSTEM_FMT=ON                           \
+  -DSYSTEM_ZSTD=ON                          \
  -DDEBIAN_BUILD=1                          \
  -DRSPAMD_GROUP=%{rspamd_group}            \
  -DRSPAMD_USER=%{rspamd_user}
@@ -373,6 +377,7 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo

 %dir %{_sysconfdir}/rspamd/modules.d
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/antivirus.conf
+%config(noreplace) %{_sysconfdir}/rspamd/modules.d/aws_s3.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/arc.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/asn.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/chartable.conf
@@ -383,6 +388,7 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/dmarc.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/elastic.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/emails.conf
+%config(noreplace) %{_sysconfdir}/rspamd/modules.d/external_relay.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/external_services.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/force_actions.conf
 %config(noreplace) %{_sysconfdir}/rspamd/modules.d/forged_recipients.conf
@@ -421,7 +427,9 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo
 %dir %{_sysconfdir}/rspamd/override.d

 %dir %{_datadir}/rspamd
+%{_datadir}/rspamd/aws_s3.lua
 %{_datadir}/rspamd/effective_tld_names.dat
+%{_datadir}/rspamd/external_relay.lua
 %{_datadir}/rspamd/http_headers.lua

 %dir %{_datadir}/rspamd/elastic
@@ -484,6 +492,7 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo
 %{_datadir}/rspamd/lualib/global_functions.lua
 %{_datadir}/rspamd/lualib/lpegre.lua
 %{_datadir}/rspamd/lualib/lua_auth_results.lua
+%{_datadir}/rspamd/lualib/lua_aws.lua
 %{_datadir}/rspamd/lualib/lua_bayes_learn.lua
 %{_datadir}/rspamd/lualib/lua_cfg_transform.lua
 %{_datadir}/rspamd/lualib/lua_clickhouse.lua
@@ -494,6 +503,7 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo
 %{_datadir}/rspamd/lualib/lua_maps_expressions.lua
 %{_datadir}/rspamd/lualib/lua_meta.lua
 %{_datadir}/rspamd/lualib/lua_mime.lua
+%{_datadir}/rspamd/lualib/lua_mime_types.lua
 %{_datadir}/rspamd/lualib/lua_redis.lua
 %{_datadir}/rspamd/lualib/lua_settings.lua
 %{_datadir}/rspamd/lualib/lua_smtp.lua
@@ -511,6 +521,7 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo
 %{_datadir}/rspamd/lualib/lua_content/ical.lua
 %{_datadir}/rspamd/lualib/lua_content/init.lua
 %{_datadir}/rspamd/lualib/lua_content/pdf.lua
+%{_datadir}/rspamd/lualib/lua_content/vcard.lua

 %dir %{_datadir}/rspamd/lualib/lua_ffi
 %{_datadir}/rspamd/lualib/lua_ffi/common.lua
@@ -537,6 +548,7 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo
 %{_datadir}/rspamd/lualib/lua_scanners/kaspersky_se.lua
 %{_datadir}/rspamd/lualib/lua_scanners/oletools.lua
 %{_datadir}/rspamd/lualib/lua_scanners/p0f.lua
+%{_datadir}/rspamd/lualib/lua_scanners/pyzor.lua
 %{_datadir}/rspamd/lualib/lua_scanners/razor.lua
 %{_datadir}/rspamd/lualib/lua_scanners/savapi.lua
 %{_datadir}/rspamd/lualib/lua_scanners/sophos.lua
@@ -553,11 +565,12 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo

 %dir %{_datadir}/rspamd/lualib/rspamadm
 %{_datadir}/rspamd/lualib/rspamadm/clickhouse.lua
-%{_datadir}/rspamd/lualib/rspamadm/confighelp.lua
 %{_datadir}/rspamd/lualib/rspamadm/configgraph.lua
+%{_datadir}/rspamd/lualib/rspamadm/confighelp.lua
 %{_datadir}/rspamd/lualib/rspamadm/configwizard.lua
 %{_datadir}/rspamd/lualib/rspamadm/cookie.lua
 %{_datadir}/rspamd/lualib/rspamadm/corpus_test.lua
+%{_datadir}/rspamd/lualib/rspamadm/dmarc_report.lua
 %{_datadir}/rspamd/lualib/rspamadm/dns_tool.lua
 %{_datadir}/rspamd/lualib/rspamadm/fuzzy_convert.lua
 %{_datadir}/rspamd/lualib/rspamadm/fuzzy_stat.lua
@@ -566,10 +579,13 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo
 %{_datadir}/rspamd/lualib/rspamadm/mime.lua
 %{_datadir}/rspamd/lualib/rspamadm/rescore.lua
 %{_datadir}/rspamd/lualib/rspamadm/stat_convert.lua
+%{_datadir}/rspamd/lualib/rspamadm/statistics_dump.lua
 %{_datadir}/rspamd/lualib/rspamadm/template.lua
 %{_datadir}/rspamd/lualib/rspamadm/vault.lua
+%{_datadir}/rspamd/lualib/rspamadm/neural_test.lua

 %dir %{_datadir}/rspamd/lualib/plugins
+%{_datadir}/rspamd/lualib/plugins/dmarc.lua
 %{_datadir}/rspamd/lualib/plugins/neural.lua
 %{_datadir}/rspamd/lualib/plugins/rbl.lua