diff options
| author |   Petr Vaněk <arkamar@gentoo.org> | 2024-12-19 17:41:41 +0100 |
|---|---|---|
| committer | Petr Vaněk <arkamar@gentoo.org> | 2024-12-19 17:45:28 +0100 |
| commit | ee616175eee3844911446b7441b5a942d58ea5ca (patch) | |
| tree | 121d61452ca71becd96417a665c94e894584f959 /mail-filter | |
| parent | sys-libs/glibc: Tests require gawk[mpfr] now (diff) | |
| download | gentoo-ee616175eee3844911446b7441b5a942d58ea5ca.tar.gz gentoo-ee616175eee3844911446b7441b5a942d58ea5ca.tar.bz2 gentoo-ee616175eee3844911446b7441b5a942d58ea5ca.zip | |
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 <arkamar@gentoo.org>
Diffstat (limited to 'mail-filter')
| -rw-r--r-- | mail-filter/rspamd/files/rspamd-3.11.0-simdutf-hdr.patch | 27 | ||||
| -rw-r--r-- | mail-filter/rspamd/rspamd-3.11.0-r1.ebuild (renamed from mail-filter/rspamd/rspamd-3.11.0.ebuild) | 3 |
2 files changed, 30 insertions, 0 deletions
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 000000000000..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 <vsevolod@rspamd.com> +Date: Tue, 17 Dec 2024 13:37:54 +0000 +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 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 <dev-libs/libfmt-11 "${FILESDIR}/${PN}-3.9.0-older-libfmt.patch" + + # bug 946676 + "${FILESDIR}/${P}-simdutf-hdr.patch" ) src_prepare() { |