pool/rspamd
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

- Update to 3.7.5

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=102
This commit is contained in:
Marcus Rückert
2023-12-15 17:50:57 +00:00
committed by Git OBS Bridge
parent 0dca80afdf
commit d7e8019fcf
8 changed files with 40 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
fix_stack_smash.patch
View File

@@ -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
+}