diff options
| author |   Petr Vaněk <arkamar@gentoo.org> | 2023-12-03 22:47:28 +0100 |
|---|---|---|
| committer | Petr Vaněk <arkamar@gentoo.org> | 2023-12-03 23:00:35 +0100 |
| commit | 056e6464c30c821ee62bea2557afa64398e20435 (patch) | |
| tree | c9f417a9ef5469b87bb7e7caad1aa302c01d779a | |
| parent | app-admin/git-credential-gopass: drop 1.15.9 (diff) | |
| download | gentoo-056e6464c30c821ee62bea2557afa64398e20435.tar.gz gentoo-056e6464c30c821ee62bea2557afa64398e20435.tar.bz2 gentoo-056e6464c30c821ee62bea2557afa64398e20435.zip | |
mail-filter/rspamd: Fix build with disabled hyperscan
The issue is fixed with a patch backported from upstream.
Upstream-issue: https://github.com/rspamd/rspamd/issues/4701
Upstream-issue: https://github.com/rspamd/rspamd/issues/4702
Closes: https://bugs.gentoo.org/917512
Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
| -rw-r--r-- | mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch | 38 | ||||
| -rw-r--r-- | mail-filter/rspamd/rspamd-3.7.4-r1.ebuild | 2 | ||||
| -rw-r--r-- | mail-filter/rspamd/rspamd-3.7.4.ebuild | 2 |
3 files changed, 42 insertions, 0 deletions
diff --git a/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch b/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch new file mode 100644 index 000000000000..76353b703f21 --- /dev/null +++ b/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch @@ -0,0 +1,38 @@ +From d907a95ac2e2cad6f7f65c4323f031f7931ae18b Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov <vsevolod@rspamd.com> +Date: Wed, 15 Nov 2023 13:43:05 +0000 +Subject: [PATCH] [Minor] Fix build with no hyperscan + +Upstream-issue: https://github.com/rspamd/rspamd/issues/4701 +Upstream-issue: https://github.com/rspamd/rspamd/issues/4702 + +diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c +index 986a4a2ea..69af0597f 100644 +--- a/src/libserver/rspamd_control.c ++++ b/src/libserver/rspamd_control.c +@@ -922,6 +922,7 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents) + } + break; + case RSPAMD_SRV_HYPERSCAN_LOADED: ++#ifdef WITH_HYPERSCAN + /* Load RE cache to provide it for new forks */ + if (rspamd_re_cache_is_hs_loaded(rspamd_main->cfg->re_cache) != RSPAMD_HYPERSCAN_LOADED_FULL || + cmd.cmd.hs_loaded.forced) { +@@ -932,7 +933,9 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents) + } + + /* After getting this notice, we can clean up old hyperscan files */ ++ + rspamd_hyperscan_notice_loaded(); ++ + msg_info_main("received hyperscan cache loaded from %s", + cmd.cmd.hs_loaded.cache_dir); + +@@ -945,6 +948,7 @@ rspamd_srv_handler(EV_P_ ev_io *w, int revents) + wcmd.cmd.hs_loaded.forced = cmd.cmd.hs_loaded.forced; + rspamd_control_broadcast_cmd(rspamd_main, &wcmd, rfd, + rspamd_control_ignore_io_handler, NULL, worker->pid); ++#endif + break; + case RSPAMD_SRV_MONITORED_CHANGE: + /* Broadcast command to all workers */ diff --git a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild index 476878d10a51..d25c1a699699 100644 --- a/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild +++ b/mail-filter/rspamd/rspamd-3.7.4-r1.ebuild @@ -71,6 +71,8 @@ PATCHES=( "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch" "${FILESDIR}/rspamd-3.6-unbundle-lua.patch" "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch" + + "${FILESDIR}/${P}-no-hyperscan.patch" #917512 ) src_prepare() { diff --git a/mail-filter/rspamd/rspamd-3.7.4.ebuild b/mail-filter/rspamd/rspamd-3.7.4.ebuild index ad8d2656579e..8ae0aff0c482 100644 --- a/mail-filter/rspamd/rspamd-3.7.4.ebuild +++ b/mail-filter/rspamd/rspamd-3.7.4.ebuild @@ -71,6 +71,8 @@ PATCHES=( "${FILESDIR}/rspamd-3.6-cmake-lua-version.patch" "${FILESDIR}/rspamd-3.6-unbundle-lua.patch" "${FILESDIR}/rspamd-3.6-unbundle-snowball.patch" + + "${FILESDIR}/${P}-no-hyperscan.patch" #917512 ) src_prepare() { |