commit: 29e0c693ac64e91fef58dd1378cacb70c3171263 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Thu May 8 07:29:45 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Thu May 8 07:33:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e0c693
mail-filter/rspamd: drop 3.8.4, 3.11.0-r1 Closes: https://bugs.gentoo.org/951266 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> mail-filter/rspamd/Manifest | 2 - .../rspamd/files/rspamd-3.11.0-simdutf-hdr.patch | 27 ---- mail-filter/rspamd/rspamd-3.11.0-r1.ebuild | 158 -------------------- mail-filter/rspamd/rspamd-3.8.4.ebuild | 162 --------------------- 4 files changed, 349 deletions(-) diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index b41be1c8b8cf..1063ed724452 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,3 +1 @@ -DIST rspamd-3.11.0.tar.gz 6440612 BLAKE2B 9858fdb0d7a425212aa4fb6eaf3d5f018d5e78e366e83ca31aaa70438cf3fc198eef5a5089e416e2b3810d58a36e9cf0466b838dc7e5dd41be0a49a5fba4e26d SHA512 301ce87147a1f4e1532fc68466ab223efa788af43f0a94a070c80c6ab04ae03956dbc471435efe49718b453589a18a2fda4476f281ddf47ddb42970e5dcaacdd DIST rspamd-3.11.1.tar.gz 6455199 BLAKE2B 4dffefa8b660b960d670bcaf485ce83b5cfac99be8e3871c059f105ef2c75d3e3d4cecbbc983e61b762d8363e8873e8ee5a30d7444822da595f72130db9d2674 SHA512 979aad9d2cc720c12922d55f4ad742b65e18d0ca52ebb764a2432bd3d64e559461c8e1fa87f7ac52e614df71d0a776aa0362a876eaa745cd3f8c21afee52b8ab -DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3 SHA512 dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51 diff --git a/mail-filter/rspamd/files/rspamd-3.11.0-simdutf-hdr.patch b/mail-filter/rspamd/files/rspamd-3.11.0-simdutf-hdr.patch deleted file mode 100644 index eb129268b49f..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.11.0-simdutf-hdr.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ccb45df90df60fae36b9438cfb2b0088e590306b Mon Sep 17 00:00:00 2001 -From: Vsevolod Stakhov <[email protected]> -Date: Tue, 17 Dec 2024 13:37:54 +0000 -Subject: [PATCH] [Fix] Fix crash on FreeBSD when Rspamd is built without - hyperscan - -Upstream-commit: https://github.com/rspamd/rspamd/commit/ccb45df90df60fae36b9438cfb2b0088e590306b ---- - src/rspamd.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/rspamd.c b/src/rspamd.c -index 088bfba49c..dafd9aebeb 100644 ---- a/src/rspamd.c -+++ b/src/rspamd.c -@@ -56,9 +56,10 @@ - - #ifdef WITH_HYPERSCAN - #include "libserver/hyperscan_tools.h" --#include "rspamd_simdutf.h" - #endif - -+#include "rspamd_simdutf.h" -+ - /* 2 seconds to fork new process in place of dead one */ - #define SOFT_FORK_TIME 2 - diff --git a/mail-filter/rspamd/rspamd-3.11.0-r1.ebuild b/mail-filter/rspamd/rspamd-3.11.0-r1.ebuild deleted file mode 100644 index bd88a159c921..000000000000 --- a/mail-filter/rspamd/rspamd-3.11.0-r1.ebuild +++ /dev/null @@ -1,158 +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" - - # bug 946676 - "${FILESDIR}/${P}-simdutf-hdr.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.8.4.ebuild b/mail-filter/rspamd/rspamd-3.8.4.ebuild deleted file mode 100644 index 0e93818e8965..000000000000 --- a/mail-filter/rspamd/rspamd-3.8.4.ebuild +++ /dev/null @@ -1,162 +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 eapi9-ver 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/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 ) -" -# <libfmt-11 https://github.com/rspamd/rspamd/pull/5034 -DEPEND=" - ${RDEPEND} - dev-cpp/doctest - <dev-libs/libfmt-11:= - >=dev-libs/xxhash-0.8.0 -" -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" -) - -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" - - if ver_replacing -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 -}
