summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Vaněk <arkamar@atlas.cz>2023-10-10 13:24:57 +0200
committerSam James <sam@gentoo.org>2023-11-17 11:07:57 +0000
commitbc09fdca794686422632a353002e9c68b70f382c (patch)
tree42170baa98b904b41cd6e3b48173983ab50d7fa3 /mail-filter
parentmail-filter/rspamd: sync live (diff)
downloadgentoo-bc09fdca794686422632a353002e9c68b70f382c.tar.gz
gentoo-bc09fdca794686422632a353002e9c68b70f382c.tar.bz2
gentoo-bc09fdca794686422632a353002e9c68b70f382c.zip
mail-filter/rspamd: drop 3.5-r1
Signed-off-by: Petr Vaněk <arkamar@atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/33277 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'mail-filter')
-rw-r--r--mail-filter/rspamd/Manifest1
-rw-r--r--mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch23
-rw-r--r--mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch64
-rw-r--r--mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch61
-rw-r--r--mail-filter/rspamd/rspamd-3.5-r1.ebuild153
5 files changed, 0 insertions, 302 deletions
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 92cf611c46f0..f6e905e71447 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,2 @@
-DIST rspamd-3.5.tar.gz 5806722 BLAKE2B 547cd9bb26942dc584d1f4b164e61bdb15505a56399fa19b358b7d7525ee983acc8d5ae1fdb3de340e3461a03aedbb48266fd81404c1f4a2e8fc5bd6735d9a62 SHA512 39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623
DIST rspamd-3.6.tar.gz 5843907 BLAKE2B 2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f SHA512 d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b
DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21 SHA512 a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116
diff --git a/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch b/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch
deleted file mode 100644
index 10b56fa977ad..000000000000
--- a/mail-filter/rspamd/files/rspamd-2.5-unbundle-snowball.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ad989f7f2..d08496998 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -108,7 +108,6 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/"
- "${CMAKE_SOURCE_DIR}/contrib/libottery"
- "${CMAKE_SOURCE_DIR}/contrib/xxhash"
- "${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"
-@@ -586,7 +585,6 @@ ADD_SUBDIRECTORY(contrib/fpconv)
- ADD_SUBDIRECTORY(contrib/lc-btrie)
- ADD_SUBDIRECTORY(contrib/libottery)
- IF(ENABLE_SNOWBALL MATCHES "ON")
-- ADD_SUBDIRECTORY(contrib/snowball)
- SET(WITH_SNOWBALL 1)
- ENDIF()
- ADD_SUBDIRECTORY(contrib/libucl)
---
-2.24.1
-
diff --git a/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch b/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch
deleted file mode 100644
index 55665b887c3b..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.0-cmake-lua-version.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b53793008..5d092d654 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,55 +147,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.26.3
-
diff --git a/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch b/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
deleted file mode 100644
index 36aed009c6c8..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 096c2e79e..f323bfd40 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -620,10 +620,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)
-@@ -721,7 +717,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 77c8756af..e0476bdc1 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -206,10 +206,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 ab411fa66..85787b31e 100644
---- a/src/lua/lua_common.c
-+++ b/src/lua/lua_common.c
-@@ -923,10 +923,6 @@ rspamd_lua_wipe_realloc (void *ud,
- return NULL;
- }
-
--#ifndef WITH_LUAJIT
--extern int luaopen_bit(lua_State *L);
--#endif
--
- lua_State *
- rspamd_lua_init (bool wipe_mem)
- {
-@@ -984,7 +980,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/rspamd-3.5-r1.ebuild b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
deleted file mode 100644
index eaa2b34643f9..000000000000
--- a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# lua5-{3,4} were dropped due to bug #903577. This issue has been resolved
-# upstream, see https://github.com/rspamd/rspamd/issues/4455. They will be
-# restored with the next version bump.
-LUA_COMPAT=( lua5-1 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 )"
-
-# for <dev-libs/libfmt-10 see https://github.com/rspamd/rspamd/issues/4482
-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-10:=
- 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.0-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
- "${FILESDIR}/rspamd-2.5-unbundle-snowball.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
-}