gentoo auto-resync : 06:11:2022 - 09:19:37

10 files changed, 37 insertions, 437 deletions

diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 3ac4d53453a7..323d967f6fda 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 262745db415a..6a732b821bc3 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -3,23 +3,17 @@ AUX rspamd-2.6-unbundle-lua.patch 1344 BLAKE2B 0d5e07043f5bff29ef484e7708cd3b0fd
 AUX rspamd-2.7-cmake-lua-version.patch 1121 BLAKE2B 7fa15211805ebd90655eb696cb39d59215315fa55e2e286555f05c505af629119fa0e851dc2a7dd00779e06610d20e590cd57e08aca8557c752c3ab1bfc49bd3 SHA512 2977a94e4e2878a4148e292bc36f605df850145e011e8ef4c35d590ff203327c457c3856a8033d527428bf23673f54807acb912fb171c0550195b3cbf605cb6f
 AUX rspamd-2.7-unbundle-zstd.patch 4047 BLAKE2B 2a93a17980915a5dc12e20f89922d2e58a73df555ba41c7e8e39a65ccb507673d900fee4b25f1539a7cf516fcf92e1ecacfc5eb1f0c154830700e2ca95acef8b SHA512 ae589dcecfb15980ec94924d1a5c4e27d8a297fa11ae8c9c40ca4b8fb523039df1f8ee193c936b30b4c6e1fc31b301ce07fb08645778defefe3351ea6df43dd9
 AUX rspamd-3.0-cmake-lua-version.patch 1444 BLAKE2B b44ada90d1d4d59f000ab75a5d28545902235c85ccab3408eefb8f034bec0c86f6a62678cc5632c7db61b19e7cc1afff2b92a8f1493c64fbe831b3eca3836322 SHA512 f382af60698dd23e69469d6dfaf3c18cef0f413b22918725aec5dd09ee3f8c339d3a6ce92f46ebca89690ce57cab3295ab3093b502af7bce4ce5576c7fd3de9a
-AUX rspamd-3.0-fix-null-dereference.patch 1151 BLAKE2B ac2de9943a6581eb700d5c81b61afb79129fd485f004a4d65ba2ef8a5cf9c7f7e9bcc4e1b19f898fc6e781586c977aa65ac957eeff34766994e5159efe7a30c9 SHA512 acf836d043c38f741287d9d2f7a936f75e9b6ecb0609c58a4f315a10ecb089592feea968a71be2409c31aacd5c56340b6bbe59624cb40982656b50a3b0659e0f
-AUX rspamd-3.0-system-doctest.patch 3087 BLAKE2B 5d61f548bb2feba2fcb5de0eac5af3fd185e00d9c6a13e931f8f61e95a3465f93155a6335d6fb182da626baaf5e378db946219dba4c10994867a48fde3ebe9e7 SHA512 57f6e82319bf1e29d65953072e3c3a1d526c34fb01742080990d4764df35862c88aa4c44c06577a8265f52a401c48ecffd88e109f3abe69255b77ea9284a3cc5
-AUX rspamd-3.0-system-libfmt.patch 1860 BLAKE2B 50754cbcc3bf687fb0274af69d5985b3da2278444819c43d7b51ee11b97776eb49e303f0d606538dd67295efb1e66d0265cc44ad8882a482c01b7733cfc46228 SHA512 6d64681d4ba6f6e93dc2f021041e0cb72309e369daaeb93f42ff9ee34ce6a9ea05db4a7ff21948788717d18d89287d2c0a9454a60b3f9bb9f72dab5be60ce7b2
 AUX rspamd-3.2-unbundle-lua.patch 1749 BLAKE2B 5cab7403c2a2db85e224fddb5ce13196e10eb0a1abb4bed85a7112b8864f9635e04ba763783811a337d6d9bd87ce68250c9201c0339bb596f95f322efaa6e733 SHA512 649a02af6682e1e76f4be677d61a93d5c78997bda6fd13982791744747c185f53d7a4261b24222bc0dd626319da0632828a590806ec7b305595297164e89407a
