mail-filter/rspamd: backport upstream fixes

Two fixes are backported to 3.13.0, in order to fix build with
disabled hyperscan USE and lua-5.2+.

Upstream-issue: https://github.com/rspamd/rspamd/issues/5620
Upstream-PR: https://github.com/rspamd/rspamd/pull/5625
Closes: https://bugs.gentoo.org/963055
Signed-off-by: Petr Vaněk <arkamar@gentoo.org>
This commit is contained in:
Petr Vaněk
2025-09-21 18:34:21 +02:00
parent aee78a54e8
commit 3c71de0774
3 changed files with 68 additions and 0 deletions

View File

@@ -0,0 +1,35 @@
From 98e731bf69306a830834fbcfa7a21c3357130693 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Thu, 18 Sep 2025 10:03:39 +0100
Subject: [PATCH] [Minor] Fix non-hyperscan build
Issue: #5620
---
Upstream-issue: https://github.com/rspamd/rspamd/issues/5620
diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c
index fc056ecd8..2aa93e0d3 100644
--- a/src/libserver/re_cache.c
+++ b/src/libserver/re_cache.c
@@ -3495,4 +3495,17 @@ int rspamd_re_cache_compile_hyperscan_scoped_single(struct rspamd_re_cache *cach
return rspamd_re_cache_compile_hyperscan(cache, cache_dir, max_time, silent,
event_loop, rspamd_re_cache_compile_scoped_cb, scoped_cbd);
}
+#else
+/* Non hyperscan version stub */
+int rspamd_re_cache_compile_hyperscan_scoped_single(struct rspamd_re_cache *cache,
+ const char *scope,
+ const char *cache_dir,
+ double max_time,
+ gboolean silent,
+ struct ev_loop *event_loop,
+ void (*cb)(const char *scope, unsigned int ncompiled, GError *err, void *cbd),
+ void *cbd)
+{
+ return 0;
+}
#endif
--
2.49.1

View File

@@ -0,0 +1,30 @@
From d808fd75ff1db1821b1dd817eb4ba9a118b31090 Mon Sep 17 00:00:00 2001
From: netoholic <technoworx@gmx.de>
Date: Fri, 19 Sep 2025 15:17:24 +0200
Subject: [PATCH] fix build issues with lua version higher than 5.1
refer to https://bugs.gentoo.org/963055
I´ve been asked to pass this upstream
---
Bug: https://bugs.gentoo.org/963055
Upstream-PR: https://github.com/rspamd/rspamd/pull/5625
diff --git a/src/libstat/backends/redis_backend.cxx b/src/libstat/backends/redis_backend.cxx
index 3a78de1dd..37ce6e9da 100644
--- a/src/libstat/backends/redis_backend.cxx
+++ b/src/libstat/backends/redis_backend.cxx
@@ -15,6 +15,9 @@
*/
#include "config.h"
#include "lua/lua_common.h"
+#if LUA_VERSION_NUM >= 502
+# define lua_objlen lua_rawlen
+#endif
#include "rspamd.h"
#include "stat_internal.h"
#include "upstream.h"
--
2.49.1

View File

@@ -71,6 +71,9 @@ PATCHES=(
"${FILESDIR}/${PN}-3.12-cmake-lua-version.patch"
"${FILESDIR}/${PN}-3.12-unbundle-lua.patch"
"${FILESDIR}/${PN}-3.12-unbundle-snowball.patch"
"${FILESDIR}/${P}-disabled-hyperscan.patch"
"${FILESDIR}/${P}-lua-5.2+.patch" #963055
)
src_prepare() {