From 11ea1082bfe8828663b6cc01b29a706ebc4cb8949e9e59d507af1e86d0da0dae Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Wed, 9 Nov 2022 01:44:23 +0000 Subject: [PATCH 1/6] - Downgrade to 3.3 until https://github.com/rspamd/rspamd/issues/4329 is solved. OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=78 --- rspamd-3.3.tar.gz | 3 +++ rspamd-3.4.tar.gz | 3 --- rspamd.changes | 6 ++++++ rspamd.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 rspamd-3.3.tar.gz delete mode 100644 rspamd-3.4.tar.gz diff --git a/rspamd-3.3.tar.gz b/rspamd-3.3.tar.gz new file mode 100644 index 0000000..25c7d90 --- /dev/null +++ b/rspamd-3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d6e90facd0f7705d11d5073dba22b5d6686097798178b3b3e965a989ba7be0f +size 5680874 diff --git a/rspamd-3.4.tar.gz b/rspamd-3.4.tar.gz deleted file mode 100644 index 5f88fb1..0000000 --- a/rspamd-3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8d3e2b9a1a6ed6521c60fe505e97086624407f67366f0ce882eee433a53c355 -size 5689732 diff --git a/rspamd.changes b/rspamd.changes index 5a4e227..c2d79fd 100644 --- a/rspamd.changes +++ b/rspamd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Nov 9 01:42:46 UTC 2022 - Marcus Rueckert + +- Downgrade to 3.3 until https://github.com/rspamd/rspamd/issues/4329 + is solved. + ------------------------------------------------------------------- Tue Nov 1 21:41:46 UTC 2022 - Marcus Rueckert diff --git a/rspamd.spec b/rspamd.spec index e6ef5fe..df8f253 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -56,7 +56,7 @@ %endif Name: rspamd -Version: 3.4 +Version: 3.3 Release: 0 Summary: Spam filtering system License: Apache-2.0 From 5cb893cab49e048800f4696cb9f5be539a01cdea092297823a8a323bdab31aca Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 9 Nov 2022 11:57:39 +0000 Subject: [PATCH 2/6] Updating link to change in openSUSE:Factory/rspamd revision 11 OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=10be707a7634d7d4393a1084c4e1e166 --- rspamd-3.3.tar.gz | 3 --- rspamd-3.4.tar.gz | 3 +++ rspamd.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 rspamd-3.3.tar.gz create mode 100644 rspamd-3.4.tar.gz diff --git a/rspamd-3.3.tar.gz b/rspamd-3.3.tar.gz deleted file mode 100644 index 25c7d90..0000000 --- a/rspamd-3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d6e90facd0f7705d11d5073dba22b5d6686097798178b3b3e965a989ba7be0f -size 5680874 diff --git a/rspamd-3.4.tar.gz b/rspamd-3.4.tar.gz new file mode 100644 index 0000000..5f88fb1 --- /dev/null +++ b/rspamd-3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8d3e2b9a1a6ed6521c60fe505e97086624407f67366f0ce882eee433a53c355 +size 5689732 diff --git a/rspamd.spec b/rspamd.spec index df8f253..e6ef5fe 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -56,7 +56,7 @@ %endif Name: rspamd -Version: 3.3 +Version: 3.4 Release: 0 Summary: Spam filtering system License: Apache-2.0 From 6bdc78ed983cf874f8f95433eefcbff32401dd37d7f6f920bd9d26f9cea61f76 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 9 Nov 2022 11:57:39 +0000 Subject: [PATCH 3/6] baserev update by copy to link target OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=79 --- rspamd-3.3.tar.gz | 3 +++ rspamd-3.4.tar.gz | 3 --- rspamd.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 rspamd-3.3.tar.gz delete mode 100644 rspamd-3.4.tar.gz diff --git a/rspamd-3.3.tar.gz b/rspamd-3.3.tar.gz new file mode 100644 index 0000000..25c7d90 --- /dev/null +++ b/rspamd-3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d6e90facd0f7705d11d5073dba22b5d6686097798178b3b3e965a989ba7be0f +size 5680874 diff --git a/rspamd-3.4.tar.gz b/rspamd-3.4.tar.gz deleted file mode 100644 index 5f88fb1..0000000 --- a/rspamd-3.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f8d3e2b9a1a6ed6521c60fe505e97086624407f67366f0ce882eee433a53c355 -size 5689732 diff --git a/rspamd.spec b/rspamd.spec index e6ef5fe..df8f253 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -56,7 +56,7 @@ %endif Name: rspamd -Version: 3.4 +Version: 3.3 Release: 0 Summary: Spam filtering system License: Apache-2.0 From e13d94138cfb4d8335ffe63aea5ddaa601f0b391e4df8339deefaa0ac47ab354 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 14 Nov 2022 16:23:22 +0000 Subject: [PATCH 4/6] - Upgrade to 3.4 again - Fix metadata_exporter with many recipients by @yo000 in #4294 - [Fix] Fix favicon.ico Content-Type header by @moisseev in #4302 - [Minor] Fix copy-paste error by @moisseev in #4305 - Add basic auth to metadata_exporter http pusher by @yo000 in #4300 - [Enhancement] Add composite rule against AFF involving freemailers by @twesterhever in #4304 - Penalize bounce spam by @frederikbosch in #4308 - Added 068714f9f5a96fbd94560211cec75775ee023d02.patch: Official patch for the unaligned memory issue described in https://github.com/rspamd/rspamd/issues/4329 - Add cleanup code to the %postun scriptlet to remove bad files, created by earlier/unpatched 3.4 versions, during package upgrade OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=80 --- ...14f9f5a96fbd94560211cec75775ee023d02.patch | 32 +++++++++++++++++++ rspamd-3.4.tar.gz | 3 ++ rspamd.changes | 18 +++++++++++ rspamd.spec | 8 ++++- 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 068714f9f5a96fbd94560211cec75775ee023d02.patch create mode 100644 rspamd-3.4.tar.gz diff --git a/068714f9f5a96fbd94560211cec75775ee023d02.patch b/068714f9f5a96fbd94560211cec75775ee023d02.patch new file mode 100644 index 0000000..f095ac3 --- /dev/null +++ b/068714f9f5a96fbd94560211cec75775ee023d02.patch @@ -0,0 +1,32 @@ +From 068714f9f5a96fbd94560211cec75775ee023d02 Mon Sep 17 00:00:00 2001 +From: Vsevolod Stakhov +Date: Fri, 11 Nov 2022 20:34:51 +0000 +Subject: [PATCH] [CritFix] Deserialise hyperscan to the page-aligned space to + prevent alignment issues + +Issue: #4329 +--- + src/libserver/hyperscan_tools.cxx | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/libserver/hyperscan_tools.cxx b/src/libserver/hyperscan_tools.cxx +index 6187208a9..96366067d 100644 +--- a/src/libserver/hyperscan_tools.cxx ++++ b/src/libserver/hyperscan_tools.cxx +@@ -306,7 +306,15 @@ auto load_cached_hs_file(const char *fname, std::int64_t offset = 0) -> tl::expe + msg_debug_hyperscan_lambda("multipattern: create new database in %s; %Hz size", + tmpfile_pattern.data(), unserialized_size); + void *buf; +- posix_memalign(&buf, 16, unserialized_size); ++#ifdef HAVE_GETPAGESIZE ++ auto page_size = getpagesize(); ++#else ++ auto page_size = sysconf(_SC_PAGESIZE); ++#endif ++ if (page_size == -1) { ++ page_size = 4096; ++ } ++ posix_memalign(&buf, page_size, unserialized_size); + if (buf == nullptr) { + return tl::make_unexpected(error {"Cannot allocate memory", errno, error_category::CRITICAL }); + } diff --git a/rspamd-3.4.tar.gz b/rspamd-3.4.tar.gz new file mode 100644 index 0000000..5f88fb1 --- /dev/null +++ b/rspamd-3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8d3e2b9a1a6ed6521c60fe505e97086624407f67366f0ce882eee433a53c355 +size 5689732 diff --git a/rspamd.changes b/rspamd.changes index c2d79fd..460b3b9 100644 --- a/rspamd.changes +++ b/rspamd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Nov 14 16:21:40 UTC 2022 - Marcus Rueckert + +- Upgrade to 3.4 again + - Fix metadata_exporter with many recipients by @yo000 in #4294 + - [Fix] Fix favicon.ico Content-Type header by @moisseev in #4302 + - [Minor] Fix copy-paste error by @moisseev in #4305 + - Add basic auth to metadata_exporter http pusher by @yo000 in + #4300 + - [Enhancement] Add composite rule against AFF involving + freemailers by @twesterhever in #4304 + - Penalize bounce spam by @frederikbosch in #4308 +- Added 068714f9f5a96fbd94560211cec75775ee023d02.patch: + Official patch for the unaligned memory issue described in + https://github.com/rspamd/rspamd/issues/4329 +- Add cleanup code to the %postun scriptlet to remove bad files, + created by earlier/unpatched 3.4 versions, during package upgrade + ------------------------------------------------------------------- Wed Nov 9 01:42:46 UTC 2022 - Marcus Rueckert diff --git a/rspamd.spec b/rspamd.spec index df8f253..155ceb7 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -56,7 +56,7 @@ %endif Name: rspamd -Version: 3.3 +Version: 3.4 Release: 0 Summary: Spam filtering system License: Apache-2.0 @@ -67,6 +67,7 @@ Source1: usr.bin.rspamd Patch0: rspamd-conf.patch Patch1: rspamd-after-redis-target.patch Patch2: fix_missing_return.patch +Patch3: https://github.com/rspamd/rspamd/commit/068714f9f5a96fbd94560211cec75775ee023d02.patch %if !0%{?is_opensuse} # because 80-check-malware-scan-clamav triggered in SLE-15-SP2 BuildRequires: -post-build-checks-malwarescan @@ -292,6 +293,11 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo %if 0%{?suse_version} %postun +# +# cleanup bad unser files from earlier 3.4 builds +# see https://github.com/rspamd/rspamd/issues/4329 for the details +# +find /var/lib/rspamd/ -type f -name '*.unser' -delete ||: %if %{with systemd} %service_del_postun %{name}.service %else From 54654d69c8794273895c13d4ca6a92fea8f86903bfbe48192dd2475497eae923 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 14 Nov 2022 16:24:09 +0000 Subject: [PATCH 5/6] cleanup tarball OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=81 --- rspamd-3.3.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 rspamd-3.3.tar.gz diff --git a/rspamd-3.3.tar.gz b/rspamd-3.3.tar.gz deleted file mode 100644 index 25c7d90..0000000 --- a/rspamd-3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d6e90facd0f7705d11d5073dba22b5d6686097798178b3b3e965a989ba7be0f -size 5680874 From 47d5e0815ef29cbbc6dcf65a8227e7bb74fcbef3f8935591ec85fe85544bfb59 Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Mon, 14 Nov 2022 16:35:57 +0000 Subject: [PATCH 6/6] - Move cleanup code to %pre because otherwise it doesnt trigger early enough OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=82 --- rspamd.changes | 6 ++++++ rspamd.spec | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/rspamd.changes b/rspamd.changes index 460b3b9..ba0fa99 100644 --- a/rspamd.changes +++ b/rspamd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 14 16:35:33 UTC 2022 - Marcus Rueckert + +- Move cleanup code to %pre because otherwise it doesnt trigger + early enough + ------------------------------------------------------------------- Mon Nov 14 16:21:40 UTC 2022 - Marcus Rueckert diff --git a/rspamd.spec b/rspamd.spec index 155ceb7..0f406d5 100644 --- a/rspamd.spec +++ b/rspamd.spec @@ -274,6 +274,12 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo %pre %{_sbindir}/groupadd -r %{rspamd_group} 2>/dev/null || : %{_sbindir}/useradd -g %{rspamd_group} -c "Rmilter user" -s /bin/false -r %{rspamd_user} 2>/dev/null || : +# +# cleanup bad unser files from earlier 3.4 builds +# see https://github.com/rspamd/rspamd/issues/4329 for the details +# +echo "Cleaning up '*.unser' files in /var/lib/rspamd" +find /var/lib/rspamd/ -type f -name '*.unser' -delete -print ||: %if 0%{?suse_version} && %{with systemd} %service_add_pre %{name}.service @@ -293,11 +299,6 @@ echo "# Site-specific additions and overrides for 'usr.bin.rspamd'" > %{buildroo %if 0%{?suse_version} %postun -# -# cleanup bad unser files from earlier 3.4 builds -# see https://github.com/rspamd/rspamd/issues/4329 for the details -# -find /var/lib/rspamd/ -type f -name '*.unser' -delete ||: %if %{with systemd} %service_del_postun %{name}.service %else