| 1 |
commit: fd0e7ad32ff1064db8cd4ba4149cf33e2ffdeb5a |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Sat Aug 21 20:53:20 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 22 02:49:02 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd0e7ad3 |
| 7 |
|
| 8 |
mail-filter/rspamd: sync live |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/784335 |
| 11 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
mail-filter/rspamd/rspamd-9999.ebuild | 21 ++++++++++++++------- |
| 15 |
1 file changed, 14 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/mail-filter/rspamd/rspamd-9999.ebuild b/mail-filter/rspamd/rspamd-9999.ebuild |
| 18 |
index a78a8bfb768..ebf109b74cd 100644 |
| 19 |
--- a/mail-filter/rspamd/rspamd-9999.ebuild |
| 20 |
+++ b/mail-filter/rspamd/rspamd-9999.ebuild |
| 21 |
@@ -3,7 +3,7 @@ |
| 22 |
|
| 23 |
EAPI=7 |
| 24 |
|
| 25 |
-LUA_COMPAT=( lua5-{1..3} luajit ) |
| 26 |
+LUA_COMPAT=( lua5-{1..4} luajit ) |
| 27 |
|
| 28 |
inherit cmake lua-single pax-utils systemd tmpfiles |
| 29 |
|
| 30 |
@@ -19,10 +19,13 @@ DESCRIPTION="Rapid spam filtering system" |
| 31 |
HOMEPAGE="https://rspamd.com https://github.com/rspamd/rspamd" |
| 32 |
LICENSE="Apache-2.0 Boost-1.0 BSD BSD-1 BSD-2 CC0-1.0 LGPL-3 MIT public-domain unicode ZLIB" |
| 33 |
SLOT="0" |
| 34 |
-IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2" |
| 35 |
+IUSE="blas cpu_flags_x86_ssse3 jemalloc +jit pcre2 test" |
| 36 |
+RESTRICT="!test? ( test )" |
| 37 |
|
| 38 |
+# A part of tests use ffi luajit extension |
| 39 |
REQUIRED_USE="${LUA_REQUIRED_USE} |
| 40 |
- jit? ( lua_single_target_luajit )" |
| 41 |
+ jit? ( lua_single_target_luajit ) |
| 42 |
+ test? ( lua_single_target_luajit )" |
| 43 |
|
| 44 |
RDEPEND="${LUA_DEPS} |
| 45 |
$(lua_gen_cond_dep ' |
| 46 |
@@ -35,6 +38,7 @@ RDEPEND="${LUA_DEPS} |
| 47 |
dev-libs/glib:2 |
| 48 |
dev-libs/icu:= |
| 49 |
dev-libs/libev |
| 50 |
+ dev-libs/libfmt:= |
| 51 |
dev-libs/libsodium:= |
| 52 |
dev-libs/snowball-stemmer |
| 53 |
sys-apps/file |
| 54 |
@@ -54,16 +58,15 @@ BDEPEND=" |
| 55 |
" |
| 56 |
|
| 57 |
PATCHES=( |
| 58 |
- "${FILESDIR}/rspamd-2.7-cmake-lua-version.patch" |
| 59 |
+ "${FILESDIR}/rspamd-3.0-cmake-lua-version.patch" |
| 60 |
"${FILESDIR}/rspamd-2.6-unbundle-lua.patch" |
| 61 |
- "${FILESDIR}/rspamd-2.7-unbundle-zstd.patch" |
| 62 |
"${FILESDIR}/rspamd-2.5-unbundle-snowball.patch" |
| 63 |
) |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
cmake_src_prepare |
| 67 |
|
| 68 |
- rm -vrf contrib/{lua-bit,snowball,zstd} || die |
| 69 |
+ rm -vrf contrib/{fmt,lua-bit,snowball,zstd} || die |
| 70 |
|
| 71 |
sed -i -e 's/User=_rspamd/User=rspamd/g' \ |
| 72 |
rspamd.service \ |
| 73 |
@@ -76,6 +79,10 @@ src_configure() { |
| 74 |
-DRUNDIR=/var/run/rspamd |
| 75 |
-DDBDIR=/var/lib/rspamd |
| 76 |
-DLOGDIR=/var/log/rspamd |
| 77 |
+ |
| 78 |
+ -DSYSTEM_FMT=ON |
| 79 |
+ -DSYSTEM_ZSTD=ON |
| 80 |
+ |
| 81 |
-DENABLE_BLAS=$(usex blas ON OFF) |
| 82 |
-DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) |
| 83 |
-DENABLE_JEMALLOC=$(usex jemalloc ON OFF) |
| 84 |
@@ -86,7 +93,7 @@ src_configure() { |
| 85 |
} |
| 86 |
|
| 87 |
src_test() { |
| 88 |
- cmake_src_test |
| 89 |
+ cmake_build run-test |
| 90 |
} |
| 91 |
|
| 92 |
src_install() { |
Archives