|
|
@@ -1,6 +1,6 @@
|
|
|
%bcond_with systemd
|
|
|
%bcond_with jemalloc
|
|
|
-%bcond_with hyperscan
|
|
|
+%bcond_without hyperscan
|
|
|
|
|
|
%define rspamd_user _rspamd
|
|
|
%define rspamd_group %{rspamd_user}
|
|
|
@@ -14,7 +14,7 @@
|
|
|
Summary: Rapid spam filtering system
|
|
|
Name: rspamd
|
|
|
Version: 3.4
|
|
|
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
+Release: 3%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: servers
|
|
|
Vendor: Project Vine
|
|
|
Distribution: Vine Linux
|
|
|
@@ -25,6 +25,14 @@ Source0: https://github.com/rspamd/rspamd/archive/%{version}.tar.gz#/%{na
|
|
|
Source1000: rspamd.init
|
|
|
Source1001: rspamd.logrotate
|
|
|
Patch1: rspamd-3.1-32bit-noasm.patch
|
|
|
+# https://github.com/rspamd/rspamd/issues/4329
|
|
|
+# https://github.com/rspamd/rspamd/commit/068714f9f5a96fbd94560211cec75775ee023d02
|
|
|
+Patch2: rspamd-3.4-hyperscan.patch
|
|
|
+# https://github.com/rspamd/rspamd/commit/0d89d51e9f280b36554e8f9bc66217e1d6f845c4
|
|
|
+Patch3: rspamd-3.4-url.patch
|
|
|
+# https://github.com/rspamd/rspamd/issues/4337
|
|
|
+# https://github.com/rspamd/rspamd/commit/ed4f55c76d039bc728bb86128b817aeb5d8d3089
|
|
|
+Patch4: rspamd-3.4-O_CREAT.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
|
|
|
|
|
|
@@ -162,6 +170,10 @@ rm -rf %{buildroot}
|
|
|
#to allow easy upgrade from 0.8.1
|
|
|
%{__chown} -R %{rspamd_user}:%{rspamd_group} %{rspamd_home}
|
|
|
|
|
|
+if [ -d /var/lib/rspamd/ ]; then
|
|
|
+ find /var/lib/rspamd/ -name "*.unser" -delete
|
|
|
+fi
|
|
|
+
|
|
|
%if %{with systemd}
|
|
|
#Macro is not used as we want to do this on upgrade
|
|
|
#%systemd_post %{name}.service
|
|
|
@@ -262,6 +274,10 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Nov 20 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4-3
|
|
|
+- imported Patch2-4 from upstream.
|
|
|
+- enabled hyperscan.
|
|
|
+
|
|
|
* Wed Nov 02 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4-2
|
|
|
- disabled hyperscan.
|
|
|
|
