commit: 847389cc5312ac380777a71cd2e94d93b121471c Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Tue Jun 10 12:36:44 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Tue Jun 10 13:04:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=847389cc
mail-filter/rspamd: add 3.12.0 - This version is switched back to bundled libfmt, see the upstream issue. - CMakeLists.txt were massively reworked, therefore it was necessary to bump most of our patches. Upstream-issue: https://github.com/rspamd/rspamd/issues/5258 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> mail-filter/rspamd/Manifest | 1 + .../files/rspamd-3.12-cmake-lua-version.patch | 64 +++++++++ .../rspamd/files/rspamd-3.12-unbundle-lua.patch | 70 ++++++++++ .../files/rspamd-3.12-unbundle-snowball.patch | 27 ++++ mail-filter/rspamd/rspamd-3.12.0.ebuild | 153 +++++++++++++++++++++ 5 files changed, 315 insertions(+) diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index 1063ed724452..b40dbdc0b24d 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1 +1,2 @@ DIST rspamd-3.11.1.tar.gz 6455199 BLAKE2B 4dffefa8b660b960d670bcaf485ce83b5cfac99be8e3871c059f105ef2c75d3e3d4cecbbc983e61b762d8363e8873e8ee5a30d7444822da595f72130db9d2674 SHA512 979aad9d2cc720c12922d55f4ad742b65e18d0ca52ebb764a2432bd3d64e559461c8e1fa87f7ac52e614df71d0a776aa0362a876eaa745cd3f8c21afee52b8ab +DIST rspamd-3.12.0.tar.gz 6477346 BLAKE2B 16f541ead3f01696113164e0a58e313260668ce1ecbac658c192f7e8b075383008c1de91e6180b3275f4d5a7ae9f43ee7932c1532c490f72b8e13bd7e7b90d3f SHA512 7861680c63cca425d8dcfecef5581361cada34d7dc8690cd6e6a73e00657a9e5a6d499d96cbdbec62bc1d3dbdcfd6b3865cd7949532379aa15c3b0c1bfbac9f7 diff --git a/mail-filter/rspamd/files/rspamd-3.12-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-3.12-cmake-lua-version.patch new file mode 100644 index 000000000000..4abdf425f37c --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.12-cmake-lua-version.patch @@ -0,0 +1,64 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1d48a2096..98e8c2ec0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -167,55 +167,8 @@ if (ENABLE_LUAJIT) + else () + # Try to find Lua (5.3, 5.4, 5.2, or 5.1 in that order) + 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 () + + # Memory allocator +-- +2.49.0 + diff --git a/mail-filter/rspamd/files/rspamd-3.12-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-3.12-unbundle-lua.patch new file mode 100644 index 000000000000..a5052c044baf --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.12-unbundle-lua.patch @@ -0,0 +1,70 @@ +diff --git a/cmake/AddDependencySubdirectories.cmake b/cmake/AddDependencySubdirectories.cmake +index 866204ff5..61781b511 100644 +--- a/cmake/AddDependencySubdirectories.cmake ++++ b/cmake/AddDependencySubdirectories.cmake +@@ -69,11 +69,6 @@ function(AddDependencySubdirectories) + find_package(doctest) + endif () + +- # Lua-specific dependencies +- if (NOT WITH_LUAJIT) +- add_subdirectory(contrib/lua-bit) +- endif () +- + # Lua REPL support + add_subdirectory(contrib/replxx) + list(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-replxx) +diff --git a/cmake/InstallRspamdFiles.cmake b/cmake/InstallRspamdFiles.cmake +index b6b631cdc..357cb5937 100644 +--- a/cmake/InstallRspamdFiles.cmake ++++ b/cmake/InstallRspamdFiles.cmake +@@ -67,7 +67,6 @@ function(InstallRspamdFiles) + + # Install third-party Lua libraries + 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 6cc49e4e4..5cd6d23e9 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -228,11 +228,6 @@ if (ENABLE_CLANG_PLUGIN) + add_dependencies(rspamd-server rspamd-clang) + endif () + +-# Handle Lua JIT/Lua dependency +-if (NOT WITH_LUAJIT) +- target_link_libraries(rspamd-server PRIVATE rspamd-bit) +-endif () +- + # Link additional optional dependencies + if (ENABLE_SNOWBALL) + target_link_libraries(rspamd-server PRIVATE stemmer) +diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c +index 3a0f1a06c..5a9056a3f 100644 +--- a/src/lua/lua_common.c ++++ b/src/lua/lua_common.c +@@ -915,10 +915,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 * +@@ -987,7 +983,6 @@ rspamd_lua_init(bool wipe_mem) + luaopen_compress(L); + luaopen_shingle(L); + #ifndef WITH_LUAJIT +- rspamd_lua_add_preload(L, "bit", luaopen_bit); + lua_settop(L, 0); + #endif + +-- +2.49.0 + diff --git a/mail-filter/rspamd/files/rspamd-3.12-unbundle-snowball.patch b/mail-filter/rspamd/files/rspamd-3.12-unbundle-snowball.patch new file mode 100644 index 000000000000..b884d0724631 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.12-unbundle-snowball.patch @@ -0,0 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98e8c2ec0..5f8939bb5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,7 +131,6 @@ include_directories( + "${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" +diff --git a/cmake/AddDependencySubdirectories.cmake b/cmake/AddDependencySubdirectories.cmake +index 61781b511..560a4383e 100644 +--- a/cmake/AddDependencySubdirectories.cmake ++++ b/cmake/AddDependencySubdirectories.cmake +@@ -32,7 +32,6 @@ function(AddDependencySubdirectories) + + # Optional dependencies based on configuration + if (ENABLE_SNOWBALL) +- add_subdirectory(contrib/snowball) + set(WITH_SNOWBALL 1 PARENT_SCOPE) + endif () + +-- +2.49.0 + diff --git a/mail-filter/rspamd/rspamd-3.12.0.ebuild b/mail-filter/rspamd/rspamd-3.12.0.ebuild new file mode 100644 index 000000000000..9b3d9ffba596 --- /dev/null +++ b/mail-filter/rspamd/rspamd-3.12.0.ebuild @@ -0,0 +1,153 @@ +# 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" +}
