Accepting request 1074269 from server:mail
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/1074269 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rspamd?expand=0&rev=14
This commit is contained in:
@@ -1,32 +0,0 @@
|
|||||||
From 068714f9f5a96fbd94560211cec75775ee023d02 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Vsevolod Stakhov <vsevolod@rspamd.com>
|
|
||||||
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 });
|
|
||||||
}
|
|
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:f8d3e2b9a1a6ed6521c60fe505e97086624407f67366f0ce882eee433a53c355
|
|
||||||
size 5689732
|
|
3
rspamd-3.5.tar.gz
Normal file
3
rspamd-3.5.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:2d6bd94942acdd3203cf31ef023eb2356c74d5f0e834b7a0e2017004d4ad5938
|
||||||
|
size 5806722
|
@@ -1,3 +1,67 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 17 21:53:38 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>
|
||||||
|
|
||||||
|
- Enable more features
|
||||||
|
- Enable nice stacktraces for crashes. New BR: libunwind-devel
|
||||||
|
- use system xxhash: New BR: xxhash-devel
|
||||||
|
- enable blas/lapack support for the neural network processing
|
||||||
|
New BR: lapack-devel, libopenblas_openmp-devel, openblas-common-devel
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 17 21:21:47 UTC 2023 - Marcus Rueckert <mrueckert@suse.de>
|
||||||
|
|
||||||
|
- Update to 3.5
|
||||||
|
- [Test] Remove test case with non-deterministic result by
|
||||||
|
@arkamar in #4323
|
||||||
|
- [WebUI] Add legacy history version badge by @moisseev in #4326
|
||||||
|
- [Feature] Enable Mime part filters on antivirus module by
|
||||||
|
@jonmoesli in #4328
|
||||||
|
- [Test] Use TMPDIR if available by @arkamar in #4327
|
||||||
|
- metadata_exporter http pusher: Extend valid return codes by
|
||||||
|
@yo000 in #4334
|
||||||
|
- [Minor] debian package: disable luajit on arm64 by @fatalbanana
|
||||||
|
in #4335
|
||||||
|
- Support external maps in Rspamd by @vstakhov in #4324
|
||||||
|
- [Fix] Return true from has_urls(true) if only emails are
|
||||||
|
present by @cpragadeesh in #4365
|
||||||
|
- [Fix] received: filtering of artificial header by @kakochang in
|
||||||
|
#4367
|
||||||
|
- [Fix] Replace broken strict_domains with phishing_exceptions by
|
||||||
|
@dupondje in #4376
|
||||||
|
- Fix build with gcc 13 by including by @heirecka in #4375
|
||||||
|
- rspamc: add -R option for human readable report by @amishmm in
|
||||||
|
#4377
|
||||||
|
- rspamc: optimize indentation condition by @amishmm in #4381
|
||||||
|
- Set required_score = reject score and minor change to the
|
||||||
|
report by @amishmm in #4383
|
||||||
|
- conf/modules.d/arc.conf: fix parameter name by @jendis in #4387
|
||||||
|
- Fixes to support global lua maps in user settings by @dpetrov67
|
||||||
|
in #4393
|
||||||
|
- [Enhancement] Make Google URL redirection rules productive by
|
||||||
|
@twesterhever in #4399
|
||||||
|
- [Enhancement] Add rule to detect Google Firebase URLs by
|
||||||
|
@twesterhever in #4401
|
||||||
|
- [Minor] Assorted cleanup and housekeeping of configuration
|
||||||
|
files by @twesterhever in #4397
|
||||||
|
- addition: add Betterbird to user_agent_thunderbird by
|
||||||
|
@georglauterbach in #4404
|
||||||
|
- [Minor] Replace "Spamhaus XBL any" hack with a more clear
|
||||||
|
solution by @twesterhever in #4398
|
||||||
|
- [Enhancement] Add IPFS URL heuristic by @twesterhever in #4310
|
||||||
|
- Checking for redirector url in mail by @korgoth1 in #4351
|
||||||
|
- fix incorrect asn references in bimi.conf by @mta59066 in #4410
|
||||||
|
- [Minor] Account for one more undisclosed-recipients address
|
||||||
|
variant by @citrin in #4413
|
||||||
|
- Fix for x-rspamd-action in Milter headers module by @nishils in
|
||||||
|
#4416
|
||||||
|
- [WebUI] Update JS libraries by @moisseev in #4414
|
||||||
|
- [WebUI] Update bootstrap by @moisseev in #4420
|
||||||
|
- [Minor] remove check for sys/cdefs.h in CMakelists.txt by
|
||||||
|
@a16bitsysop in #4430
|
||||||
|
- [Minor] Fix some compiler warnings by @a16bitsysop in #4436
|
||||||
|
- Drop 068714f9f5a96fbd94560211cec75775ee023d02.patch:
|
||||||
|
- this drops the rspamd-director binary
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Jan 25 11:11:42 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
|
Wed Jan 25 11:11:42 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
|
||||||
|
|
||||||
|
17
rspamd.spec
17
rspamd.spec
@@ -56,7 +56,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: rspamd
|
Name: rspamd
|
||||||
Version: 3.4
|
Version: 3.5
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Spam filtering system
|
Summary: Spam filtering system
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@@ -67,7 +67,6 @@ Source1: usr.bin.rspamd
|
|||||||
Patch0: rspamd-conf.patch
|
Patch0: rspamd-conf.patch
|
||||||
Patch1: rspamd-after-redis-target.patch
|
Patch1: rspamd-after-redis-target.patch
|
||||||
Patch2: fix_missing_return.patch
|
Patch2: fix_missing_return.patch
|
||||||
Patch3: https://github.com/rspamd/rspamd/commit/068714f9f5a96fbd94560211cec75775ee023d02.patch
|
|
||||||
%if !0%{?is_opensuse}
|
%if !0%{?is_opensuse}
|
||||||
# because 80-check-malware-scan-clamav triggered in SLE-15-SP2
|
# because 80-check-malware-scan-clamav triggered in SLE-15-SP2
|
||||||
BuildRequires: -post-build-checks-malwarescan
|
BuildRequires: -post-build-checks-malwarescan
|
||||||
@@ -113,8 +112,11 @@ BuildRequires: pkgconfig(sqlite3)
|
|||||||
BuildRequires: pkgconfig(systemd)
|
BuildRequires: pkgconfig(systemd)
|
||||||
%{?systemd_ordering}
|
%{?systemd_ordering}
|
||||||
%endif
|
%endif
|
||||||
|
BuildRequires: lapack-devel
|
||||||
|
BuildRequires: pkgconfig(libunwind)
|
||||||
|
BuildRequires: pkgconfig(libxxhash)
|
||||||
BuildRequires: pkgconfig(libzstd)
|
BuildRequires: pkgconfig(libzstd)
|
||||||
|
BuildRequires: pkgconfig(openblas)
|
||||||
%if 0%{?suse_version} >= 1550
|
%if 0%{?suse_version} >= 1550
|
||||||
Requires: lua54-lpeg
|
Requires: lua54-lpeg
|
||||||
%else
|
%else
|
||||||
@@ -173,6 +175,11 @@ export CC="gcc-%{?force_gcc_version}"
|
|||||||
export CXX="g++-%{?force_gcc_version}"
|
export CXX="g++-%{?force_gcc_version}"
|
||||||
%endif
|
%endif
|
||||||
%cmake \
|
%cmake \
|
||||||
|
%if 0%{?force_gcc_version}
|
||||||
|
-DCMAKE_ASM_COMPILER="gcc-%{?force_gcc_version}" \
|
||||||
|
%else
|
||||||
|
-DCMAKE_ASM_COMPILER="gcc" \
|
||||||
|
%endif
|
||||||
%if 0%{suse_version} == 1315
|
%if 0%{suse_version} == 1315
|
||||||
-DCMAKE_USER_MAKE_RULES_OVERRIDE="" \
|
-DCMAKE_USER_MAKE_RULES_OVERRIDE="" \
|
||||||
%endif
|
%endif
|
||||||
@@ -194,6 +201,9 @@ export CXX="g++-%{?force_gcc_version}"
|
|||||||
-DENABLE_OPTIMIZATION=ON \
|
-DENABLE_OPTIMIZATION=ON \
|
||||||
%endif
|
%endif
|
||||||
-DENABLE_REDIRECTOR=ON \
|
-DENABLE_REDIRECTOR=ON \
|
||||||
|
-DENABLE_LIBUNWIND:BOOL=ON \
|
||||||
|
-DENABLE_BLAS:BOOL=ON \
|
||||||
|
-DSYSTEM_XXHASH:BOOL=ON \
|
||||||
-DCMAKE_SKIP_INSTALL_RPATH=ON \
|
-DCMAKE_SKIP_INSTALL_RPATH=ON \
|
||||||
-DCMAKE_SKIP_RPATH=OFF \
|
-DCMAKE_SKIP_RPATH=OFF \
|
||||||
%if %{with luajit}
|
%if %{with luajit}
|
||||||
@@ -311,7 +321,6 @@ find /var/lib/rspamd/ -type f -name '*.unser' -delete -print ||:
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_sbindir}/rc%{name}
|
%{_sbindir}/rc%{name}
|
||||||
%{_bindir}/rspamd
|
%{_bindir}/rspamd
|
||||||
%{_bindir}/rspamd-redirector
|
|
||||||
%{_bindir}/rspamd_stats
|
%{_bindir}/rspamd_stats
|
||||||
%{_libdir}/librspamd-actrie.so
|
%{_libdir}/librspamd-actrie.so
|
||||||
%{_libdir}/librspamd-server.so
|
%{_libdir}/librspamd-server.so
|
||||||
|
Reference in New Issue
Block a user