rspamd: upgrade to 3.9.1

This commit is contained in:
Raven 2024-08-25 08:53:26 +06:00
parent d9a8215a96
commit a3f4811e5d
3 changed files with 30 additions and 12 deletions

View File

@ -0,0 +1,12 @@
diff -Naur a/conf/lang_detection.inc b/conf/lang_detection.inc
--- a/conf/lang_detection.inc 2024-07-23 16:37:27.000000000 +0600
+++ b/conf/lang_detection.inc 2024-08-19 09:35:00.113184366 +0600
@@ -21,7 +21,7 @@
# languages_disable = ["fr", "es"]
# Use the following fasttext model for language detection (if Fasttext support is compiled in)
-# fasttext_model = "${SHAREDIR}/languages/fasttext_model.ftz"
+# fasttext_model = "${SHAREDIR}/fasttext_model.ftz"
# Prefer fasttext over all other methods
# prefer_fasttext = true;

BIN
base/rspamd/lid.176.ftz Normal file

Binary file not shown.

View File

@ -21,18 +21,18 @@
%undefine __cmake_in_source_build
%endif
Name: rspamd
Conflicts: rspamd-asan
Provides: rspamd
Version: 3.8.4
Version: 3.9.1
Release: 1%{?dist}
Summary: Rapid spam filtering system
Group: System Environment/Daemons
License: Apache-2.0
URL: https://rspamd.com
Source0: https://github.com/rspamd/rspamd/archive/%{version}/rspamd-%{version}.tar.gz
Source0: https://github.com/rspamd/rspamd/archive/refs/tags/%{version}.tar.gz#/rspamd-%{version}.tar.gz
Source1: %{name}.logrotate
Source2: 80-rspamd.preset
Source3: %{name}.init
@ -41,6 +41,7 @@ Source4: LuaJIT-2.1.ROLLING.tar.gz
%endif
# https://github.com/rspamd/fastText.git
Source5: fasttext.tar.gz
Source6: lid.176.ftz
%if 0%{?rhel} == 6
# revert usage of g_abort() back to abort()
@ -49,6 +50,9 @@ Patch0: rspamd-get-rid-of-g_abort.patch
Patch1: rspamd-define-static_assert.patch
%endif
%if %{with fasttext}
Patch2: fix-fasttext-model-path.patch
%endif
%if 0%{?rhel} == 7
BuildRequires: cmake3 >= 3.12
@ -68,6 +72,7 @@ BuildRequires: file-devel
BuildRequires: lapack-devel
BuildRequires: pkgconfig(icu-i18n)
BuildRequires: pkgconfig(libsodium)
BuildRequires: pkgconfig(libarchive) >= 3.0
%ifarch x86_64
@ -217,19 +222,20 @@ export LDFLAGS="$LDFLAGS -Wl,-rpath=%{_libdir}/rspamd/fasttext"
%if %{with fasttext}
mkdir -p %{buildroot}%{_libdir}/rspamd/fasttext
cp %{_builddir}/fasttext-bin/lib/libfasttext.so.0 %{buildroot}%{_libdir}/rspamd/fasttext/
install -m 0644 %{SOURCE6} %{buildroot}%{_datadir}/%{name}/fasttext_model.ftz
%endif
%{__install} -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/rspamd
install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/rspamd
%if 0%{?rhel} >= 7
%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_presetdir}/80-rspamd.preset
install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_presetdir}/80-rspamd.preset
%endif
%{__install} -d -p -m 0755 %{buildroot}%{_localstatedir}/log/rspamd
%{__install} -d -p -m 0755 %{buildroot}%{_localstatedir}/lib/rspamd
%{__install} -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/rspamd/local.d/
%{__install} -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/rspamd/override.d/
install -d -p -m 0755 %{buildroot}%{_localstatedir}/log/rspamd
install -d -p -m 0755 %{buildroot}%{_localstatedir}/lib/rspamd
install -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/rspamd/local.d/
install -p -D -d -m 0755 %{buildroot}%{_sysconfdir}/rspamd/override.d/
%if 0%{?rhel} < 7
%{__install} -p -D -m 0755 %{SOURCE3} %{buildroot}%{_initrddir}/%{name}
%{__install} -d -p -m 0755 %{buildroot}%{_localstatedir}/run/rspamd
install -p -D -m 0755 %{SOURCE3} %{buildroot}%{_initrddir}/%{name}
install -d -p -m 0755 %{buildroot}%{_localstatedir}/run/rspamd
%endif
%clean
@ -319,4 +325,4 @@ fi
- update to 3.7.4
* Tue Oct 3 2023 Raven <raven@sysadmins.ws> - 3.6-1
- initial build
- initial build