Accepting request 825867 from home:bmwiedemann:branches:server:mail

Add rspamd-gcc10-buildfix.patch for Factory build

Skip rspamd-moonjit.patch on SLE to fix build

OBS-URL: https://build.opensuse.org/request/show/825867
OBS-URL: https://build.opensuse.org/package/show/server:mail/rspamd?expand=0&rev=42

rspamd-gcc10-buildfix.patch

@@ -0,0 +1,23 @@
+commit 06c6c939ae59516a720f0cfc5a29e214b6569476
+Author: Heiko Becker <heirecka@exherbo.org>
+Date:   Sat Apr 4 00:15:28 2020 +0200
+
+    [Minor] Cherry-pick a fix for replxx to build with gcc10
+    
+    723d9c84869511dfb5e63f5c3d3372ac38114713 in replxx's git.
+    
+    Building rspamd with gcc10 errors out with "'runtime_error' is not a
+    member of 'std'" otherwise.
+
+diff --git a/contrib/replxx/src/io.cxx b/contrib/replxx/src/io.cxx
+index a09886701..8df176d1c 100644
+--- a/contrib/replxx/src/io.cxx
++++ b/contrib/replxx/src/io.cxx
+@@ -3,6 +3,7 @@
+ #include <cstdlib>
+ #include <cstring>
+ #include <array>
++#include <stdexcept>
+ 
+ #ifdef _WIN32
+ 

rspamd.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 12 03:34:28 UTC 2020 - Bernhard Wiedemann <bwiedemann@suse.com>
+
+- Add rspamd-gcc10-buildfix.patch for Factory
+- Skip rspamd-moonjit.patch on SLE to fix build
+
 -------------------------------------------------------------------
 Thu Apr 16 20:49:12 UTC 2020 - Hans-Peter Jansen <hpj@urpla.net>
 

rspamd.spec

@@ -32,8 +32,8 @@
     %bcond_without luajit
   %endif
 
-  # Tumbleweed and Leap 15.2 / SLE 15 SP2 uses moonjit:
-  %if (0%{?suse_version} > 1500) || (0%{?sle_version} >= 150200)
+  # Tumbleweed and Leap 15.2 uses moonjit:
+  %if (0%{?suse_version} > 1500) || (0%{?sle_version} >= 150200 && 0%{?is_opensuse})
     %bcond_without moonjit
   %endif
 %endif
@@ -66,6 +66,8 @@ Source0:        https://github.com/rspamd/rspamd/archive/%{version}/%{name}-%{ve
 Patch0:         rspamd-conf.patch
 Patch1:         rspamd-after-redis-target.patch
 Patch2:         rspamd-moonjit.patch
+# PATCH-FIX-UPSTREAM
+Patch3:         rspamd-gcc10-buildfix.patch
 BuildRequires:  cmake
 BuildRequires:  curl-devel
 BuildRequires:  db-devel
@@ -158,6 +160,7 @@ This package holds the client tools (rspamc and rspamadm)
 %if %{with moonjit}
 %patch2 -p1
 %endif
+%patch3 -p1
 
 %build
 %cmake                                      \