commit: 8a31789b8e900a225947a82e98f27576b03fb19e Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Wed Mar 13 08:18:46 2024 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Wed Mar 13 17:30:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a31789b
mail-filter/rspamd: drop 3.6-r1, 3.7.4, 3.7.4-r1, 3.7.5 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> mail-filter/rspamd/Manifest | 3 - .../rspamd/files/rspamd-3.6-fix-tests.patch | 23 --- .../rspamd/files/rspamd-3.6-memleak-fix.patch | 36 ----- .../rspamd/files/rspamd-3.7.4-no-hyperscan.patch | 38 ----- mail-filter/rspamd/rspamd-3.6-r1.ebuild | 153 -------------------- mail-filter/rspamd/rspamd-3.7.4-r1.ebuild | 157 --------------------- mail-filter/rspamd/rspamd-3.7.4.ebuild | 157 --------------------- mail-filter/rspamd/rspamd-3.7.5.ebuild | 155 -------------------- 8 files changed, 722 deletions(-) diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index 8929872819e4..f5a68e3e11cc 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,5 +1,2 @@ -DIST rspamd-3.6.tar.gz 5843907 BLAKE2B 2ccb3e65a14624d48540bd3e2d034fec0dd89cd75032ade3ca74ded09cee6ed67f670c31035b18583b850cc4efeb21b44f97ec2c35d518a49b0c4e6f0eb8c90f SHA512 d99e2a60eec94eb39902454a8041eeb76f673c9f784849128766323a218d6c419755e0f8819e2a6921ca08c6a7d63660dc87bc911f808fb4a67d29e8fbfc571b -DIST rspamd-3.7.4.tar.gz 5903754 BLAKE2B d13b3451b4a6a7c5e8644ba57196190065edda2fc48e7245ef7e0094cb90838760cc124a2cf8d0b4b7519c7583284f6883fbcd4bf3a6489496b5e52234a36c21 SHA512 a82696957417f7197b59e614012176626b4fdf1464ed38ce57552c8a02fe2e426504e0b0780ab4f36d208a11ae4d1921bacee52341c8a906b4ab19c1719fd116 -DIST rspamd-3.7.5.tar.gz 5903689 BLAKE2B 29fecbc3a813fbc898360289aef2a8634fc15df38b28c47279eefa0afd836b2d3e95d83076190d9c1f0123402ea95f7c9b94fe2322996e37a529841cc55def8f SHA512 d8d25cda2dee80e0c1e627c96e56ade97fc44ca0cf9410d21bd3a82fc2a4004e09c0bbb8c89eb81e835c0be5cd748f468910c3be67f5e4cdb50d56d9f8cda672 DIST rspamd-3.8.1.tar.gz 5910993 BLAKE2B c3c29cb380fa09a33173bb6f51ff76eaf88cf459eda0c6f19f890148eb97703a8f43f34443a6d4b28cb1cbcf2c6f47321203556d265a0b2f0b0050b5575c5851 SHA512 b87c1cba11faca278db85426ed527832c34d1beff56e0993543a05fcc2d5d72675cf31bbc4241f52da9122787d24f8b955218988a198a3c29dee5db3be2c7e99 DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3 SHA512 dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51 diff --git a/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch b/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch deleted file mode 100644 index 33e851261f46..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Duncan Bellamy <d...@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-memleak-fix.patch b/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch deleted file mode 100644 index f372b79de7c7..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ffbab4fbf218514845b8e5209aec044621b1f460 Mon Sep 17 00:00:00 2001 -From: Vsevolod Stakhov <vsevo...@rspamd.com> -Date: Sun, 6 Aug 2023 18:33:37 +0100 -Subject: [PATCH] [CritFix] Fix leak in `gzip` function - -Upstream-Issue: https://github.com/rspamd/rspamd/issues/4564 - -diff --git a/src/libutil/util.c b/src/libutil/util.c -index 4be7cc620..deba3e807 100644 ---- a/src/libutil/util.c -+++ b/src/libutil/util.c -@@ -2231,6 +2231,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in) - strm.avail_out = sizeof(temp) > buf->allocated ? buf->allocated : sizeof(temp); - ret = deflate(&strm, Z_FINISH); - if (ret == Z_STREAM_ERROR) { -+ deflateEnd(&strm); - return FALSE; - } - -@@ -2247,6 +2248,8 @@ rspamd_fstring_gzip(rspamd_fstring_t **in) - if (ret != Z_BUF_ERROR || strm.avail_in == 0) { - buf->len = strm.next_out - (unsigned char *) buf->str; - *in = buf; -+ deflateEnd(&strm); -+ - return ret == Z_STREAM_END; - } - } -@@ -2267,6 +2270,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in) - g_free(hold); - buf->len = strm.next_out - (unsigned char *) buf->str; - *in = buf; -+ deflateEnd(&strm); - - return ret == Z_STREAM_END; - } diff --git a/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch b/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch deleted file mode 100644 index 76353b703f21..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d907a95ac2e2cad6f7f65c4323f031f7931ae18b Mon Sep 17 00:00:00 2001 -From: Vsevolod Stakhov <vsevo...@rspamd.com> -Date: Wed, 15 Nov 2023 13:43:05 +0000 -Subject: [PATCH] [Minor] Fix build with no hyperscan - -Upstream-issue: https://github.com/rspamd/rspamd/issues/4701 -Upstream-issue: https://github.com/rspamd/rspamd/issues/4702 - -diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c -index 986a4a2ea..69af0597f 100644 ---- a/src/libserver/rspamd_control.c -+++ b/src/libserver/rspamd_control.c -@@ -922,6 +922,7 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents) - } - break; - case RSPAMD_SRV_HYPERSCAN_LOADED: -+#ifdef WITH_HYPERSCAN - /* Load RE cache to provide it for new forks */ - if (rspamd_re_cache_is_hs_loaded(rspamd_main->cfg->re_cache) != RSPAMD_HYPERSCAN_LOADED_FULL || - cmd.cmd.hs_loaded.forced) { -@@ -932,7 +933,9 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents) - } - - /* After getting this notice, we can clean up old hyperscan files */ -+ - rspamd_hyperscan_notice_loaded(); -+ - msg_info_main("received hyperscan cache loaded from %s", - cmd.cmd.hs_loaded.cache_dir); - -@@ -945,6 +948,7 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents) - wcmd.cmd.hs_loaded.forced = cmd.cmd.hs_loaded.forced; - rspamd_control_broadcast_cmd(rspamd_main, &wcmd, rfd, - rspamd_control_ignore_io_handler, NULL, worker->pid); -+#endif - break; - case RSPAMD_SRV_MONITORED_CHANGE: - /* Broadcast command to all workers */ diff --git a/mail-filter/rspamd/rspamd-3.6-r1.ebuild b/mail-filter/rspamd/rspamd-3.6-r1.ebuild deleted file mode 100644 index 3e711833e3a8..000000000000 --- a/mail-filter/rspamd/rspamd-3.6-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 - -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" - - # see https://github.com/rspamd/rspamd/issues/4564 - "${FILESDIR}/${P}-memleak-fix.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 -} diff --git a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild deleted file mode 100644 index d25c1a699699..000000000000 --- a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# 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" -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 ) -" -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}/rspamd-3.6-cmake-lua-version.patch" - "${FILESDIR}/rspamd-3.6-unbundle-lua.patch" - "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch" - - "${FILESDIR}/${P}-no-hyperscan.patch" #917512 -) - -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 - ) - 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 -} diff --git a/mail-filter/rspamd/rspamd-3.7.4.ebuild b/mail-filter/rspamd/rspamd-3.7.4.ebuild deleted file mode 100644 index 8ae0aff0c482..000000000000 --- a/mail-filter/rspamd/rspamd-3.7.4.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# 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/libpcre2:=[jit=] - dev-libs/libsodium:= - dev-libs/openssl:0=[-bindist(-)] - dev-libs/snowball-stemmer:= - 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 - dev-libs/libfmt:= - >=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" - - "${FILESDIR}/${P}-no-hyperscan.patch" #917512 -) - -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 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 -} diff --git a/mail-filter/rspamd/rspamd-3.7.5.ebuild b/mail-filter/rspamd/rspamd-3.7.5.ebuild deleted file mode 100644 index e4daeebbe16d..000000000000 --- a/mail-filter/rspamd/rspamd-3.7.5.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2024 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" -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 ) -" -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}/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 - ) - 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 -}
