[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 229b0d236856c6795462043a6a1a3cc5f250c702
Author: Petr Vaněk gentoo org>
AuthorDate: Fri Jan 9 08:04:25 2026 +
Commit: Petr Vaněk gentoo org>
CommitDate: Fri Jan 9 08:13:11 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=229b0d23
mail-filter/rspamd: add 3.14.3
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.14.3.ebuild | 150
2 files changed, 151 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 52f953537f0e..e03c5588ed22 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,3 +2,4 @@ DIST rspamd-3.13.2.tar.gz 6634719 BLAKE2B
e9d564b21d1a13707c01a621836a7198afa9a5
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
diff --git a/mail-filter/rspamd/rspamd-3.14.3.ebuild
b/mail-filter/rspamd/rspamd-3.14.3.ebuild
new file mode 100644
index ..2b9313592172
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.14.3.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2026 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} == * ]] ; 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
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 397a74540b289bfafade0958dd28e9f397b7cb0d
Author: Petr Vaněk gentoo org>
AuthorDate: Mon Jan 5 11:31:09 2026 +
Commit: Petr Vaněk gentoo org>
CommitDate: Mon Jan 5 11:31:09 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=397a7454
mail-filter/rspamd: drop 3.12.1
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 -
mail-filter/rspamd/rspamd-3.12.1.ebuild | 150
2 files changed, 151 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 303a41565948..52f953537f0e 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,4 +1,3 @@
-DIST rspamd-3.12.1.tar.gz 6482214 BLAKE2B
06869bdaace99cf26a013609d8744e86ca2fbc7310bcf884db6edb2f52a62f2d47c38801483c312801348e64711ed691f59ab9ddf56d9c4c88ab3b237e8e10ec
SHA512
5e049f6aa872f9ded9ee7f580222edb83260a3a8dc14b74a0f95b88796d36690ac5e9b33b143560253111f79cc8cd5231fd2478661d8cfe92d75874cc472cf6c
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
diff --git a/mail-filter/rspamd/rspamd-3.12.1.ebuild
b/mail-filter/rspamd/rspamd-3.12.1.ebuild
deleted file mode 100644
index 642acd0df272..
--- a/mail-filter/rspamd/rspamd-3.12.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} == * ]] ; 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,
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: de109314f3e237563c21a157b93247d75683b30b
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Dec 24 09:19:20 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Dec 24 11:00:19 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de109314
mail-filter/rspamd: add 3.14.2
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.14.2.ebuild | 150
2 files changed, 151 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index bc730911bac6..303a41565948 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,3 +2,4 @@ DIST rspamd-3.12.1.tar.gz 6482214 BLAKE2B
06869bdaace99cf26a013609d8744e86ca2fbc
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
diff --git a/mail-filter/rspamd/rspamd-3.14.2.ebuild
b/mail-filter/rspamd/rspamd-3.14.2.ebuild
new file mode 100644
index ..8d70ac724e70
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.14.2.ebuild
@@ -0,0 +1,150 @@
+# 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} == * ]] ; 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
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 10ea4b29defba9aeec69bd83766186344c0c4176
Author: Sam James gentoo org>
AuthorDate: Mon Dec 22 00:25:45 2025 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 22 00:26:15 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10ea4b29
mail-filter/rspamd: Stabilize 3.13.2 amd64, #965840
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.13.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.13.2.ebuild
b/mail-filter/rspamd/rspamd-3.13.2.ebuild
index 474b64a4219b..3b4921849d37 100644
--- a/mail-filter/rspamd/rspamd-3.13.2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.13.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 4f0245b188127a0982da0e49e0c395108b33639b
Author: Sam James gentoo org>
AuthorDate: Mon Dec 22 00:25:51 2025 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 22 00:26:15 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0245b1
mail-filter/rspamd: Stabilize 3.13.2 x86, #965840
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.13.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.13.2.ebuild
b/mail-filter/rspamd/rspamd-3.13.2.ebuild
index 3b4921849d37..642acd0df272 100644
--- a/mail-filter/rspamd/rspamd-3.13.2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.13.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 04859e6aaa5998f55599f7ab06c27f583b93e73e
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Dec 9 13:38:41 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Dec 9 13:43:53 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04859e6a
mail-filter/rspamd: disable lua5-1, lua5-2
Rspamd 3.14.1 does not work correctly with Lua 5.1. Upstream does not
test rspamd with Lua 5.1 and they plan to drop support for Lua < 5.3
soon anyway.
Link: https://github.com/rspamd/rspamd/pull/5774#issuecomment-3616075781
Bug: https://bugs.gentoo.org/967009
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/rspamd-3.14.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.14.1.ebuild
b/mail-filter/rspamd/rspamd-3.14.1.ebuild
index fc67117be93c..8b5f324eddb0 100644
--- a/mail-filter/rspamd/rspamd-3.14.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.14.1.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-LUA_COMPAT=( lua5-{1..4} luajit )
+LUA_COMPAT=( lua5-{3..4} luajit )
inherit cmake lua-single pax-utils systemd tmpfiles
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 8737b2d82bf2457faff4a5b41429069dd41db6b2
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Dec 9 13:44:16 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Dec 9 13:44:16 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8737b2d8
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 9d744185659a..8d70ac724e70 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-LUA_COMPAT=( lua5-{1..4} luajit )
+LUA_COMPAT=( lua5-{3..4} luajit )
inherit cmake lua-single pax-utils systemd tmpfiles
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 590cbfec1de05635bb5b40cf12d36254a611cdc9
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Dec 3 11:31:40 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Dec 3 11:36:56 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590cbfec
mail-filter/rspamd: Fix build with Lua 5.1
LUA_OK is not defined in Lua 5.1. The build issue is fixed with a patch
from upstream.
Link: https://github.com/rspamd/rspamd/pull/5774
Closes: https://bugs.gentoo.org/967009
Signed-off-by: Petr Vaněk gentoo.org>
.../rspamd/files/rspamd-3.14.1-lua5.1-fix.patch| 37 ++
mail-filter/rspamd/rspamd-3.14.1.ebuild| 1 +
2 files changed, 38 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-3.14.1-lua5.1-fix.patch
b/mail-filter/rspamd/files/rspamd-3.14.1-lua5.1-fix.patch
new file mode 100644
index ..28401920504c
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.14.1-lua5.1-fix.patch
@@ -0,0 +1,37 @@
+From 73f7b82ab3507049a752ffc15a0615cd9d7a10df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?=
+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
+
diff --git a/mail-filter/rspamd/rspamd-3.14.1.ebuild
b/mail-filter/rspamd/rspamd-3.14.1.ebuild
index 9d744185659a..fc67117be93c 100644
--- a/mail-filter/rspamd/rspamd-3.14.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.14.1.ebuild
@@ -71,6 +71,7 @@ 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() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 6ad1913b9b9848caeb4c96af5d1ec7cd1809b466
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Dec 2 13:23:00 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Dec 2 13:40:28 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad1913b
mail-filter/rspamd: rename patch
Signed-off-by: Petr Vaněk gentoo.org>
...{rspamd--unbundle-lua.patch => rspamd-3.14.1-unbundle-lua.patch} | 0
mail-filter/rspamd/rspamd-.ebuild | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/files/rspamd--unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-3.14.1-unbundle-lua.patch
similarity index 100%
rename from mail-filter/rspamd/files/rspamd--unbundle-lua.patch
rename to mail-filter/rspamd/files/rspamd-3.14.1-unbundle-lua.patch
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index daab6e5f59a2..9d744185659a 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -69,7 +69,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-3.12-cmake-lua-version.patch"
- "${FILESDIR}/${PN}--unbundle-lua.patch"
+ "${FILESDIR}/${PN}-3.14.1-unbundle-lua.patch"
"${FILESDIR}/${PN}-3.12-unbundle-snowball.patch"
)
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 63b4fd3a21d3bf5a2161ad6c144818eac99ec46d
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Dec 2 13:23:30 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Dec 2 13:40:30 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63b4fd3a
mail-filter/rspamd: add 3.14.1
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.14.1.ebuild | 150
2 files changed, 151 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 0e2c614313a4..bc730911bac6 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
DIST rspamd-3.12.1.tar.gz 6482214 BLAKE2B
06869bdaace99cf26a013609d8744e86ca2fbc7310bcf884db6edb2f52a62f2d47c38801483c312801348e64711ed691f59ab9ddf56d9c4c88ab3b237e8e10ec
SHA512
5e049f6aa872f9ded9ee7f580222edb83260a3a8dc14b74a0f95b88796d36690ac5e9b33b143560253111f79cc8cd5231fd2478661d8cfe92d75874cc472cf6c
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
diff --git a/mail-filter/rspamd/rspamd-3.14.1.ebuild
b/mail-filter/rspamd/rspamd-3.14.1.ebuild
new file mode 100644
index ..9d744185659a
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.14.1.ebuild
@@ -0,0 +1,150 @@
+# 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} == * ]] ; 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,
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 72e721a16eac9a1f410330a34744e247bb43b939
Author: Petr Vaněk gentoo org>
AuthorDate: Mon Nov 24 09:25:05 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Mon Nov 24 09:32:43 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e721a1
mail-filter/rspamd: update unbundle lua patch for live ebuild
Upstream removed bundled tableshape lua library, see upstream commit
d09e61920618 ("[Cleanup] Drop tableshape contrib library"), which broke
our unbundle-lua patch.
Signed-off-by: Petr Vaněk gentoo.org>
.../rspamd/files/rspamd--unbundle-lua.patch| 70 ++
mail-filter/rspamd/rspamd-.ebuild | 2 +-
2 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/files/rspamd--unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd--unbundle-lua.patch
new file mode 100644
index ..74e14f1fd6aa
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd--unbundle-lua.patch
@@ -0,0 +1,70 @@
+diff --git a/cmake/AddDependencySubdirectories.cmake
b/cmake/AddDependencySubdirectories.cmake
+index 866204ff5..61781b511 100644
+--- a/cmake/AddDependencySubdirectories.cmake
b/cmake/AddDependencySubdirectories.cmake
+@@ -69,11 +69,6 @@ function(AddDependencySubdirectories)
+ find_package(doctest)
+ endif ()
+
+-# Lua-specific dependencies
+-if (NOT WITH_LUAJIT)
+-add_subdirectory(contrib/lua-bit)
+-endif ()
+-
+ # Lua REPL support
+ add_subdirectory(contrib/replxx)
+ list(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-replxx)
+diff --git a/cmake/InstallRspamdFiles.cmake b/cmake/InstallRspamdFiles.cmake
+index 75a6fe447..91b29f031 100644
+--- a/cmake/InstallRspamdFiles.cmake
b/cmake/InstallRspamdFiles.cmake
+@@ -67,7 +67,6 @@ function(InstallRspamdFiles)
+
+ # Install third-party Lua libraries
+ install(FILES "contrib/lua-fun/fun.lua" DESTINATION ${LUALIBDIR})
+-install(FILES "contrib/lua-argparse/argparse.lua" DESTINATION
${LUALIBDIR})
+ install(FILES "contrib/lua-lupa/lupa.lua" DESTINATION ${LUALIBDIR})
+ install(FILES "contrib/lua-lpeg/lpegre.lua" DESTINATION ${LUALIBDIR})
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6cc49e4e4..5cd6d23e9 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -228,11 +228,6 @@ if (ENABLE_CLANG_PLUGIN)
+ add_dependencies(rspamd-server rspamd-clang)
+ endif ()
+
+-# Handle Lua JIT/Lua dependency
+-if (NOT WITH_LUAJIT)
+-target_link_libraries(rspamd-server PRIVATE rspamd-bit)
+-endif ()
+-
+ # Link additional optional dependencies
+ if (ENABLE_SNOWBALL)
+ target_link_libraries(rspamd-server PRIVATE stemmer)
+diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
+index 2ec4d6c72..8137415ca 100644
+--- a/src/lua/lua_common.c
b/src/lua/lua_common.c
+@@ -916,10 +916,6 @@ rspamd_lua_wipe_realloc(void *ud,
+ return NULL;
+ }
+
+-#ifndef WITH_LUAJIT
+-extern int luaopen_bit(lua_State *L);
+-#endif
+-
+ static unsigned int lua_initialized = 0;
+
+ lua_State *
+@@ -989,7 +985,6 @@ rspamd_lua_init(bool wipe_mem)
+ luaopen_libarchive(L);
+ luaopen_shingle(L);
+ #ifndef WITH_LUAJIT
+- rspamd_lua_add_preload(L, "bit", luaopen_bit);
+ lua_settop(L, 0);
+ #endif
+
+--
+2.51.0
+
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 474b64a4219b..daab6e5f59a2 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -69,7 +69,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/${PN}-3.12-cmake-lua-version.patch"
- "${FILESDIR}/${PN}-3.12-unbundle-lua.patch"
+ "${FILESDIR}/${PN}--unbundle-lua.patch"
"${FILESDIR}/${PN}-3.12-unbundle-snowball.patch"
)
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 0a72482929ceff7df67a3db8397319bd0fcc6585
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Nov 11 07:58:27 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Nov 11 07:58:27 2025 +
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 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..
--- 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
-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..
--- a/mail-filter/rspamd/files/rspamd-3.13.0-lua-5.2+.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: ebe86dc16f5ae37ccb5128fe255c7c852bb0617d
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Nov 11 07:58:26 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Nov 11 07:58:26 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebe86dc1
mail-filter/rspamd: add 3.14.0
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.14.0.ebuild | 150
2 files changed, 151 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index b08344bf309c..a5a10ae88d98 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,3 +2,4 @@ DIST rspamd-3.12.1.tar.gz 6482214 BLAKE2B
06869bdaace99cf26a013609d8744e86ca2fbc
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/rspamd-3.14.0.ebuild
b/mail-filter/rspamd/rspamd-3.14.0.ebuild
new file mode 100644
index ..474b64a4219b
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.14.0.ebuild
@@ -0,0 +1,150 @@
+# 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} == * ]] ; 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
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 2ffe2a91507bc84044732339394d33470b364deb
Author: Petr Vaněk gentoo org>
AuthorDate: Mon Oct 6 12:48:06 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Mon Oct 6 12:48:38 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ffe2a91
mail-filter/rspamd: add 3.13.2
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.13.2.ebuild | 150
2 files changed, 151 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 0100380dfa0c..b08344bf309c 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
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
diff --git a/mail-filter/rspamd/rspamd-3.13.2.ebuild
b/mail-filter/rspamd/rspamd-3.13.2.ebuild
new file mode 100644
index ..b31f0de18705
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.13.2.ebuild
@@ -0,0 +1,150 @@
+# 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} == * ]] ; 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/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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: b7c8bff3a1200d7db4f0d248617be1a2bddd11e1
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Sep 30 11:31:41 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Sep 30 11:39:16 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c8bff3
mail-filter/rspamd: add 3.13.1
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.13.1.ebuild | 150
2 files changed, 151 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 6c09fb6f20ec..0100380dfa0c 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +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
diff --git a/mail-filter/rspamd/rspamd-3.13.1.ebuild
b/mail-filter/rspamd/rspamd-3.13.1.ebuild
new file mode 100644
index ..b31f0de18705
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.13.1.ebuild
@@ -0,0 +1,150 @@
+# 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} == * ]] ; 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/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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 3c71de0774d6000415bbfcecaa58fc6a08e23e98
Author: Petr Vaněk gentoo org>
AuthorDate: Sun Sep 21 16:34:21 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Sun Sep 21 17:26:07 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c71de07
mail-filter/rspamd: backport upstream fixes
Two fixes are backported to 3.13.0, in order to fix build with
disabled hyperscan USE and lua-5.2+.
Upstream-issue: https://github.com/rspamd/rspamd/issues/5620
Upstream-PR: https://github.com/rspamd/rspamd/pull/5625
Closes: https://bugs.gentoo.org/963055
Signed-off-by: Petr Vaněk gentoo.org>
.../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| 3 ++
3 files changed, 68 insertions(+)
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
new file mode 100644
index ..0fdaf5c1ca46
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.13.0-disabled-hyperscan.patch
@@ -0,0 +1,35 @@
+From 98e731bf69306a830834fbcfa7a21c3357130693 Mon Sep 17 00:00:00 2001
+From: Vsevolod Stakhov
+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
new file mode 100644
index ..4219df14073f
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.13.0-lua-5.2+.patch
@@ -0,0 +1,30 @@
+From d808fd75ff1db1821b1dd817eb4ba9a118b31090 Mon Sep 17 00:00:00 2001
+From: netoholic
+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
index b31f0de18705..3a9ecadba67d 100644
--- a/mail-filter/rspamd/rspamd-3.13.0.ebuild
+++ b/mail-filter/rspamd/rspamd-3.13.0.ebuild
@@ -71,6 +71,9 @@ 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() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 6d276d718c221ce6dd89b38d839bfa3df074b2a8
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Sep 17 09:28:54 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Sep 17 09:33:07 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d276d71
mail-filter/rspamd: add 3.13.0
This release includes LTO build fix.
Link: https://github.com/rspamd/rspamd/pull/5592
Closes: https://bugs.gentoo.org/962041
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.13.0.ebuild | 150
2 files changed, 151 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 6c0eb3da18b8..6c09fb6f20ec 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
DIST rspamd-3.12.1.tar.gz 6482214 BLAKE2B
06869bdaace99cf26a013609d8744e86ca2fbc7310bcf884db6edb2f52a62f2d47c38801483c312801348e64711ed691f59ab9ddf56d9c4c88ab3b237e8e10ec
SHA512
5e049f6aa872f9ded9ee7f580222edb83260a3a8dc14b74a0f95b88796d36690ac5e9b33b143560253111f79cc8cd5231fd2478661d8cfe92d75874cc472cf6c
+DIST rspamd-3.13.0.tar.gz 6596845 BLAKE2B
f1cbdfbcf7a524004deeaab89f236ff3ca5db0494bd3e34e99f161d027e34cea00e5d36956fa02cbeabbc55562249c6cf369561dbf4f93cd6390a5c0d2597287
SHA512
5a706349933fe2f2d51eb23f8019715338bfa49715287954e0b0f889193588e12f2de9090ab892f5854d5b569b719f669bcfc8ccdf705825cf52daf3d3f1c69a
diff --git a/mail-filter/rspamd/rspamd-3.13.0.ebuild
b/mail-filter/rspamd/rspamd-3.13.0.ebuild
new file mode 100644
index ..b31f0de18705
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.13.0.ebuild
@@ -0,0 +1,150 @@
+# 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} == * ]] ; 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/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
+
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 9dc41c369795caf519f401b2e3f66a3afab3d7dd
Author: Petr Vaněk gentoo org>
AuthorDate: Fri Aug 29 07:41:09 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Fri Aug 29 07:41:09 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc41c36
mail-filter/rspamd: drop 3.11.1-r1, 3.12.0
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 2 -
.../rspamd-3.11.1-doctest-compatibility.patch | 45 -
.../files/rspamd-3.11.1-punycode-icu-76.1.patch| 36
.../files/rspamd-3.6-cmake-lua-version.patch | 64 ---
.../rspamd/files/rspamd-3.6-unbundle-lua.patch | 61 ---
.../files/rspamd-3.6-unbundle-snowball.patch | 20 ---
.../rspamd/files/rspamd-3.9.0-older-libfmt.patch | 184 -
mail-filter/rspamd/rspamd-3.11.1-r1.ebuild | 161 --
mail-filter/rspamd/rspamd-3.12.0.ebuild| 153 -
9 files changed, 726 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index cd002d1df018..6c0eb3da18b8 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1 @@
-DIST rspamd-3.11.1.tar.gz 6455199 BLAKE2B
4dffefa8b660b960d670bcaf485ce83b5cfac99be8e3871c059f105ef2c75d3e3d4cecbbc983e61b762d8363e8873e8ee5a30d7444822da595f72130db9d2674
SHA512
979aad9d2cc720c12922d55f4ad742b65e18d0ca52ebb764a2432bd3d64e559461c8e1fa87f7ac52e614df71d0a776aa0362a876eaa745cd3f8c21afee52b8ab
-DIST rspamd-3.12.0.tar.gz 6477346 BLAKE2B
16f541ead3f01696113164e0a58e313260668ce1ecbac658c192f7e8b075383008c1de91e6180b3275f4d5a7ae9f43ee7932c1532c490f72b8e13bd7e7b90d3f
SHA512
7861680c63cca425d8dcfecef5581361cada34d7dc8690cd6e6a73e00657a9e5a6d499d96cbdbec62bc1d3dbdcfd6b3865cd7949532379aa15c3b0c1bfbac9f7
DIST rspamd-3.12.1.tar.gz 6482214 BLAKE2B
06869bdaace99cf26a013609d8744e86ca2fbc7310bcf884db6edb2f52a62f2d47c38801483c312801348e64711ed691f59ab9ddf56d9c4c88ab3b237e8e10ec
SHA512
5e049f6aa872f9ded9ee7f580222edb83260a3a8dc14b74a0f95b88796d36690ac5e9b33b143560253111f79cc8cd5231fd2478661d8cfe92d75874cc472cf6c
diff --git a/mail-filter/rspamd/files/rspamd-3.11.1-doctest-compatibility.patch
b/mail-filter/rspamd/files/rspamd-3.11.1-doctest-compatibility.patch
deleted file mode 100644
index 68d91b4c3124..
--- a/mail-filter/rspamd/files/rspamd-3.11.1-doctest-compatibility.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 08e94fb8276b568e33480df60dec0a72ba1bef26 Mon Sep 17 00:00:00 2001
-From: Alexandra Parker
-Date: Wed, 7 May 2025 13:17:32 -0700
-Subject: [PATCH] [Fix] libmime: declare comparators const for doctest 2.4.12
- compatibility
-
-Petr Vaněk pointed out a change in doctest 2.4.12 that broke the libmime
-test code:
-https://github.com/doctest/doctest/commit/d7a5eeb820b61cc3af8a61b3117f76a403b7742a
-
-CHECK is now treats LHS as const and the compiler won't find non-const
-operator== as a result. It's reasonable for comparators to be const, so
-make them const.
-
-Signed-Off-By: Alexandra Parker
-Upstream-PR: https://github.com/rspamd/rspamd/pull/5458
-
-diff --git a/src/libmime/mime_string.hxx b/src/libmime/mime_string.hxx
-index b181576d33..d6c11d018b 100644
a/src/libmime/mime_string.hxx
-+++ b/src/libmime/mime_string.hxx
-@@ -497,19 +497,19 @@ public:
- }
-
- /* Comparison */
-- auto operator==(const basic_mime_string &other)
-+ auto operator==(const basic_mime_string &other) const
- {
- return other.storage == storage;
- }
-- auto operator==(const storage_type &other)
-+ auto operator==(const storage_type &other) const
- {
- return other == storage;
- }
-- auto operator==(const view_type &other)
-+ auto operator==(const view_type &other) const
- {
- return other == storage;
- }
-- auto operator==(const CharT *other)
-+ auto operator==(const CharT *other) const
- {
- if (other == NULL) {
- return false;
diff --git a/mail-filter/rspamd/files/rspamd-3.11.1-punycode-icu-76.1.patch
b/mail-filter/rspamd/files/rspamd-3.11.1-punycode-icu-76.1.patch
deleted file mode 100644
index 1dce30f3ed86..
--- a/mail-filter/rspamd/files/rspamd-3.11.1-punycode-icu-76.1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e6e947a4ee4757628d90fd819c664187e796bd19 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Van=C4=9Bk?=
-Date: Thu, 8 May 2025 09:17:18 +0200
-Subject: [PATCH] Remove punycode tests failing with icu 76.1
-
-Some punycode tests fail due to a transitional processing deprecation in
-icu 76.1, see [1,2]. Let's remove those tests.
-
-[1]
https://github.com/unicode-org/icu/commit/f062f52c123f436eb1142115ba2e4e7b65a4ac8f
-[2] https://unicode-org.atlassian.net/browse/ICU-22294
-
-Upstream-issue: https://github.com/rspamd/rspamd/issues/5263
- test/lua/unit/rspamd_resolver.lua | 6 --
- 1 file changed, 6 deletions(-)
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 1934b266eb8ab89fbdbb55d9cf4b3eeb7a0683fb
Author: Joonas Niilola gentoo org>
AuthorDate: Wed Aug 6 16:31:10 2025 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Aug 6 16:31:49 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1934b266
mail-filter/rspamd: Stabilize 3.12.1 x86, #960379
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.12.1.ebuild
b/mail-filter/rspamd/rspamd-3.12.1.ebuild
index 61ccd2cba4d6..7f8253322da5 100644
--- a/mail-filter/rspamd/rspamd-3.12.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.12.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 936589208a69247d1ef0367d3ecc37373300cadf
Author: Joonas Niilola gentoo org>
AuthorDate: Wed Aug 6 16:30:42 2025 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Aug 6 16:31:49 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93658920
mail-filter/rspamd: Stabilize 3.12.1 amd64, #960379
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.12.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.12.1.ebuild
b/mail-filter/rspamd/rspamd-3.12.1.ebuild
index b31f0de18705..61ccd2cba4d6 100644
--- a/mail-filter/rspamd/rspamd-3.12.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.12.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 6c45609c7e81cb10eaeb74419803a2f874797ea7
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Jun 17 10:06:12 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Jun 17 12:16:19 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c45609c
mail-filter/rspamd: add 3.12.1
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.12.1.ebuild | 150
2 files changed, 151 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index b40dbdc0b24d..cd002d1df018 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-3.11.1.tar.gz 6455199 BLAKE2B
4dffefa8b660b960d670bcaf485ce83b5cfac99be8e3871c059f105ef2c75d3e3d4cecbbc983e61b762d8363e8873e8ee5a30d7444822da595f72130db9d2674
SHA512
979aad9d2cc720c12922d55f4ad742b65e18d0ca52ebb764a2432bd3d64e559461c8e1fa87f7ac52e614df71d0a776aa0362a876eaa745cd3f8c21afee52b8ab
DIST rspamd-3.12.0.tar.gz 6477346 BLAKE2B
16f541ead3f01696113164e0a58e313260668ce1ecbac658c192f7e8b075383008c1de91e6180b3275f4d5a7ae9f43ee7932c1532c490f72b8e13bd7e7b90d3f
SHA512
7861680c63cca425d8dcfecef5581361cada34d7dc8690cd6e6a73e00657a9e5a6d499d96cbdbec62bc1d3dbdcfd6b3865cd7949532379aa15c3b0c1bfbac9f7
+DIST rspamd-3.12.1.tar.gz 6482214 BLAKE2B
06869bdaace99cf26a013609d8744e86ca2fbc7310bcf884db6edb2f52a62f2d47c38801483c312801348e64711ed691f59ab9ddf56d9c4c88ab3b237e8e10ec
SHA512
5e049f6aa872f9ded9ee7f580222edb83260a3a8dc14b74a0f95b88796d36690ac5e9b33b143560253111f79cc8cd5231fd2478661d8cfe92d75874cc472cf6c
diff --git a/mail-filter/rspamd/rspamd-3.12.1.ebuild
b/mail-filter/rspamd/rspamd-3.12.1.ebuild
new file mode 100644
index ..b31f0de18705
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.12.1.ebuild
@@ -0,0 +1,150 @@
+# 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} == * ]] ; 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/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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: ed8b9b8764cca20ccea8c07cb7069f59a0e4f141
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Jun 17 10:08:05 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Jun 17 12:16:20 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed8b9b87
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 3 ---
1 file changed, 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 9b3d9ffba596..b31f0de18705 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -71,9 +71,6 @@ PATCHES=(
"${FILESDIR}/${PN}-3.12-cmake-lua-version.patch"
"${FILESDIR}/${PN}-3.12-unbundle-lua.patch"
"${FILESDIR}/${PN}-3.12-unbundle-snowball.patch"
-
- # upstream issue https://github.com/rspamd/rspamd/issues/5263
- "${FILESDIR}/${PN}-3.11.1-punycode-icu-76.1.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 847389cc5312ac380777a71cd2e94d93b121471c
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Jun 10 12:36:44 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Jun 10 13:04:46 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=847389cc
mail-filter/rspamd: add 3.12.0
- This version is switched back to bundled libfmt, see the upstream
issue.
- CMakeLists.txt were massively reworked, therefore it was necessary to
bump most of our patches.
Upstream-issue: https://github.com/rspamd/rspamd/issues/5258
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
.../files/rspamd-3.12-cmake-lua-version.patch | 64 +
.../rspamd/files/rspamd-3.12-unbundle-lua.patch| 70 ++
.../files/rspamd-3.12-unbundle-snowball.patch | 27
mail-filter/rspamd/rspamd-3.12.0.ebuild| 153 +
5 files changed, 315 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 1063ed724452..b40dbdc0b24d 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
DIST rspamd-3.11.1.tar.gz 6455199 BLAKE2B
4dffefa8b660b960d670bcaf485ce83b5cfac99be8e3871c059f105ef2c75d3e3d4cecbbc983e61b762d8363e8873e8ee5a30d7444822da595f72130db9d2674
SHA512
979aad9d2cc720c12922d55f4ad742b65e18d0ca52ebb764a2432bd3d64e559461c8e1fa87f7ac52e614df71d0a776aa0362a876eaa745cd3f8c21afee52b8ab
+DIST rspamd-3.12.0.tar.gz 6477346 BLAKE2B
16f541ead3f01696113164e0a58e313260668ce1ecbac658c192f7e8b075383008c1de91e6180b3275f4d5a7ae9f43ee7932c1532c490f72b8e13bd7e7b90d3f
SHA512
7861680c63cca425d8dcfecef5581361cada34d7dc8690cd6e6a73e00657a9e5a6d499d96cbdbec62bc1d3dbdcfd6b3865cd7949532379aa15c3b0c1bfbac9f7
diff --git a/mail-filter/rspamd/files/rspamd-3.12-cmake-lua-version.patch
b/mail-filter/rspamd/files/rspamd-3.12-cmake-lua-version.patch
new file mode 100644
index ..4abdf425f37c
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.12-cmake-lua-version.patch
@@ -0,0 +1,64 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1d48a2096..98e8c2ec0 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -167,55 +167,8 @@ if (ENABLE_LUAJIT)
+ else ()
+ # Try to find Lua (5.3, 5.4, 5.2, or 5.1 in that order)
+ ProcessPackage(LIBLUA LIBRARY "lua"
+-"lua-5.3"
+-LIB_SUFFIXES "lua5.3"
+-INCLUDE lua.h INCLUDE_SUFFIXES
+-"include/lua-5.3"
+-"include/lua5.3"
+-"include/lua53"
+-"include/lua"
+ ROOT ${LUA_ROOT}
+-MODULES lua53
+-OPTIONAL)
+-
+-if (NOT WITH_LIBLUA)
+-ProcessPackage(LIBLUA LIBRARY "lua"
+-"lua-5.4"
+-LIB_SUFFIXES "lua5.4"
+-INCLUDE lua.h INCLUDE_SUFFIXES
+-"include/lua-5.4"
+-"include/lua5.4"
+-"include/lua54"
+-"include/lua"
+-ROOT ${LUA_ROOT}
+-MODULES lua54
+-OPTIONAL)
+-if (NOT WITH_LIBLUA)
+-ProcessPackage(LIBLUA LIBRARY "lua"
+-"lua-5.2"
+-LIB_SUFFIXES "lua5.2"
+-INCLUDE lua.h INCLUDE_SUFFIXES
+-"include/lua-5.2"
+-"include/lua5.2"
+-"include/lua52"
+-"include/lua"
+-ROOT ${LUA_ROOT}
+-MODULES lua52
+-OPTIONAL)
+-
+-if (NOT WITH_LIBLUA)
+-ProcessPackage(LIBLUA LIBRARY "lua"
+-"lua-5.1"
+-INCLUDE lua.h INCLUDE_SUFFIXES
+-"include/lua-5.1"
+-"include/lua5.1"
+-"include/lua51"
+-"include/lua"
+-ROOT ${LUA_ROOT}
+-MODULES lua51)
+-endif ()
+-endif ()
+-endif ()
++MODULES lua)
+ endif ()
+
+ # Memory allocator
+--
+2.49.0
+
diff --git a/mail-filter/rspamd/files/rspamd-3.12-unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-3.12-unbundle-lua.patch
new file mode 100644
index ..a5052c044baf
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.12-unbundle-lua.patch
@@ -0,0 +1,70 @@
+diff --git a/cmake/AddDependencySubdirectories.cmake
b/cmake/AddDependencySubdirectories.cmake
+index 866204ff5..61781b511 100644
+--- a/cmake/AddDependencySubdirectories.cmake
b/cmake/AddDependencySubdirectories.cmake
+@@ -69,11 +69,6 @@ function(AddDependencySubdirectories)
+ find_package(doctest)
+ endif ()
+
+-# Lua-specific dependencies
+-if (NOT WITH_LUAJIT)
+-add_subdirectory(contrib/lua-bit)
+-endif ()
+-
+ # Lua REPL support
+ add_subdirectory(contrib/replxx)
+ list(APPEND RSPAMD_REQUIRED_LIBRARIES rspamd-replxx)
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 064ebcfc92f8a3fb746593df0381c65911190eb8
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Jun 10 12:58:04 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Jun 10 13:04:47 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=064ebcfc
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 16b59dbaef8d..9b3d9ffba596 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -59,7 +59,6 @@ RDEPEND="
DEPEND="
${RDEPEND}
dev-cpp/doctest
- dev-libs/libfmt:=
>=dev-libs/xxhash-0.8.0
"
BDEPEND="
@@ -69,15 +68,18 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
- "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
+ "${FILESDIR}/${PN}-3.12-cmake-lua-version.patch"
+ "${FILESDIR}/${PN}-3.12-unbundle-lua.patch"
+ "${FILESDIR}/${PN}-3.12-unbundle-snowball.patch"
+
+ # upstream issue https://github.com/rspamd/rspamd/issues/5263
+ "${FILESDIR}/${PN}-3.11.1-punycode-icu-76.1.patch"
)
src_prepare() {
cmake_src_prepare
- rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
+ rm -vrf contrib/{doctest,lua-{argparse,bit},snowball,xxhash,zstd} || die
> cmake/Toolset.cmake || die #827550
@@ -95,7 +97,6 @@ src_configure() {
-DLIBDIR="/usr/$(get_libdir)/rspamd"
-DSYSTEM_DOCTEST=ON
- -DSYSTEM_FMT=ON
-DSYSTEM_XXHASH=ON
-DSYSTEM_ZSTD=ON
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 29e0c693ac64e91fef58dd1378cacb70c3171263
Author: Petr Vaněk gentoo org>
AuthorDate: Thu May 8 07:29:45 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Thu May 8 07:33:43 2025 +
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 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..
--- 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
-Date: Tue, 17 Dec 2024 13:37:54 +
-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..
--- 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} == * ]] ; 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=(
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: e1469bfbcb388eb9f6d036befb2f1baa974e2bc1
Author: Petr Vaněk gentoo org>
AuthorDate: Thu May 8 06:59:23 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Thu May 8 07:30:59 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1469bfb
mail-filter/rspamd: Fix doctest 2.4.12 compatibility
Upstream-PR: https://github.com/rspamd/rspamd/pull/5458
Closes: https://bugs.gentoo.org/955440
Signed-off-by: Petr Vaněk gentoo.org>
.../rspamd-3.11.1-doctest-compatibility.patch | 45 ++
...spamd-3.11.1.ebuild => rspamd-3.11.1-r1.ebuild} | 3 ++
2 files changed, 48 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-3.11.1-doctest-compatibility.patch
b/mail-filter/rspamd/files/rspamd-3.11.1-doctest-compatibility.patch
new file mode 100644
index ..68d91b4c3124
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.11.1-doctest-compatibility.patch
@@ -0,0 +1,45 @@
+From 08e94fb8276b568e33480df60dec0a72ba1bef26 Mon Sep 17 00:00:00 2001
+From: Alexandra Parker
+Date: Wed, 7 May 2025 13:17:32 -0700
+Subject: [PATCH] [Fix] libmime: declare comparators const for doctest 2.4.12
+ compatibility
+
+Petr Vaněk pointed out a change in doctest 2.4.12 that broke the libmime
+test code:
+https://github.com/doctest/doctest/commit/d7a5eeb820b61cc3af8a61b3117f76a403b7742a
+
+CHECK is now treats LHS as const and the compiler won't find non-const
+operator== as a result. It's reasonable for comparators to be const, so
+make them const.
+
+Signed-Off-By: Alexandra Parker
+Upstream-PR: https://github.com/rspamd/rspamd/pull/5458
+
+diff --git a/src/libmime/mime_string.hxx b/src/libmime/mime_string.hxx
+index b181576d33..d6c11d018b 100644
+--- a/src/libmime/mime_string.hxx
b/src/libmime/mime_string.hxx
+@@ -497,19 +497,19 @@ public:
+ }
+
+ /* Comparison */
+- auto operator==(const basic_mime_string &other)
++ auto operator==(const basic_mime_string &other) const
+ {
+ return other.storage == storage;
+ }
+- auto operator==(const storage_type &other)
++ auto operator==(const storage_type &other) const
+ {
+ return other == storage;
+ }
+- auto operator==(const view_type &other)
++ auto operator==(const view_type &other) const
+ {
+ return other == storage;
+ }
+- auto operator==(const CharT *other)
++ auto operator==(const CharT *other) const
+ {
+ if (other == NULL) {
+ return false;
diff --git a/mail-filter/rspamd/rspamd-3.11.1.ebuild
b/mail-filter/rspamd/rspamd-3.11.1-r1.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-3.11.1.ebuild
rename to mail-filter/rspamd/rspamd-3.11.1-r1.ebuild
index a1465d928f29..83ff23a2295d 100644
--- a/mail-filter/rspamd/rspamd-3.11.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.11.1-r1.ebuild
@@ -75,6 +75,9 @@ PATCHES=(
# backward compatibility with
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: bac18a6e6bd8d4e377491236855034d5b9eacf53
Author: Petr Vaněk gentoo org>
AuthorDate: Thu May 8 07:24:49 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Thu May 8 07:31:00 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac18a6e
mail-filter/rspamd: remove punycode tests for icu 76.1
Those tests fail due to a transational processing deprecation in icu
76.1.
Upstream-issue: https://github.com/rspamd/rspamd/issues/5263
Signed-off-by: Petr Vaněk gentoo.org>
.../files/rspamd-3.11.1-punycode-icu-76.1.patch| 36 ++
mail-filter/rspamd/rspamd-3.11.1-r1.ebuild | 3 ++
2 files changed, 39 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-3.11.1-punycode-icu-76.1.patch
b/mail-filter/rspamd/files/rspamd-3.11.1-punycode-icu-76.1.patch
new file mode 100644
index ..1dce30f3ed86
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.11.1-punycode-icu-76.1.patch
@@ -0,0 +1,36 @@
+From e6e947a4ee4757628d90fd819c664187e796bd19 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?=
+Date: Thu, 8 May 2025 09:17:18 +0200
+Subject: [PATCH] Remove punycode tests failing with icu 76.1
+
+Some punycode tests fail due to a transitional processing deprecation in
+icu 76.1, see [1,2]. Let's remove those tests.
+
+[1]
https://github.com/unicode-org/icu/commit/f062f52c123f436eb1142115ba2e4e7b65a4ac8f
+[2] https://unicode-org.atlassian.net/browse/ICU-22294
+
+Upstream-issue: https://github.com/rspamd/rspamd/issues/5263
+---
+ test/lua/unit/rspamd_resolver.lua | 6 --
+ 1 file changed, 6 deletions(-)
+
+diff --git a/test/lua/unit/rspamd_resolver.lua
b/test/lua/unit/rspamd_resolver.lua
+index e987ff00b..405951758 100644
+--- a/test/lua/unit/rspamd_resolver.lua
b/test/lua/unit/rspamd_resolver.lua
+@@ -7,12 +7,6 @@ context("Check punycoding UTF-8 URL", function()
+ local resolver = rspamd_resolver.init(rspamd_util.create_event_base(),
rspamd_config)
+
+ local cases = {
+--- https://unicode.org/reports/tr46/#Deviations
+-['faß.de'] = 'fass.de', -- IDNA2008 result: xn--fa-hia.de
+-['βόλος.com'] = 'xn--nxasmq6b.com', -- IDNA2008 result: xn--nxasmm1c.com
+-['نامهای.com'] = 'xn--mgba3gch31f.com', -- IDNA2008 result:
xn--mgba3gch31f060k.com
+-['ශ්රී.com'] = 'xn--10cl1a0b.com', -- IDNA2008 result:
xn--10cl1a0b660p.com
+-
+ -- https://unicode.org/reports/tr46/#Table_Example_Processing
+ ['日本語。ＪＰ'] = 'xn--wgv71a119e.jp', -- Fullwidth characters are remapped,
including 。
+ --['u¨.com'] = 'xn--tda.com', -- Normalize changes u + umlaut to ü
+--
+2.45.3
+
diff --git a/mail-filter/rspamd/rspamd-3.11.1-r1.ebuild
b/mail-filter/rspamd/rspamd-3.11.1-r1.ebuild
index 83ff23a2295d..2aec0af1f461 100644
--- a/mail-filter/rspamd/rspamd-3.11.1-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.11.1-r1.ebuild
@@ -78,6 +78,9 @@ PATCHES=(
# compatibility for doctest-2.4.12, bug 955440
"${FILESDIR}/${PN}-3.11.1-doctest-compatibility.patch"
+
+ # upstream issue https://github.com/rspamd/rspamd/issues/5263
+ "${FILESDIR}/${PN}-3.11.1-punycode-icu-76.1.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: e906a0cdd6542976d8b5a02538848a04bd1ab8aa
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Mar 19 07:52:56 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Mar 19 07:54:49 2025 +
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 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..
--- 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?=
-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..
--- a/mail-filter/rspamd/rspamd-3.10.0-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 9734d5371d9c1e30375f2c33dbbe5750b25dc889
Author: Sam James gentoo org>
AuthorDate: Thu Mar 13 11:01:31 2025 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 13 11:01:46 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9734d537
mail-filter/rspamd: Stabilize 3.11.1 x86, #951281
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.11.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.11.1.ebuild
b/mail-filter/rspamd/rspamd-3.11.1.ebuild
index 8ac2a996ee96..a1465d928f29 100644
--- a/mail-filter/rspamd/rspamd-3.11.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.11.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: f12e2a5747b63460e629d27e71ecedbb554bcab4
Author: Sam James gentoo org>
AuthorDate: Thu Mar 13 11:01:29 2025 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 13 11:01:46 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12e2a57
mail-filter/rspamd: Stabilize 3.11.1 amd64, #951281
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.11.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.11.1.ebuild
b/mail-filter/rspamd/rspamd-3.11.1.ebuild
index 5eb72f6c212f..8ac2a996ee96 100644
--- a/mail-filter/rspamd/rspamd-3.11.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.11.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: bec552fe58bde3fc4952bf6cbb8014a8cdf0db98
Author: Petr Vaněk gentoo org>
AuthorDate: Sat Mar 8 21:02:25 2025 +
Commit: Petr Vaněk gentoo org>
CommitDate: Sat Mar 8 21:03:50 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec552fe
mail-filter/rspamd: add 3.11.1
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.11.1.ebuild | 155
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 8a589d80d893..fa783dbb3ad5 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,5 +1,6 @@
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/rspamd-3.11.1.ebuild
b/mail-filter/rspamd/rspamd-3.11.1.ebuild
new file mode 100644
index ..5eb72f6c212f
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.11.1.ebuild
@@ -0,0 +1,155 @@
+# 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} == * ]] ; 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 cmake/Toolset.cmake || die #827550
+
+ sed -i -e 's/User=_rspamd/User=rspamd/g' \
+ rspamd.service \
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 4b7f4de1a9b5e6b4d052dd053474accb7df70ba4
Author: Ulrich Müller gentoo org>
AuthorDate: Fri Feb 14 14:11:18 2025 +
Commit: Ulrich Müller gentoo org>
CommitDate: Sat Feb 15 09:26:31 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7f4de1
mail-filter/rspamd: Port to ver_replacing
Signed-off-by: Ulrich Müller gentoo.org>
mail-filter/rspamd/rspamd-3.8.4.ebuild | 24 +++-
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.4.ebuild
b/mail-filter/rspamd/rspamd-3.8.4.ebuild
index f5242f7e37fb..0e93818e8965 100644
--- a/mail-filter/rspamd/rspamd-3.8.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# 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
+inherit cmake eapi9-ver lua-single pax-utils systemd tmpfiles
if [[ ${PV} == * ]] ; then
EGIT_REPO_URI="https://github.com/rspamd/rspamd.git";
@@ -150,15 +150,13 @@ src_install() {
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
+ 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
}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: ee616175eee3844911446b7441b5a942d58ea5ca Author: Petr Vaněk gentoo org> AuthorDate: Thu Dec 19 16:41:41 2024 + Commit: Petr Vaněk gentoo org> CommitDate: Thu Dec 19 16:45:28 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee616175 mail-filter/rspamd: fix build with USE=-hyperscan This fix backports upstream patch https://github.com/rspamd/rspamd/commit/ccb45df90df60fae36b9438cfb2b0088e590306b Closes: https://bugs.gentoo.org/946676 Signed-off-by: Petr Vaněk gentoo.org> .../rspamd/files/rspamd-3.11.0-simdutf-hdr.patch | 27 ++ ...spamd-3.11.0.ebuild => rspamd-3.11.0-r1.ebuild} | 3 +++ 2 files changed, 30 insertions(+) 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 new file mode 100644 index ..eb129268b49f --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.11.0-simdutf-hdr.patch @@ -0,0 +1,27 @@ +From ccb45df90df60fae36b9438cfb2b0088e590306b Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov +Date: Tue, 17 Dec 2024 13:37:54 + +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.ebuild b/mail-filter/rspamd/rspamd-3.11.0-r1.ebuild similarity index 98% rename from mail-filter/rspamd/rspamd-3.11.0.ebuild rename to mail-filter/rspamd/rspamd-3.11.0-r1.ebuild index 45df6738554b..cc4d00d79234 100644 --- a/mail-filter/rspamd/rspamd-3.11.0.ebuild +++ b/mail-filter/rspamd/rspamd-3.11.0-r1.ebuild @@ -75,6 +75,9 @@ PATCHES=( # backward compatibility with
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: ad33ee654ec3879668bff7f6ad3640166b93837a
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Dec 18 19:40:57 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Thu Dec 19 09:06:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad33ee65
mail-filter/rspamd: add 3.11.0
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.11.0.ebuild | 155
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 3cff1f2175f2..8a589d80d893 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,4 +1,5 @@
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.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/rspamd-3.11.0.ebuild
b/mail-filter/rspamd/rspamd-3.11.0.ebuild
new file mode 100644
index ..45df6738554b
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.11.0.ebuild
@@ -0,0 +1,155 @@
+# 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} == * ]] ; 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 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"
+
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 2c9cd42aadf6edbe2d643faac88326b9f1865587
Author: Petr Vaněk gentoo org>
AuthorDate: Mon Nov 18 15:49:45 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Mon Nov 18 16:10:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c9cd42a
mail-filter/rspamd: restrict https://github.com/rspamd/rspamd/pull/5034
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/rspamd-3.8.4.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.4.ebuild
b/mail-filter/rspamd/rspamd-3.8.4.ebuild
index 1ba2cca28359..f5242f7e37fb 100644
--- a/mail-filter/rspamd/rspamd-3.8.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.4.ebuild
@@ -55,10 +55,11 @@ RDEPEND="
jemalloc? ( dev-libs/jemalloc:= )
selinux? ( sec-policy/selinux-spamassassin )
"
+# https://github.com/rspamd/rspamd/pull/5034
DEPEND="
${RDEPEND}
dev-cpp/doctest
- dev-libs/libfmt:=
+ =dev-libs/xxhash-0.8.0
"
BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 99e2186dbcef3394b831f92f7974ecdafd86863f
Author: Petr Vaněk gentoo org>
AuthorDate: Thu Oct 24 13:07:26 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Thu Oct 24 13:08:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99e2186d
mail-filter/rspamd: add 3.10.2
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.10.2.ebuild | 155
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 55b3f3003f5b..3cff1f2175f2 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
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.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/rspamd-3.10.2.ebuild
b/mail-filter/rspamd/rspamd-3.10.2.ebuild
new file mode 100644
index ..45df6738554b
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.10.2.ebuild
@@ -0,0 +1,155 @@
+# 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} == * ]] ; 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 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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: a420be1dffb7d144cda2161519165a47d1c22d45
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Oct 2 17:36:00 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Oct 2 17:43:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a420be1d
mail-filter/rspamd: fix build issue with lua5-{3,4}
Backport patch, which fixes a build issue with Lua 5.3 and 5.4.
Issue: https://github.com/rspamd/rspamd/issues/5163
Signed-off-by: Petr Vaněk gentoo.org>
.../rspamd/files/rspamd-3.10.0-libucl-type.patch | 36 ++
...spamd-3.10.0.ebuild => rspamd-3.10.0-r1.ebuild} | 3 ++
2 files changed, 39 insertions(+)
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
new file mode 100644
index ..25d4c32d26ff
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.10.0-libucl-type.patch
@@ -0,0 +1,36 @@
+From 3041484f859f3d8cc2275c5189280c31ff3ffeda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?=
+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.ebuild
b/mail-filter/rspamd/rspamd-3.10.0-r1.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-3.10.0.ebuild
rename to mail-filter/rspamd/rspamd-3.10.0-r1.ebuild
index 45df6738554b..8fb906ba42cb 100644
--- a/mail-filter/rspamd/rspamd-3.10.0.ebuild
+++ b/mail-filter/rspamd/rspamd-3.10.0-r1.ebuild
@@ -75,6 +75,9 @@ PATCHES=(
# backward compatibility with https://github.com/rspamd/rspamd/issues/5163
+ "${FILESDIR}/${P}-libucl-type.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 9e23120ff294d65d23a4ffb2fb8ed33b216476d3
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Oct 1 09:31:30 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Oct 1 09:34:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e23120f
mail-filter/rspamd: drop 3.9.0
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 -
mail-filter/rspamd/rspamd-3.9.0.ebuild | 155 -
2 files changed, 156 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 6792e0007924..55b3f3003f5b 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,4 +1,3 @@
DIST rspamd-3.10.0.tar.gz 6008518 BLAKE2B
875c25e6ab1c62d5081c65cd11d30eb084be46f0adb31f8b2c123fd85efaf250ba1bea94d30152a6edefe40a6cf7a6c7f4bde21607121d25501ef63085a9fc2f
SHA512
ffe7a4418db3c4211a39ec92d2610fff3d88d72aa399cb3a0780be26e6a22b5d47041a6862496d5cf05da37cb1cae0c9b10890b409c568b4c74dd16a3ad2c5af
DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B
a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3
SHA512
dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
-DIST rspamd-3.9.0.tar.gz 5955138 BLAKE2B
52eea9b11c3780bdd54d24a4ae49d7f1c598fa2748cf1d1b4e4cd19fff50fcfcfafe5140038efa437104ba71e6e968a39613e86b642df7be84553c96123a90fa
SHA512
7e75df264de5c778e92aac72be5d701724896ef60dc7f7e41f91a89193b812896dff56f6434233eaa91b5cdf8e6aa863f39129a154520a08b52bcb04c61b965e
DIST rspamd-3.9.1.tar.gz 5980094 BLAKE2B
bb02cecdd686c85ef8340f122255f36c2cd5f6823da05370abce1e059466d053f543998945172be43c631f9d1fce0837a62fc047ca8aa76f3ea87680ee3e2a17
SHA512
b8d60448b8174a05f9dcfb17181e0e2908828923491fadb0f07b8debf97923f6967f3e5dfd27ca3c1a24671abd65c144139b02d1698a8a8a2e5b0672f9012d1f
diff --git a/mail-filter/rspamd/rspamd-3.9.0.ebuild
b/mail-filter/rspamd/rspamd-3.9.0.ebuild
deleted file mode 100644
index 40c66dca1317..
--- a/mail-filter/rspamd/rspamd-3.9.0.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} == * ]] ; 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}/rspamd-3.6-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
- "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
-
- # backward compatibility with 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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 0c2a6e3b99430625d2909d634f04e3e2a5666f1f
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Oct 1 09:31:12 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Oct 1 09:34:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c2a6e3b
mail-filter/rspamd: add 3.10.0
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.10.0.ebuild | 155
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 61c37d67e748..6792e0007924 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
+DIST rspamd-3.10.0.tar.gz 6008518 BLAKE2B
875c25e6ab1c62d5081c65cd11d30eb084be46f0adb31f8b2c123fd85efaf250ba1bea94d30152a6edefe40a6cf7a6c7f4bde21607121d25501ef63085a9fc2f
SHA512
ffe7a4418db3c4211a39ec92d2610fff3d88d72aa399cb3a0780be26e6a22b5d47041a6862496d5cf05da37cb1cae0c9b10890b409c568b4c74dd16a3ad2c5af
DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B
a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3
SHA512
dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
DIST rspamd-3.9.0.tar.gz 5955138 BLAKE2B
52eea9b11c3780bdd54d24a4ae49d7f1c598fa2748cf1d1b4e4cd19fff50fcfcfafe5140038efa437104ba71e6e968a39613e86b642df7be84553c96123a90fa
SHA512
7e75df264de5c778e92aac72be5d701724896ef60dc7f7e41f91a89193b812896dff56f6434233eaa91b5cdf8e6aa863f39129a154520a08b52bcb04c61b965e
DIST rspamd-3.9.1.tar.gz 5980094 BLAKE2B
bb02cecdd686c85ef8340f122255f36c2cd5f6823da05370abce1e059466d053f543998945172be43c631f9d1fce0837a62fc047ca8aa76f3ea87680ee3e2a17
SHA512
b8d60448b8174a05f9dcfb17181e0e2908828923491fadb0f07b8debf97923f6967f3e5dfd27ca3c1a24671abd65c144139b02d1698a8a8a2e5b0672f9012d1f
diff --git a/mail-filter/rspamd/rspamd-3.10.0.ebuild
b/mail-filter/rspamd/rspamd-3.10.0.ebuild
new file mode 100644
index ..45df6738554b
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.10.0.ebuild
@@ -0,0 +1,155 @@
+# 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} == * ]] ; 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 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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 6503d050fcb4d7d5829738c20ff33e4f2f3d08ec
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Jul 23 21:03:04 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Jul 23 21:03:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6503d050
mail-filter/rspamd: add 3.9.1
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
mail-filter/rspamd/rspamd-3.9.1.ebuild | 155 +
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 89a5f23e7ef2..61c37d67e748 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B
a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3
SHA512
dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
DIST rspamd-3.9.0.tar.gz 5955138 BLAKE2B
52eea9b11c3780bdd54d24a4ae49d7f1c598fa2748cf1d1b4e4cd19fff50fcfcfafe5140038efa437104ba71e6e968a39613e86b642df7be84553c96123a90fa
SHA512
7e75df264de5c778e92aac72be5d701724896ef60dc7f7e41f91a89193b812896dff56f6434233eaa91b5cdf8e6aa863f39129a154520a08b52bcb04c61b965e
+DIST rspamd-3.9.1.tar.gz 5980094 BLAKE2B
bb02cecdd686c85ef8340f122255f36c2cd5f6823da05370abce1e059466d053f543998945172be43c631f9d1fce0837a62fc047ca8aa76f3ea87680ee3e2a17
SHA512
b8d60448b8174a05f9dcfb17181e0e2908828923491fadb0f07b8debf97923f6967f3e5dfd27ca3c1a24671abd65c144139b02d1698a8a8a2e5b0672f9012d1f
diff --git a/mail-filter/rspamd/rspamd-3.9.1.ebuild
b/mail-filter/rspamd/rspamd-3.9.1.ebuild
new file mode 100644
index ..45df6738554b
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.9.1.ebuild
@@ -0,0 +1,155 @@
+# 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} == * ]] ; 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 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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 868baf98108d1975cc049a622e90485f74ee9082
Author: Petr Vaněk gentoo org>
AuthorDate: Sat Jul 13 20:40:25 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Sat Jul 13 20:42:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868baf98
mail-filter/rspamd: add 3.9.0
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
.../rspamd/files/rspamd-3.9.0-older-libfmt.patch | 184 +
mail-filter/rspamd/rspamd-3.9.0.ebuild | 155 +
3 files changed, 340 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index dd2b12eb7b18..89a5f23e7ef2 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B
a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3
SHA512
dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
+DIST rspamd-3.9.0.tar.gz 5955138 BLAKE2B
52eea9b11c3780bdd54d24a4ae49d7f1c598fa2748cf1d1b4e4cd19fff50fcfcfafe5140038efa437104ba71e6e968a39613e86b642df7be84553c96123a90fa
SHA512
7e75df264de5c778e92aac72be5d701724896ef60dc7f7e41f91a89193b812896dff56f6434233eaa91b5cdf8e6aa863f39129a154520a08b52bcb04c61b965e
diff --git a/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch
b/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch
new file mode 100644
index ..0b6de27f5689
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.9.0-older-libfmt.patch
@@ -0,0 +1,184 @@
+From 0826efdadc36a7f1f4251f0450101fb5cbb1c94f Mon Sep 17 00:00:00 2001
+From: Petr Vaněk
+Date: Sat, 13 Jul 2024 15:53:28 +0200
+Subject: [PATCH] backward compatibility with https://github.com/rspamd/rspamd/commit/19299911dc7b951fa9649b918a661026a5d0e450
+[2]
https://github.com/fmtlib/fmt/commit/79f1506fe3a7fae7c22c55d3cd7cdc33bc536dae
+[3]
https://github.com/fmtlib/fmt/commit/58a6bd48a8dc7ea74bb9fd900c60fd333a85725f
+
+diff --git a/src/libmime/lang_detection_fasttext.cxx
b/src/libmime/lang_detection_fasttext.cxx
+index 89916151f..5c3549c8e 100644
+--- a/src/libmime/lang_detection_fasttext.cxx
b/src/libmime/lang_detection_fasttext.cxx
+@@ -20,7 +20,7 @@
+ #include "fasttext/fasttext.h"
+ #include "libserver/cfg_file.h"
+ #include "libserver/logger.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "stat_api.h"
+ #include
+ #include
+diff --git a/src/libserver/backtrace.cxx b/src/libserver/backtrace.cxx
+index c24e61936..330c829b0 100644
+--- a/src/libserver/backtrace.cxx
b/src/libserver/backtrace.cxx
+@@ -19,7 +19,7 @@
+ #ifdef BACKWARD_ENABLE
+
+ #include "contrib/backward-cpp/backward.hpp"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "logger.h"
+
+ namespace rspamd {
+diff --git a/src/libserver/cfg_rcl.cxx b/src/libserver/cfg_rcl.cxx
+index ce3df4010..f0c9db64d 100644
+--- a/src/libserver/cfg_rcl.cxx
b/src/libserver/cfg_rcl.cxx
+@@ -34,7 +34,7 @@
+ #include // for std::transform
+ #include
+ #include "contrib/ankerl/unordered_dense.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "libutil/cxx/util.hxx"
+ #include "libutil/cxx/file_util.hxx"
+ #include "frozen/unordered_set.h"
+diff --git a/src/libserver/cfg_utils.cxx b/src/libserver/cfg_utils.cxx
+index 1344bc4f9..adc23f590 100644
+--- a/src/libserver/cfg_utils.cxx
b/src/libserver/cfg_utils.cxx
+@@ -65,7 +65,7 @@
+ #include
+ #include
+ #include
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #include "cxx/util.hxx"
+ #include "frozen/unordered_map.h"
+ #include "frozen/string.h"
+diff --git a/src/libserver/css/css_parser.cxx
b/src/libserver/css/css_parser.cxx
+index 11fa830f0..c016b9d9d 100644
+--- a/src/libserver/css/css_parser.cxx
b/src/libserver/css/css_parser.cxx
+@@ -20,7 +20,7 @@
+ #include "css_rule.hxx"
+ #include "css_util.hxx"
+ #include "css.hxx"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+
+ #include
+ #include
+diff --git a/src/libserver/css/css_selector.cxx
b/src/libserver/css/css_selector.cxx
+index d2ae093cb..61bd8750f 100644
+--- a/src/libserver/css/css_selector.cxx
b/src/libserver/css/css_selector.cxx
+@@ -17,7 +17,7 @@
+ #include "css_selector.hxx"
+ #include "css.hxx"
+ #include "libserver/html/html.hxx"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+ #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+ #include "doctest/doctest.h"
+
+diff --git a/src/libserver/css/css_value.cxx b/src/libserver/css/css_value.cxx
+index f2ff55363..64ebc536f 100644
+--- a/src/libserver/css/css_value.cxx
b/src/libserver/css/css_value.cxx
+@@ -20,7 +20,7 @@
+ #include "frozen/string.h"
+ #include "libutil/util.h"
+ #include "contrib/ankerl/unordered_dense.h"
+-#include "fmt/base.h"
++#include "fmt/core.h"
+
+ #define DOCTEST_CONFIG_IMPLEMENTATION_IN_DLL
+ #include "doctest/doctest.h"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 0458788cf9450674af6ec828adf2db041e265c3d
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Apr 23 09:53:06 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Apr 23 10:41:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0458788c
mail-filter/rspamd: drop 3.8.1
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 -
mail-filter/rspamd/rspamd-3.8.1.ebuild | 155 -
2 files changed, 156 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index f5a68e3e11cc..dd2b12eb7b18 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1 @@
-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/rspamd-3.8.1.ebuild
b/mail-filter/rspamd/rspamd-3.8.1.ebuild
deleted file mode 100644
index f2a11e4ecfa4..
--- a/mail-filter/rspamd/rspamd-3.8.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} == * ]] ; 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 )
-"
-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() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 56d0c91c35b0578120989465c89395eafa373368
Author: Matoro Mahri matoro tk>
AuthorDate: Thu Apr 18 18:27:31 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 19 06:37:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d0c91c
mail-filter/rspamd: Stabilize 3.8.4 amd64, #928004
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/rspamd/rspamd-3.8.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.4.ebuild
b/mail-filter/rspamd/rspamd-3.8.4.ebuild
index d1d6da7bf192..3eea4b377db7 100644
--- a/mail-filter/rspamd/rspamd-3.8.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 2829d4451012f2eaf37dd039b96fbe2d85805f74
Author: Matoro Mahri matoro tk>
AuthorDate: Thu Apr 18 20:19:01 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 19 06:37:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2829d445
mail-filter/rspamd: Stabilize 3.8.4 x86, #928004
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/rspamd/rspamd-3.8.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.4.ebuild
b/mail-filter/rspamd/rspamd-3.8.4.ebuild
index 3eea4b377db7..1ba2cca28359 100644
--- a/mail-filter/rspamd/rspamd-3.8.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 8a31789b8e900a225947a82e98f27576b03fb19e
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Mar 13 08:18:46 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Mar 13 17:30:17 2024 +
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 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..
--- a/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Duncan Bellamy
-Date: Thu, 3 Aug 2023 22:08:06 +
-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..
--- 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
-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;
- }
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: bf6a4fee21b57c6781540fddc0c35e0471a1def1
Author: Matoro Mahri matoro tk>
AuthorDate: Sun Mar 10 22:28:25 2024 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Mon Mar 11 16:11:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6a4fee
mail-filter/rspamd: Stabilize 3.8.1 x86, #925489
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Viorel Munteanu gentoo.org>
mail-filter/rspamd/rspamd-3.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.1.ebuild
b/mail-filter/rspamd/rspamd-3.8.1.ebuild
index 2c4184dcd20b..f2a11e4ecfa4 100644
--- a/mail-filter/rspamd/rspamd-3.8.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 5e20534d60d9e1c113975c14eef63bbfc7a14ea7
Author: Matoro Mahri matoro tk>
AuthorDate: Sun Mar 10 22:17:59 2024 +
Commit: Viorel Munteanu gentoo org>
CommitDate: Mon Mar 11 16:11:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e20534d
mail-filter/rspamd: Stabilize 3.8.1 amd64, #925489
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Viorel Munteanu gentoo.org>
mail-filter/rspamd/rspamd-3.8.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.1.ebuild
b/mail-filter/rspamd/rspamd-3.8.1.ebuild
index 4cbd73d5bd4e..2c4184dcd20b 100644
--- a/mail-filter/rspamd/rspamd-3.8.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 29e1cdf39be0abeb24c8facdbd54bfc3eb4d66d8 Author: Petr Vaněk gentoo org> AuthorDate: Wed Feb 28 21:24:52 2024 + Commit: Petr Vaněk gentoo org> CommitDate: Wed Feb 28 21:32:17 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29e1cdf3 mail-filter/rspamd: add libarchive dep to live ebuild Signed-off-by: Petr Vaněk gentoo.org> mail-filter/rspamd/rspamd-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/mail-filter/rspamd/rspamd-.ebuild b/mail-filter/rspamd/rspamd-.ebuild index 7763299004ae..16b59dbaef8d 100644 --- a/mail-filter/rspamd/rspamd-.ebuild +++ b/mail-filter/rspamd/rspamd-.ebuild @@ -38,6 +38,7 @@ RDEPEND=" ') acct-group/rspamd acct-user/rspamd + app-arch/libarchive:= app-arch/zstd:= dev-db/sqlite:3 dev-libs/glib:2
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: f5c90a7a7e87a2629c20b05cfb5f0847fb706a22
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Feb 28 21:29:10 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Feb 28 21:32:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5c90a7a
mail-filter/rspamd: drop 3.8.2, 3.8.3
Both versions has known bugs, which were addressed promptly in 3.8.4.
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 2 -
mail-filter/rspamd/rspamd-3.8.2.ebuild | 163 -
mail-filter/rspamd/rspamd-3.8.3.ebuild | 163 -
3 files changed, 328 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 75fb4e5bf878..8929872819e4 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,6 +2,4 @@ DIST rspamd-3.6.tar.gz 5843907 BLAKE2B
2ccb3e65a14624d48540bd3e2d034fec0dd89cd75
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.2.tar.gz 5915793 BLAKE2B
df375fd2d3272a43bf5e9bfe3cec7352a92e5df319d973a59299317a5e199e8e2936d1e81fbb2b8f669d23a0fac2d51830a06f577d4d5751eb93404e6f08b0cd
SHA512
75d46197720c556ae04de2898a788e704385195785cf6c505dfdadcdb837dc7abbb2a4285acf8d19575f01ccb5c83b5c9847424d4cabf3a645799ad1f35c7f2a
-DIST rspamd-3.8.3.tar.gz 5915102 BLAKE2B
7c8a8055ffa190ea7f0d34cdb504e3d70fd526f546d39fdb118f8c151d5ac21fc1c2bfb9c226454f39a5c4f3e5bb73de7b9f8612fb390c5a49de48bd1593bada
SHA512
f325f533f333b50799699532dbc22e183c4f76ade14e5b47c1e3234ee8c3bde9304a9f28f26c23ccff99c7a82ea1253d15c5687d07f0682a2a4d61d6fbba665c
DIST rspamd-3.8.4.tar.gz 5915680 BLAKE2B
a6674c5175a10dffa440b9f4227fc4f2e7c497bf8a5a6c87c9f042ca870380a61be63405f4d2714103f49679edd5a28c4eb30807b8acb22998c7dbba72f19cb3
SHA512
dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51
diff --git a/mail-filter/rspamd/rspamd-3.8.2.ebuild
b/mail-filter/rspamd/rspamd-3.8.2.ebuild
deleted file mode 100644
index d1d6da7bf192..
--- a/mail-filter/rspamd/rspamd-3.8.2.ebuild
+++ /dev/null
@@ -1,163 +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} == * ]] ; 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 )
-"
-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"
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: c13f39be6f5f2b8d6e777cf6eb99d3a1b0ae629a
Author: Petr Vaněk gentoo org>
AuthorDate: Tue Feb 20 22:13:08 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Feb 20 22:16:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c13f39be
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index d8e37a79ac0c..7763299004ae 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -109,12 +109,20 @@ src_configure() {
-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() {
- cmake_build run-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() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 5258085b1e5239d5dfcc60970f3acaf3ea9ccb6c
Author: Matoro Mahri matoro tk>
AuthorDate: Mon Jan 29 18:22:43 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jan 30 03:53:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5258085b
mail-filter/rspamd: Stabilize 3.7.5 amd64, #921014
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/rspamd/rspamd-3.7.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.7.5.ebuild
b/mail-filter/rspamd/rspamd-3.7.5.ebuild
index 476878d10a51..e4daeebbe16d 100644
--- a/mail-filter/rspamd/rspamd-3.7.5.ebuild
+++ b/mail-filter/rspamd/rspamd-3.7.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: a2e961efcd3c4333c31d9248b5b6e0dcef5f1e93
Author: Petr Vaněk gentoo org>
AuthorDate: Fri Jan 26 09:01:43 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Fri Jan 26 09:15:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2e961ef
mail-filter/rspamd: add 3.8.1
This version fixes Lua 5.1 issue, see bug 922522.
Bug: https://bugs.gentoo.org/922522
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
mail-filter/rspamd/rspamd-3.8.1.ebuild | 155 +
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 89c5db99091a..cae72b6d8a43 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,3 +2,4 @@ DIST rspamd-3.6.tar.gz 5843907 BLAKE2B
2ccb3e65a14624d48540bd3e2d034fec0dd89cd75
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.0.tar.gz 5911065 BLAKE2B
6698051599f6d014229c3cdc3f005469b2a55841aea737a181c6f1aeee6bfde22478de23aa614bd4900be9746409648089baeb0f8a9033a531b362d783b63efa
SHA512
8c0d673be64df95aa84cdef20a09b4cfd501c39006a6dea58a925f737823fe5ec92ccdf86a38b78e5ab6ba8c7dd16b837a49dbc744ae479362979b6427e05e55
+DIST rspamd-3.8.1.tar.gz 5910993 BLAKE2B
c3c29cb380fa09a33173bb6f51ff76eaf88cf459eda0c6f19f890148eb97703a8f43f34443a6d4b28cb1cbcf2c6f47321203556d265a0b2f0b0050b5575c5851
SHA512
b87c1cba11faca278db85426ed527832c34d1beff56e0993543a05fcc2d5d72675cf31bbc4241f52da9122787d24f8b955218988a198a3c29dee5db3be2c7e99
diff --git a/mail-filter/rspamd/rspamd-3.8.1.ebuild
b/mail-filter/rspamd/rspamd-3.8.1.ebuild
new file mode 100644
index ..4cbd73d5bd4e
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.8.1.ebuild
@@ -0,0 +1,155 @@
+# 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} == * ]] ; 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 )
+"
+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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 9a31d97af4910925784bfd609199347030336516
Author: Petr Vaněk gentoo org>
AuthorDate: Fri Jan 26 09:03:02 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Fri Jan 26 09:15:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a31d97a
mail-filter/rspamd: drop 3.8.0
Closes: https://bugs.gentoo.org/922522
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 -
mail-filter/rspamd/rspamd-3.8.0.ebuild | 155 -
2 files changed, 156 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index cae72b6d8a43..279d1b04dcca 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,5 +1,4 @@
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.0.tar.gz 5911065 BLAKE2B
6698051599f6d014229c3cdc3f005469b2a55841aea737a181c6f1aeee6bfde22478de23aa614bd4900be9746409648089baeb0f8a9033a531b362d783b63efa
SHA512
8c0d673be64df95aa84cdef20a09b4cfd501c39006a6dea58a925f737823fe5ec92ccdf86a38b78e5ab6ba8c7dd16b837a49dbc744ae479362979b6427e05e55
DIST rspamd-3.8.1.tar.gz 5910993 BLAKE2B
c3c29cb380fa09a33173bb6f51ff76eaf88cf459eda0c6f19f890148eb97703a8f43f34443a6d4b28cb1cbcf2c6f47321203556d265a0b2f0b0050b5575c5851
SHA512
b87c1cba11faca278db85426ed527832c34d1beff56e0993543a05fcc2d5d72675cf31bbc4241f52da9122787d24f8b955218988a198a3c29dee5db3be2c7e99
diff --git a/mail-filter/rspamd/rspamd-3.8.0.ebuild
b/mail-filter/rspamd/rspamd-3.8.0.ebuild
deleted file mode 100644
index 4cbd73d5bd4e..
--- a/mail-filter/rspamd/rspamd-3.8.0.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} == * ]] ; 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 )
-"
-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
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: d65837bcfffec57193ccd4e3a8d6a80610530248
Author: Matoro Mahri matoro tk>
AuthorDate: Mon Jan 22 17:39:40 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jan 23 05:04:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d65837bc
mail-filter/rspamd: Keyword 3.8.0 x86, #918871
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/rspamd/rspamd-3.8.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.8.0.ebuild
b/mail-filter/rspamd/rspamd-3.8.0.ebuild
index f50bb6bf2ff5..4cbd73d5bd4e 100644
--- a/mail-filter/rspamd/rspamd-3.8.0.ebuild
+++ b/mail-filter/rspamd/rspamd-3.8.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 99c9c25f85f05787970d89e51867cdeed1c00040
Author: Petr Vaněk gentoo org>
AuthorDate: Fri Jan 19 18:59:35 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Fri Jan 19 19:05:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99c9c25f
mail-filter/rspamd: add 3.8.0
The y2038 test is commented out, see bug 922250 and [1].
[1]
https://github.com/rspamd/rspamd/commit/4704a4a26948f1127c66c03c94e7752ee52805c6
Closes: https://bugs.gentoo.org/922250
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
mail-filter/rspamd/rspamd-3.8.0.ebuild | 155 +
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 4ebcc556ab04..89c5db99091a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
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.0.tar.gz 5911065 BLAKE2B
6698051599f6d014229c3cdc3f005469b2a55841aea737a181c6f1aeee6bfde22478de23aa614bd4900be9746409648089baeb0f8a9033a531b362d783b63efa
SHA512
8c0d673be64df95aa84cdef20a09b4cfd501c39006a6dea58a925f737823fe5ec92ccdf86a38b78e5ab6ba8c7dd16b837a49dbc744ae479362979b6427e05e55
diff --git a/mail-filter/rspamd/rspamd-3.8.0.ebuild
b/mail-filter/rspamd/rspamd-3.8.0.ebuild
new file mode 100644
index ..f50bb6bf2ff5
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.8.0.ebuild
@@ -0,0 +1,155 @@
+# 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} == * ]] ; 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
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 910702f42a4b56f347e4192534af7dc9cda25463
Author: Petr Vaněk gentoo org>
AuthorDate: Fri Dec 15 16:17:36 2023 +
Commit: Petr Vaněk gentoo org>
CommitDate: Fri Dec 15 16:22:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=910702f4
mail-filter/rspamd: add 3.7.5
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/Manifest| 1 +
mail-filter/rspamd/rspamd-3.7.5.ebuild | 155 +
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index f6e905e71447..4ebcc556ab04 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
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
diff --git a/mail-filter/rspamd/rspamd-3.7.5.ebuild
b/mail-filter/rspamd/rspamd-3.7.5.ebuild
new file mode 100644
index ..476878d10a51
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.7.5.ebuild
@@ -0,0 +1,155 @@
+# 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} == * ]] ; 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)
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: eb1389896b76a06f13f4a5a0d29f177640bf84c0 Author: Petr Vaněk gentoo org> AuthorDate: Wed Nov 29 21:45:12 2023 + Commit: Petr Vaněk gentoo org> CommitDate: Wed Nov 29 21:45:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb138989 mail-filter/rspamd: update my email Signed-off-by: Petr Vaněk gentoo.org> mail-filter/rspamd/metadata.xml | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index 234502a13abb..6044b0bb7bec 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -1,14 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd";> - [email protected] + [email protected] Petr Vaněk - [email protected] -Proxy Maintainers - rspamd/rspamd
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: e207a3b1d64bc0cbc0bbf7d5c0a8a0d534c2129f
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Nov 29 09:23:31 2023 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Nov 29 21:12:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e207a3b1
mail-filter/rspamd: switch to dev-libs/vctorscan
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/metadata.xml | 1 +
mail-filter/rspamd/rspamd-3.7.4-r1.ebuild | 155 ++
2 files changed, 156 insertions(+)
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index 09b8498d3eb3..234502a13abb 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -13,6 +13,7 @@
rspamd/rspamd
+Enable hyperscan for fast regexp processing
Enable PCRE JIT support
diff --git a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild
b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild
new file mode 100644
index ..476878d10a51
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild
@@ -0,0 +1,155 @@
+# 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} == * ]] ; 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
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 49cb28937ceb21fcbee9b14a36bc92cc3f371772
Author: Petr Vaněk gentoo org>
AuthorDate: Wed Nov 29 09:23:31 2023 +
Commit: Petr Vaněk gentoo org>
CommitDate: Wed Nov 29 21:12:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49cb2893
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 8a3804be1663..d8e37a79ac0c 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="
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"
+IUSE="blas +hyperscan jemalloc +jit selinux test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -51,7 +51,7 @@ RDEPEND="
virtual/blas
virtual/lapack
)
- cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+ hyperscan? ( dev-libs/vectorscan:= )
jemalloc? ( dev-libs/jemalloc:= )
selinux? ( sec-policy/selinux-spamassassin )
"
@@ -99,10 +99,13 @@ src_configure() {
-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_HYPERSCAN=$(usex hyperscan ON OFF)
-DENABLE_JEMALLOC=$(usex jemalloc ON OFF)
-DENABLE_LUAJIT=$(usex lua_single_target_luajit ON OFF)
-DENABLE_PCRE2=ON
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: dc601d53907c786e9db7250f5cacbaf8d977af47
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Nov 20 21:14:04 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Nov 22 11:32:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc601d53
mail-filter/rspamd: enable Backward for glibc only
Enabling Backward for glibc only solves the problem for other libcs like
musl, which does not provide execinfo.h.
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://bugs.gentoo.org/917643
Closes: https://github.com/gentoo/gentoo/pull/33925
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.7.4.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mail-filter/rspamd/rspamd-3.7.4.ebuild
b/mail-filter/rspamd/rspamd-3.7.4.ebuild
index 7f70037f8cbe..ad8d2656579e 100644
--- a/mail-filter/rspamd/rspamd-3.7.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.7.4.ebuild
@@ -99,6 +99,9 @@ src_configure() {
-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)
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: efdd36c388997dbb8065bbc4eba588ace7c9568c
Author: Joonas Niilola gentoo org>
AuthorDate: Fri Sep 8 07:16:59 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Sep 8 07:16:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efdd36c3
mail-filter/rspamd: Stabilize 3.6-r1 x86, #913753
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.6-r1.ebuild
b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
index 2bc8880da051..3e711833e3a8 100644
--- a/mail-filter/rspamd/rspamd-3.6-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 9d478492c3dc83996e069c64bc464808427e54a0
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Sep 7 18:38:40 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Sep 7 18:38:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d478492
mail-filter/rspamd: Stabilize 3.6-r1 amd64, #913753
Signed-off-by: Arthur Zamarin gentoo.org>
mail-filter/rspamd/rspamd-3.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.6-r1.ebuild
b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
index dba607175345..2bc8880da051 100644
--- a/mail-filter/rspamd/rspamd-3.6-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 753c2d194c68c2c83c4b9d2bd6875e4b97a2e621
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Aug 5 07:59:37 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 7 05:35:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=753c2d19
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/32183
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index b60d7d586587..8d0f80ea85ed 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -68,9 +68,9 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
- "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+ "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: d0e615e314d69085bf006960ed4ac714d58f02b4
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 28 19:04:32 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 29 10:58:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0e615e3
mail-filter/rspamd: drop 3.4-r3
Bug: https://bugs.gentoo.org/905345
Signed-off-by: Andreas Sturmlechner gentoo.org>
mail-filter/rspamd/Manifest| 1 -
.../rspamd/files/rspamd-3.3-remove-test-case.patch | 20 ---
mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch | 30
.../rspamd-3.4-hyperscan-page-alignment.patch | 28
mail-filter/rspamd/rspamd-3.4-r3.ebuild| 153 -
5 files changed, 232 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index bcee383412e4..1b42f54a09d7 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1 @@
-DIST rspamd-3.4.tar.gz 5689732 BLAKE2B
8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104
SHA512
fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
DIST rspamd-3.5.tar.gz 5806722 BLAKE2B
547cd9bb26942dc584d1f4b164e61bdb15505a56399fa19b358b7d7525ee983acc8d5ae1fdb3de340e3461a03aedbb48266fd81404c1f4a2e8fc5bd6735d9a62
SHA512
39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623
diff --git a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
deleted file mode 100644
index 0cad11382b21..
--- a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove test case which does not work with luajit-2.1 anymore as it
-depends on internal behavior of lujait-2.0.
-
-Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
-
-diff --git a/test/lua/unit/lua_util.extract_specific_urls.lua
b/test/lua/unit/lua_util.extract_specific_urls.lua
-index 05ffeb7b0..a7e2f9f48 100644
a/test/lua/unit/lua_util.extract_specific_urls.lua
-+++ b/test/lua/unit/lua_util.extract_specific_urls.lua
-@@ -108,7 +108,6 @@ context("Lua util - extract_specific_urls plain",
function()
- local cases = {
- {expect = url_list, filter = nil, limit = , need_emails = true,
prefix = 'p'},
- {expect = {}, filter = (function() return false end), limit = ,
need_emails = true, prefix = 'p'},
--{expect = {"domain4.co.net", "test.com"}, filter = nil, limit = 2,
need_emails = true, prefix = 'p'},
- {expect = {"domain4.co.net", "test.com", "domain3.org"}, filter = nil,
limit = 3, need_emails = true, prefix = 'p'},
- {
- expect = {"gov.co.net", "tesco.co.net", "domain1.co.net",
"domain2.co.net", "domain3.co.net", "domain4.co.net"},
---
-2.37.4
-
diff --git a/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
b/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
deleted file mode 100644
index f660b353fec7..
--- a/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/rspamd/rspamd/commit/0a916c632e18e6686e1a2256d5ef2fe1a1cc239f
-
-From 0a916c632e18e6686e1a2256d5ef2fe1a1cc239f Mon Sep 17 00:00:00 2001
-From: Heiko Becker
-Date: Wed, 18 Jan 2023 23:54:24 +0100
-Subject: [PATCH] Fix build with gcc 13 by including
-
-Like other versions before, gcc 13 moved some includes around and as a
-result is no longer transitively included. Explicitly include
-it for uint8_t.
a/src/libserver/css/css_tokeniser.hxx
-+++ b/src/libserver/css/css_tokeniser.hxx
-@@ -24,6 +24,7 @@
- #include
- #include
- #include
-+#include
- #include "mem_pool.h"
-
- namespace rspamd::css {
a/src/libserver/html/html_tag.hxx
-+++ b/src/libserver/html/html_tag.hxx
-@@ -23,6 +23,7 @@
- #include
- #include
- #include
-+#include
-
- #include "html_tags.h"
-
diff --git a/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
b/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
deleted file mode 100644
index 913f1f7ecd4d..
--- a/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix for hyperscan page alignment issues.
-
-Upstream-Issue: https://github.com/rspamd/rspamd/issues/4329
-
-diff --git a/src/libserver/hyperscan_tools.cxx
b/src/libserver/hyperscan_tools.cxx
-index 6187208a9..96366067d 100644
a/src/libserver/hyperscan_tools.cxx
-+++ b/src/libserver/hyperscan_tools.cxx
-@@ -306,7 +306,15 @@ auto load_cached_hs_file(const char *fname, std::int64_t
offset = 0) -> tl::expe
-
msg_debug_hyperscan_lambda("multipattern: create new database in %s; %Hz size",
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 4b4703ef2b9188dfdd9ff0ea50cae35367318404
Author: Joonas Niilola gentoo org>
AuthorDate: Sat May 27 06:39:42 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat May 27 06:42:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b4703ef
mail-filter/rspamd: Stabilize 3.5-r1 amd64, #905345
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
index 836c73d46150..e3d6bbc2e688 100644
--- a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 61921027bdde1d418b66fe4000454e138a595a10
Author: Joonas Niilola gentoo org>
AuthorDate: Sat May 27 06:42:19 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat May 27 06:42:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61921027
mail-filter/rspamd: Stabilize 3.5-r1 x86, #905345
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
index e3d6bbc2e688..eaa2b34643f9 100644
--- a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 23ab69bb2f0a819c26f9559d28a40aa97f8c7510
Author: Petr Vaněk atlas cz>
AuthorDate: Thu May 25 08:40:14 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri May 26 10:58:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ab69bb
mail-filter/rspamd: disable lua5-3, lua5-4
The support for lua5-{3,4} is being temporarily disabled in this
version, as the bug fix patch is too large for backporting.
Closes: https://bugs.gentoo.org/903577
Upstream-issue: https://github.com/rspamd/rspamd/issues/4455
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/31156
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.5-r1.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
index 979310e1d722..836c73d46150 100644
--- a/mail-filter/rspamd/rspamd-3.5-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.5-r1.ebuild
@@ -3,7 +3,10 @@
EAPI=8
-LUA_COMPAT=( lua5-{1..4} luajit )
+# lua5-{3,4} were dropped due to bug #903577. This issue has been resolved
+# upstream, see https://github.com/rspamd/rspamd/issues/4455. They will be
+# restored with the next version bump.
+LUA_COMPAT=( lua5-1 luajit )
inherit cmake lua-single pax-utils systemd tmpfiles
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 45db47d0b8b97d082d8ba4566817737dab5795c6
Author: Petr Vaněk atlas cz>
AuthorDate: Wed May 17 10:48:53 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri May 26 10:58:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45db47d0
mail-filter/rspamd: limit deps to https://github.com/rspamd/rspamd/issues/4482
Closes: https://bugs.gentoo.org/906068
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/{rspamd-3.4-r2.ebuild => rspamd-3.4-r3.ebuild} | 3 ++-
mail-filter/rspamd/{rspamd-3.5.ebuild => rspamd-3.5-r1.ebuild}| 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r3.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-3.4-r2.ebuild
rename to mail-filter/rspamd/rspamd-3.4-r3.ebuild
index d81ac12ae142..a58ca9510131 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r3.ebuild
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
REQUIRED_USE="${LUA_REQUIRED_USE}
test? ( lua_single_target_luajit )"
+# for https://github.com/rspamd/rspamd/issues/4482
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
@@ -42,7 +43,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
- dev-libs/libfmt:=
+ https://github.com/rspamd/rspamd/issues/4482
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
dev-lua/LuaBitOp[${LUA_USEDEP}]
@@ -42,7 +43,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
- dev-libs/libfmt:=
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 1dcd29c56c2c8237e0a9adc39237a33ae52bea7b
Author: Petr Vaněk atlas cz>
AuthorDate: Sun Mar 19 17:17:15 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 19 21:20:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dcd29c5
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 5e7014163c32..b60d7d586587 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -91,6 +91,7 @@ src_configure() {
-DRUNDIR=/var/run/rspamd
-DDBDIR=/var/lib/rspamd
-DLOGDIR=/var/log/rspamd
+ -DLIBDIR="/usr/$(get_libdir)/rspamd"
-DSYSTEM_DOCTEST=ON
-DSYSTEM_FMT=ON
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: fc55387362b98251f1b04a8253439fe6653bb86d
Author: Petr Vaněk atlas cz>
AuthorDate: Sun Mar 19 17:16:26 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 19 21:20:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc553873
mail-filter/rspamd: add 3.5
Closes: https://bugs.gentoo.org/902137
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.5.ebuild | 149 +++
2 files changed, 150 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index d10d234b142a..bcee383412e4 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1 +1,2 @@
DIST rspamd-3.4.tar.gz 5689732 BLAKE2B
8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104
SHA512
fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
+DIST rspamd-3.5.tar.gz 5806722 BLAKE2B
547cd9bb26942dc584d1f4b164e61bdb15505a56399fa19b358b7d7525ee983acc8d5ae1fdb3de340e3461a03aedbb48266fd81404c1f4a2e8fc5bd6735d9a62
SHA512
39c87d5dfd9ae1fc7709e19967eac5e7c7dc83fa070dfebbb7ab5411d7d50d6e6f10248ada717cf1cb3f6ff6c5bfb4d31fd87e1a7e1b2e5f876f6be7b5705623
diff --git a/mail-filter/rspamd/rspamd-3.5.ebuild
b/mail-filter/rspamd/rspamd-3.5.ebuild
new file mode 100644
index ..bf4fc1bf5f86
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.5.ebuild
@@ -0,0 +1,149 @@
+# 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} == * ]] ; 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.0-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-2.5-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
+
+ -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
+
+ #
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 33b433a59dc9b5a04680b65e9e88dfc5b4ea22ae
Author: Petr Vaněk atlas cz>
AuthorDate: Sun Mar 19 16:37:00 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Mar 19 21:20:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b433a5
mail-filter/rspamd: update warning message
This improves wording for new revision.
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.4-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
index 0a63b92b87b8..d81ac12ae142 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -141,8 +141,8 @@ pkg_postinst() {
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 is patched in this"
- elog "ebuild revision rspamd-3.4-r1. All possibly
broken .unser files will be"
+ 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."
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 98b37bd96e336bbf1f6f02f9979e6d0aaa5f2f69
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Jan 30 08:45:37 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Feb 9 16:11:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98b37bd9
mail-filter/rspamd: drop 3.3
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/29337
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/Manifest | 1 -
mail-filter/rspamd/rspamd-3.3.ebuild | 136 ---
2 files changed, 137 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 8892d1cbf45b..d10d234b142a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1 @@
-DIST rspamd-3.3.tar.gz 5680874 BLAKE2B
2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9
SHA512
02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
DIST rspamd-3.4.tar.gz 5689732 BLAKE2B
8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104
SHA512
fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild
b/mail-filter/rspamd/rspamd-3.3.ebuild
deleted file mode 100644
index 6fb46e9d9b6b..
--- a/mail-filter/rspamd/rspamd-3.3.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2022 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} == * ]] ; 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-util/ragel
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
- "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
- "${FILESDIR}/rspamd-3.3-remove-test-case.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
-
- -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
-
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 8bf21588a1ff873679440c9b751aedec9ae783fa
Author: Sam James gentoo org>
AuthorDate: Thu Jan 26 07:21:40 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 26 07:21:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf21588
mail-filter/rspamd: fix build w/ gcc 13
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch | 30
mail-filter/rspamd/rspamd-3.4-r2.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
b/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
new file mode 100644
index ..f660b353fec7
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.4-gcc-13.patch
@@ -0,0 +1,30 @@
+https://github.com/rspamd/rspamd/commit/0a916c632e18e6686e1a2256d5ef2fe1a1cc239f
+
+From 0a916c632e18e6686e1a2256d5ef2fe1a1cc239f Mon Sep 17 00:00:00 2001
+From: Heiko Becker
+Date: Wed, 18 Jan 2023 23:54:24 +0100
+Subject: [PATCH] Fix build with gcc 13 by including
+
+Like other versions before, gcc 13 moved some includes around and as a
+result is no longer transitively included. Explicitly include
+it for uint8_t.
+--- a/src/libserver/css/css_tokeniser.hxx
b/src/libserver/css/css_tokeniser.hxx
+@@ -24,6 +24,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "mem_pool.h"
+
+ namespace rspamd::css {
+--- a/src/libserver/html/html_tag.hxx
b/src/libserver/html/html_tag.hxx
+@@ -23,6 +23,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "html_tags.h"
+
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
index 67c7e30c3e00..0a63b92b87b8 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.5-unbundle-snowball.patch"
"${FILESDIR}/${PN}-3.3-remove-test-case.patch"
"${FILESDIR}/${PN}-3.4-hyperscan-page-alignment.patch"
+ "${FILESDIR}/${P}-gcc-13.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 7976366883e23b128abf6135a486d6312ffe9f57
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Jan 17 04:13:15 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Jan 17 04:13:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79763668
mail-filter/rspamd: Stabilize 3.4-r2 amd64, #89
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
index 800551b3a1f5..67c7e30c3e00 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 351a7b20d051b416cf460536e87a664259dff4c0
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Jan 17 04:12:06 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Jan 17 04:13:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351a7b20
mail-filter/rspamd: add missing perl BDEPEND
CMake Error at /usr/share/cmake/Modules/FindPackageHandleStandardArgs.cmake:230
(message):
Could NOT find Perl (missing: PERL_EXECUTABLE)
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.4-r2.ebuild | 1 +
mail-filter/rspamd/rspamd-.ebuild | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
index 5f557fe50711..a828bc41c8af 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -62,6 +62,7 @@ DEPEND="${RDEPEND}
dev-cpp/doctest
"
BDEPEND="
+ dev-lang/perl
dev-util/ragel
virtual/pkgconfig
"
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index b6932290133a..5e7014163c32 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -62,6 +62,7 @@ DEPEND="${RDEPEND}
dev-cpp/doctest
"
BDEPEND="
+ dev-lang/perl
dev-util/ragel
virtual/pkgconfig
"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 766886f3e2f45684b9445406c267e7cb2e6ea297
Author: Joonas Niilola gentoo org>
AuthorDate: Tue Jan 17 04:12:54 2023 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Jan 17 04:13:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766886f3
mail-filter/rspamd: Stabilize 3.4-r2 x86, #89
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.4-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
index a828bc41c8af..800551b3a1f5 100644
--- a/mail-filter/rspamd/rspamd-3.4-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: a3f9e9a6627cc9c176498cee7226155633ba735d
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Jan 2 08:57:06 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Jan 4 05:48:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3f9e9a6
mail-filter/rspamd: respect libdir
Closes: https://bugs.gentoo.org/887591
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/28933
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/{rspamd-3.4-r1.ebuild => rspamd-3.4-r2.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.4-r1.ebuild
b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-3.4-r1.ebuild
rename to mail-filter/rspamd/rspamd-3.4-r2.ebuild
index fc1664f05a6d..5f557fe50711 100644
--- a/mail-filter/rspamd/rspamd-3.4-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -92,6 +92,7 @@ src_configure() {
-DRUNDIR=/var/run/rspamd
-DDBDIR=/var/lib/rspamd
-DLOGDIR=/var/log/rspamd
+ -DLIBDIR="/usr/$(get_libdir)/rspamd"
-DSYSTEM_DOCTEST=ON
-DSYSTEM_FMT=ON
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: 7c78c5f223626fb3bb688cce6e50068e90cb1704
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 20 21:14:40 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Dec 24 08:58:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c78c5f2
mail-filter/rspamd: drop 2.7-r104
Signed-off-by: Andreas Sturmlechner gentoo.org>
mail-filter/rspamd/Manifest| 1 -
.../rspamd/files/rspamd-2.6-unbundle-lua.patch | 53 -
.../files/rspamd-2.7-cmake-lua-version.patch | 49
.../rspamd/files/rspamd-2.7-unbundle-zstd.patch| 125 -
mail-filter/rspamd/metadata.xml| 1 -
mail-filter/rspamd/rspamd-2.7-r104.ebuild | 116 ---
6 files changed, 345 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index bca781f9d3ef..8892d1cbf45b 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,2 @@
-DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
DIST rspamd-3.3.tar.gz 5680874 BLAKE2B
2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9
SHA512
02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
DIST rspamd-3.4.tar.gz 5689732 BLAKE2B
8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104
SHA512
fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
diff --git a/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
deleted file mode 100644
index 9278fa8608d7..
--- a/mail-filter/rspamd/files/rspamd-2.6-unbundle-lua.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b794b9dbd..1ba5c085e 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -632,10 +632,6 @@ ADD_SUBDIRECTORY(contrib/fastutf8)
- ADD_SUBDIRECTORY(contrib/google-ced)
-
-
--IF (NOT WITH_LUAJIT)
-- ADD_SUBDIRECTORY(contrib/lua-bit)
--ENDIF()
--
- IF (ENABLE_LUA_REPL MATCHES "ON")
- ADD_SUBDIRECTORY(contrib/replxx)
- SET(WITH_LUA_REPL 1)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9a34d2ac4..59bab5c15 100644
a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -189,10 +189,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
- ADD_DEPENDENCIES(rspamd-server rspamd-clang)
- ENDIF()
-
--IF (NOT WITH_LUAJIT)
-- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit)
--ENDIF()
--
- IF (ENABLE_SNOWBALL MATCHES "ON")
- TARGET_LINK_LIBRARIES(rspamd-server stemmer)
- ENDIF()
-diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
-index b7fcc2034..1d86464da 100644
a/src/lua/lua_common.c
-+++ b/src/lua/lua_common.c
-@@ -922,10 +922,6 @@ rspamd_lua_wipe_realloc (void *ud,
- return NULL;
- }
-
--#ifndef WITH_LUAJIT
--extern int luaopen_bit(lua_State *L);
--#endif
--
- lua_State *
- rspamd_lua_init (bool wipe_mem)
- {
-@@ -981,7 +977,6 @@ rspamd_lua_init (bool wipe_mem)
- luaopen_spf (L);
- luaopen_tensor (L);
- #ifndef WITH_LUAJIT
-- rspamd_lua_add_preload (L, "bit", luaopen_bit);
- lua_settop (L, 0);
- #endif
-
diff --git a/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch
b/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch
deleted file mode 100644
index c8254f1ce95e..
--- a/mail-filter/rspamd/files/rspamd-2.7-cmake-lua-version.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 72382acb6..2335ae4bc 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,42 +141,8 @@ IF(ENABLE_LUAJIT MATCHES "ON")
- ELSE(ENABLE_LUAJIT MATCHES "ON")
-
- ProcessPackage(LIBLUA LIBRARY "lua"
-- "lua-5.3"
-- LIB_SUFFIXES"lua5.3"
-- INCLUDE lua.h INCLUDE_SUFFIXES
-- "include/lua-5.3"
-- "include/lua5.3"
-- "include/lua53"
-- "include/lua"
- ROOT ${LUA_ROOT}
-- MODULES lua53
-- OPTIONAL)
--
-- IF (NOT WITH_LIBLUA)
-- ProcessPackage(LIBLUA LIBRARY "lua"
-- "lua-5.2"
-- LIB_SUFFIXES"lua5.2"
-- INCLUDE lua.h INCLUDE_SUFFIXES
-- "include/lua-5.2"
--
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: 1d2bf9e530d455d9d2e4b318d33c411ffb9e36f5
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Nov 14 14:05:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Nov 15 00:56:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d2bf9e5
mail-filter/rspamd: fix page-alignment of .unser files
This revision applies patch taken from upstream [1] which fixes
page-alignment issue of .unser files causing segfaults. The issue
affects only those who already started rspamd-3.4. All .unser files will
be automatically removed in postinstall phase for those who are updating
from 3.4 to 3.4-r1.
[1] https://github.com/rspamd/rspamd/issues/4329
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/28263
Signed-off-by: Sam James gentoo.org>
.../rspamd-3.4-hyperscan-page-alignment.patch | 28 ++
.../{rspamd-3.4.ebuild => rspamd-3.4-r1.ebuild}| 13 ++
2 files changed, 41 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
b/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
new file mode 100644
index ..913f1f7ecd4d
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.4-hyperscan-page-alignment.patch
@@ -0,0 +1,28 @@
+Fix for hyperscan page alignment issues.
+
+Upstream-Issue: https://github.com/rspamd/rspamd/issues/4329
+
+diff --git a/src/libserver/hyperscan_tools.cxx
b/src/libserver/hyperscan_tools.cxx
+index 6187208a9..96366067d 100644
+--- a/src/libserver/hyperscan_tools.cxx
b/src/libserver/hyperscan_tools.cxx
+@@ -306,7 +306,15 @@ auto load_cached_hs_file(const char *fname, std::int64_t
offset = 0) -> tl::expe
+
msg_debug_hyperscan_lambda("multipattern: create new database in %s; %Hz size",
+ tmpfile_pattern.data(),
unserialized_size);
+ void *buf;
+- posix_memalign(&buf, 16,
unserialized_size);
++#ifdef HAVE_GETPAGESIZE
++ auto page_size = getpagesize();
++#else
++ auto page_size =
sysconf(_SC_PAGESIZE);
++#endif
++ if (page_size == -1) {
++ page_size = 4096;
++ }
++ posix_memalign(&buf, page_size,
unserialized_size);
+ if (buf == nullptr) {
+ return
tl::make_unexpected(error {"Cannot allocate memory", errno,
error_category::CRITICAL });
+ }
+--
+2.37.4
+
diff --git a/mail-filter/rspamd/rspamd-3.4.ebuild
b/mail-filter/rspamd/rspamd-3.4-r1.ebuild
similarity index 83%
rename from mail-filter/rspamd/rspamd-3.4.ebuild
rename to mail-filter/rspamd/rspamd-3.4-r1.ebuild
index cb1d4e71df63..fc1664f05a6d 100644
--- a/mail-filter/rspamd/rspamd-3.4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.4-r1.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.2-unbundle-lua.patch"
"${FILESDIR}/${PN}-2.5-unbundle-snowball.patch"
"${FILESDIR}/${PN}-3.3-remove-test-case.patch"
+ "${FILESDIR}/${PN}-3.4-hyperscan-page-alignment.patch"
)
src_prepare() {
@@ -133,4 +134,16 @@ src_install() {
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 is patched in this"
+ elog "ebuild revision rspamd-3.4-r1. 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
}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: dd069115f096e59c45e566693a9f0f3f8fcd43a8
Author: Joonas Niilola gentoo org>
AuthorDate: Sat Nov 12 06:20:46 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Nov 12 06:23:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd069115
mail-filter/rspamd: Stabilize 3.3 amd64, #880887
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild
b/mail-filter/rspamd/rspamd-3.3.ebuild
index 7231e72c2f72..3bdc6e00e3aa 100644
--- a/mail-filter/rspamd/rspamd-3.3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: d735af02bda6f48c0305acf7c45136d88388379d
Author: Joonas Niilola gentoo org>
AuthorDate: Sat Nov 12 06:22:45 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sat Nov 12 06:23:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d735af02
mail-filter/rspamd: Stabilize 3.3 x86, #880887
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild
b/mail-filter/rspamd/rspamd-3.3.ebuild
index 3bdc6e00e3aa..6fb46e9d9b6b 100644
--- a/mail-filter/rspamd/rspamd-3.3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == * ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/rspamd/rspamd/archive/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Rapid spam filtering system"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: e22b9e780258d9aede2b057cff5e7ab8b9c6af2f
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Nov 5 19:20:21 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 6 06:16:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e22b9e78
mail-filter/rspamd: drop 3.0-r4, 3.1-r2, 3.2
Issues from two bugs bellow seems to be fixed in more recent versions.
Closes: https://bugs.gentoo.org/817866
Closes: https://bugs.gentoo.org/828584
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest| 3 -
.../files/rspamd-3.0-fix-null-dereference.patch| 46
.../rspamd/files/rspamd-3.0-system-doctest.patch | 72
.../rspamd/files/rspamd-3.0-system-libfmt.patch| 48
mail-filter/rspamd/rspamd-3.0-r4.ebuild| 128
mail-filter/rspamd/rspamd-3.1-r2.ebuild| 128
mail-filter/rspamd/rspamd-3.2.ebuild | 129 -
7 files changed, 554 deletions(-)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index e0065dc95ea1..cfddb0fa2c14 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,5 +1,2 @@
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
-DIST rspamd-3.0.tar.gz 5535659 BLAKE2B
605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa
SHA512
1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
-DIST rspamd-3.1.tar.gz 5566920 BLAKE2B
dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc
SHA512
3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
-DIST rspamd-3.2.tar.gz 5637835 BLAKE2B
8d42b34dacdc818689fd8602abf8c4d5ff2431eb30b2d8fae6e78642ce4361d39a54cb4b981c58cd31205b0f2013978896081e0d7364620312db3fa855d14b1e
SHA512
fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79
DIST rspamd-3.3.tar.gz 5680874 BLAKE2B
2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9
SHA512
02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
diff --git a/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
b/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
deleted file mode 100644
index d355f701a273..
--- a/mail-filter/rspamd/files/rspamd-3.0-fix-null-dereference.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From abea3ac21f764658a966dad475fc99e4b79530d7 Mon Sep 17 00:00:00 2001
-From: Jan Smutny
-Date: Tue, 31 Aug 2021 14:25:23 +0200
-Subject: [PATCH] [Fix] src/lua/lua_mimepart.c: fix null dereference
-
-
-This patch is taken from upstream. It fixes possible runtime segfaults.
-
-PR: https://github.com/rspamd/rspamd/pull/3873
-
-diff --git a/src/lua/lua_mimepart.c b/src/lua/lua_mimepart.c
-index 66b588e3a..21a46d496 100644
a/src/lua/lua_mimepart.c
-+++ b/src/lua/lua_mimepart.c
-@@ -1240,7 +1240,16 @@ lua_textpart_get_fuzzy_hashes (lua_State * L)
- rspamd_stat_token_t *word;
- struct lua_shingle_filter_cbdata cbd;
-
-- if (part && pool) {
-+
-+ if (part == NULL || pool == NULL) {
-+ return luaL_error (L, "invalid arguments");
-+ }
-+
-+ if (IS_TEXT_PART_EMPTY (part) || part->utf_words == NULL) {
-+ lua_pushnil (L);
-+ lua_pushnil (L);
-+ }
-+ else {
- /* TODO: add keys and algorithms support */
- rspamd_cryptobox_hash (key, "rspamd", strlen ("rspamd"), NULL,
0);
-
-@@ -1294,9 +1303,6 @@ lua_textpart_get_fuzzy_hashes (lua_State * L)
- }
- }
- }
-- else {
-- return luaL_error (L, "invalid arguments");
-- }
-
- return 2;
- }
---
-2.31.1
-
diff --git a/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
b/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
deleted file mode 100644
index bb315ee7a459..
--- a/mail-filter/rspamd/files/rspamd-3.0-system-doctest.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From d37a3764e9889e6de0a7341ba3195ee8a314de23 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20Van=C4=9Bk?=
-Date: Wed, 1 Sep 2021 13:30:56 +0200
-Subject: [PATCH] Add SYSTEM_DOCTEST cmake option
-
-This gives packagers option to use
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/files/, mail-filter/rspamd/
commit: b022bb84a1fa213ed074ae78e01717683305ec75
Author: Petr Vaněk atlas cz>
AuthorDate: Sat Nov 5 19:27:38 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 6 06:16:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b022bb84
mail-filter/rspamd: remove broken test case
Recent stabilization of luajit-2.1 triggered test phase failures related
to improperly designed test case. It was already removed from upstream,
see linked PR.
Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
Bug: https://bugs.gentoo.org/879575
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
.../rspamd/files/rspamd-3.3-remove-test-case.patch | 20
mail-filter/rspamd/rspamd-3.3.ebuild | 1 +
2 files changed, 21 insertions(+)
diff --git a/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
new file mode 100644
index ..0cad11382b21
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.3-remove-test-case.patch
@@ -0,0 +1,20 @@
+Remove test case which does not work with luajit-2.1 anymore as it
+depends on internal behavior of lujait-2.0.
+
+Upstream-PR: https://github.com/rspamd/rspamd/pull/4323
+
+diff --git a/test/lua/unit/lua_util.extract_specific_urls.lua
b/test/lua/unit/lua_util.extract_specific_urls.lua
+index 05ffeb7b0..a7e2f9f48 100644
+--- a/test/lua/unit/lua_util.extract_specific_urls.lua
b/test/lua/unit/lua_util.extract_specific_urls.lua
+@@ -108,7 +108,6 @@ context("Lua util - extract_specific_urls plain",
function()
+ local cases = {
+ {expect = url_list, filter = nil, limit = , need_emails = true,
prefix = 'p'},
+ {expect = {}, filter = (function() return false end), limit = ,
need_emails = true, prefix = 'p'},
+-{expect = {"domain4.co.net", "test.com"}, filter = nil, limit = 2,
need_emails = true, prefix = 'p'},
+ {expect = {"domain4.co.net", "test.com", "domain3.org"}, filter = nil,
limit = 3, need_emails = true, prefix = 'p'},
+ {
+ expect = {"gov.co.net", "tesco.co.net", "domain1.co.net",
"domain2.co.net", "domain3.co.net", "domain4.co.net"},
+--
+2.37.4
+
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild
b/mail-filter/rspamd/rspamd-3.3.ebuild
index b6932290133a..7231e72c2f72 100644
--- a/mail-filter/rspamd/rspamd-3.3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.3.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
"${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+ "${FILESDIR}/rspamd-3.3-remove-test-case.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 5272058e6d1b40f22550ce775c6cc75b7dfe9c2a
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Nov 2 12:25:03 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 6 06:16:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5272058e
mail-filter/rspamd: add 3.4
This version still suffers with jemalloc issue, see bug 810337.
Bug: https://bugs.gentoo.org/810337
Closes: https://bugs.gentoo.org/879575
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/28150
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.4.ebuild | 136 +++
2 files changed, 137 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index cfddb0fa2c14..bca781f9d3ef 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
DIST rspamd-3.3.tar.gz 5680874 BLAKE2B
2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9
SHA512
02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
+DIST rspamd-3.4.tar.gz 5689732 BLAKE2B
8d1b98205f51cfe834db3ed53b8be72ada834980380cba06c4470689d16ef4a6396190ae27044ae76a7b35df6afd3cdf551f9469d878ac69ec61ef6b86b46104
SHA512
fec8cb7b845bf25d02f1c32c82bf35ad9c65f3301a73f3ea611b6fcfa0ac1b75f75561c4c42f142f876ac3a78f96fd91d22d30c5b3600e4001e25f06bc693ccf
diff --git a/mail-filter/rspamd/rspamd-3.4.ebuild
b/mail-filter/rspamd/rspamd-3.4.ebuild
new file mode 100644
index ..cb1d4e71df63
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.4.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 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} == * ]] ; 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-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0-cmake-lua-version.patch"
+ "${FILESDIR}/${PN}-3.2-unbundle-lua.patch"
+ "${FILESDIR}/${PN}-2.5-unbundle-snowball.patch"
+ "${FILESDIR}/${PN}-3.3-remove-test-case.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
+
+ -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)
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 0a184eedb8250cae3db9758440f9d47ede89467c Author: Petr Vaněk atlas cz> AuthorDate: Tue Oct 4 13:49:34 2022 + Commit: Sam James gentoo org> CommitDate: Fri Oct 7 11:28:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a184eed mail-filter/rspamd: update upstream metadata Signed-off-by: Petr Vaněk atlas.cz> Signed-off-by: Sam James gentoo.org> mail-filter/rspamd/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index d9a2c3be0222..ebd97898f0a6 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -10,7 +10,7 @@ Proxy Maintainers -vstakhov/rspamd +rspamd/rspamd Use dev-libs/libpcre2
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 4a424df747d23d5151e70495fce5e97521479e90
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Oct 4 08:55:10 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 7 11:28:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a424df7
mail-filter/rspamd: add 3.3
This version contains a fix for Clang-16 (error: implicit declaration of
function ZSTD_resetDStream) reported in bug 870448. It still suffers
with a bug 810337.
Bug: https://bugs.gentoo.org/810337
Closes: https://bugs.gentoo.org/870448
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.3.ebuild | 135 +++
2 files changed, 136 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 4875b2720023..e0065dc95ea1 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -2,3 +2,4 @@ DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a179703532
DIST rspamd-3.0.tar.gz 5535659 BLAKE2B
605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa
SHA512
1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
DIST rspamd-3.1.tar.gz 5566920 BLAKE2B
dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc
SHA512
3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
DIST rspamd-3.2.tar.gz 5637835 BLAKE2B
8d42b34dacdc818689fd8602abf8c4d5ff2431eb30b2d8fae6e78642ce4361d39a54cb4b981c58cd31205b0f2013978896081e0d7364620312db3fa855d14b1e
SHA512
fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79
+DIST rspamd-3.3.tar.gz 5680874 BLAKE2B
2fbafabc0a59ca4ad1bbdc1b7ceb5b5bc281dc75d2997ac50c080cdf5ced2582409e3f98b63239bab64fafbcc63016d857967fe00c371a6d5b896d170f5da4a9
SHA512
02c5e62cb9ce32cdd6da859c4afe2bf03fcaff456d79f68ab7c3c288a0b36f11a701825c3cb7f0ecaccd419f84ce693961c1ed955ce4dbcfe291a8e978e2e69c
diff --git a/mail-filter/rspamd/rspamd-3.3.ebuild
b/mail-filter/rspamd/rspamd-3.3.ebuild
new file mode 100644
index ..b6932290133a
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 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} == * ]] ; 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-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-2.5-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
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: aabcda2ede89b4563c3c992df876a4f108dc1cca Author: Petr Vaněk atlas cz> AuthorDate: Tue Oct 4 13:50:17 2022 + Commit: Sam James gentoo org> CommitDate: Fri Oct 7 11:28:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabcda2e mail-filter/rspamd: update HOMEPAGE Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/27613 Signed-off-by: Sam James gentoo.org> mail-filter/rspamd/rspamd-.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mail-filter/rspamd/rspamd-.ebuild b/mail-filter/rspamd/rspamd-.ebuild index 7874f481a0d1..b6932290133a 100644 --- a/mail-filter/rspamd/rspamd-.ebuild +++ b/mail-filter/rspamd/rspamd-.ebuild @@ -16,7 +16,11 @@ else fi DESCRIPTION="Rapid spam filtering system" -HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd"; +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"
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 53d6b83e6ea9e7d7bcf761400fd966a70078bb95
Author: Petr Vaněk atlas cz>
AuthorDate: Thu May 26 20:05:02 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Jun 12 07:18:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53d6b83e
mail-filter/rspamd: remove dev-cpp/doctest version restriction
This was a bug in dev-cpp/doctest which was fixed in 2.4.8-r1 revbump in
previous commit.
Closes: https://bugs.gentoo.org/830624
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/25657
Signed-off-by: Joonas Niilola gentoo.org>
mail-filter/rspamd/rspamd-3.1-r2.ebuild | 2 +-
mail-filter/rspamd/rspamd-3.2.ebuild| 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.1-r2.ebuild
b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
index 2b6e79c7bad0..ac8b9e2b716a 100644
--- a/mail-filter/rspamd/rspamd-3.1-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
@@ -54,7 +54,7 @@ RDEPEND="${LUA_DEPS}
selinux? ( sec-policy/selinux-spamassassin )"
DEPEND="
${RDEPEND}
-
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: f618ee3531b93d54ac2857075f309712c14bbfa8
Author: Kenton Groombridge gentoo org>
AuthorDate: Sun May 22 02:09:18 2022 +
Commit: Kenton Groombridge gentoo org>
CommitDate: Sun May 22 02:13:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f618ee35
mail-filter/rspamd: add selinux USE flag
Signed-off-by: Kenton Groombridge gentoo.org>
mail-filter/rspamd/rspamd-2.7-r104.ebuild | 5 +++--
mail-filter/rspamd/rspamd-3.0-r4.ebuild | 5 +++--
mail-filter/rspamd/rspamd-3.1-r2.ebuild | 5 +++--
mail-filter/rspamd/rspamd-3.2.ebuild | 3 ++-
mail-filter/rspamd/rspamd-.ebuild | 3 ++-
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.7-r104.ebuild
b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
index 8c015b8220b0..12fd017ebb51 100644
--- a/mail-filter/rspamd/rspamd-2.7-r104.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
@@ -19,7 +19,7 @@ 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 pcre2"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux"
REQUIRED_USE="${LUA_REQUIRED_USE}"
@@ -46,7 +46,8 @@ RDEPEND="${LUA_DEPS}
jemalloc? ( dev-libs/jemalloc:= )
dev-libs/openssl:0=[-bindist(-)]
pcre2? ( dev-libs/libpcre2:=[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
+ !pcre2? ( dev-libs/libpcre[jit=] )
+ selinux? ( sec-policy/selinux-spamassassin )"
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/ragel
diff --git a/mail-filter/rspamd/rspamd-3.0-r4.ebuild
b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
index e8f4e0ccb5a0..ad3bcaa4ff19 100644
--- a/mail-filter/rspamd/rspamd-3.0-r4.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
@@ -19,7 +19,7 @@ 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 pcre2 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -51,7 +51,8 @@ RDEPEND="${LUA_DEPS}
jemalloc? ( dev-libs/jemalloc:= )
dev-libs/openssl:0=[-bindist(-)]
pcre2? ( dev-libs/libpcre2:=[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
+ !pcre2? ( dev-libs/libpcre[jit=] )
+ selinux? ( sec-policy/selinux-spamassassin )"
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/ragel
diff --git a/mail-filter/rspamd/rspamd-3.1-r2.ebuild
b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
index 9e9406415871..2b6e79c7bad0 100644
--- a/mail-filter/rspamd/rspamd-3.1-r2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
@@ -19,7 +19,7 @@ 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 pcre2 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 selinux test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -50,7 +50,8 @@ RDEPEND="${LUA_DEPS}
jemalloc? ( dev-libs/jemalloc:= )
dev-libs/openssl:0=[-bindist(-)]
pcre2? ( dev-libs/libpcre2:=[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
+ !pcre2? ( dev-libs/libpcre[jit=] )
+ selinux? ( sec-policy/selinux-spamassassin )"
DEPEND="
${RDEPEND}
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 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit selinux test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -51,6 +51,7 @@ RDEPEND="${LUA_DEPS}
)
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
jemalloc? ( dev-libs/jemalloc:= )
+ selinux? ( sec-policy/selinux-spamassassin )
"
# This version is also affected with bug #830624
DEPEND="${RDEPEND}
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index bbae6a310243..7874f481a0d1 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -19,7 +19,7 @@ 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 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit selinux test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -52,6 +52,7 @@
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: c367ce8e3bda32773dceadb810afc7245454682e
Author: Petr Vaněk atlas cz>
AuthorDate: Tue Apr 12 12:36:23 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Apr 13 06:32:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c367ce8e
mail-filter/rspamd: add missing zlib dependency
This follows a change from commit 8bf75c7b9949 ("mail-filter/rspamd: add
missing zlib dependency"). The zlib was integrated to rspamd-1.7.0, this
dependency is missing for quite some time.
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/25008
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/{rspamd-2.7-r103.ebuild => rspamd-2.7-r104.ebuild} | 3 ++-
mail-filter/rspamd/{rspamd-3.0-r3.ebuild => rspamd-3.0-r4.ebuild} | 3 ++-
mail-filter/rspamd/{rspamd-3.1-r1.ebuild => rspamd-3.1-r2.ebuild} | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
similarity index 98%
rename from mail-filter/rspamd/rspamd-2.7-r103.ebuild
rename to mail-filter/rspamd/rspamd-2.7-r104.ebuild
index e3e4d0e59f1e..8c015b8220b0 100644
--- a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r104.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,6 +37,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libsodium:=
dev-libs/snowball-stemmer:=
sys-apps/file
+ sys-libs/zlib
blas? (
virtual/blas
virtual/lapack
diff --git a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
similarity index 98%
rename from mail-filter/rspamd/rspamd-3.0-r3.ebuild
rename to mail-filter/rspamd/rspamd-3.0-r4.ebuild
index 54434e12ad55..e8f4e0ccb5a0 100644
--- a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -42,6 +42,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libsodium:=
dev-libs/snowball-stemmer:=
sys-apps/file
+ sys-libs/zlib
blas? (
virtual/blas
virtual/lapack
diff --git a/mail-filter/rspamd/rspamd-3.1-r1.ebuild
b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
similarity index 99%
rename from mail-filter/rspamd/rspamd-3.1-r1.ebuild
rename to mail-filter/rspamd/rspamd-3.1-r2.ebuild
index d1cc32c3e7bb..9e9406415871 100644
--- a/mail-filter/rspamd/rspamd-3.1-r1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r2.ebuild
@@ -41,6 +41,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libsodium:=
dev-libs/snowball-stemmer:=
sys-apps/file
+ sys-libs/zlib
blas? (
virtual/blas
virtual/lapack
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/
commit: eac08ceb58e0fe52a1932960c290e31d3b0638e3
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Apr 6 21:07:02 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 12 08:20:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac08ceb
mail-filter/rspamd: add 3.2
- move dev-cpp/doctest from RDEPEND to DEPEND only
- unbundle dev-lua/lua-argparse
- doctest bug #830624 affects this version as well
- use dev-libs/libpcre2 only, it is upstream default and
dev-libs/libpcre is eol
Closes: https://bugs.gentoo.org/836673
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest| 1 +
.../rspamd/files/rspamd-3.2-unbundle-lua.patch | 61 ++
mail-filter/rspamd/rspamd-3.2.ebuild | 128 +
3 files changed, 190 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index 78c40cf829a4..4875b2720023 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,3 +1,4 @@
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
DIST rspamd-3.0.tar.gz 5535659 BLAKE2B
605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa
SHA512
1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
DIST rspamd-3.1.tar.gz 5566920 BLAKE2B
dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc
SHA512
3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
+DIST rspamd-3.2.tar.gz 5637835 BLAKE2B
8d42b34dacdc818689fd8602abf8c4d5ff2431eb30b2d8fae6e78642ce4361d39a54cb4b981c58cd31205b0f2013978896081e0d7364620312db3fa855d14b1e
SHA512
fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79
diff --git a/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
b/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
new file mode 100644
index ..36aed009c6c8
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.2-unbundle-lua.patch
@@ -0,0 +1,61 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 096c2e79e..f323bfd40 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -620,10 +620,6 @@ ELSE()
+ find_package(doctest)
+ ENDIF()
+
+-IF (NOT WITH_LUAJIT)
+- ADD_SUBDIRECTORY(contrib/lua-bit)
+-ENDIF()
+-
+ IF (ENABLE_LUA_REPL MATCHES "ON")
+ ADD_SUBDIRECTORY(contrib/replxx)
+ SET(WITH_LUA_REPL 1)
+@@ -721,7 +717,6 @@ ENDFOREACH(LUA_LIB)
+
+ # Install lua fun library
+ INSTALL(FILES "contrib/lua-fun/fun.lua" DESTINATION ${LUALIBDIR})
+-INSTALL(FILES "contrib/lua-argparse/argparse.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-tableshape/tableshape.lua" DESTINATION
${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-lupa/lupa.lua" DESTINATION ${LUALIBDIR})
+ INSTALL(FILES "contrib/lua-lpeg/lpegre.lua" DESTINATION ${LUALIBDIR})
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 77c8756af..e0476bdc1 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -206,10 +206,6 @@ IF (ENABLE_CLANG_PLUGIN MATCHES "ON")
+ ADD_DEPENDENCIES(rspamd-server rspamd-clang)
+ ENDIF()
+
+-IF (NOT WITH_LUAJIT)
+- TARGET_LINK_LIBRARIES(rspamd-server rspamd-bit)
+-ENDIF()
+-
+ IF (ENABLE_SNOWBALL MATCHES "ON")
+ TARGET_LINK_LIBRARIES(rspamd-server stemmer)
+ ENDIF()
+diff --git a/src/lua/lua_common.c b/src/lua/lua_common.c
+index ab411fa66..85787b31e 100644
+--- a/src/lua/lua_common.c
b/src/lua/lua_common.c
+@@ -923,10 +923,6 @@ rspamd_lua_wipe_realloc (void *ud,
+ return NULL;
+ }
+
+-#ifndef WITH_LUAJIT
+-extern int luaopen_bit(lua_State *L);
+-#endif
+-
+ lua_State *
+ rspamd_lua_init (bool wipe_mem)
+ {
+@@ -984,7 +980,6 @@ rspamd_lua_init (bool wipe_mem)
+ luaopen_parsers (L);
+ luaopen_compress (L);
+ #ifndef WITH_LUAJIT
+- rspamd_lua_add_preload (L, "bit", luaopen_bit);
+ lua_settop (L, 0);
+ #endif
+
diff --git a/mail-filter/rspamd/rspamd-3.2.ebuild
b/mail-filter/rspamd/rspamd-3.2.ebuild
new file mode 100644
index ..fe5f08fba5e9
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2022 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} == * ]] ; then
+ EGIT_REPO_URI="https://github.com/rspamd/rspamd.git";
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 8bf75c7b9949a658c80bcb334b9cffe041d2dd86
Author: Sam James gentoo org>
AuthorDate: Tue Apr 12 08:20:01 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 12 08:20:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bf75c7b
mail-filter/rspamd: add missing zlib dependency
Noticed by iwdevtools.
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.2.ebuild | 1 +
mail-filter/rspamd/rspamd-.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/mail-filter/rspamd/rspamd-3.2.ebuild
b/mail-filter/rspamd/rspamd-3.2.ebuild
index fe5f08fba5e9..4446b30d950e 100644
--- a/mail-filter/rspamd/rspamd-3.2.ebuild
+++ b/mail-filter/rspamd/rspamd-3.2.ebuild
@@ -44,6 +44,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/openssl:0=[-bindist(-)]
dev-libs/snowball-stemmer:=
sys-apps/file
+ sys-libs/zlib
blas? (
virtual/blas
virtual/lapack
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 5ca54eb0e85c..bbae6a310243 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -45,6 +45,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/snowball-stemmer:=
>=dev-libs/xxhash-0.8.0
sys-apps/file
+ sys-libs/zlib
blas? (
virtual/blas
virtual/lapack
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 92406fdceebaaa26eb55713857256ebd69ef7279
Author: Petr Vaněk atlas cz>
AuthorDate: Fri Apr 8 14:52:09 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 12 08:20:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92406fdc
mail-filter/rspamd: use system dev-libs/xxhash
New SYSTEM_XXHASH was recently accepted by upstream.
Upstream-PR: https://github.com/rspamd/rspamd/pull/4138
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/24945
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index f04832d56b59..5ca54eb0e85c 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -43,6 +43,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/libsodium:=
dev-libs/openssl:0=[-bindist(-)]
dev-libs/snowball-stemmer:=
+ >=dev-libs/xxhash-0.8.0
sys-apps/file
blas? (
virtual/blas
@@ -68,7 +69,7 @@ PATCHES=(
src_prepare() {
cmake_src_prepare
- rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,zstd} || die
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,xxhash,zstd}
|| die
> cmake/Toolset.cmake || die #827550
@@ -86,6 +87,7 @@ src_configure() {
-DSYSTEM_DOCTEST=ON
-DSYSTEM_FMT=ON
+ -DSYSTEM_XXHASH=ON
-DSYSTEM_ZSTD=ON
-DENABLE_BLAS=$(usex blas ON OFF)
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: a0be7a6a1a96b4df87446f3e514a4af5818e83c3
Author: Petr Vaněk atlas cz>
AuthorDate: Wed Apr 6 09:51:21 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 12 08:20:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0be7a6a
mail-filter/rspamd: sync live
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-.ebuild | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index b4d4c6d23bae..f04832d56b59 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..4} luajit )
@@ -19,7 +19,7 @@ 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 pcre2 test"
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit test"
RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
@@ -29,17 +29,19 @@ REQUIRED_USE="${LUA_REQUIRED_USE}
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-cpp/doctest
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:=
sys-apps/file
blas? (
@@ -48,10 +50,10 @@ RDEPEND="${LUA_DEPS}
)
cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
jemalloc? ( dev-libs/jemalloc:= )
- dev-libs/openssl:0=[-bindist(-)]
- pcre2? ( dev-libs/libpcre2:=[jit=] )
- !pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
+"
+DEPEND="${RDEPEND}
+ dev-cpp/doctest
+"
BDEPEND="
dev-util/ragel
virtual/pkgconfig
@@ -59,14 +61,14 @@ BDEPEND="
PATCHES=(
"${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
- "${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-3.2-unbundle-lua.patch"
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
)
src_prepare() {
cmake_src_prepare
- rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+ rm -vrf contrib/{doctest,fmt,lua-{argparse,bit},snowball,zstd} || die
> cmake/Toolset.cmake || die #827550
@@ -90,7 +92,7 @@ src_configure() {
-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=$(usex pcre2 ON OFF)
+ -DENABLE_PCRE2=ON
)
cmake_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: fe00d0ea297eaad95f779216527cb4bd85f515df Author: Jonas Stein gentoo org> AuthorDate: Thu Feb 10 20:11:34 2022 + Commit: Jonas Stein gentoo org> CommitDate: Thu Feb 10 20:11:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe00d0ea mail-filter/rspamd: Maintainer retired Proxied maintainer retired due to inactivity. Closes: https://bugs.gentoo.org/633254 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Jonas Stein gentoo.org> mail-filter/rspamd/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index b1f97d1434d0..d9a2c3be0222 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -1,10 +1,6 @@ https://www.gentoo.org/dtd/metadata.dtd";> - [email protected] -Christian Roessner - [email protected] Petr Vaněk
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 6dbfcb026c30a8cadde714830a967310ecdfeac8
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jan 10 17:35:48 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jan 10 17:41:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dbfcb02
mail-filter/rspamd: require https://bugs.gentoo.org/830624
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/rspamd/{rspamd-3.1.ebuild => rspamd-3.1-r1.ebuild} | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild
b/mail-filter/rspamd/rspamd-3.1-r1.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-3.1.ebuild
rename to mail-filter/rspamd/rspamd-3.1-r1.ebuild
index b4d4c6d23bae..d1cc32c3e7bb 100644
--- a/mail-filter/rspamd/rspamd-3.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -34,7 +34,6 @@ RDEPEND="${LUA_DEPS}
acct-user/rspamd
app-arch/zstd:=
dev-db/sqlite:3
- dev-cpp/doctest
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
@@ -51,7 +50,9 @@ RDEPEND="${LUA_DEPS}
dev-libs/openssl:0=[-bindist(-)]
pcre2? ( dev-libs/libpcre2:=[jit=] )
!pcre2? ( dev-libs/libpcre[jit=] )"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 45c18da33fe7f9ec1d9eb61d8c60406a867c63bb
Author: Petr Vaněk atlas cz>
AuthorDate: Mon Nov 29 18:37:39 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Dec 1 20:02:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c18da3
mail-filter/rspamd: respect user compiler flags choice
The Toolset.cmake file seems to be unnecessary, it tries to control
flags which in Gentoo should be controlled by user. This applies a
change suggested in [1].
[1] https://bugs.gentoo.org/827550#c1
Closes: https://bugs.gentoo.org/827550
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/23127
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/rspamd-3.1.ebuild | 2 ++
mail-filter/rspamd/rspamd-.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild
b/mail-filter/rspamd/rspamd-3.1.ebuild
index 3d43ffe54025..b4d4c6d23bae 100644
--- a/mail-filter/rspamd/rspamd-3.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild
@@ -68,6 +68,8 @@ src_prepare() {
rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+ > cmake/Toolset.cmake || die #827550
+
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index 3d43ffe54025..b4d4c6d23bae 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -68,6 +68,8 @@ src_prepare() {
rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+ > cmake/Toolset.cmake || die #827550
+
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
|| die
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 0bbf63dde755e16cffe896f15efe3328978e44b8 Author: Sam James gentoo org> AuthorDate: Mon Nov 22 11:12:28 2021 + Commit: Sam James gentoo org> CommitDate: Mon Nov 22 11:12:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bbf63dd mail-filter/rspamd: use tag in metadata.xml Signed-off-by: Sam James gentoo.org> mail-filter/rspamd/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml index 78a3ccc54c80..b1f97d1434d0 100644 --- a/mail-filter/rspamd/metadata.xml +++ b/mail-filter/rspamd/metadata.xml @@ -17,7 +17,7 @@ vstakhov/rspamd -Use dev-libs/libpcre2 +Use dev-libs/libpcre2 Enable PCRE JIT support
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: ce8c5ced6f2dd5150bbfb248015f92bbffb1959f
Author: Petr Vaněk atlas cz>
AuthorDate: Fri Nov 12 08:33:57 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Nov 22 10:08:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce8c5ced
mail-filter/rspamd: make USE=jit to control only PCRE JIT support
It is valid configuration to use JIT enabled PCRE with non-JIT Lua and
vice versa, as it was pointed out in a bug report. Therefore, this
change removes
jit? ( lua_single_target_luajit )
restriction from all available ebuilds.
Closes: https://bugs.gentoo.org/822765
Signed-off-by: Petr Vaněk atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/22915
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/metadata.xml | 1 +
mail-filter/rspamd/rspamd-2.7-r103.ebuild | 3 +--
mail-filter/rspamd/rspamd-3.0-r3.ebuild | 1 -
mail-filter/rspamd/rspamd-3.1.ebuild | 1 -
mail-filter/rspamd/rspamd-.ebuild | 1 -
5 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index a183078256ab..78a3ccc54c80 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -18,5 +18,6 @@
Use dev-libs/libpcre2
+Enable PCRE JIT support
diff --git a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
index 8a361f82f03e..e3e4d0e59f1e 100644
--- a/mail-filter/rspamd/rspamd-2.7-r103.ebuild
+++ b/mail-filter/rspamd/rspamd-2.7-r103.ebuild
@@ -21,8 +21,7 @@ LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3
MIT public-domain u
SLOT="0"
IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2"
-REQUIRED_USE="${LUA_REQUIRED_USE}
- jit? ( lua_single_target_luajit )"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
diff --git a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
b/mail-filter/rspamd/rspamd-3.0-r3.ebuild
index 1ff4af0796ec..54434e12ad55 100644
--- a/mail-filter/rspamd/rspamd-3.0-r3.ebuild
+++ b/mail-filter/rspamd/rspamd-3.0-r3.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
REQUIRED_USE="${LUA_REQUIRED_USE}
- jit? ( lua_single_target_luajit )
test? ( lua_single_target_luajit )"
RDEPEND="${LUA_DEPS}
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild
b/mail-filter/rspamd/rspamd-3.1.ebuild
index df5d75abfd0e..3d43ffe54025 100644
--- a/mail-filter/rspamd/rspamd-3.1.ebuild
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
REQUIRED_USE="${LUA_REQUIRED_USE}
- jit? ( lua_single_target_luajit )
test? ( lua_single_target_luajit )"
RDEPEND="${LUA_DEPS}
diff --git a/mail-filter/rspamd/rspamd-.ebuild
b/mail-filter/rspamd/rspamd-.ebuild
index df5d75abfd0e..3d43ffe54025 100644
--- a/mail-filter/rspamd/rspamd-.ebuild
+++ b/mail-filter/rspamd/rspamd-.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
# A part of tests use ffi luajit extension
REQUIRED_USE="${LUA_REQUIRED_USE}
- jit? ( lua_single_target_luajit )
test? ( lua_single_target_luajit )"
RDEPEND="${LUA_DEPS}
[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/
commit: 5a751a73ab82422e63f50a7350f4789fc7780c06
Author: Petr Vaněk atlas cz>
AuthorDate: Sun Nov 7 21:21:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Nov 7 23:28:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a751a73
mail-filter/rspamd: add 3.1
Closes: https://bugs.gentoo.org/822207
Signed-off-by: Petr Vaněk atlas.cz>
Signed-off-by: Sam James gentoo.org>
mail-filter/rspamd/Manifest | 1 +
mail-filter/rspamd/rspamd-3.1.ebuild | 124 +++
2 files changed, 125 insertions(+)
diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest
index fa7fefdafd2..78c40cf829a 100644
--- a/mail-filter/rspamd/Manifest
+++ b/mail-filter/rspamd/Manifest
@@ -1,2 +1,3 @@
DIST rspamd-2.7.tar.gz 5126227 BLAKE2B
70f57dba6ac9abe93d735d42e84bd17a1797035322029577a8e4376409bcee5345d4624925d3dd071bddce038858ebfdce8ee4f87f81b1fc8b1f71ad14e85930
SHA512
8779771baf85ef6ca1d7d2180429072ab1547ab834b073ee9222dcc6494efdd0a23f5e7ac52a777c23fd89296769f5b6f182593e714097c6f11ca7c9165e4ba7
DIST rspamd-3.0.tar.gz 5535659 BLAKE2B
605ac59b947b49efb026e04d153df5fc0d56c65712def3f2c54a949db32b8534e634d172a1899cc08e98e0a9da839fc00f0f569dc8c52a743f38bd71b8abaeaa
SHA512
1ea6f9ffe58b7f280dbd31e39db6412ebeddda634ca8a669fa5bff2951d17123a5d4a09ec0f366c6b0c0b585f868e646fd49e4d45bd451408675b927ec2557c4
+DIST rspamd-3.1.tar.gz 5566920 BLAKE2B
dfb31534e7dbce303729e89537f83eea90d6524a0ccf81633e0d55840f21936985ba5991f2a2ed9ca5594a4a3938f9366f7a1879fc553f41ab52bb89460b87dc
SHA512
3c3c06c10d3dfc90e4bc92c7ebaff4bd4854d3b0e56d6476f0223918c4a52f4cc7a8b381b1f867164199ee18ea00eda77ae0315925f3fd71596d610200667178
diff --git a/mail-filter/rspamd/rspamd-3.1.ebuild
b/mail-filter/rspamd/rspamd-3.1.ebuild
new file mode 100644
index 000..df5d75abfd0
--- /dev/null
+++ b/mail-filter/rspamd/rspamd-3.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit cmake lua-single pax-utils systemd tmpfiles
+
+if [[ ${PV} == * ]] ; 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 pcre2 test"
+RESTRICT="!test? ( test )"
+
+# A part of tests use ffi luajit extension
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ jit? ( lua_single_target_luajit )
+ test? ( lua_single_target_luajit )"
+
+RDEPEND="${LUA_DEPS}
+ $(lua_gen_cond_dep '
+ dev-lua/LuaBitOp[${LUA_USEDEP}]
+ ')
+ acct-group/rspamd
+ acct-user/rspamd
+ app-arch/zstd:=
+ dev-db/sqlite:3
+ dev-cpp/doctest
+ dev-libs/glib:2
+ dev-libs/icu:=
+ dev-libs/libev
+ dev-libs/libfmt:=
+ dev-libs/libsodium:=
+ dev-libs/snowball-stemmer:=
+ sys-apps/file
+ blas? (
+ virtual/blas
+ virtual/lapack
+ )
+ cpu_flags_x86_ssse3? ( dev-libs/hyperscan )
+ jemalloc? ( dev-libs/jemalloc:= )
+ dev-libs/openssl:0=[-bindist(-)]
+ pcre2? ( dev-libs/libpcre2:=[jit=] )
+ !pcre2? ( dev-libs/libpcre[jit=] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/ragel
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
+ "${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ rm -vrf contrib/{doctest,fmt,lua-bit,snowball,zstd} || die
+
+ 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
+
+ -DSYSTEM_DOCTEST=ON
+ -DSYSTEM_FMT=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=$(usex pcre2 ON OFF)
+ )
+ 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
+
+
