瀏覽代碼

rspamd-3.0-3

Tomohiro "Tomo-p" KATO 2 年之前
父節點
當前提交
68915e4af7
共有 1 個文件被更改,包括 20 次插入5 次删除
  1. 20 5
      r/rspamd/rspamd-vl.spec

+ 20 - 5
r/rspamd/rspamd-vl.spec

@@ -1,4 +1,5 @@
 %bcond_with systemd
+%bcond_with jemalloc
 
 %define rspamd_user      _rspamd
 %define rspamd_group     %{rspamd_user}
@@ -12,7 +13,7 @@
 Summary:        Rapid spam filtering system
 Name:           rspamd
 Version:        3.0
-Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Release:        3%{?_dist_release}%{?with_systemd:.systemd}
 Group:          servers
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -24,6 +25,7 @@ Patch0:         rspamd-3.0-lua54.patch
 # to build with glibc-2.34+
 # https://github.com/onqtam/doctest/commit/099d5414e97244ec44cf46b14cd176b3a3dc52e3
 Patch1:         doctest-SIGSTKSZ.patch
+Patch2:         rspamd-openssl3.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
 
@@ -34,6 +36,9 @@ BuildRequires:  gmime-devel
 %ifarch x86_64
 BuildRequires:  hyperscan-devel
 %endif
+%if %{with jemalloc}
+BuildRequires:  jemalloc-devel
+%endif
 BuildRequires:  libevent-devel
 BuildRequires:  libicu-devel
 BuildRequires:  libsodium-devel
@@ -76,11 +81,11 @@ lua.
 pushd contrib/doctest
 %patch1 -p1
 popd
+%patch2 -p1
 
 
 %build
-%{__cmake} \
-		-DCMAKE_C_OPT_FLAGS="%{optflags}" \
+%cmake \
         -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DCONFDIR=%{_sysconfdir}/rspamd \
         -DINCLUDEDIR=%{_includedir} \
@@ -108,15 +113,18 @@ popd
         -DENABLE_LIBUNWIND=ON \
         -DENABLE_LUAJIT=OFF \
         -DENABLE_PCRE2=ON \
+%if %{with jemalloc}
+        -DENABLE_JEMALLOC=ON \
+%endif
         %nil
 
         #-DCMAKE_SKIP_INSTALL_RPATH=ON \
 
-%{__make} %{?_smp_mflags}
+%cmake_build
 
 
 %install
-%{__make} install DESTDIR=%{buildroot} INSTALLDIRS=vendor
+%cmake_install INSTALLDIRS=vendor
 
 pushd ./centos/sources/
 
@@ -250,6 +258,13 @@ fi
 
 
 %changelog
+* Sat Oct 16 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0-3
+- disabled jemalloc as default: SIGSEGV was occured.
+
+* Sat Oct 16 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0-2
+- added Patch2 to build with openssl-3.0.0.
+- built with jemalloc.
+
 * Thu Aug 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0-1
 - new upstream release.
 - updated Patch0.