community/rspamd: upgrade to 2.5

2 files changed, 33 insertions, 54 deletions

diff --git a/community/rspamd/APKBUILD b/community/rspamd/APKBUILD
index de8061c111..20c6741818 100644
--- a/community/rspamd/APKBUILD
+++ b/community/rspamd/APKBUILD
@@ -5,12 +5,12 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Contributor: Duncan Bellamy <dunk@denkimushi.com>
 pkgname=rspamd
-pkgver=2.4
-pkgrel=3
+pkgver=2.5
+pkgrel=0
 pkgdesc="Fast, free and open-source spam filtering system"
 url="https://rspamd.com/"
 arch="all"
-license="Apache-2.0 BSD-1-Clause BSD-2-Clause BSD-3-Clause CC0 LGPL-2.1-or-later
+license="Apache-2.0 BSD-1-Clause BSD-2-Clause BSD-3-Clause CC0-1.0 LGPL-2.1-or-later
 	LGPL-3.0-only MIT Zlib"
 pkgusers="rspamd"
 pkggroups="rspamd"
@@ -47,7 +47,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/vstakhov/rspamd/archive/$pkg
 	$pkgname.logrotated
 	$pkgname.initd
 	$pkgname.confd
-	OSDep_cmake.patch
 	conf-split-workers.patch
 	default-configs.patch
 	"
@@ -68,7 +67,7 @@ build() {
 		-DENABLE_PCRE2=ON \
 		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
 		-DCMAKE_C_FLAGS="$CFLAGS" \
-		${CMAKE_CROSSOPTS} .
+		"$CMAKE_CROSSOPTS" .
 	make
 }
 
