Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rspamd for openSUSE:Factory checked in at 2023-12-22 22:42:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rspamd (Old) and /work/SRC/openSUSE:Factory/.rspamd.new.28375 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rspamd" Fri Dec 22 22:42:56 2023 rev:21 rq:1134658 version:3.7.5 Changes: -------- --- /work/SRC/openSUSE:Factory/rspamd/rspamd.changes 2023-12-08 22:34:15.460866153 +0100 +++ /work/SRC/openSUSE:Factory/.rspamd.new.28375/rspamd.changes 2023-12-22 22:43:45.309326557 +0100 @@ -1,0 +2,22 @@ +Fri Dec 15 16:59:47 UTC 2023 - Marcus Rueckert <mrueck...@suse.de> + +- 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 + +------------------------------------------------------------------- Old: ---- rspamd-3.7.4.tar.gz rspamd-d907a95.patch New: ---- rspamd-3.7.5.tar.gz BETA DEBUG BEGIN: Old:- drop pwatches included in update: rspamd-d907a95.patch - refreshed patches to apply cleanly again: BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rspamd.spec ++++++ --- /var/tmp/diff_new_pack.3tKZgw/_old 2023-12-22 22:43:45.829345608 +0100 +++ /var/tmp/diff_new_pack.3tKZgw/_new 2023-12-22 22:43:45.829345608 +0100 @@ -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 @@ 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 ++++++ fix_missing_return.patch ++++++ --- /var/tmp/diff_new_pack.3tKZgw/_old 2023-12-22 22:43:45.849346341 +0100 +++ /var/tmp/diff_new_pack.3tKZgw/_new 2023-12-22 22:43:45.853346487 +0100 @@ -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"; } ++++++ fix_stack_smash.patch ++++++ --- /var/tmp/diff_new_pack.3tKZgw/_old 2023-12-22 22:43:45.865346927 +0100 +++ /var/tmp/diff_new_pack.3tKZgw/_new 2023-12-22 22:43:45.869347074 +0100 @@ -7,10 +7,10 @@ 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 @@ - 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,11 +38,4 @@ } 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 -+} ++++++ rspamd-3.7.4.tar.gz -> rspamd-3.7.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/.drone.jsonnet new/rspamd-3.7.5/.drone.jsonnet --- old/rspamd-3.7.4/.drone.jsonnet 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/.drone.jsonnet 2023-12-15 16:32:54.000000000 +0100 @@ -192,7 +192,6 @@ 'cd /rspamd/build', 'ulimit -c unlimited', 'ulimit -s unlimited', - 'umask 0000', 'set +e', 'RSPAMD_INSTALLROOT=/rspamd/install robot --removekeywords wuks --exclude isbroken $DRONE_WORKSPACE/test/functional/cases; EXIT_CODE=$?', 'set -e', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/.drone.yml new/rspamd-3.7.5/.drone.yml --- old/rspamd-3.7.4/.drone.yml 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/.drone.yml 2023-12-15 16:32:54.000000000 +0100 @@ -136,7 +136,6 @@ "cd /rspamd/build", "ulimit -c unlimited", "ulimit -s unlimited", - "umask 0000", "set +e", "RSPAMD_INSTALLROOT=/rspamd/install robot --removekeywords wuks --exclude isbroken $DRONE_WORKSPACE/test/functional/cases; EXIT_CODE=$?", "set -e", @@ -353,7 +352,6 @@ "cd /rspamd/build", "ulimit -c unlimited", "ulimit -s unlimited", - "umask 0000", "set +e", "RSPAMD_INSTALLROOT=/rspamd/install robot --removekeywords wuks --exclude isbroken $DRONE_WORKSPACE/test/functional/cases; EXIT_CODE=$?", "set -e", @@ -561,7 +559,7 @@ } --- { - "hmac": "6c89d1423ccbddbfac9e2b67f24192018670209a293cfee308880a16a2f2b372", + "hmac": "1fb0cd2235d6c518d809751b4b263601285c5554863c89c19bd325af38207bce", "kind": "signature" } ... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/CMakeLists.txt new/rspamd-3.7.5/CMakeLists.txt --- old/rspamd-3.7.4/CMakeLists.txt 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/CMakeLists.txt 2023-12-15 16:32:54.000000000 +0100 @@ -9,7 +9,7 @@ SET(RSPAMD_VERSION_MAJOR 3) SET(RSPAMD_VERSION_MINOR 7) -SET(RSPAMD_VERSION_PATCH 4) +SET(RSPAMD_VERSION_PATCH 5) # Keep two digits all the time SET(RSPAMD_VERSION_MAJOR_NUM ${RSPAMD_VERSION_MAJOR}0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/ChangeLog new/rspamd-3.7.5/ChangeLog --- old/rspamd-3.7.4/ChangeLog 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/ChangeLog 2023-12-15 16:32:54.000000000 +0100 @@ -1,3 +1,12 @@ +3.7.5: 15 Dec 2023 + * Add support for loongarch + * [Fix] Fix rspamadm lua logger + * [Fix] Fix systemd logging + * [Fix] dkim_signing: siging_table: lowercase before lookup + * [Minor] Fix build with no hyperscan + * [Minor] Try improve test stability + * [Test] Fix tests on rspamd-3.7 + 3.7.4: 14 Nov 2023 * [Enhancement] Add composite rule for suspicious URLs in suspicious messages * [Fix] Another try to fix setproctitle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/cmake/FindArch.cmake new/rspamd-3.7.5/cmake/FindArch.cmake --- old/rspamd-3.7.4/cmake/FindArch.cmake 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/cmake/FindArch.cmake 2023-12-15 16:32:54.000000000 +0100 @@ -35,6 +35,8 @@ #else #error cmake_ARCH ppc #endif +#elif defined(__loongarch__) || defined(__loongarch64) + #error cmake_ARCH loongarch64 #endif #error cmake_ARCH unknown diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/contrib/backward-cpp/backward.hpp new/rspamd-3.7.5/contrib/backward-cpp/backward.hpp --- old/rspamd-3.7.4/contrib/backward-cpp/backward.hpp 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/contrib/backward-cpp/backward.hpp 2023-12-15 16:32:54.000000000 +0100 @@ -4222,6 +4222,8 @@ #else error_addr = reinterpret_cast<void *>(uctx->uc_mcontext.pc); #endif +#elif defined(__loongarch__) + error_addr = reinterpret_cast<void *>(uctx->uc_mcontext.__pc); #elif defined(__mips__) error_addr = reinterpret_cast<void *>( reinterpret_cast<struct sigcontext *>(&uctx->uc_mcontext)->sc_pc); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/contrib/libev/ev.c new/rspamd-3.7.5/contrib/libev/ev.c --- old/rspamd-3.7.4/contrib/libev/ev.c 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/contrib/libev/ev.c 2023-12-15 16:32:54.000000000 +0100 @@ -843,6 +843,8 @@ #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory") #elif defined __sh__ #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") + #elif defined __loongarch__ || __loongarch64 + #define ECB_MEMORY_FENCE __asm__ __volatile__ ("dbar %0 ": : "I"(0) : "memory") #endif #endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/lualib/lua_dkim_tools.lua new/rspamd-3.7.5/lualib/lua_dkim_tools.lua --- old/rspamd-3.7.4/lualib/lua_dkim_tools.lua 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/lualib/lua_dkim_tools.lua 2023-12-15 16:32:54.000000000 +0100 @@ -268,7 +268,7 @@ 'signing_table: cannot get data when no header from is presented') return false, {} end - local sign_entry = settings.signing_table:get_key(hfrom[1].addr) + local sign_entry = settings.signing_table:get_key(hfrom[1].addr:lower()) if sign_entry then -- Check opendkim style entries diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/src/libserver/logger/logger.c new/rspamd-3.7.5/src/libserver/logger/logger.c --- old/rspamd-3.7.4/src/libserver/logger/logger.c 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/src/libserver/logger/logger.c 2023-12-15 16:32:54.000000000 +0100 @@ -1051,11 +1051,11 @@ 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) { @@ -1197,4 +1197,4 @@ return niov; } } -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/src/libserver/rspamd_control.c new/rspamd-3.7.5/src/libserver/rspamd_control.c --- old/rspamd-3.7.4/src/libserver/rspamd_control.c 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/src/libserver/rspamd_control.c 2023-12-15 16:32:54.000000000 +0100 @@ -922,6 +922,7 @@ } 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 @@ } /* 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 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/src/rspamd.c new/rspamd-3.7.5/src/rspamd.c --- old/rspamd-3.7.4/src/rspamd.c 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/src/rspamd.c 2023-12-15 16:32:54.000000000 +0100 @@ -1279,6 +1279,8 @@ return "ARM64"; #elif defined(__arm__) || defined(_M_ARM) return "ARM"; +#elif defined(__loongarch__) || defined(__loongarch64) + return "LOONGARCH64"; #elif defined(__mips__) return "MIPS"; #elif defined(__powerpc__) || defined(_M_PPC) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/cases/108_settings.robot new/rspamd-3.7.5/test/functional/cases/108_settings.robot --- old/rspamd-3.7.4/test/functional/cases/108_settings.robot 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/cases/108_settings.robot 2023-12-15 16:32:54.000000000 +0100 @@ -180,7 +180,7 @@ Do Not Expect Symbol SIMPLE_PRE SETTINGS ID - VIRTUAL SELECTOR - Scan File ${MESSAGE} Rcpt=us...@example.com + Scan File ${MESSAGE} Rcpt=te...@example.com Expect Symbol With Score SIMPLE_VIRTUAL 10 Expect Symbol With Score EXPLICIT_VIRTUAL 10 Do Not Expect Symbol SIMPLE_TEST @@ -190,7 +190,7 @@ Do Not Expect Symbol SIMPLE_PRE SETTINGS ID - ANGLED RECIPIENT - Scan File ${MESSAGE} Rcpt=<us...@example.com> + Scan File ${MESSAGE} Rcpt=<te...@example.com> Expect Symbol With Score SIMPLE_VIRTUAL 10 Expect Symbol With Score EXPLICIT_VIRTUAL 10 Do Not Expect Symbol SIMPLE_TEST diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/cases/150_rspamadm.robot new/rspamd-3.7.5/test/functional/cases/150_rspamadm.robot --- old/rspamd-3.7.4/test/functional/cases/150_rspamadm.robot 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/cases/150_rspamadm.robot 2023-12-15 16:32:54.000000000 +0100 @@ -34,7 +34,12 @@ Lua batch mode ${result} = Run Process ${RSPAMADM} lua -b ${RSPAMD_TESTDIR}/lua/rspamadm/test_batch.lua - Should Match Regexp ${result.stderr} ^$ + Should Be Equal ${result.stderr} hello world + Should Match Regexp ${result.stdout} ^$ Should Be Equal As Integers ${result.rc} 0 - Should Be Equal ${result.stdout} hello world +Verbose mode + ${result} = Run Process ${RSPAMADM} -v lua ${RSPAMD_TESTDIR}/lua/rspamadm/test_verbose.lua + Should Match Regexp ${result.stderr} ^$ + Should Match Regexp ${result.stdout} hello world\n + Should Be Equal As Integers ${result.rc} 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/cases/410_systemd_logger.robot new/rspamd-3.7.5/test/functional/cases/410_systemd_logger.robot --- old/rspamd-3.7.4/test/functional/cases/410_systemd_logger.robot 1970-01-01 01:00:00.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/cases/410_systemd_logger.robot 2023-12-15 16:32:54.000000000 +0100 @@ -0,0 +1,21 @@ +*** Settings *** +Suite Setup Rspamd Setup +Suite Teardown Systemd Teardown +Library ${RSPAMD_TESTDIR}/lib/rspamd.py +Resource ${RSPAMD_TESTDIR}/lib/rspamd.robot +Variables ${RSPAMD_TESTDIR}/lib/vars.py + +*** Variables *** +${CONFIG} ${RSPAMD_TESTDIR}/configs/systemd.conf +${RSPAMD_SCOPE} Suite + +*** Test Cases *** +EMPTY TEST + Pass Execution No worries + +*** Keywords *** +Systemd Teardown + Touch ${RSPAMD_TMPDIR}/rspamd.log + Rspamd Teardown + ${log} = Get File ${EXECDIR}/robot-save/rspamd.stderr.last + Should Match Regexp ${log} \\n\\(main\\) lua; lua_cfg_transform\\.lua:\\d+: overriding actions from the legacy metric settings\\n diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/configs/settings.conf new/rspamd-3.7.5/test/functional/configs/settings.conf --- old/rspamd-3.7.4/test/functional/configs/settings.conf 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/configs/settings.conf 2023-12-15 16:32:54.000000000 +0100 @@ -35,7 +35,7 @@ user = "t...@example.com"; from = "te...@example.com"; hostname = "example.com"; - selector = "rcpts:addr.in(te...@example.com)"; + selector = "rcpts:addr.in('te...@example.com')"; header = { "Content-Transfer-Encoding" = "7bit"; "Custom-Header" = true; @@ -45,7 +45,7 @@ "Test" = "passed"; } - expression = 'user || from || hostname || selector:1 || header:mime_version || header:custom_header || header:1 || request_header:test' + expression = 'user || from || hostname || selector:1 || header:mime_version || header:custom_header || header:content_transfer_encoding || request_header:test' apply { symbols_enabled { SIMPLE_VIRTUAL = 10.0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/configs/systemd-local.conf new/rspamd-3.7.5/test/functional/configs/systemd-local.conf --- old/rspamd-3.7.4/test/functional/configs/systemd-local.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/configs/systemd-local.conf 2023-12-15 16:32:54.000000000 +0100 @@ -0,0 +1,4 @@ +logging { + type = "console"; + systemd = true; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/configs/systemd.conf new/rspamd-3.7.5/test/functional/configs/systemd.conf --- old/rspamd-3.7.4/test/functional/configs/systemd.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/configs/systemd.conf 2023-12-15 16:32:54.000000000 +0100 @@ -0,0 +1,3 @@ +.include(duplicate=append,priority=0) "{= env.TESTDIR =}/configs/trivial.conf" + +.include(priority=1,duplicate=merge) "{= env.TESTDIR =}/configs/systemd-local.conf" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/lua/rspamadm/test_batch.lua new/rspamd-3.7.5/test/functional/lua/rspamadm/test_batch.lua --- old/rspamd-3.7.4/test/functional/lua/rspamadm/test_batch.lua 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/lua/rspamadm/test_batch.lua 2023-12-15 16:32:54.000000000 +0100 @@ -1 +1,4 @@ -print("hello world") \ No newline at end of file +local rspamd_logger = require "rspamd_logger" + +rspamd_logger.info(rspamd_config, "nope") +rspamd_logger.err(rspamd_config, "hello world") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/lua/rspamadm/test_verbose.lua new/rspamd-3.7.5/test/functional/lua/rspamadm/test_verbose.lua --- old/rspamd-3.7.4/test/functional/lua/rspamadm/test_verbose.lua 1970-01-01 01:00:00.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/lua/rspamadm/test_verbose.lua 2023-12-15 16:32:54.000000000 +0100 @@ -0,0 +1,3 @@ +local rspamd_logger = require "rspamd_logger" + +rspamd_logger.info(rspamd_config, "hello world") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/messages/dmarc/fail_none.eml new/rspamd-3.7.5/test/functional/messages/dmarc/fail_none.eml --- old/rspamd-3.7.4/test/functional/messages/dmarc/fail_none.eml 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/messages/dmarc/fail_none.eml 2023-12-15 16:32:54.000000000 +0100 @@ -1,3 +1,3 @@ -From: Rspamd <f...@cacophony.za.org> - -hello +From: Rspamd <f...@cacophony.za.org> + +hello diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/util/dummy_http.py new/rspamd-3.7.5/test/functional/util/dummy_http.py --- old/rspamd-3.7.4/test/functional/util/dummy_http.py 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/util/dummy_http.py 2023-12-15 16:32:54.000000000 +0100 @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import asyncio +import dummy_killer import tornado.ioloop import tornado.web import tornado.httpserver @@ -131,8 +132,7 @@ # Write the PID to the specified PID file, if provided if args.pidfile: - with open(args.pidfile, "w") as f: - f.write(str(os.getpid())) + dummy_killer.write_pid(args.pidfile) # Start the server server.bind(args.port, args.bind) @@ -141,4 +141,4 @@ await asyncio.Event().wait() if __name__ == "__main__": - asyncio.run(main()) \ No newline at end of file + asyncio.run(main()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/util/dummy_killer.py new/rspamd-3.7.5/test/functional/util/dummy_killer.py --- old/rspamd-3.7.4/test/functional/util/dummy_killer.py 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/util/dummy_killer.py 2023-12-15 16:32:54.000000000 +0100 @@ -1,6 +1,7 @@ import signal import os import atexit +import tempfile def setup_killer(server, method = None): def default_method(): @@ -18,9 +19,10 @@ def write_pid(path): - with open(path, 'w+') as f: + with tempfile.NamedTemporaryFile(mode='w', delete=False) as f: f.write(str(os.getpid())) f.close() + os.rename(f.name, path) def cleanup(): os.remove(path) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rspamd-3.7.4/test/functional/util/dummy_p0f.py new/rspamd-3.7.5/test/functional/util/dummy_p0f.py --- old/rspamd-3.7.4/test/functional/util/dummy_p0f.py 2023-11-14 16:01:02.000000000 +0100 +++ new/rspamd-3.7.5/test/functional/util/dummy_p0f.py 2023-12-15 16:32:54.000000000 +0100 @@ -66,6 +66,8 @@ p0f_status = 'ok' p0f_os = 'linux' + os.umask(0000) + alen = len(sys.argv) if alen > 1: SOCK = sys.argv[1] ++++++ rspamd-conf.patch ++++++ --- /var/tmp/diff_new_pack.3tKZgw/_old 2023-12-22 22:43:46.521370961 +0100 +++ /var/tmp/diff_new_pack.3tKZgw/_new 2023-12-22 22:43:46.521370961 +0100 @@ -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 {
