From cbec26819a71fb3a9cf92b222c235b24b3e975d1 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 1 Oct 2020 14:11:33 +0000
Subject: [PATCH] community/rspamd to 2.6-1

---
 community/rspamd/0001-LTO-check.patch | 25 -----------------------
 community/rspamd/PKGBUILD             | 29 +++++++++++----------------
 2 files changed, 12 insertions(+), 42 deletions(-)
 delete mode 100644 community/rspamd/0001-LTO-check.patch

diff --git a/community/rspamd/0001-LTO-check.patch b/community/rspamd/0001-LTO-check.patch
deleted file mode 100644
index aeaefae18..000000000
--- a/community/rspamd/0001-LTO-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 1972a6f4ae4d718821488f45444843bfdf0c1075 Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Wed, 20 Nov 2019 17:54:49 -0700
-Subject: [PATCH] LTO check
-
----
- cmake/Toolset.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/Toolset.cmake b/cmake/Toolset.cmake
-index b6c863521..84bb07cba 100644
---- a/cmake/Toolset.cmake
-+++ b/cmake/Toolset.cmake
-@@ -149,7 +149,7 @@ elseif (CMAKE_BUILD_TYPE_UC MATCHES "RELEASE")
-         cmake_policy (SET CMP0069 NEW)
-         include (CheckIPOSupported)
-         check_ipo_supported (RESULT SUPPORT_LTO OUTPUT LTO_DIAG )
--        if (SUPPORT_LTO)
-+        if (SUPPORT_LTO AND ENABLE_OPTIMIZATION MATCHES "ON")
-             set (CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
-             message (STATUS "Enable IPO for the ${CMAKE_BUILD_TYPE} build")
-         else ()
--- 
-2.23.0
-
diff --git a/community/rspamd/PKGBUILD b/community/rspamd/PKGBUILD
index fb7b39917..7a7f56cbb 100644
--- a/community/rspamd/PKGBUILD
+++ b/community/rspamd/PKGBUILD
@@ -5,12 +5,11 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - remove dependency on hyperscan (x86 only)
-#  - set -DENABLE_HYPERSCAN=OFF, -DENABLE_OPTIMIZATION=OFF (LTO)
-#  - patch to disable LTO when ENABLE_OPTIMIZATION=OFF
+#  - set -DENABLE_HYPERSCAN=OFF, -DENABLE_LTO=OFF
 
 pkgname=rspamd
-pkgver=2.5
-pkgrel=2
+pkgver=2.6
+pkgrel=1
 epoch=
 pkgdesc='Fast, free and open-source spam filtering system'
 arch=(x86_64)
@@ -121,20 +120,17 @@ backup=(
   etc/rspamd/worker-proxy.inc
 )
 install=rspamd.install
+_tag=eec4438705135c8507a5d039126357e816eb89a9
 source=(
-  git+https://github.com/rspamd/rspamd.git#tag=61cbcd0483d271f71632e700f52fd8a19351109b
+  git+https://github.com/rspamd/rspamd.git#tag=${_tag}
   rspamd.tmpfiles
   rspamd.sysusers
   rspamd.logrotate
-  0001-LTO-check.patch
-)
-sha256sums=(
-  SKIP
-  4ee186f046d9ca22168a7e31dcf02cc7cd09ea60fb82ae60144b78fdd846a9a5
-  cd76079124ad65419d9339165ac517af6834fb507e67b45720c66246159c402b
-  91edb06d8413f5c1237a6072c576a2701e64a4d4ac30f7a2c043f639d37a532b
-  06f69a07fbb20c9eb74e356ab4658c86106b1bdd02f99536f60264b81dca1a5a
 )
+b2sums=('SKIP'
+        '6b1b4220444d382d01fe981acf51580c397363a873507fdb508fd5109adae2609c03e629ecdd6e48c13f068d0c3530be4d0fb55b3084c33522619dd29f70a40c'
+        '5b4db27d87158609519bb0e59700ac627d447e4627b70600a70638f81a39361ad416c4784dafc392e9f9bc7b69211587ae64cbab7bec98668e75df5c4fba46ea'
+        '25c2253c7ecd9fba215cb6a1df93d76fab98e98ffeec380f828d7a612a78e0c4822dacc838ca37c2ceec452e54e7fc06c4c4df3290c8a6e8ee5ae869bbbb449e')
 
 pkgver() {
   cd rspamd
@@ -146,12 +142,10 @@ prepare() {
   cd rspamd
 
   sed 's/_rspamd/rspamd/g' -i rspamd.service
-  patch -p1 -i ../0001-LTO-check.patch
 }
 
 build() {
-  cmake -S rspamd -B build \
-    -G Ninja \
+  cmake -S rspamd -B build -G Ninja \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCONFDIR=/etc/rspamd \
     -DDBDIR=/var/lib/rspamd \
@@ -162,7 +156,8 @@ build() {
     -DWANT_SYSTEMD_UNITS=ON \
     -DENABLE_HYPERSCAN=OFF \
     -DENABLE_JEMALLOC=ON \
-    -DENABLE_OPTIMIZATION=OFF
+    -DENABLE_OPTIMIZATION=ON \
+    -DENABLE_LTO=OFF
   cmake --build build
 }