commit: 0a72482929ceff7df67a3db8397319bd0fcc6585 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Tue Nov 11 07:58:27 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Tue Nov 11 07:58:27 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a724829
mail-filter/rspamd: drop 3.13.0, 3.13.1 Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org> mail-filter/rspamd/Manifest | 2 - .../files/rspamd-3.13.0-disabled-hyperscan.patch | 35 ----- .../rspamd/files/rspamd-3.13.0-lua-5.2+.patch | 30 ---- mail-filter/rspamd/rspamd-3.13.0.ebuild | 153 --------------------- mail-filter/rspamd/rspamd-3.13.1.ebuild | 150 -------------------- 5 files changed, 370 deletions(-) diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index a5a10ae88d98..0e2c614313a4 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,5 +1,3 @@ DIST rspamd-3.12.1.tar.gz 6482214 BLAKE2B 06869bdaace99cf26a013609d8744e86ca2fbc7310bcf884db6edb2f52a62f2d47c38801483c312801348e64711ed691f59ab9ddf56d9c4c88ab3b237e8e10ec SHA512 5e049f6aa872f9ded9ee7f580222edb83260a3a8dc14b74a0f95b88796d36690ac5e9b33b143560253111f79cc8cd5231fd2478661d8cfe92d75874cc472cf6c -DIST rspamd-3.13.0.tar.gz 6596845 BLAKE2B f1cbdfbcf7a524004deeaab89f236ff3ca5db0494bd3e34e99f161d027e34cea00e5d36956fa02cbeabbc55562249c6cf369561dbf4f93cd6390a5c0d2597287 SHA512 5a706349933fe2f2d51eb23f8019715338bfa49715287954e0b0f889193588e12f2de9090ab892f5854d5b569b719f669bcfc8ccdf705825cf52daf3d3f1c69a -DIST rspamd-3.13.1.tar.gz 6614373 BLAKE2B ca149464aac17bbe099f04658efc2e8a696df342a3dfb1cf94ff3efd68df92964c6b3ed5954fdbb7e99e2ffcec2747d7470a078040534cafc03cd633d6d96e31 SHA512 a8ce81bf292aa20e33ddee1f4af8594b52b71fdaae4363b5b5ad67fcc757c9733114f35a90238b0fc68fc7bdeae28bc8805abe6cc122a5e39c8d1548bb0672a7 DIST rspamd-3.13.2.tar.gz 6634719 BLAKE2B e9d564b21d1a13707c01a621836a7198afa9a5a5a88f872b60944ba9ef5fb2a0b98adf485dd28c852eca634a54dfea66afc141a5cea864e98826ec6f6768a285 SHA512 ff8d9c59f6d0caabf563e2c07bff5adf8cb82dd0988d595900e0206a0315433c69ee425c50d4b5073c3d14f16615f11d7776986fe77b41daed7801e7522244ba DIST rspamd-3.14.0.tar.gz 6720727 BLAKE2B 55adfe072cad8ae028dd1a494309d014079f7fb968f6d861362626ff526736c7d42a9bc0bad73785e90facc72abd01c206abb7f0a2b82f7c00bd1987e4e7ccec SHA512 709a4d1d875492b1269c325f043b48fd6a9da137250514ca068d3a2ca87d7401e356f37f11a3d47b815032b72d363991779e239b0bf2017ed7cea13cedf3ffc5 diff --git a/mail-filter/rspamd/files/rspamd-3.13.0-disabled-hyperscan.patch b/mail-filter/rspamd/files/rspamd-3.13.0-disabled-hyperscan.patch deleted file mode 100644 index 0fdaf5c1ca46..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.13.0-disabled-hyperscan.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 98e731bf69306a830834fbcfa7a21c3357130693 Mon Sep 17 00:00:00 2001 -From: Vsevolod Stakhov <[email protected]> -Date: Thu, 18 Sep 2025 10:03:39 +0100 -Subject: [PATCH] [Minor] Fix non-hyperscan build - -Issue: #5620 ---- - -Upstream-issue: https://github.com/rspamd/rspamd/issues/5620 - -diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c -index fc056ecd8..2aa93e0d3 100644 ---- a/src/libserver/re_cache.c -+++ b/src/libserver/re_cache.c -@@ -3495,4 +3495,17 @@ int rspamd_re_cache_compile_hyperscan_scoped_single(struct rspamd_re_cache *cach - return rspamd_re_cache_compile_hyperscan(cache, cache_dir, max_time, silent, - event_loop, rspamd_re_cache_compile_scoped_cb, scoped_cbd); - } -+#else -+/* Non hyperscan version stub */ -+int rspamd_re_cache_compile_hyperscan_scoped_single(struct rspamd_re_cache *cache, -+ const char *scope, -+ const char *cache_dir, -+ double max_time, -+ gboolean silent, -+ struct ev_loop *event_loop, -+ void (*cb)(const char *scope, unsigned int ncompiled, GError *err, void *cbd), -+ void *cbd) -+{ -+ return 0; -+} - #endif --- -2.49.1 - diff --git a/mail-filter/rspamd/files/rspamd-3.13.0-lua-5.2+.patch b/mail-filter/rspamd/files/rspamd-3.13.0-lua-5.2+.patch deleted file mode 100644 index 4219df14073f..000000000000 --- a/mail-filter/rspamd/files/rspamd-3.13.0-lua-5.2+.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d808fd75ff1db1821b1dd817eb4ba9a118b31090 Mon Sep 17 00:00:00 2001 -From: netoholic <[email protected]> -Date: Fri, 19 Sep 2025 15:17:24 +0200 -Subject: [PATCH] fix build issues with lua version higher than 5.1 - -refer to https://bugs.gentoo.org/963055 - -I´ve been asked to pass this upstream ---- - -Bug: https://bugs.gentoo.org/963055 -Upstream-PR: https://github.com/rspamd/rspamd/pull/5625 - -diff --git a/src/libstat/backends/redis_backend.cxx b/src/libstat/backends/redis_backend.cxx -index 3a78de1dd..37ce6e9da 100644 ---- a/src/libstat/backends/redis_backend.cxx -+++ b/src/libstat/backends/redis_backend.cxx -@@ -15,6 +15,9 @@ - */ - #include "config.h" - #include "lua/lua_common.h" -+#if LUA_VERSION_NUM >= 502 -+# define lua_objlen lua_rawlen -+#endif - #include "rspamd.h" - #include "stat_internal.h" - #include "upstream.h" --- -2.49.1 - diff --git a/mail-filter/rspamd/rspamd-3.13.0.ebuild b/mail-filter/rspamd/rspamd-3.13.0.ebuild deleted file mode 100644 index d94c484a4573..000000000000 --- a/mail-filter/rspamd/rspamd-3.13.0.ebuild +++ /dev/null @@ -1,153 +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" - - "${FILESDIR}/${P}-disabled-hyperscan.patch" - "${FILESDIR}/${P}-lua-5.2+.patch" #963055 -) - -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" -} diff --git a/mail-filter/rspamd/rspamd-3.13.1.ebuild b/mail-filter/rspamd/rspamd-3.13.1.ebuild deleted file mode 100644 index 474b64a4219b..000000000000 --- a/mail-filter/rspamd/rspamd-3.13.1.ebuild +++ /dev/null @@ -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" -}
