diff options
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/rspamd/Manifest | 1 | ||||
| -rw-r--r-- | mail-filter/rspamd/files/rspamd-3.6-cmake-lua-version.patch | 64 | ||||
| -rw-r--r-- | mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch | 23 | ||||
| -rw-r--r-- | mail-filter/rspamd/files/rspamd-3.6-unbundle-lua.patch | 61 | ||||
| -rw-r--r-- | mail-filter/rspamd/files/rspamd-3.6-unbundle-snowball.patch | 20 | ||||
| -rw-r--r-- | mail-filter/rspamd/rspamd-3.6.ebuild | 150 |
6 files changed, 319 insertions, 0 deletions
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index 1b42f54a09d7..1b41c11b39d2 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1 +1,2 @@ DIST rspamd-3.5.tar.gz 5806722 BLAKE2B 547cd9bb26942dc584d1f4b164e61bdb15505a56399fa19b358b7d7525ee983acc8d5ae1fdb3de340e3461a03aedbb48266fd81404c1f4a2e8fc5bd6735d9a62 SHA512 39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623 +DIST rspamd-3.6.tar.gz 5843907 BLAKE2B 2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f SHA512 d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b 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 new file mode 100644 index 000000000000..9a08eaac28b0 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.6-cmake-lua-version.patch @@ -0,0 +1,64 @@ +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-fix-tests.patch b/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch new file mode 100644 index 000000000000..33e851261f46 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch @@ -0,0 +1,23 @@ +From: Duncan Bellamy <dunk@denkimushi.com> +Date: Thu, 3 Aug 2023 22:08:06 +0000 +Subject: [PATCH] [Fix] CMakeLists.txt remove whitespace added by linter as it + makes tests fail + +Upstream-PR: https://github.com/rspamd/rspamd/pull/4560 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5402c4806..efda209ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -777,7 +777,7 @@ IF (NOT DEBIAN_BUILD) + ADD_CUSTOM_TARGET(check DEPENDS rspamd-test-cxx rspamd-test) + ADD_CUSTOM_TARGET(run-test DEPENDS check + COMMAND test/rspamd-test-cxx +- COMMAND sh -c 'LUA_PATH= "${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua" ++ COMMAND sh -c 'LUA_PATH="${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua" + test/rspamd-test -p /rspamd/lua') + ENDIF (NOT DEBIAN_BUILD) + +-- +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 new file mode 100644 index 000000000000..78a2a49d796f --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.6-unbundle-lua.patch @@ -0,0 +1,61 @@ +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 new file mode 100644 index 000000000000..5779142b7b10 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.6-unbundle-snowball.patch @@ -0,0 +1,20 @@ +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/rspamd-3.6.ebuild b/mail-filter/rspamd/rspamd-3.6.ebuild new file mode 100644 index 000000000000..fb768118313d --- /dev/null +++ b/mail-filter/rspamd/rspamd-3.6.ebuild @@ -0,0 +1,150 @@ +# Copyright 1999-2023 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 cpu_flags_x86_ssse3 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/zstd:= + dev-db/sqlite:3 + dev-libs/glib:2 + dev-libs/icu:= + dev-libs/libev + dev-libs/libfmt:= + dev-libs/libpcre2:=[jit=] + 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? ( + virtual/blas + virtual/lapack + ) + cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) + jemalloc? ( dev-libs/jemalloc:= ) + selinux? ( sec-policy/selinux-spamassassin ) +" +DEPEND="${RDEPEND} + dev-cpp/doctest +" +BDEPEND=" + dev-lang/perl + dev-util/ragel + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch" + "${FILESDIR}/rspamd-3.6-unbundle-lua.patch" + "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch" + "${FILESDIR}/rspamd-3.6-fix-tests.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 + + -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=ON + ) + 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" + + for ver in ${REPLACING_VERSIONS}; do + if ver_test "${ver}" -eq "3.4"; then + elog "rspamd-3.4 is known to segfault when it is updated from older version due" + elog "to a page-alignment of hyperscan .unser files. The issue was patched in" + elog "rspamd-3.4-r1 ebuild revision. All possibly broken .unser files will be" + elog "automaticaly removed. See https://github.com/rspamd/rspamd/issues/4329 for" + elog "more information." + + find "${EROOT}/var/lib/rspamd" -type f -name '*.unser' -delete + fi + done +} |