commit: 9dc41c369795caf519f401b2e3f66a3afab3d7dd Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Fri Aug 29 07:41:09 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Fri Aug 29 07:41:09 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc41c36
mail-filter/rspamd: drop 3.11.1-r1, 3.12.0 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> mail-filter/rspamd/Manifest | 2 - .../rspamd-3.11.1-doctest-compatibility.patch | 45 ----- .../files/rspamd-3.11.1-punycode-icu-76.1.patch | 36 ---- .../files/rspamd-3.6-cmake-lua-version.patch | 64 ------- .../rspamd/files/rspamd-3.6-unbundle-lua.patch | 61 ------- .../files/rspamd-3.6-unbundle-snowball.patch | 20 --- .../rspamd/files/rspamd-3.9.0-older-libfmt.patch | 184 --------------------- mail-filter/rspamd/rspamd-3.11.1-r1.ebuild | 161 ------------------ mail-filter/rspamd/rspamd-3.12.0.ebuild | 153 ----------------- 9 files changed, 726 deletions(-) diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index cd002d1df018..6c0eb3da18b8 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,3 +1 @@ -DIST rspamd-3.11.1.tar.gz 6455199 BLAKE2B 4dffefa8b660b960d670bcaf485ce83b5cfac99be8e3871c059f105ef2c75d3e3d4cecbbc983e61b762d8363e8873e8ee5a30d7444822da595f72130db9d2674 SHA512 979aad9d2cc720c12922d55f4ad742b65e18d0ca52ebb764a2432bd3d64e559461c8e1fa87f7ac52e614df71d0a776aa0362a876eaa745cd3f8c21afee52b8ab -DIST rspamd-3.12.0.tar.gz 6477346 BLAKE2B 16f541ead3f01696113164e0a58e313260668ce1ecbac658c192f7e8b075383008c1de91e6180b3275f4d5a7ae9f43ee7932c1532c490f72b8e13bd7e7b90d3f SHA512 7861680c63cca425d8dcfecef5581361cada34d7dc8690cd6e6a73e00657a9e5a6d499d96cbdbec62bc1d3dbdcfd6b3865cd7949532379aa15c3b0c1bfbac9f7 DIST rspamd-3.12.1.tar.gz 6482214 BLAKE2B 06869bdaace99cf26a013609d8744e86ca2fbc7310bcf884db6edb2f52a62f2d47c38801483c312801348e64711ed691f59ab9ddf56d9c4c88ab3b237e8e10ec SHA512 5e049f6aa872f9ded9ee7f580222edb83260a3a8dc14b74a0f95b88796d36690ac5e9b33b143560253111f79cc8cd5231fd2478661d8cfe92d75874cc472cf6c diff --git a/mail-filter/rspamd/files/rspamd-3.11.1-doctest-compatibility.patch b/mail-filter/rspamd/files/rspamd-3.11.1-doctest-compatibility.patch deleted file mode 100644 index 68d91b4c3124..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.11.1-doctest-compatibility.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 08e94fb8276b568e33480df60dec0a72ba1bef26 Mon Sep 17 00:00:00 2001 -From: Alexandra Parker <[email protected]> -Date: Wed, 7 May 2025 13:17:32 -0700 -Subject: [PATCH] [Fix] libmime: declare comparators const for doctest 2.4.12 - compatibility - -Petr Vaněk pointed out a change in doctest 2.4.12 that broke the libmime -test code: -https://github.com/doctest/doctest/commit/d7a5eeb820b61cc3af8a61b3117f76a403b7742a - -CHECK is now treats LHS as const and the compiler won't find non-const -operator== as a result. It's reasonable for comparators to be const, so -make them const. - -Signed-Off-By: Alexandra Parker <[email protected]> -Upstream-PR: https://github.com/rspamd/rspamd/pull/5458 - -diff --git a/src/libmime/mime_string.hxx b/src/libmime/mime_string.hxx -index b181576d33..d6c11d018b 100644 ---- a/src/libmime/mime_string.hxx -+++ b/src/libmime/mime_string.hxx -@@ -497,19 +497,19 @@ public: - } - - /* Comparison */ -- auto operator==(const basic_mime_string &other) -+ auto operator==(const basic_mime_string &other) const - { - return other.storage == storage; - } -- auto operator==(const storage_type &other) -+ auto operator==(const storage_type &other) const - { - return other == storage; - } -- auto operator==(const view_type &other) -+ auto operator==(const view_type &other) const - { - return other == storage; - } -- auto operator==(const CharT *other) -+ auto operator==(const CharT *other) const - { - if (other == NULL) { - return false; diff --git a/mail-filter/rspamd/files/rspamd-3.11.1-punycode-icu-76.1.patch b/mail-filter/rspamd/files/rspamd-3.11.1-punycode-icu-76.1.patch deleted file mode 100644 index 1dce30f3ed86..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.11.1-punycode-icu-76.1.patch +++ /dev/null @@ -1,36 +0,0 @@ -From e6e947a4ee4757628d90fd819c664187e796bd19 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <[email protected]> -Date: Thu, 8 May 2025 09:17:18 +0200 -Subject: [PATCH] Remove punycode tests failing with icu 76.1 - -Some punycode tests fail due to a transitional processing deprecation in -icu 76.1, see [1,2]. Let's remove those tests. - -[1] https://github.com/unicode-org/icu/commit/f062f52c123f436eb1142115ba2e4e7b65a4ac8f -[2] https://unicode-org.atlassian.net/browse/ICU-22294 - -Upstream-issue: https://github.com/rspamd/rspamd/issues/5263 ---- - test/lua/unit/rspamd_resolver.lua | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/test/lua/unit/rspamd_resolver.lua b/test/lua/unit/rspamd_resolver.lua -index e987ff00b..405951758 100644 ---- a/test/lua/unit/rspamd_resolver.lua -+++ b/test/lua/unit/rspamd_resolver.lua -@@ -7,12 +7,6 @@ context("Check punycoding UTF-8 URL", function() - local resolver = rspamd_resolver.init(rspamd_util.create_event_base(), rspamd_config) - - local cases = { -- -- https://unicode.org/reports/tr46/#Deviations -- ['faß.de'] = 'fass.de', -- IDNA2008 result: xn--fa-hia.de -- ['βόλος.com'] = 'xn--nxasmq6b.com', -- IDNA2008 result: xn--nxasmm1c.com -- ['نامهای.com'] = 'xn--mgba3gch31f.com', -- IDNA2008 result: xn--mgba3gch31f060k.com -- ['ශ්රී.com'] = 'xn--10cl1a0b.com', -- IDNA2008 result: xn--10cl1a0b660p.com -- - -- https://unicode.org/reports/tr46/#Table_Example_Processing - ['日本語。ＪＰ'] = 'xn--wgv71a119e.jp', -- Fullwidth characters are remapped, including 。 - --['u¨.com'] = 'xn--tda.com', -- Normalize changes u + umlaut to ü --- -2.45.3 - diff --git a/mail-filter/rspamd/files/rspamd-3.6-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-3.6-cmake-lua-version.patch deleted file mode 100644 index 9a08eaac28b0..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.6-cmake-lua-version.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bea0af828..f72304f05 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -149,55 +149,8 @@ IF (ENABLE_LUAJIT MATCHES "ON") - ELSE (ENABLE_LUAJIT MATCHES "ON") - - ProcessPackage(LIBLUA LIBRARY "lua" -- "lua-5.3" -- LIB_SUFFIXES "lua5.3" -- INCLUDE lua.h INCLUDE_SUFFIXES -- "include/lua-5.3" -- "include/lua5.3" -- "include/lua53" -- "include/lua" - ROOT ${LUA_ROOT} -- MODULES lua53 -- OPTIONAL) -- -- IF (NOT WITH_LIBLUA) -- ProcessPackage(LIBLUA LIBRARY "lua" -- "lua-5.4" -- LIB_SUFFIXES "lua5.4" -- INCLUDE lua.h INCLUDE_SUFFIXES -- "include/lua-5.4" -- "include/lua5.4" -- "include/lua54" -- "include/lua" -- ROOT ${LUA_ROOT} -- MODULES lua54 -- OPTIONAL) -- IF (NOT WITH_LIBLUA) -- ProcessPackage(LIBLUA LIBRARY "lua" -- "lua-5.2" -- LIB_SUFFIXES "lua5.2" -- INCLUDE lua.h INCLUDE_SUFFIXES -- "include/lua-5.2" -- "include/lua5.2" -- "include/lua52" -- "include/lua" -- ROOT ${LUA_ROOT} -- 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 () -+ MODULES lua) - ENDIF (ENABLE_LUAJIT MATCHES "ON") - - IF (ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE) --- -2.41.0 - diff --git a/mail-filter/rspamd/files/rspamd-3.6-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-3.6-unbundle-lua.patch deleted file mode 100644 index 78a2a49d796f..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.6-unbundle-lua.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bea0af828..d7a4eed14 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -641,10 +641,6 @@ ELSE () - find_package(doctest) - ENDIF () - --IF (NOT WITH_LUAJIT) -- ADD_SUBDIRECTORY(contrib/lua-bit) --ENDIF () -- - IF (ENABLE_LUA_REPL MATCHES "ON") - ADD_SUBDIRECTORY(contrib/replxx) - SET(WITH_LUA_REPL 1) -@@ -742,7 +738,6 @@ ENDFOREACH (LUA_LIB) - - # Install lua fun library - INSTALL(FILES "contrib/lua-fun/fun.lua" DESTINATION ${LUALIBDIR}) --INSTALL(FILES "contrib/lua-argparse/argparse.lua" DESTINATION ${LUALIBDIR}) - INSTALL(FILES "contrib/lua-tableshape/tableshape.lua" DESTINATION ${LUALIBDIR}) - INSTALL(FILES "contrib/lua-lupa/lupa.lua" DESTINATION ${LUALIBDIR}) - INSTALL(FILES "contrib/lua-lpeg/lpegre.lua" DESTINATION ${LUALIBDIR}) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 5dee8e610..a90f8d52d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -205,10 +205,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON") - ADD_DEPENDENCIES(rspamd-server rspamd-clang) - ENDIF() - --IF (NOT WITH_LUAJIT) -- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit) --ENDIF() -- - IF (ENABLE_SNOWBALL MATCHES "ON") - TARGET_LINK_LIBRARIES(rspamd-server stemmer) - ENDIF() -diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c -index b543ae5db..7a93934fd 100644 ---- a/src/lua/lua_common.c -+++ b/src/lua/lua_common.c -@@ -904,10 +904,6 @@ rspamd_lua_wipe_realloc(void *ud, - return NULL; - } - --#ifndef WITH_LUAJIT --extern int luaopen_bit(lua_State *L); --#endif -- - static unsigned int lua_initialized = 0; - - lua_State * -@@ -975,7 +971,6 @@ rspamd_lua_init(bool wipe_mem) - luaopen_parsers(L); - luaopen_compress(L); - #ifndef WITH_LUAJIT -- rspamd_lua_add_preload(L, "bit", luaopen_bit); - lua_settop(L, 0); - #endif - diff --git a/mail-filter/rspamd/files/rspamd-3.6-unbundle-snowball.patch b/mail-filter/rspamd/files/rspamd-3.6-unbundle-snowball.patch deleted file mode 100644 index 5779142b7b10..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.6-unbundle-snowball.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bea0af828..00778100c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -115,7 +115,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/" - "${CMAKE_SOURCE_DIR}/contrib/fpconv" - "${CMAKE_SOURCE_DIR}/contrib/libottery" - "${CMAKE_SOURCE_DIR}/contrib/cdb" -- "${CMAKE_SOURCE_DIR}/contrib/snowball/include" - "${CMAKE_SOURCE_DIR}/contrib/librdns" - "${CMAKE_SOURCE_DIR}/contrib/aho-corasick" - "${CMAKE_SOURCE_DIR}/contrib/lc-btrie" -@@ -617,7 +616,6 @@ ELSE () - ADD_DEFINITIONS(-DSYS_ZSTD) - ENDIF () - IF (ENABLE_SNOWBALL MATCHES "ON") -- ADD_SUBDIRECTORY(contrib/snowball) - SET(WITH_SNOWBALL 1) - ENDIF () - ADD_SUBDIRECTORY(contrib/libucl) diff --git a/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch b/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch deleted file mode 100644 index 0b6de27f5689..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 0826efdadc36a7f1f4251f0450101fb5cbb1c94f Mon Sep 17 00:00:00 2001 -From: Petr Vaněk <[email protected]> -Date: Sat, 13 Jul 2024 15:53:28 +0200 -Subject: [PATCH] backward compatibility with <dev-libs/libfmt-11 - -Upstream updated bundled libfmt to version 11 [1], where fmt/core.h was -renamed to fmt/base.h [2]. Rspamd switched to a new header file but -libfmt reintroduced fmt/core.h later for compatibility reasons. This -patch switches fmt/base.h back to fmt/core.h in order to be able to work -with <dev-libs/libfmt-11. - -[1] https://github.com/rspamd/rspamd/commit/19299911dc7b951fa9649b918a661026a5d0e450 -[2] https://github.com/fmtlib/fmt/commit/79f1506fe3a7fae7c22c55d3cd7cdc33bc536dae -[3] https://github.com/fmtlib/fmt/commit/58a6bd48a8dc7ea74bb9fd900c60fd333a85725f - -diff --git a/src/libmime/lang_detection_fasttext.cxx b/src/libmime/lang_detection_fasttext.cxx -index 89916151f..5c3549c8e 100644 ---- a/src/libmime/lang_detection_fasttext.cxx -+++ b/src/libmime/lang_detection_fasttext.cxx -@@ -20,7 +20,7 @@ - #include "fasttext/fasttext.h" - #include "libserver/cfg_file.h" - #include "libserver/logger.h" --#include "fmt/base.h" -+#include "fmt/core.h" - #include "stat_api.h" - #include <exception> - #include <string_view> -diff --git a/src/libserver/backtrace.cxx b/src/libserver/backtrace.cxx -index c24e61936..330c829b0 100644 ---- a/src/libserver/backtrace.cxx -+++ b/src/libserver/backtrace.cxx -@@ -19,7 +19,7 @@ - #ifdef BACKWARD_ENABLE - - #include "contrib/backward-cpp/backward.hpp" --#include "fmt/base.h" -+#include "fmt/core.h" - #include "logger.h" - - namespace rspamd { -diff --git a/src/libserver/cfg_rcl.cxx b/src/libserver/cfg_rcl.cxx -index ce3df4010..f0c9db64d 100644 ---- a/src/libserver/cfg_rcl.cxx -+++ b/src/libserver/cfg_rcl.cxx -@@ -34,7 +34,7 @@ - #include <algorithm>// for std::transform - #include <memory> - #include "contrib/ankerl/unordered_dense.h" --#include "fmt/base.h" -+#include "fmt/core.h" - #include "libutil/cxx/util.hxx" - #include "libutil/cxx/file_util.hxx" - #include "frozen/unordered_set.h" -diff --git a/src/libserver/cfg_utils.cxx b/src/libserver/cfg_utils.cxx -index 1344bc4f9..adc23f590 100644 ---- a/src/libserver/cfg_utils.cxx -+++ b/src/libserver/cfg_utils.cxx -@@ -65,7 +65,7 @@ - #include <string> - #include <string_view> - #include <vector> --#include "fmt/base.h" -+#include "fmt/core.h" - #include "cxx/util.hxx" - #include "frozen/unordered_map.h" - #include "frozen/string.h" -diff --git a/src/libserver/css/css_parser.cxx b/src/libserver/css/css_parser.cxx -index 11fa830f0..c016b9d9d 100644 ---- a/src/libserver/css/css_parser.cxx -+++ b/src/libserver/css/css_parser.cxx -@@ -20,7 +20,7 @@ - #include "css_rule.hxx" - #include "css_util.hxx" - #include "css.hxx" --#include "fmt/base.h" -+#include "fmt/core.h" - - #include <vector> - #include <unicode/utf8.h> -diff --git a/src/libserver/css/css_selector.cxx b/src/libserver/css/css_selector.cxx -index d2ae093cb..61bd8750f 100644 ---- a/src/libserver/css/css_selector.cxx -+++ b/src/libserver/css/css_selector.cxx -@@ -17,7 +17,7 @@ - #include "css_selector.hxx" - #include "css.hxx" - #include "libserver/html/html.hxx" --#include "fmt/base.h" -+#include "fmt/core.h" - #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL - #include "doctest/doctest.h" - -diff --git a/src/libserver/css/css_value.cxx b/src/libserver/css/css_value.cxx -index f2ff55363..64ebc536f 100644 ---- a/src/libserver/css/css_value.cxx -+++ b/src/libserver/css/css_value.cxx -@@ -20,7 +20,7 @@ - #include "frozen/string.h" - #include "libutil/util.h" - #include "contrib/ankerl/unordered_dense.h" --#include "fmt/base.h" -+#include "fmt/core.h" - - #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL - #include "doctest/doctest.h" -diff --git a/src/libserver/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx -index 5035bee2c..6f8450e6a 100644 ---- a/src/libserver/hyperscan_tools.cxx -+++ b/src/libserver/hyperscan_tools.cxx -@@ -21,7 +21,7 @@ - #include <filesystem> - #include "contrib/ankerl/unordered_dense.h" - #include "contrib/ankerl/svector.h" --#include "fmt/base.h" -+#include "fmt/core.h" - #include "libutil/cxx/file_util.hxx" - #include "libutil/cxx/error.hxx" - #include "hs.h" -diff --git a/src/libserver/symcache/symcache_impl.cxx b/src/libserver/symcache/symcache_impl.cxx -index 7159555d2..4ea087024 100644 ---- a/src/libserver/symcache/symcache_impl.cxx -+++ b/src/libserver/symcache/symcache_impl.cxx -@@ -21,7 +21,7 @@ - #include "unix-std.h" - #include "libutil/cxx/file_util.hxx" - #include "libutil/cxx/util.hxx" --#include "fmt/base.h" -+#include "fmt/core.h" - #include "contrib/t1ha/t1ha.h" - - #ifdef __has_include -diff --git a/src/libserver/symcache/symcache_item.cxx b/src/libserver/symcache/symcache_item.cxx -index 4a9581fe7..490a87880 100644 ---- a/src/libserver/symcache/symcache_item.cxx -+++ b/src/libserver/symcache/symcache_item.cxx -@@ -17,7 +17,7 @@ - #include "lua/lua_common.h" - #include "symcache_internal.hxx" - #include "symcache_item.hxx" --#include "fmt/base.h" -+#include "fmt/core.h" - #include "libserver/task.h" - #include "libutil/cxx/util.hxx" - #include <numeric> -diff --git a/src/libstat/backends/cdb_backend.cxx b/src/libstat/backends/cdb_backend.cxx -index bd05e8ef8..1d2b54d4c 100644 ---- a/src/libstat/backends/cdb_backend.cxx -+++ b/src/libstat/backends/cdb_backend.cxx -@@ -28,7 +28,7 @@ - #include <optional> - #include "contrib/expected/expected.hpp" - #include "contrib/ankerl/unordered_dense.h" --#include "fmt/base.h" -+#include "fmt/core.h" - - namespace rspamd::stat::cdb { - -diff --git a/src/libstat/backends/redis_backend.cxx b/src/libstat/backends/redis_backend.cxx -index 06842b078..6abcfa122 100644 ---- a/src/libstat/backends/redis_backend.cxx -+++ b/src/libstat/backends/redis_backend.cxx -@@ -19,7 +19,7 @@ - #include "stat_internal.h" - #include "upstream.h" - #include "libserver/mempool_vars_internal.h" --#include "fmt/base.h" -+#include "fmt/core.h" - - #include "libutil/cxx/error.hxx" - -diff --git a/test/rspamd_cxx_unit_dkim.hxx b/test/rspamd_cxx_unit_dkim.hxx -index d445c3800..6d3b4207e 100644 ---- a/test/rspamd_cxx_unit_dkim.hxx -+++ b/test/rspamd_cxx_unit_dkim.hxx -@@ -21,7 +21,7 @@ - - #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL - #include "doctest/doctest.h" --#include "fmt/base.h" -+#include "fmt/core.h" - #include "libserver/dkim.h" - - #include <vector> diff --git a/mail-filter/rspamd/rspamd-3.11.1-r1.ebuild b/mail-filter/rspamd/rspamd-3.11.1-r1.ebuild deleted file mode 100644 index 2aec0af1f461..000000000000 --- a/mail-filter/rspamd/rspamd-3.11.1-r1.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 +hyperscan jemalloc +jit 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}] - dev-lua/lua-argparse[${LUA_USEDEP}] - ') - acct-group/rspamd - acct-user/rspamd - app-arch/libarchive:= - app-arch/zstd:= - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/icu:= - dev-libs/libpcre2:=[jit=] - dev-libs/libsodium:= - dev-libs/openssl:0=[-bindist(-)] - dev-libs/snowball-stemmer:= - sys-libs/zlib - blas? ( - virtual/blas - virtual/lapack - ) - hyperscan? ( dev-libs/vectorscan:= ) - jemalloc? ( dev-libs/jemalloc:= ) - selinux? ( sec-policy/selinux-spamassassin ) -" -DEPEND=" - ${RDEPEND} - dev-cpp/doctest - dev-libs/libfmt:= - >=dev-libs/xxhash-0.8.0 -" -BDEPEND=" - dev-lang/perl - dev-util/ragel - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-3.6-cmake-lua-version.patch" - "${FILESDIR}/${PN}-3.6-unbundle-lua.patch" - "${FILESDIR}/${PN}-3.6-unbundle-snowball.patch" - - # backward compatibility with <dev-libs/libfmt-11 - "${FILESDIR}/${PN}-3.9.0-older-libfmt.patch" - - # compatibility for doctest-2.4.12, bug 955440 - "${FILESDIR}/${PN}-3.11.1-doctest-compatibility.patch" - - # upstream issue https://github.com/rspamd/rspamd/issues/5263 - "${FILESDIR}/${PN}-3.11.1-punycode-icu-76.1.patch" -) - -src_prepare() { - cmake_src_prepare - - rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,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 - -DLIBDIR="/usr/$(get_libdir)/rspamd" - - -DSYSTEM_DOCTEST=ON - -DSYSTEM_FMT=ON - -DSYSTEM_XXHASH=ON - -DSYSTEM_ZSTD=ON - - # For bundled https://github.com/bombela/backward-cpp - # Bundled backward library uses execinfo.h in current setting, which is - # available in glibc, but not in musl. Let's enable it for glibc only. - -DENABLE_BACKWARD=$(usex elibc_glibc ON OFF) # bug 917643 - -DSTACK_DETAILS_AUTO_DETECT=OFF - - -DENABLE_BLAS=$(usex blas ON OFF) - -DENABLE_HYPERSCAN=$(usex hyperscan ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF) - -DENABLE_PCRE2=ON - - -DBUILD_TESTING=$(usex test ON OFF) - ) - cmake_src_configure -} - -src_test() { - # These variables ensure tests use Lua scripts from this package rather - # than the installed version. However, rspamd always first attempts to load - # from /etc/rspamd/lua, with no method to override this behavior. - LUA_PATH="${S}/contrib/lua-?/?.lua" \ - LUALIBDIR="${S}/lualib" \ - RULESDIR="${S}/lualib" \ - cmake_src_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.12.0.ebuild b/mail-filter/rspamd/rspamd-3.12.0.ebuild deleted file mode 100644 index 9b3d9ffba596..000000000000 --- a/mail-filter/rspamd/rspamd-3.12.0.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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 +hyperscan jemalloc +jit 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}] - dev-lua/lua-argparse[${LUA_USEDEP}] - ') - acct-group/rspamd - acct-user/rspamd - app-arch/libarchive:= - app-arch/zstd:= - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/icu:= - dev-libs/libpcre2:=[jit=] - dev-libs/libsodium:= - dev-libs/openssl:0=[-bindist(-)] - dev-libs/snowball-stemmer:= - sys-libs/zlib - blas? ( - virtual/blas - virtual/lapack - ) - hyperscan? ( dev-libs/vectorscan:= ) - jemalloc? ( dev-libs/jemalloc:= ) - selinux? ( sec-policy/selinux-spamassassin ) -" -DEPEND=" - ${RDEPEND} - dev-cpp/doctest - >=dev-libs/xxhash-0.8.0 -" -BDEPEND=" - dev-lang/perl - dev-util/ragel - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}/${PN}-3.12-cmake-lua-version.patch" - "${FILESDIR}/${PN}-3.12-unbundle-lua.patch" - "${FILESDIR}/${PN}-3.12-unbundle-snowball.patch" - - # upstream issue https://github.com/rspamd/rspamd/issues/5263 - "${FILESDIR}/${PN}-3.11.1-punycode-icu-76.1.patch" -) - -src_prepare() { - cmake_src_prepare - - rm -vrf contrib/{doctest,lua-{argparse,bit},snowball,xxhash,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 - -DLIBDIR="/usr/$(get_libdir)/rspamd" - - -DSYSTEM_DOCTEST=ON - -DSYSTEM_XXHASH=ON - -DSYSTEM_ZSTD=ON - - # For bundled https://github.com/bombela/backward-cpp - # Bundled backward library uses execinfo.h in current setting, which is - # available in glibc, but not in musl. Let's enable it for glibc only. - -DENABLE_BACKWARD=$(usex elibc_glibc ON OFF) # bug 917643 - -DSTACK_DETAILS_AUTO_DETECT=OFF - - -DENABLE_BLAS=$(usex blas ON OFF) - -DENABLE_HYPERSCAN=$(usex hyperscan ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF) - -DENABLE_PCRE2=ON - - -DBUILD_TESTING=$(usex test ON OFF) - ) - cmake_src_configure -} - -src_test() { - # These variables ensure tests use Lua scripts from this package rather - # than the installed version. However, rspamd always first attempts to load - # from /etc/rspamd/lua, with no method to override this behavior. - LUA_PATH="${S}/contrib/lua-?/?.lua" \ - LUALIBDIR="${S}/lualib" \ - RULESDIR="${S}/lualib" \ - cmake_src_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" -}
