3 files changed, 34 insertions, 64 deletions
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..e4d36f982 100644
--- a/user/rspamd/APKBUILD
+++ b/user/rspamd/APKBUILD
@@ -5,11 +5,12 @@
 # Contributor: Duncan Bellamy <dunk@denkimushi.com>
 # Maintainer: Lee Starnes <lee@canned-death.us>
 pkgname=rspamd
-pkgver=3.2
+pkgver=3.11.1
 pkgrel=0
 pkgdesc="Fast, free and open-source spam filtering system"
 url="https://rspamd.com/"
 arch="all"
+options="!check" # Tests require LuaJIT's ffi module
 license="Apache-2.0 AND BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND LGPL-2.1+ AND LGPL-3.0-only AND MIT AND Zlib"
 pkgusers="rspamd"
 pkggroups="rspamd"
@@ -21,7 +22,9 @@ makedepends="
 	file-dev
 	glib-dev
 	icu-dev
+	libarchive-dev
 	libevent-dev
+	libexecinfo-dev
 	libgd-dev
 	libsodium-dev
 	lua5.3
@@ -31,6 +34,7 @@ makedepends="
 	perl
 	ragel
 	sqlite-dev
+	zstd-dev
 	"
 install="$pkgname.pre-install"
 subpackages="
@@ -38,24 +42,29 @@ subpackages="
 	$pkgname-client
 	$pkgname-libs
 	$pkgname-utils::noarch
-	$pkgname-controller::noarch
-	$pkgname-fuzzy::noarch
-	$pkgname-proxy::noarch
 	$pkgname-openrc
 	$pkgname-dbg
 	"
+ldpath="/usr/lib/rspamd"
 source="$pkgname-$pkgver.tar.gz::https://github.com/rspamd/rspamd/archive/$pkgver.tar.gz
 	$pkgname.logrotated
 	$pkgname.initd
 	$pkgname.confd
-	10-conf-split-workers.patch
 	"
 
