summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Vaněk <arkamar@atlas.cz>2021-08-21 22:53:20 +0200
committerSam James <sam@gentoo.org>2021-08-22 03:49:02 +0100
commitfd0e7ad32ff1064db8cd4ba4149cf33e2ffdeb5a (patch)
tree8cac0b86ee5d35a4616530cb26e510e3bd1d50d6 /mail-filter/rspamd
parentmail-filter/rspamd: add 3.0 (diff)
downloadgentoo-fd0e7ad32ff1064db8cd4ba4149cf33e2ffdeb5a.tar.gz
gentoo-fd0e7ad32ff1064db8cd4ba4149cf33e2ffdeb5a.tar.bz2
gentoo-fd0e7ad32ff1064db8cd4ba4149cf33e2ffdeb5a.zip
mail-filter/rspamd: sync live
Closes: https://bugs.gentoo.org/784335 Signed-off-by: Petr Vaněk <arkamar@atlas.cz> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'mail-filter/rspamd')
-rw-r--r--mail-filter/rspamd/rspamd-9999.ebuild21
1 files changed, 14 insertions, 7 deletions
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild
index a78a8bfb768c..ebf109b74cd2 100644
--- a/mail-filter/rspamd/rspamd-9999.ebuild
+++ b/mail-filter/rspamd/rspamd-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-LUA_COMPAT=( lua5-{1..3} luajit )
+LUA_COMPAT=( lua5-{1..4} luajit )
inherit cmake lua-single pax-utils systemd tmpfiles
@@ -19,10 +19,13 @@ 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 test"
+RESTRICT="!test? ( test )"
+# A part of tests use ffi luajit extension
REQUIRED_USE="${LUA_REQUIRED_USE}
- jit? ( lua_single_target_luajit )"
+ jit? ( lua_single_target_luajit )
+ test? ( lua_single_target_luajit )"
RDEPEND="${LUA_DEPS}
$(lua_gen_cond_dep '
@@ -35,6 +38,7 @@ RDEPEND="${LUA_DEPS}
dev-libs/glib:2
dev-libs/icu:=
dev-libs/libev
+ dev-libs/libfmt:=
dev-libs/libsodium:=
dev-libs/snowball-stemmer
sys-apps/file
@@ -54,16 +58,15 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}/rspamd-2.7-cmake-lua-version.patch"
+ "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch"
"${FILESDIR}/rspamd-2.6-unbundle-lua.patch"
- "${FILESDIR}/rspamd-2.7-unbundle-zstd.patch"
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch"
)
src_prepare() {
cmake_src_prepare
- rm -vrf contrib/{lua-bit,snowball,zstd} || die
+ rm -vrf contrib/{fmt,lua-bit,snowball,zstd} || die
sed -i -e 's/User=_rspamd/User=rspamd/g' \
rspamd.service \
@@ -76,6 +79,10 @@ src_configure() {
-DRUNDIR=/var/run/rspamd
-DDBDIR=/var/lib/rspamd
-DLOGDIR=/var/log/rspamd
+
+ -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)
@@ -86,7 +93,7 @@ src_configure() {
}
src_test() {
- cmake_src_test
+ cmake_build run-test
}
src_install() {