mail-filter/rspamd: drop 3.14.0, 3.14.1, 3.14.2

Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
This commit is contained in:
Petr Vaněk
2026-06-20 11:43:14 +02:00
parent 7b09a806e6
commit 3f6ab4f8bf
5 changed files with 0 additions and 491 deletions
-3
View File
@@ -1,6 +1,3 @@
DIST rspamd-3.13.2.tar.gz 6634719 BLAKE2B e9d564b21d1a13707c01a621836a7198afa9a5a5a88f872b60944ba9ef5fb2a0b98adf485dd28c852eca634a54dfea66afc141a5cea864e98826ec6f6768a285 SHA512 ff8d9c59f6d0caabf563e2c07bff5adf8cb82dd0988d595900e0206a0315433c69ee425c50d4b5073c3d14f16615f11d7776986fe77b41daed7801e7522244ba
DIST rspamd-3.14.0.tar.gz 6720727 BLAKE2B 55adfe072cad8ae028dd1a494309d014079f7fb968f6d861362626ff526736c7d42a9bc0bad73785e90facc72abd01c206abb7f0a2b82f7c00bd1987e4e7ccec SHA512 709a4d1d875492b1269c325f043b48fd6a9da137250514ca068d3a2ca87d7401e356f37f11a3d47b815032b72d363991779e239b0bf2017ed7cea13cedf3ffc5
DIST rspamd-3.14.1.tar.gz 6762783 BLAKE2B 648e6f14e47b43815b689d89274b55fc87061d0a5ec79ee4631fcbfaf4867823887b466d1ddb4c8c62b82f919ef079a870918084b52977bf4f11ec778aa5c219 SHA512 40b22056ffc6677afb0336b8de78d27216b6221e0ac05b2ea2e2530dee46797a909e55801652473b905d4b33127efb82e045513e56c0bfb0d9da9db818566b38
DIST rspamd-3.14.2.tar.gz 6781078 BLAKE2B ddd52ee2e1dd8ec789a3b95053b26ededdc12e3ef1e5d7a6f2a581d4a2d0f13d2e9fd2ff72cccb6396a51034695740e225d398d2d2763668e1270a11fce95854 SHA512 449be4b8bb722704cb24689508e603496c25cae4caa849f0b46e6c413fc05280f698f16411c30fb550f365b0d67a771abc2f9c36aba3e90cc34d93887e7bd6a8
DIST rspamd-3.14.3.tar.gz 6747546 BLAKE2B e4ced7bf29129ffa283f63fcf78c70a23ef158ad84161557041d9ae353c0d270f78677d574a3cc6adad1aa41b1f83c88b127c294675c0137eae0285e79e53740 SHA512 93b1140ca919b6ed099269d167b69a9a5dbd4135fedf530c20d94896fe27f9d9a55fb6662e343a503ac11c5e02695b6e58b36f4278d668a21c8b860462eafd35
DIST rspamd-4.0.1.tar.gz 6998348 BLAKE2B cf7bb26a3e4e911246b90488f854d79a2b8e2208ebb718472413737bb496f523a2bc82f0e112298a251d27bd2be2e2a166d14648b64c3d9807507c75a5c59dd9 SHA512 4fafba3af4d7456376bc7f0c6b56bd0bed0bcd4d5420b36c1a359639db9941d3069ddfcb7ae91f5384f69b3e4a68586d0347f249137a829366ff5e5bfb19b815
@@ -1,37 +0,0 @@
From 73f7b82ab3507049a752ffc15a0615cd9d7a10df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
Date: Tue, 2 Dec 2025 22:06:16 +0100
Subject: [PATCH 1/1] [Fix] Use 0 instead of LUA_OK for lua_pcall result
comparison
Lua 5.1 does not define LUA_OK, so the result of lua_pcall is compared
to 0 instead, which is consistent with the rest of the codebase.
Bug: https://bugs.gentoo.org/967009
Upstream-PR: https://github.com/rspamd/rspamd/pull/5774
diff --git a/src/rspamadm/confighelp.c b/src/rspamadm/confighelp.c
index 04c8845a1..68617f86d 100644
--- a/src/rspamadm/confighelp.c
+++ b/src/rspamadm/confighelp.c
@@ -207,7 +207,7 @@ rspamadm_confighelp_load_plugins_doc(struct rspamd_config *cfg)
lua_getglobal(L, "require");
lua_pushstring(L, "rspamadm.confighelp_plugins");
- if (lua_pcall(L, 1, 1, 0) != LUA_OK) {
+ if (lua_pcall(L, 1, 1, 0) != 0) {
rspamd_fprintf(stderr, "cannot load confighelp_plugins module: %s\n",
lua_tostring(L, -1));
lua_pop(L, 1);
@@ -221,7 +221,7 @@ rspamadm_confighelp_load_plugins_doc(struct rspamd_config *cfg)
return NULL;
}
- if (lua_pcall(L, 0, 1, 0) != LUA_OK) {
+ if (lua_pcall(L, 0, 1, 0) != 0) {
rspamd_fprintf(stderr, "cannot execute confighelp_plugins function: %s\n",
lua_tostring(L, -1));
lua_pop(L, 1);
--
2.51.0
-150
View File
@@ -1,150 +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:=
virtual/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"
)
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"
}
-151
View File
@@ -1,151 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
LUA_COMPAT=( lua5-{3..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:=
virtual/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.14.1-unbundle-lua.patch"
"${FILESDIR}/${PN}-3.12-unbundle-snowball.patch"
"${FILESDIR}/${P}-lua5.1-fix.patch" #967009
)
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"
}
-150
View File
@@ -1,150 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
LUA_COMPAT=( lua5-{3..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:=
virtual/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.14.1-unbundle-lua.patch"
"${FILESDIR}/${PN}-3.12-unbundle-snowball.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"
}