3 files changed, 0 insertions, 97 deletions
diff --git a/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch b/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch
deleted file mode 100644
index 33e851261f46..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.6-fix-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Duncan Bellamy <dunk@denkimushi.com>
-Date: Thu, 3 Aug 2023 22:08:06 +0000
-Subject: [PATCH] [Fix] CMakeLists.txt remove whitespace added by linter as it
- makes tests fail
-
-Upstream-PR: https://github.com/rspamd/rspamd/pull/4560
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5402c4806..efda209ca 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -777,7 +777,7 @@ IF (NOT DEBIAN_BUILD)
-     ADD_CUSTOM_TARGET(check DEPENDS rspamd-test-cxx rspamd-test)
-     ADD_CUSTOM_TARGET(run-test DEPENDS check
-             COMMAND test/rspamd-test-cxx
--            COMMAND sh -c 'LUA_PATH= "${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua"
-+            COMMAND sh -c 'LUA_PATH="${CMAKE_SOURCE_DIR}/lualib/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/?.lua\;${CMAKE_SOURCE_DIR}/lualib/?/init.lua\;${CMAKE_SOURCE_DIR}/contrib/lua-?/?.lua"
-             test/rspamd-test -p /rspamd/lua')
- ENDIF (NOT DEBIAN_BUILD)
- 
--- 
-2.41.0
-
diff --git a/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch b/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch
deleted file mode 100644
index f372b79de7c7..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From ffbab4fbf218514845b8e5209aec044621b1f460 Mon Sep 17 00:00:00 2001
-From: Vsevolod Stakhov <vsevolod@rspamd.com>
-Date: Sun, 6 Aug 2023 18:33:37 +0100
-Subject: [PATCH] [CritFix] Fix leak in `gzip` function
-
-Upstream-Issue: https://github.com/rspamd/rspamd/issues/4564
-
-diff --git a/src/libutil/util.c b/src/libutil/util.c
-index 4be7cc620..deba3e807 100644
---- a/src/libutil/util.c
-+++ b/src/libutil/util.c
-@@ -2231,6 +2231,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in)
- 	strm.avail_out = sizeof(temp) > buf->allocated ? buf->allocated : sizeof(temp);
- 	ret = deflate(&strm, Z_FINISH);
- 	if (ret == Z_STREAM_ERROR) {
-+		deflateEnd(&strm);
- 		return FALSE;
- 	}
- 
-@@ -2247,6 +2248,8 @@ rspamd_fstring_gzip(rspamd_fstring_t **in)
- 		if (ret != Z_BUF_ERROR || strm.avail_in == 0) {
- 			buf->len = strm.next_out - (unsigned char *) buf->str;
- 			*in = buf;
-+			deflateEnd(&strm);
-+
- 			return ret == Z_STREAM_END;
- 		}
- 	}
-@@ -2267,6 +2270,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in)
- 	g_free(hold);
- 	buf->len = strm.next_out - (unsigned char *) buf->str;
- 	*in = buf;
-+	deflateEnd(&strm);
- 
- 	return ret == Z_STREAM_END;
- }
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
deleted file mode 100644
index 76353b703f21..000000000000
--- a/mail-filter/rspamd/files/rspamd-3.7.4-no-hyperscan.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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 */