commit: ee616175eee3844911446b7441b5a942d58ea5ca Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Thu Dec 19 16:41:41 2024 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Thu Dec 19 16:45:28 2024 +0000 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 <arkamar <AT> 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 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 <[email protected]> +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 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 <dev-libs/libfmt-11 "${FILESDIR}/${PN}-3.9.0-older-libfmt.patch" + + # bug 946676 + "${FILESDIR}/${P}-simdutf-hdr.patch" ) src_prepare() {
