diff --git a/fix_missing_return.patch b/fix_missing_return.patch index 40fac9e..d2ab69d 100644 --- a/fix_missing_return.patch +++ b/fix_missing_return.patch @@ -1,8 +1,8 @@ -Index: rspamd-3.3/src/libserver/symcache/symcache_item.hxx +Index: rspamd-3.7.5/src/libserver/symcache/symcache_item.hxx =================================================================== ---- rspamd-3.3.orig/src/libserver/symcache/symcache_item.hxx -+++ rspamd-3.3/src/libserver/symcache/symcache_item.hxx -@@ -77,6 +77,7 @@ constexpr static auto item_type_to_str(s +--- rspamd-3.7.5.orig/src/libserver/symcache/symcache_item.hxx ++++ rspamd-3.7.5/src/libserver/symcache/symcache_item.hxx +@@ -78,6 +78,7 @@ constexpr static auto item_type_to_str(s case symcache_item_type::VIRTUAL: return "virtual"; } diff --git a/fix_stack_smash.patch b/fix_stack_smash.patch index 27b6ab2..ebcb83e 100644 --- a/fix_stack_smash.patch +++ b/fix_stack_smash.patch @@ -7,10 +7,10 @@ The caller uses the value to size its memory allocation: struct iovec *iov = g_alloca(sizeof(struct iovec) * niov); and that faulted on aarch64. -Index: rspamd-3.7.4/src/libserver/logger/logger.c +Index: rspamd-3.7.5/src/libserver/logger/logger.c =================================================================== ---- rspamd-3.7.4.orig/src/libserver/logger/logger.c -+++ rspamd-3.7.4/src/libserver/logger/logger.c +--- rspamd-3.7.5.orig/src/libserver/logger/logger.c ++++ rspamd-3.7.5/src/libserver/logger/logger.c @@ -1046,25 +1046,7 @@ gsize rspamd_log_fill_iov(struct iovec * gint r; @@ -20,11 +20,11 @@ Index: rspamd-3.7.4/src/libserver/logger/logger.c - return 4; - } - else { -- return 3; /* No time component */ +- return 2; /* No time component */ - } - } - else if (log_systemd) { -- return 3; +- return 4; - } - else { - if (log_color) { @@ -38,10 +38,3 @@ Index: rspamd-3.7.4/src/libserver/logger/logger.c } else { static gchar timebuf[64], modulebuf[64]; -@@ -1197,4 +1179,4 @@ gsize rspamd_log_fill_iov(struct iovec * - return niov; - } - } --} -\ No newline at end of file -+} diff --git a/rspamd-3.7.4.tar.gz b/rspamd-3.7.4.tar.gz deleted file mode 100644 index 2a5b438..0000000 --- a/rspamd-3.7.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30cf9f209c9cdb4962839255c94c0d8eb6cc937abc0d799710168d3ee8ad6138 -size 5903754 diff --git a/rspamd-3.7.5.tar.gz b/rspamd-3.7.5.tar.gz new file mode 100644 index 0000000..c10b3f6 --- /dev/null +++ b/rspamd-3.7.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fba8b0086fe68ac16146cfc25cfcff352bff52fa5cef7d277007ed008170330 +size 5903689 diff --git a/rspamd-conf.patch b/rspamd-conf.patch index fedf055..82a3c51 100644 --- a/rspamd-conf.patch +++ b/rspamd-conf.patch @@ -1,8 +1,8 @@ -Index: rspamd-1.7.9/conf/rspamd.conf +Index: rspamd-3.7.5/conf/rspamd.conf =================================================================== ---- rspamd-1.7.9.orig/conf/rspamd.conf -+++ rspamd-1.7.9/conf/rspamd.conf -@@ -28,7 +28,8 @@ options { +--- rspamd-3.7.5.orig/conf/rspamd.conf ++++ rspamd-3.7.5/conf/rspamd.conf +@@ -34,7 +34,8 @@ lang_detection { .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/cgp.inc" logging { diff --git a/rspamd-d907a95.patch b/rspamd-d907a95.patch deleted file mode 100644 index b9a6b7d..0000000 --- a/rspamd-d907a95.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d907a95ac2e2cad6f7f65c4323f031f7931ae18b Mon Sep 17 00:00:00 2001 -From: Vsevolod Stakhov -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 */ diff --git a/rspamd.changes b/rspamd.changes index c6b88ac..f5ac79b 100644 --- a/rspamd.changes +++ b/rspamd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Fri Dec 15 16:59:47 UTC 2023 - Marcus Rueckert + +- Update to 3.7.5 + - Test updates for rspamd-3.7 branch by @fatalbanana in #4708 + - Fix rspamadm lua logger in rspamd-3.7 (#/4727) by @fatalbanana + in #4729 + - Some picks for rspamd-3.7 by @fatalbanana in #4731 + - rspamd-3.7: fix systemd logging by @fatalbanana in #4734 + - rspamd-3.7: [Fix] dkim_signing: siging_table: lowercase before + lookup by @fatalbanana in #4737 +- drop pwatches included in update: + rspamd-d907a95.patch +- refreshed patches to apply cleanly again: + fix_missing_return.patch + rspamd-conf.patch +- While the fix for the logging bug was accepted into master. The + 3.7.5 release uses a different solution apparently. Update patch + fix_stack_smash.patch. + + https://github.com/rspamd/rspamd/pull/4732#issuecomment-1858255236 + ------------------------------------------------------------------- Wed Dec 6 15:28:07 UTC 2023 - Adam Majer diff --git a/rspamd.spec b/rspamd.spec index c7cdb9d..0b9f58a 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -56,7 +56,7 @@ %endif Name: rspamd -Version: 3.7.4 +Version: 3.7.5 Release: 0 Summary: Spam filtering system License: Apache-2.0 @@ -67,8 +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 -Patch4: fix_stack_smash.patch +Patch3: fix_stack_smash.patch %if !0%{?is_opensuse} # because 80-check-malware-scan-clamav triggered in SLE-15-SP2 BuildRequires: -post-build-checks-malwarescan