[Minor] Post release fixes...

diff --git a/debian/rules b/debian/rules
index 23a9cd96d2161851fa3fbaa7a92a6bfba467c570..7ee2b37607ff349e5958c8fad84d44e756ece5f3 100755 (executable)
--- 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 1596622faaba75b12a6433178035b646668a08be..d7f82d0eefb8a9bd8e025438f94b8e58ea4c6864 100644 (file)
--- 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