From a227abd4b5a4bdd12bfb274fbbbecb5974a94a30 Mon Sep 17 00:00:00 2001
From: Lee Starnes <lee@canned-death.us>
Date: Sun, 15 May 2022 04:16:38 +0000
Subject: user/rspamd: 3.2

---
 user/rspamd/20-lua-cmake.patch | 39 ---------------------------------------
 user/rspamd/APKBUILD           | 11 ++++-------
 2 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 user/rspamd/20-lua-cmake.patch

(limited to 'user/rspamd')

diff --git a/user/rspamd/20-lua-cmake.patch b/user/rspamd/20-lua-cmake.patch
deleted file mode 100644
index cfd3926d6..000000000
--- a/user/rspamd/20-lua-cmake.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-rspamd's FindLua macro fails to find our lua libs and includes, but it also
-always undefines LUA_LIBRARY and LUA_INCLUDE_DIR.
-
---- a/CMakeLists.txt	2020-04-01 13:57:55.000000000 +0000
-+++ b/CMakeLists.txt	2020-08-16 05:12:50.850000000 +0000
-@@ -121,31 +121,8 @@
- 
- # Now find libraries and headers
- LIST(APPEND RSPAMD_REQUIRED_LIBRARIES "m")
--IF(ENABLE_LUAJIT MATCHES "ON")
--	#ProcessPackage(LUAJIT luajit)
--	SET(WITH_LUA 1)
--	FindLua(VERSION_MAJOR "5" VERSION_MINOR "1" ROOT "${LUA_ROOT}")
--	IF(NOT LUA_FOUND)
--		MESSAGE(FATAL_ERROR "Lua not found, lua support is required")
--	ELSE(NOT LUA_FOUND)
--		SET(WITH_LUA 1)
--		INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}")
--	ENDIF(NOT LUA_FOUND)
--ELSE(ENABLE_LUAJIT MATCHES "ON")
--	FindLua(VERSION_MAJOR "5" VERSION_MINOR "3" ROOT "${LUA_ROOT}")
--	IF(NOT LUA_FOUND)
--		FindLua(VERSION_MAJOR "5" VERSION_MINOR "2" ROOT "${LUA_ROOT}")
--		IF(NOT LUA_FOUND)
--				FindLua(VERSION_MAJOR "5" VERSION_MINOR "1" ROOT "${LUA_ROOT}")
--		ENDIF(NOT LUA_FOUND)
--	ENDIF(NOT LUA_FOUND)
--	IF(NOT LUA_FOUND)
--			MESSAGE(FATAL_ERROR "Lua not found, lua support is required")
--	ELSE(NOT LUA_FOUND)
--			SET(WITH_LUA 1)
--			INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}")
--	ENDIF(NOT LUA_FOUND)
--ENDIF(ENABLE_LUAJIT MATCHES "ON")
-+
-+INCLUDE_DIRECTORIES("${LUA_INCLUDE_DIR}")
- 
- IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE)
- 	ProcessPackage(JEMALLOC LIBRARY jemalloc_pic jemalloc INCLUDE jemalloc.h INCLUDE_SUFFIXES include/jemalloc
diff --git a/user/rspamd/APKBUILD b/user/rspamd/APKBUILD
index 71dbcb2ac..2c9699529 100644
--- a/user/rspamd/APKBUILD
+++ b/user/rspamd/APKBUILD
@@ -5,7 +5,7 @@
 # Contributor: Duncan Bellamy <dunk@denkimushi.com>
 # Maintainer: Lee Starnes <lee@canned-death.us>
 pkgname=rspamd
-pkgver=2.5
+pkgver=3.2
 pkgrel=0
 pkgdesc="Fast, free and open-source spam filtering system"
 url="https://rspamd.com/"
@@ -14,7 +14,7 @@ license="Apache-2.0 AND BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND CC0-1
 pkgusers="rspamd"
 pkggroups="rspamd"
 depends=""
-checkdepends=""
+checkdepends="luarocks"
 makedepends="
 	cmake
 	curl-dev
@@ -32,7 +32,6 @@ makedepends="
 	ragel
 	sqlite-dev
 	"
-checkdepends="luarocks"
 install="$pkgname.pre-install"
 subpackages="
 	$pkgname-doc
@@ -50,7 +49,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/rspamd/rspamd/archive/$pkgve
 	$pkgname.initd
 	$pkgname.confd
 	10-conf-split-workers.patch
-	20-lua-cmake.patch
 	"
 
 build() {
@@ -167,9 +165,8 @@ proxy() {
 	mv "$pkgdir/etc/$pkgname"/worker-proxy.* "$subpkgdir/etc/$pkgname/"
 }
 
-sha512sums="6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540  rspamd-2.5.tar.gz
+sha512sums="fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79  rspamd-3.2.tar.gz
 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb  rspamd.logrotated
 782e1126d32e450a1db0ac822c127b9a763f903093f200bdf603a6a0610a853671b94c89b0bb2d8ebdfb065e0cf62be51c1c7f451e8da34e25f252a276c2b0f3  rspamd.initd
 a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702  rspamd.confd
-a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e  10-conf-split-workers.patch
-4c124eb0e5edcdb77ae0430de193da25c418f0265251d017efaaba86d419ba3db2a10dc5205fc3ae375bf005bbeaa102fb45415c05136004b4056950e1d737b6  20-lua-cmake.patch"
+a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e  10-conf-split-workers.patch"
-- 
cgit v1.2.3-60-g2f50