+AUX rspamd-3.3-remove-test-case.patch 1090 BLAKE2B 5bdd567f1a4edbea2a610ce0998ab1cae6647af4a3af36bdd1c90b6275407b8cf782089c9661ba8957d43dd31a9880cfd8b205fccac67d2121401ea9c7b2db1f SHA512 ad947b1f33b5de4d83d0ee1fbbbd51139d759e5758f9354dc45a604575764ecc0e08b362586b4bfa8ec35555cf5f622d7898e5be780f7b4efdbc3f38ced3a669
 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7
 AUX rspamd-r7.init 1357 BLAKE2B 90227e0980397a256e6136cac4a4a4d143130d82a211bfd4894d5f8deb85113e0b219e6453257d548ec3d80de24241e6ecfc2b0a4178cb344c8c6549d96e549b SHA512 89a079d32b7d8c5a037c7bb2ab6825624ce89ea4b25893bcf6f49befc0c7b924b51d48b30bf61c4b3ea5bc3ccbaba16664c7df52236debda0bdb58f1adf8867a
 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1
 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8
 DIST rspamd-2.7.tar.gz 5126227 BLAKE2B 70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930 SHA512 8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
-DIST rspamd-3.0.tar.gz 5535659 BLAKE2B 605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa SHA512 1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
-DIST rspamd-3.1.tar.gz 5566920 BLAKE2B dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc SHA512 3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
-DIST rspamd-3.2.tar.gz 5637835 BLAKE2B 8d42b34dacdc818689fd8602abf8c4d5ff2431eb30b2d8fae6e78642ce4361d39a54cb4b981c58cd31205b0f2013978896081e0d7364620312db3fa855d14b1e SHA512 fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79
 DIST rspamd-3.3.tar.gz 5680874 BLAKE2B 2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9 SHA512 02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
+DIST rspamd-3.4.tar.gz 5689732 BLAKE2B 8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104 SHA512 fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
 EBUILD rspamd-2.7-r104.ebuild 2714 BLAKE2B 66f8af6dc6c41333c6adfc7109d18fb4afe3add890c7599488f411d7605ce88ae401a5d9460dd0c4fd732ccfcc8409ea38fb1ff05f666dafb2846d7dc043316c SHA512 3f90efea931ce5c42ceda477879124803ab6c07b8633480ec27c12869cc8645804b262b7a44db540cafb2f6045a44eeda58cfd994645ddc9739474339ca29f70
