Accepting request 1128152 from server:mail

OBS-URL: https://build.opensuse.org/request/show/1128152
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rspamd?expand=0&rev=19

rspamd-d907a95.patch

@@ -0,0 +1,40 @@
+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
+
+Issue: #4702
+---
+ src/libserver/rspamd_control.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+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 */

rspamd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov 22 10:06:42 UTC 2023 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Add upstream patch to fix build without hyperscan:
+  * rspamd-d907a95.patch
+
 -------------------------------------------------------------------
 Tue Nov 14 20:41:32 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>
 

rspamd.spec

@@ -67,6 +67,7 @@ Source1:        usr.bin.rspamd
 Patch0:         rspamd-conf.patch
 Patch1:         rspamd-after-redis-target.patch
 Patch2:         fix_missing_return.patch
+Patch3:         rspamd-d907a95.patch
 %if !0%{?is_opensuse}
 # because 80-check-malware-scan-clamav triggered in SLE-15-SP2
 BuildRequires:  -post-build-checks-malwarescan