@@ -80,42 +79,44 @@ package() {
 	make DESTDIR="$pkgdir" install
 
 	cd "$pkgdir"
-
-	find usr/bin -type l -delete
+	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-$pkgver ./usr/sbin/rspamd
-	mv ./usr/bin/rspamadm-$pkgver ./usr/bin/rspamadm
+	mv usr/bin/rspamd usr/sbin/
 
-	mkdir -p ./usr/share/doc/$pkgname
-	mv ./usr/share/$pkgname/www/README.md \
-		./usr/share/doc/$pkgname/
+	mkdir -p usr/share/doc/$pkgname
+	mv usr/share/$pkgname/www/README.md \
+		usr/share/doc/$pkgname/
 
-	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 -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
 
-	mkdir -p ./etc/$pkgname/local.d \
-		./etc/$pkgname/override.d
+	mkdir -p etc/$pkgname/local.d \
+		etc/$pkgname/override.d
 
 	install -dm 750 -o rspamd -g rspamd \
-		./var/lib/$pkgname \
-		./var/lib/$pkgname/dynamic
+		var/lib/$pkgname \
+		var/lib/$pkgname/dynamic
 	install -dm 750 -o rspamd -g rspamd \
-		./var/log/$pkgname
+		var/log/$pkgname
 }
 
 client() {
 	pkgdesc="$pkgdesc (console client)"
 
-	cd "$pkgdir"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv ./usr/bin/rspamc-$pkgver "$subpkgdir"/usr/bin/rspamc
+	amove usr/bin/rspamc
 }
 
 libs() {
 	pkgdesc="$pkgdesc (libraries)"
 
-	cd "$pkgdir"
 	amove usr/lib/$pkgname/*.so
 }
 
@@ -123,10 +124,8 @@ utils() {
 	pkgdesc="$pkgdesc (utilities)"
 	depends="perl"
 
-	cd "$pkgdir"
-	mkdir -p "$subpkgdir"/usr/bin
-	mv ./usr/bin/"$pkgname"_stats "$subpkgdir"/usr/bin/"$pkgname"-stats
-	_mv ./usr/bin/$pkgname-redirector "$subpkgdir"/usr/bin/
+	amove usr/bin/"$pkgname"-stats
+	amove usr/bin/$pkgname-redirector
 }
 
 fuzzy() {
@@ -134,9 +133,8 @@ fuzzy() {
 	license="Apache-2.0"
 	depends="$pkgname"
 
-	cd "$pkgdir"
-	_mv ./etc/$pkgname/worker-fuzzy.* "$subpkgdir"/etc/$pkgname/
-	_mv ./etc/$pkgname/modules.d/fuzzy_* "$subpkgdir"/etc/$pkgname/modules.d/
+	amove etc/$pkgname/worker-fuzzy.*
+	amove etc/$pkgname/modules.d/fuzzy_*
 }
 
 controller() {
@@ -144,9 +142,8 @@ controller() {
 	license="MIT"
 	depends="$pkgname"
 
-	cd "$pkgdir"
-	_mv ./usr/share/$pkgname/www "$subpkgdir"/usr/share/$pkgname/
-	_mv ./etc/$pkgname/worker-controller.* "$subpkgdir"/etc/$pkgname/
+	amove usr/share/$pkgname/www
+	amove etc/$pkgname/worker-controller.*
 }
 
 proxy() {
@@ -154,20 +151,12 @@ proxy() {
 	license="Apache-2.0"
 	depends="$pkgname"
 
-	cd "$pkgdir"
-	_mv ./etc/$pkgname/worker-proxy.* "$subpkgdir"/etc/$pkgname/
-}
-
-_mv() {
-	local dest; for dest; do true; done  # get last argument
-	mkdir -p "$dest"
-	mv "$@"
+	amove etc/$pkgname/worker-proxy.*
 }
 
-sha512sums="47d64fdadc1c61642efebe4772add48848a45c8106bf431dacb458d85cdd9bf996ca46bcb75d60cedb15ae72518089e9b3e63a0716d22843f5b9f38d7d86be08  rspamd-2.4.tar.gz
+sha512sums="6068309da98eeb75f95188414b12ce9443aef31200853f820646e70e1dbf2d9d1e2c661a86df2183c175cc01cfb09f6a5c7b8ba358901a56ec6cdb9d9fef4540  rspamd-2.5.tar.gz
 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb  rspamd.logrotated
 782e1126d32e450a1db0ac822c127b9a763f903093f200bdf603a6a0610a853671b94c89b0bb2d8ebdfb065e0cf62be51c1c7f451e8da34e25f252a276c2b0f3  rspamd.initd
 a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702  rspamd.confd
-f78208c06f4e7695f034b755f1e625c0600a590d4a0976e3eff9d163f98f9914a95279a765c225ec152a881533ffa39d2b1ac80afc3ceb98e1d7e2bda9c9a86d  OSDep_cmake.patch
 a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e  conf-split-workers.patch
 62a34af0eb0003c0345823689d199d192f4f7e3221fef5a2af846daf9a6f4c7c934a6b2a89b472ba88f3a371a51b9794901e1dbe871f762c791a257cb7bb6858  default-configs.patch"
diff --git a/community/rspamd/OSDep_cmake.patch b/community/rspamd/OSDep_cmake.patch
deleted file mode 100644
index f551fca910..0000000000
--- a/community/rspamd/OSDep_cmake.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cmake/OSDep.cmake
-+++ b/cmake/OSDep.cmake
-@@ -65,7 +65,6 @@
-     LIST(APPEND CMAKE_REQUIRED_LIBRARIES rt)
-     LIST(APPEND CMAKE_REQUIRED_LIBRARIES dl)
-     LIST(APPEND CMAKE_REQUIRED_LIBRARIES resolv)
--    LIST(APPEND CMAKE_REQUIRED_LIBRARIES nsl)
-     LIST(APPEND CMAKE_REQUIRED_LIBRARIES socket)
-     LIST(APPEND CMAKE_REQUIRED_LIBRARIES umem)
-     # Ugly hack, but FindOpenSSL on Solaris does not link with libcrypto