From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Sat, 18 Mar 2023 13:24:19 +0000 (+0000)
Subject: [Minor] Post release fixes...
X-Git-Tag: 3.6~197
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec805f6d90dbd8de2bf5db0877040812c2aaf651;p=thirdparty%2Frspamd.git

[Minor] Post release fixes...
---

diff --git a/debian/rules b/debian/rules
index 23a9cd96d2..7ee2b37607 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,18 +14,12 @@ ENABLE_LUAJIT := -DENABLE_LUAJIT=ON -DLUA_ROOT=/luajit-build
 
 # Can be filled by a build system
 EXTRA_ARGS :=
-ENABLE_JEMALLOC := -DENABLE_JEMALLOC=OFF
+ENABLE_JEMALLOC := -DENABLE_JEMALLOC=ON
+ENABLE_HYPERSCAN := -DENABLE_HYPERSCAN=ON
 
-ifeq ($(filter $(DEB_HOST_ARCH),amd64 i386 arm64),)
 ifeq ($(filter $(DEB_HOST_ARCH),arm64),)
 	ENABLE_JEMALLOC := -DENABLE_JEMALLOC=OFF
 	ENABLE_HYPERSCAN := -DENABLE_HYPERSCAN=ON -DHYPERSCAN_ROOT_DIR=/vectorscan
-else
-	ENABLE_JEMALLOC := -DENABLE_JEMALLOC=ON
-	ENABLE_HYPERSCAN := -DENABLE_HYPERSCAN=ON
-endif
-else
-	ENABLE_HYPERSCAN := -DENABLE_HYPERSCAN=OFF
 endif
 
 %:
diff --git a/rpm/rspamd.spec b/rpm/rspamd.spec
index 1596622faa..d7f82d0eef 100644
--- a/rpm/rspamd.spec
+++ b/rpm/rspamd.spec
@@ -170,6 +170,10 @@ rm -rf %{buildroot}
 %post
 %{__chown} -R _rspamd:_rspamd %{_localstatedir}/lib/rspamd
 %{__chown} _rspamd:_rspamd %{_localstatedir}/log/rspamd
+%if 0%{?el7}
+# We need to clean old hyperscan files on upgrade: see https://github.com/rspamd/rspamd/issues/4441
+rm -f %{_localstatedir}/lib/rspamd/*.hs*
+%endif
 systemctl --no-reload preset rspamd.service >/dev/null 2>&1 || :
 
 %preun