From 43c174a45476f06f229405d35f5f25f4f052fb9d Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 30 May 2024 17:46:30 -0500
Subject: user/rspamd: Update to 3.8.4

---
 user/rspamd/10-conf-split-workers.patch |  2 +-
 user/rspamd/APKBUILD                    | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'user/rspamd')

diff --git a/user/rspamd/10-conf-split-workers.patch b/user/rspamd/10-conf-split-workers.patch
index 505d2c72e..be8f073e4 100644
--- a/user/rspamd/10-conf-split-workers.patch
+++ b/user/rspamd/10-conf-split-workers.patch
@@ -36,7 +36,7 @@ upgrading the aport!
 -
 -worker "fuzzy" {
 -    bind_socket = "localhost:11335";
--    count = -1; # Disable by default
+-    count = -1; # Disable by default, see #4677 for details
 -    .include "$CONFDIR/worker-fuzzy.inc"
 -    .include(try=true; priority=1,duplicate=merge) "$LOCAL_CONFDIR/local.d/worker-fuzzy.inc"
 -    .include(try=true; priority=10) "$LOCAL_CONFDIR/override.d/worker-fuzzy.inc"
diff --git a/user/rspamd/APKBUILD b/user/rspamd/APKBUILD
index 2c9699529..a54dba858 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=3.2
+pkgver=3.8.4
 pkgrel=0
 pkgdesc="Fast, free and open-source spam filtering system"
 url="https://rspamd.com/"
@@ -22,6 +22,7 @@ makedepends="
 	glib-dev
 	icu-dev
 	libevent-dev
+	libexecinfo-dev
 	libgd-dev
 	libsodium-dev
 	lua5.3
@@ -31,6 +32,7 @@ makedepends="
 	perl
 	ragel
 	sqlite-dev
+	zstd-dev
 	"
 install="$pkgname.pre-install"
 subpackages="
@@ -55,7 +57,7 @@ build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake -B build \
+	LDFLAGS="-lexecinfo" cmake -B build \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCONFDIR=/etc/$pkgname \
@@ -67,7 +69,9 @@ build() {
 		-DLUA_LIBRARY=/usr/lib/lua5.3/liblua.so \
 		-DENABLE_REDIRECTOR=ON \
 		-DENABLE_URL_INCLUDE=ON \
+		-DENABLE_BACKWARD=OFF \
 		-DENABLE_PCRE2=ON \
+		-DSYSTEM_ZSTD=ON \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		"$CMAKE_CROSSOPTS" .
@@ -132,7 +136,6 @@ utils() {
 
 	mkdir -p "$subpkgdir/usr/bin"
 	mv "$pkgdir/usr/bin/${pkgname}-stats" "$subpkgdir/usr/bin/"
-	mv "$pkgdir/usr/bin/${pkgname}-redirector" "$subpkgdir/usr/bin/"
 }
 
 fuzzy() {
@@ -165,8 +168,8 @@ proxy() {
 	mv "$pkgdir/etc/$pkgname"/worker-proxy.* "$subpkgdir/etc/$pkgname/"
 }
 
-sha512sums="fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79  rspamd-3.2.tar.gz
+sha512sums="dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51  rspamd-3.8.4.tar.gz
 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb  rspamd.logrotated
 782e1126d32e450a1db0ac822c127b9a763f903093f200bdf603a6a0610a853671b94c89b0bb2d8ebdfb065e0cf62be51c1c7f451e8da34e25f252a276c2b0f3  rspamd.initd
 a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702  rspamd.confd
-a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e  10-conf-split-workers.patch"
+0321c76b42131943f7b53efeb6bbd1c5b732fdec4f796838568af45d245066518f8b2ccd667d5a370df539ba73dda47e66d4ce0eeb211ef6fc5942e96c2e311b  10-conf-split-workers.patch"
-- 
cgit v1.2.3-70-g09d2