-EBUILD rspamd-3.0-r4.ebuild 3005 BLAKE2B d92759892eab41d6c0674c13b2cdff521df58c8895d2f530010df694e352634dadeeb835ab6cfbd7d543e085e6bbd7f7d24357a56c0be4c82581b9a7e41845ac SHA512 d75a91150729eac9ea6f1dcae227f45cbf0e8b305795e9d72e42d50312c765e3ab9a1bb2573abbd0b0676d805d5cb073401f6b0fc8d00ed9639d61d8f372e94a
-EBUILD rspamd-3.1-r2.ebuild 2926 BLAKE2B acad05d3c35d53dc4c50e5f651f09fedc77dc0c7ec93c35f8e1adedc0b1e208d1076a599475d0d14ee2d6f831143579a2139ea9de6ccb0c66d534ab78de50bb6 SHA512 c5e495833dc636dd94657c5afb10b4dacaffca04441a35287514dcb7d0add3c0d9a8da8025a8d320bc95c169ed82f70922298225d2f8c9416a8c15d5c97a39b1
-EBUILD rspamd-3.2.ebuild 2904 BLAKE2B 1104dbd6d492d327b005708a4009829e53af0be6b58093d4795e1b2461c6287608246bf8f16f3d59dde8410141544e8b0669541cf43768f30539a728de9668a3 SHA512 c81efb5e723aa945ff974726b2ae72fee2d365b549f71628ccfdab8ac95a0af4919aae9eeaccabce4711b74debfffeb0efe67de50c6f4f62ed990d88f29db03d
-EBUILD rspamd-3.3.ebuild 2962 BLAKE2B 1ce9fae978e5ddafa8f887f5499585fba244774af96391639ce46b039bfbcc0cc409d8bc29acf1757d3a11b34d07d67e8498b6b8d5b540ca215142fb2549bdbe SHA512 d8c65eeb8f5be736249b2f7fbd573f669ad1a66ae95a5324de7d952086d3d17d9fb1b9c68630c37e28b8fd4cb508dfc12a0e24f2461904614c3fff46083bd37f
+EBUILD rspamd-3.3.ebuild 3011 BLAKE2B c993baf5ff8af1d329065c159dcea87ee96a8e5f1797f7bfc511cd50c2a897a13ba1dfc7338000b51f02c4949ea5e2676481a78ad398e9dfc665d4c1d088559e SHA512 33c0087845c19ec7f1bad81c080df2924e0d72ea9abf3d61cb0ee992cbcc82706eaab5964e593ffa7f8960b13bb13e716d266d49e5814db071e939eee411335c
+EBUILD rspamd-3.4.ebuild 3007 BLAKE2B 8e4aed3dfafba9f01073c1c7631efcf48c0befaaf9eaca024515420087371964996bc71230e5132f0a302480584146ce95a4494eeb4ddeef38fd35a50dd43b18 SHA512 09d554e3c11f26a6fc496f4308f129889aa2d0d3b0dda9a0f7dcca68753d258029d1e0be8b3947c2d287a513bd68d4a15004333ad713787f127f24f60e00d1a4
 EBUILD rspamd-9999.ebuild 2962 BLAKE2B 1ce9fae978e5ddafa8f887f5499585fba244774af96391639ce46b039bfbcc0cc409d8bc29acf1757d3a11b34d07d67e8498b6b8d5b540ca215142fb2549bdbe SHA512 d8c65eeb8f5be736249b2f7fbd573f669ad1a66ae95a5324de7d952086d3d17d9fb1b9c68630c37e28b8fd4cb508dfc12a0e24f2461904614c3fff46083bd37f
 MISC metadata.xml 617 BLAKE2B ba8fa4a2dd3e0ae82670c7573d59efea267cb2daf3f2332d3c66d97ce8a96b2e1385af688ed9ebb734698fe3439adbc707dc1ab6be80e3651feb5fe07ed0ace5 SHA512 c3b55719e48afcb581eb9ff9bfcde69cb72cfab4341624fefb5e15d68424099d9b4834cc2979391d8681ed081ec1b2aa1eb764e11a9a635960abeedf98ba52dc
