commit: e906a0cdd6542976d8b5a02538848a04bd1ab8aa Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Wed Mar 19 07:52:56 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Wed Mar 19 07:54:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e906a0cd
mail-filter/rspamd: drop 3.9.1, 3.10.0-r1, 3.10.2 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> mail-filter/rspamd/Manifest | 3 - .../rspamd/files/rspamd-3.10.0-libucl-type.patch | 36 ----- mail-filter/rspamd/rspamd-3.10.0-r1.ebuild | 158 --------------------- mail-filter/rspamd/rspamd-3.10.2.ebuild | 155 -------------------- mail-filter/rspamd/rspamd-3.9.1.ebuild | 155 -------------------- 5 files changed, 507 deletions(-) diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index fa783dbb3ad5..b41be1c8b8cf 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,6 +1,3 @@ -DIST rspamd-3.10.0.tar.gz 6008518 BLAKE2B 875c25e6ab1c62d5081c65cd11d30eb084be46f0adb31f8b2c123fd85efaf250ba1bea94d30152a6edefe40a6cf7a6c7f4bde21607121d25501ef63085a9fc2f SHA512 ffe7a4418db3c4211a39ec92d2610fff3d88d72aa399cb3a0780be26e6a22b5d47041a6862496d5cf05da37cb1cae0c9b10890b409c568b4c74dd16a3ad2c5af -DIST rspamd-3.10.2.tar.gz 6048061 BLAKE2B 5690ab9bb95556bec64b6f208dcec0930f6f0e479a131588e940c7274bc2dd82854d04afa029d2d5ee6ad48348ca592a3571965eca747dba38ae964836e980f8 SHA512 5c71b333705dfe71a47e4cbf880b1ca417c46e254343ede9652fdcb5a9151974fafe88b1475073d43f947a1fe075ac81a70f1ac50693653ba139b65e384edb83 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 -DIST rspamd-3.9.1.tar.gz 5980094 BLAKE2B bb02cecdd686c85ef8340f122255f36c2cd5f6823da05370abce1e059466d053f543998945172be43c631f9d1fce0837a62fc047ca8aa76f3ea87680ee3e2a17 SHA512 b8d60448b8174a05f9dcfb17181e0e2908828923491fadb0f07b8debf97923f6967f3e5dfd27ca3c1a24671abd65c144139b02d1698a8a8a2e5b0672f9012d1f diff --git a/mail-filter/rspamd/files/rspamd-3.10.0-libucl-type.patch b/mail-filter/rspamd/files/rspamd-3.10.0-libucl-type.patch deleted file mode 100644 index 25d4c32d26ff..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.10.0-libucl-type.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3041484f859f3d8cc2275c5189280c31ff3ffeda Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <[email protected]> -Date: Wed, 2 Oct 2024 15:01:07 +0200 -Subject: [PATCH] [Fix] Use correct type for keylen in lua_ucl_newindex - -The keylen variable used in lua_ucl_newindex function should use size_t -type instead of lua_Integer, because all functions that use keylen -expect it to be of size_t type. This mismatch leads to incompatible -pointer types, and modern versions of GCC fail to compile the code. - -Fixes: 9e87597ceb05 ("[Project] Allow manipulations with opaque UCL objects") -Issue: https://github.com/rspamd/rspamd/issues/5163 -PR: https://github.com/rspamd/rspamd/pull/5169 - -diff --git a/contrib/libucl/lua_ucl.c b/contrib/libucl/lua_ucl.c -index 19ac9cb127..473aefe0cf 100644 ---- a/contrib/libucl/lua_ucl.c -+++ b/contrib/libucl/lua_ucl.c -@@ -1426,7 +1426,7 @@ lua_ucl_newindex(lua_State *L) - - if (ucl_object_type(obj) == UCL_OBJECT) { - if (key_type == LUA_TSTRING) { -- lua_Integer keylen; -+ size_t keylen; - const char *key = lua_tolstring(L, 2, &keylen); - - ucl_object_t *value_obj = lua_ucl_object_get(L, 3); -@@ -1539,7 +1539,7 @@ lua_ucl_newindex(lua_State *L) - obj->value.av = NULL; - obj->type = UCL_OBJECT; - -- lua_Integer keylen; -+ size_t keylen; - const char *key = lua_tolstring(L, 2, &keylen); - - ucl_object_t *value_obj = lua_ucl_object_get(L, 3); diff --git a/mail-filter/rspamd/rspamd-3.10.0-r1.ebuild b/mail-filter/rspamd/rspamd-3.10.0-r1.ebuild deleted file mode 100644 index 8fb906ba42cb..000000000000 --- a/mail-filter/rspamd/rspamd-3.10.0-r1.ebuild +++ /dev/null @@ -1,158 +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 ~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" - - # see https://github.com/rspamd/rspamd/issues/5163 - "${FILESDIR}/${P}-libucl-type.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.10.2.ebuild b/mail-filter/rspamd/rspamd-3.10.2.ebuild deleted file mode 100644 index 45df6738554b..000000000000 --- a/mail-filter/rspamd/rspamd-3.10.2.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 ~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" -) - -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.9.1.ebuild b/mail-filter/rspamd/rspamd-3.9.1.ebuild deleted file mode 100644 index 45df6738554b..000000000000 --- a/mail-filter/rspamd/rspamd-3.9.1.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 ~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" -) - -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" -}