+provides="
+	rspamd-controller=$pkgver-r$pkgrel
+	rspamd-fuzzy=$pkgver-r$pkgrel
+	rspamd-proxy=$pkgver-r$pkgrel
+	"
+
+replaces="rspamd-controller rspamd-fuzzy rspamd-proxy"
+
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake -B build \
+	LDFLAGS="$LDFLAGS -lexecinfo" cmake -B build \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCONFDIR=/etc/$pkgname \
@@ -65,41 +74,34 @@ build() {
 		-DENABLE_LUAJIT=OFF \
 		-DLUA_INCLUDE_DIR=/usr/include/lua5.3 \
 		-DLUA_LIBRARY=/usr/lib/lua5.3/liblua.so \
-		-DENABLE_REDIRECTOR=ON \
 		-DENABLE_URL_INCLUDE=ON \
+		-DENABLE_BACKWARD=OFF \
 		-DENABLE_PCRE2=ON \
+		-DENABLE_URL_INCLUDE=ON \
+		-DSYSTEM_ZSTD=ON \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
 		"$CMAKE_CROSSOPTS" .
-	make -C build
+	cmake --build build --target all
 }
 
 check() {
-	make -C build rspamd-test
+	cmake --build build --target run-test
 }
 
 package() {
-	make -C build DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" cmake --install build
 
 	cd "$pkgdir"
-	local path=usr/bin
-	for b in rspamd rspamc rspamadm;
-	do
-		rm "$path"/$b
-		mv "$path"/$b-$pkgver "$path"/$b
-	done
 
-	mv "$path"/rspamd_stats "$path"/rspamd-stats
-	mkdir -p ./usr/sbin
-	mv usr/bin/rspamd usr/sbin/
-
-	mkdir -p usr/share/doc/$pkgname
-	mv usr/share/$pkgname/www/README.md \
-		usr/share/doc/$pkgname/
+	install -D usr/share/"$pkgname"/www/README.md \
+		usr/share/doc/"$pkgname"/README.md
+	rm usr/share/"$pkgname"/www/README.md
 
 	install -Dm 644 "$srcdir"/$pkgname.logrotated etc/logrotate.d/$pkgname
 	install -Dm 755 "$srcdir"/$pkgname.initd etc/init.d/$pkgname
 	install -Dm 644 "$srcdir"/$pkgname.confd etc/conf.d/$pkgname
+	install -d etc/"$pkgname"/local.d etc/"$pkgname"/override.d
 
 	mkdir -p etc/$pkgname/local.d \
 		etc/$pkgname/override.d
@@ -116,14 +118,14 @@ client() {
 	pkgdesc="$pkgdesc (console client)"
 
 	mkdir -p "$subpkgdir/usr/bin"
-	mv "$pkgdir/usr/bin/rspamc" "$subpkgdir/usr/bin/rspamc"
+	mv "$pkgdir"/usr/bin/rspamc* "$subpkgdir/usr/bin/"
 }
 
 libs() {
 	pkgdesc="$pkgdesc (libraries)"
 
-	mkdir -p "$subpkgdir/usr/lib/$subpkgname"
-	mv "$pkgdir/usr/lib/$pkgname/"*.so "$subpkgdir/usr/lib/$subpkgname/"
+	mkdir -p "$subpkgdir/usr/lib/$pkgname"
+	mv "$pkgdir/usr/lib/$pkgname/"*.so "$subpkgdir/usr/lib/$pkgname/"
 }
 
 utils() {
@@ -131,42 +133,10 @@ utils() {
 	depends="perl"
 
 	mkdir -p "$subpkgdir/usr/bin"
-	mv "$pkgdir/usr/bin/${pkgname}-stats" "$subpkgdir/usr/bin/"
-	mv "$pkgdir/usr/bin/${pkgname}-redirector" "$subpkgdir/usr/bin/"
-}
-
-fuzzy() {
-	pkgdesc="$pkgdesc (local fuzzy storage)"
-	license="Apache-2.0"
-	depends="$pkgname"
-
-	mkdir -p "$subpkgdir/etc/$pkgname/modules.d"
-	mv "$pkgdir/etc/$pkgname"/worker-fuzzy.* "$subpkgdir/etc/$pkgname/"
-	mv "$pkgdir/etc/$pkgname"/modules.d/fuzzy_* "$subpkgdir/etc/$pkgname/modules.d/"
-}
-
-controller() {
-	pkgdesc="$pkgdesc (controller web interface)"
-	license="MIT"
-	depends="$pkgname"
-
-	mkdir -p "$subpkgdir/usr/share/$pkgname"
-	mv "$pkgdir/usr/share/$pkgname/www" "$subpkgdir/usr/share/$pkgname/www"
-	mkdir -p "$subpkgdir/etc/$pkgname"
-	mv "$pkgdir/etc/$pkgname"/worker-controller.* "$subpkgdir/etc/$pkgname/"
-}
-
-proxy() {
-	pkgdesc="$pkgdesc (milter support)"
-	license="Apache-2.0"
-	depends="$pkgname"
-
-	mkdir -p "$subpkgdir/etc/$pkgname"
-	mv "$pkgdir/etc/$pkgname"/worker-proxy.* "$subpkgdir/etc/$pkgname/"
+	mv "$pkgdir/usr/bin/${pkgname}"_stats "$subpkgdir/usr/bin/"
 }
 
-sha512sums="fd3570da24d7f09f48ba6e98c210789b85006c51adaf37336c83a570ef5b9239d4a09491b647464254d3600fbea7c662ec271e9a77ee4108236962490c677a79  rspamd-3.2.tar.gz
+sha512sums="979aad9d2cc720c12922d55f4ad742b65e18d0ca52ebb764a2432bd3d64e559461c8e1fa87f7ac52e614df71d0a776aa0362a876eaa745cd3f8c21afee52b8ab  rspamd-3.11.1.tar.gz
 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb  rspamd.logrotated
-782e1126d32e450a1db0ac822c127b9a763f903093f200bdf603a6a0610a853671b94c89b0bb2d8ebdfb065e0cf62be51c1c7f451e8da34e25f252a276c2b0f3  rspamd.initd
-a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702  rspamd.confd
-a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e  10-conf-split-workers.patch"
+c136126e3d3953079939b2b0b9b49f5f921af4c3aa0ad59a206632436ff963a69b5980a3b8e4eb14882d8db31d6fd96045a9e1cd6302ad111d76b8e92fab890e  rspamd.initd
+a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702  rspamd.confd"
diff --git a/user/rspamd/rspamd.initd b/user/rspamd/rspamd.initd
index aaa40428b..cf0ea79ab 100644
--- a/user/rspamd/rspamd.initd
+++ b/user/rspamd/rspamd.initd
@@ -13,7 +13,7 @@ description_reopen="Reopen log files"
 : ${cfgfile:=${RSPAMD_CONFIG:-/etc/rspamd/rspamd.conf}}
 : ${startuplog:=${RSPAMD_STARTUPLOG:-/dev/null}}
 
-command="/usr/sbin/rspamd"
+command="/usr/bin/rspamd"
 command_args="--config $cfgfile --no-fork ${command_args:-}"
 command_background="yes"
 pidfile="/run/rspamd/$RC_SVCNAME.pid"