diff --git a/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch b/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
deleted file mode 100644
index d355f701a273..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From abea3ac21f764658a966dad475fc99e4b79530d7 Mon Sep 17 00:00:00 2001
-From: Jan Smutny <js@excello.cz>
-Date: Tue, 31 Aug 2021 14:25:23 +0200
-Subject: [PATCH] [Fix] src/lua/lua_mimepart.c: fix null dereference
-
----
-
-This patch is taken from upstream. It fixes possible runtime segfaults.
-
-PR: https://github.com/rspamd/rspamd/pull/3873
-
-diff --git a/src/lua/lua_mimepart.c b/src/lua/lua_mimepart.c
-index 66b588e3a..21a46d496 100644
---- a/src/lua/lua_mimepart.c
-+++ b/src/lua/lua_mimepart.c
-@@ -1240,7 +1240,16 @@ lua_textpart_get_fuzzy_hashes (lua_State * L)
- 	rspamd_stat_token_t *word;
- 	struct lua_shingle_filter_cbdata cbd;
- 
--	if (part && pool) {
-+
-+	if (part == NULL || pool == NULL) {
-+		return luaL_error (L, "invalid arguments");
-+	}
-+
-+	if (IS_TEXT_PART_EMPTY (part) || part->utf_words == NULL) {
-+		lua_pushnil (L);
-+		lua_pushnil (L);
-+	}
-+	else {
- 		/* TODO: add keys and algorithms support */
- 		rspamd_cryptobox_hash (key, "rspamd", strlen ("rspamd"), NULL, 0);
- 
-@@ -1294,9 +1303,6 @@ lua_textpart_get_fuzzy_hashes (lua_State * L)
- 			}
- 		}
- 	}
--	else {
--		return luaL_error (L, "invalid arguments");
--	}
- 
- 	return 2;
- }
--- 
-2.31.1
-
diff --git a/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch b/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
deleted file mode 100644
index bb315ee7a459..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From d37a3764e9889e6de0a7341ba3195ee8a314de23 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
-Date: Wed, 1 Sep 2021 13:30:56 +0200
-Subject: [PATCH] Add SYSTEM_DOCTEST cmake option
-
-This gives packagers option to use system version of doctest rather than
-bundled one. It is disabled by default. Additionally, there is no need
-to link rspamd-test-cxx with doctest as it is is single header library.
-
-Main reason for this change is that currently bundled version of
-doctest-2.4.5 can't compile with glibc-2.34 [1]. However, this issue was
-already fixed in upstream doctest-2.4.6 [2] in commit [3]. With this,
-packagers can just bump doctest to fixed version.
-
-[1] https://github.com/onqtam/doctest/issues/473
-[2] https://github.com/onqtam/doctest/blob/master/CHANGELOG.md#246-2021-03-22
-[3] https://github.com/onqtam/doctest/commit/099d5414e97244ec44cf46b14cd176b3a3dc52e3
----
-
-Merged-to-upstream: https://github.com/rspamd/rspamd/pull/3875
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fc4175677..ced49730d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,6 +59,7 @@ OPTION(ENABLE_LUA_TRACE    "Trace all Lua C API invocations [default: OFF]" OFF)
- OPTION(ENABLE_LUA_REPL     "Enables Lua repl (requires C++11 compiler) [default: ON]" ON)
- OPTION(SYSTEM_ZSTD         "Use system zstd instead of bundled one [default: OFF]" OFF)
- OPTION(SYSTEM_FMT          "Use system fmt instead of bundled one [defalut: OFF]" OFF)
-+OPTION(SYSTEM_DOCTEST      "Use system doctest instead of bundled one [default: OFF]" OFF)
- 
- ############################# INCLUDE SECTION #############################################
- 
-@@ -118,7 +119,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
- 		"${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
- 		"${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
- 		"${CMAKE_SOURCE_DIR}/contrib/frozen/include"
--		"${CMAKE_SOURCE_DIR}/contrib/doctest"
- 		"${CMAKE_SOURCE_DIR}/contrib/fu2/include"
- 		"${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
- 		"${CMAKE_BINARY_DIR}/src/libcryptobox")
-@@ -656,7 +656,12 @@ IF(SYSTEM_FMT MATCHES "OFF")
- ELSE()
- 	find_package(fmt)
- ENDIF()
--ADD_SUBDIRECTORY(contrib/doctest)
-+IF(SYSTEM_DOCTEST MATCHES "OFF")
-+	ADD_SUBDIRECTORY(contrib/doctest)
-+	INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/doctest")
-+ELSE()
-+	find_package(doctest)
-+ENDIF()
- 
- IF (NOT WITH_LUAJIT)
- 	ADD_SUBDIRECTORY(contrib/lua-bit)
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 9e56cbad7..08e9556f3 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -24,9 +24,7 @@ SET(CXXTESTSSRC		rspamd_cxx_unit.cxx)
- ADD_EXECUTABLE(rspamd-test-cxx EXCLUDE_FROM_ALL ${CXXTESTSSRC})
- SET_TARGET_PROPERTIES(rspamd-test-cxx PROPERTIES LINKER_LANGUAGE CXX)
- ADD_DEPENDENCIES(rspamd-test-cxx rspamd-server)
--ADD_DEPENDENCIES(rspamd-test-cxx doctest)
- TARGET_LINK_LIBRARIES(rspamd-test-cxx PRIVATE rspamd-server)
--TARGET_LINK_LIBRARIES(rspamd-test-cxx PRIVATE doctest)
- SET_TARGET_PROPERTIES(rspamd-test-cxx PROPERTIES LINKER_LANGUAGE CXX)
- 
- IF(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
--- 
-2.31.1
-
diff --git a/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch b/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch
deleted file mode 100644
index a6439b465e92..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.0-system-libfmt.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 309bb213cffb23e6bee98157b53cf5db31f97ef9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
-Date: Sat, 21 Aug 2021 11:24:35 +0200
-Subject: [PATCH] Add SYSTEM_FMT cmake option
-
-This gives packagers option to use system version of fmt rather than
-bundled one. It is disabled by default.
----
-
-Merged-to-upstream: https://github.com/rspamd/rspamd/pull/3855
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c38758f3..fc4175677 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,6 +58,7 @@ OPTION(ENABLE_LIBUNWIND    "Use libunwind to print crash traces [default: OFF]"
- OPTION(ENABLE_LUA_TRACE    "Trace all Lua C API invocations [default: OFF]" OFF)
- OPTION(ENABLE_LUA_REPL     "Enables Lua repl (requires C++11 compiler) [default: ON]" ON)
- OPTION(SYSTEM_ZSTD         "Use system zstd instead of bundled one [default: OFF]" OFF)
-+OPTION(SYSTEM_FMT          "Use system fmt instead of bundled one [defalut: OFF]" OFF)
- 
- ############################# INCLUDE SECTION #############################################
- 
-@@ -117,7 +118,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
- 		"${CMAKE_SOURCE_DIR}/contrib/lc-btrie"
- 		"${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
- 		"${CMAKE_SOURCE_DIR}/contrib/frozen/include"
--		"${CMAKE_SOURCE_DIR}/contrib/fmt/include"
- 		"${CMAKE_SOURCE_DIR}/contrib/doctest"
- 		"${CMAKE_SOURCE_DIR}/contrib/fu2/include"
- 		"${CMAKE_BINARY_DIR}/src" #Stored in the binary dir
-@@ -650,7 +650,12 @@ ADD_SUBDIRECTORY(contrib/libev)
- ADD_SUBDIRECTORY(contrib/kann)
- ADD_SUBDIRECTORY(contrib/fastutf8)
- ADD_SUBDIRECTORY(contrib/google-ced)
--ADD_SUBDIRECTORY(contrib/fmt)
-+IF(SYSTEM_FMT MATCHES "OFF")
-+	ADD_SUBDIRECTORY(contrib/fmt)
-+	INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/contrib/fmt/include")
-+ELSE()
-+	find_package(fmt)
-+ENDIF()
- ADD_SUBDIRECTORY(contrib/doctest)
- 
- IF (NOT WITH_LUAJIT)
--- 
-2.31.1
-
diff --git a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
new file mode 100644
index 000000000000..0cad11382b21
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
@@ -0,0 +1,20 @@
+Remove test case which does not work with luajit-2.1 anymore as it
+depends on internal behavior of lujait-2.0.
+
+Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
+
+diff --git a/test/lua/unit/lua_util.extract_specific_urls.lua b/test/lua/unit/lua_util.extract_specific_urls.lua
+index 05ffeb7b0..a7e2f9f48 100644
+--- a/test/lua/unit/lua_util.extract_specific_urls.lua
++++ b/test/lua/unit/lua_util.extract_specific_urls.lua
+@@ -108,7 +108,6 @@ context("Lua util - extract_specific_urls plain", function()
+   local cases = {
+     {expect = url_list, filter = nil, limit = 9999, need_emails = true, prefix = 'p'},
+     {expect = {}, filter = (function() return false end), limit = 9999, need_emails = true, prefix = 'p'},
+-    {expect = {"domain4.co.net", "test.com"}, filter = nil, limit = 2, need_emails = true, prefix = 'p'},
+     {expect = {"domain4.co.net", "test.com", "domain3.org"}, filter = nil, limit = 3, need_emails = true, prefix = 'p'},
+     {
+       expect = {"gov.co.net", "tesco.co.net", "domain1.co.net", "domain2.co.net", "domain3.co.net", "domain4.co.net"},
+-- 
+2.37.4
+
diff --git a/mail-filter/rspamd/rspamd-3.0-r4.ebuild b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
deleted file mode 100644
index ad3bcaa4ff19..000000000000
--- a/mail-filter/rspamd/rspamd-3.0-r4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit cmake lua-single pax-utils systemd tmpfiles
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
-SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux test"
-RESTRICT="!test? ( test )"
-
-# A part of tests use ffi luajit extension
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	test? ( lua_single_target_luajit )"
-
-RDEPEND="${LUA_DEPS}
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	')
-	acct-group/rspamd
-	acct-user/rspamd
-	app-arch/zstd:=
-	dev-db/sqlite:3
-	dev-cpp/doctest
-	dev-libs/glib:2
-	dev-libs/icu:=
-	dev-libs/libev
-	dev-libs/libfmt:=
-	dev-libs/libsodium:=
-	dev-libs/snowball-stemmer:=
-	sys-apps/file
-	sys-libs/zlib
-	blas? (
-		virtual/blas
-		virtual/lapack
-	)
-	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-	jemalloc? ( dev-libs/jemalloc:= )
-	dev-libs/openssl:0=[-bindist(-)]
-	pcre2? ( dev-libs/libpcre2:=[jit=] )
-	!pcre2? ( dev-libs/libpcre[jit=] )
-	selinux? ( sec-policy/selinux-spamassassin )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/ragel
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake-lua-version.patch"
-	"${FILESDIR}/${P}-system-libfmt.patch"
-	"${FILESDIR}/${P}-system-doctest.patch"
-	"${FILESDIR}/${P}-fix-null-dereference.patch"
-	"${FILESDIR}/${PN}-2.6-unbundle-lua.patch"
-	"${FILESDIR}/${PN}-2.5-unbundle-snowball.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
-
-	sed -i -e 's/User=_rspamd/User=rspamd/g' \
-		rspamd.service \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR=/etc/rspamd
-		-DRUNDIR=/var/run/rspamd
-		-DDBDIR=/var/lib/rspamd
-		-DLOGDIR=/var/log/rspamd
-
-		-DSYSTEM_DOCTEST=ON
-		-DSYSTEM_FMT=ON
-		-DSYSTEM_ZSTD=ON
-
-		-DENABLE_BLAS=$(usex blas ON OFF)
-		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
-		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build run-test
-}
-
-src_install() {
-	cmake_src_install
-
-	newconfd "${FILESDIR}"/rspamd.conf rspamd
-	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
-	systemd_newunit rspamd.service rspamd.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	# Remove mprotect for JIT support
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
-	diropts -o rspamd -g rspamd
-	keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}
diff --git a/mail-filter/rspamd/rspamd-3.1-r2.ebuild b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
deleted file mode 100644
index ac8b9e2b716a..000000000000
--- a/mail-filter/rspamd/rspamd-3.1-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake lua-single pax-utils systemd tmpfiles
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/rspamd/rspamd.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
-SLOT="0"
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux test"
-RESTRICT="!test? ( test )"
-
-# A part of tests use ffi luajit extension
-REQUIRED_USE="${LUA_REQUIRED_USE}
-	test? ( lua_single_target_luajit )"
-
-RDEPEND="${LUA_DEPS}
-	$(lua_gen_cond_dep '
-		dev-lua/LuaBitOp[${LUA_USEDEP}]
-	')
-	acct-group/rspamd
-	acct-user/rspamd
-	app-arch/zstd:=
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/icu:=
-	dev-libs/libev
-	dev-libs/libfmt:=
-	dev-libs/libsodium:=
-	dev-libs/snowball-stemmer:=
-	sys-apps/file
-	sys-libs/zlib
-	blas? (
-		virtual/blas
-		virtual/lapack
-	)
-	cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
-	jemalloc? ( dev-libs/jemalloc:= )
-	dev-libs/openssl:0=[-bindist(-)]
-	pcre2? ( dev-libs/libpcre2:=[jit=] )
-	!pcre2? ( dev-libs/libpcre[jit=] )
-	selinux? ( sec-policy/selinux-spamassassin )"
-DEPEND="
-	${RDEPEND}
-	dev-cpp/doctest"
-BDEPEND="
-	dev-util/ragel
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
-	"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
-	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
-
-	> cmake/Toolset.cmake || die #827550
-
-	sed -i -e 's/User=_rspamd/User=rspamd/g' \
-		rspamd.service \
-		|| die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFDIR=/etc/rspamd
-		-DRUNDIR=/var/run/rspamd
-		-DDBDIR=/var/lib/rspamd
-		-DLOGDIR=/var/log/rspamd
-
-		-DSYSTEM_DOCTEST=ON
-		-DSYSTEM_FMT=ON
-		-DSYSTEM_ZSTD=ON
-
-		-DENABLE_BLAS=$(usex blas ON OFF)
-		-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-		-DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
-		-DENABLE_PCRE2=$(usex pcre2 ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build run-test
-}
-
-src_install() {
-	cmake_src_install
-
-	newconfd "${FILESDIR}"/rspamd.conf rspamd
-	newinitd "${FILESDIR}/rspamd-r7.init" rspamd
-	systemd_newunit rspamd.service rspamd.service
-
-	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
-
-	# Remove mprotect for JIT support
-	if use lua_single_target_luajit; then
-		pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-*
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rspamd-r1.logrotate rspamd
-
-	diropts -o rspamd -g rspamd
-	keepdir /var/{lib,log}/rspamd
-}
-
-pkg_postinst() {
-	tmpfiles_process "${PN}.conf"
-}
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild b/mail-filter/rspamd/rspamd-3.3.ebuild
index b6932290133a..7231e72c2f72 100644
--- a/mail-filter/rspamd/rspamd-3.3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.3.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
 	"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
 	"${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
 	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+	"${FILESDIR}/rspamd-3.3-remove-test-case.patch"
 )
 
 src_prepare() {
diff --git a/mail-filter/rspamd/rspamd-3.2.ebuild b/mail-filter/rspamd/rspamd-3.4.ebuild
index 136dcaf7574d..cb1d4e71df63 100644
--- a/mail-filter/rspamd/rspamd-3.2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4.ebuild
@@ -16,7 +16,11 @@ else
 fi
 
 DESCRIPTION="Rapid spam filtering system"
-HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"
+HOMEPAGE="
+	https://rspamd.com
+	https://github.com/rspamd/rspamd
+"
+
 LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB"
 SLOT="0"
 IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit selinux test"
@@ -43,6 +47,7 @@ RDEPEND="${LUA_DEPS}
 	dev-libs/libsodium:=
 	dev-libs/openssl:0=[-bindist(-)]
 	dev-libs/snowball-stemmer:=
+	>=dev-libs/xxhash-0.8.0
 	sys-apps/file
 	sys-libs/zlib
 	blas? (
@@ -62,15 +67,16 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
-	"${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
-	"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+	"${FILESDIR}/${PN}-3.0-cmake-lua-version.patch"
+	"${FILESDIR}/${PN}-3.2-unbundle-lua.patch"
+	"${FILESDIR}/${PN}-2.5-unbundle-snowball.patch"
+	"${FILESDIR}/${PN}-3.3-remove-test-case.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,zstd} || die
+	rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd} || die
 
 	> cmake/Toolset.cmake || die #827550
 
@@ -88,6 +94,7 @@ src_configure() {
 
 		-DSYSTEM_DOCTEST=ON
 		-DSYSTEM_FMT=ON
+		-DSYSTEM_XXHASH=ON
 		-DSYSTEM_ZSTD=ON
 
 		-DENABLE_BLAS=$(usex blas ON OFF)