testing/litespeed: upgrade to 1.4.41 and modernize

1 files changed, 31 insertions, 32 deletions

diff --git a/testing/litespeed/APKBUILD b/testing/litespeed/APKBUILD
index 12c7ac250d..2d451740bc 100644
--- a/testing/litespeed/APKBUILD
+++ b/testing/litespeed/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Valery Kartel <valery.kartel@gmail.com>
 pkgname=litespeed
-pkgver=1.4.40
+pkgver=1.4.41
 pkgrel=0
 _pkgreal=open$pkgname
 _pkghome=var/lib/$pkgname
@@ -12,12 +12,12 @@ arch="x86 x86_64 armhf armv7"
 license="GPL-3.0"
 pkgusers=litespeed
 pkggroups=litespeed
-depends="$_php-$pkgname $_php-bcmath $_php-json $_php-mcrypt $_php-session"
+depends="$_php-$pkgname $_php-bcmath $_php-json $_php-mcrypt $_php-session $_php-sockets $_php-posix"
 depends_dev=
 makedepends="linux-headers openssl-dev geoip-dev expat-dev pcre-dev zlib-dev
 	bsd-compat-headers"
 install="$pkgname.pre-install"
-subpackages="$pkgname-snmp::noarch"
+subpackages="$pkgname-openrc $pkgname-snmp::noarch"
 source="https://openlitespeed.org/packages/openlitespeed-$pkgver.src.tgz
 	$pkgname.initd
 	include.patch
@@ -41,19 +41,18 @@ build() {
 		--with-openssl=/usr \
 		--with-expat \
 		--with-pcre \
-		--with-zlib \
-		|| return 1
-	make || return 1
+		--with-zlib
+	make
 }
 
 package() {
 	local file;
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 
 	mkdir -p "$pkgdir"/usr/lib/$pkgname \
 		"$pkgdir"/usr/sbin \
-		"$pkgdir"/var/log || return 1
+		"$pkgdir"/var/log
 
 	# remove trash
 	rm -fr "$pkgdir"/$_pkghome/php* \
@@ -66,8 +65,7 @@ package() {
 		"$pkgdir"/$_pkghome/admin/conf/php.* \
 		"$pkgdir"/$_pkghome/admin/misc/gdb-bt \
 		"$pkgdir"/$_pkghome/admin/misc/convertxml.* \
-		"$pkgdir"/$_pkghome/admin/misc/build_admin_php.sh \
-		|| return 1
+		"$pkgdir"/$_pkghome/admin/misc/build_admin_php.sh
 
 	# fix ownership
 	chown -R $pkgusers:$pkggroups \
@@ -79,55 +77,56 @@ package() {
 		"$pkgdir"/$_pkghome/admin/tmp \
 		"$pkgdir"/$_pkghome/admin/logs \
 		"$pkgdir"/$_pkghome/admin/conf \
-		"$pkgdir"/$_pkghome/Example/logs || return 1
+		"$pkgdir"/$_pkghome/admin/cgid \
+		"$pkgdir"/$_pkghome/Example/logs
 
 	# install configs
 	install -Dm755 "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
+		"$pkgdir"/etc/init.d/$pkgname
 	mv "$pkgdir"/$_pkghome/conf \
-		"$pkgdir"/etc/$pkgname || return 1
+		"$pkgdir"/etc/$pkgname
 	mv "$pkgdir"/$_pkghome/admin/conf \
-		"$pkgdir"/etc/$pkgname/admin || return 1
-	ln -s /etc/$pkgname "$pkgdir"/$_pkghome/conf || return 1
-	ln -s /etc/$pkgname/admin "$pkgdir"/$_pkghome/admin/conf || return 1
-	find "$pkgdir"/etc/$pkgname -type f -print0 | xargs -0 chmod -x || return 1
+		"$pkgdir"/etc/$pkgname/admin
+	ln -s /etc/$pkgname "$pkgdir"/$_pkghome/conf
+	ln -s /etc/$pkgname/admin "$pkgdir"/$_pkghome/admin/conf
+	find "$pkgdir"/etc/$pkgname -type f -print0 | xargs -0 chmod -x
 
 	# install binary
 	mv "$pkgdir"/$_pkghome/bin/$_pkgreal \
-		"$pkgdir"/usr/sbin/lshttpd || return 1
+		"$pkgdir"/usr/sbin/lshttpd
 	ln -sf /usr/sbin/lshttpd \
-		"$pkgdir"/$_pkghome/bin/$pkgname || return 1
+		"$pkgdir"/$_pkghome/bin/$pkgname
 
 	# install modules
 	for file in $(find "$pkgdir"/$_pkghome/modules -name "*.so"); do
-		mv $file "$pkgdir"/usr/lib/$pkgname/${file##*/} || return 1
-		ln -s /usr/lib/$pkgname/${file##*/} $file || return 1
+		mv $file "$pkgdir"/usr/lib/$pkgname/${file##*/}
+		ln -s /usr/lib/$pkgname/${file##*/} $file
 	done
 
 	# install logs
-	mv "$pkgdir"/$_pkghome/logs "$pkgdir"/var/log/$pkgname || return 1
-	mv "$pkgdir"/$_pkghome/admin/logs "$pkgdir"/var/log/$pkgname/admin || return 1
-	mv "$pkgdir"/$_pkghome/Example/logs "$pkgdir"/var/log/$pkgname/Example || return 1
-	ln -s /var/log/$pkgname "$pkgdir"/$_pkghome/logs || return 1
-	ln -s /var/log/$pkgname/admin "$pkgdir"/$_pkghome/admin/logs || return 1
-	ln -s /var/log/$pkgname/Example "$pkgdir"/$_pkghome/Example/logs || return 1
+	mv "$pkgdir"/$_pkghome/logs "$pkgdir"/var/log/$pkgname
+	mv "$pkgdir"/$_pkghome/admin/logs "$pkgdir"/var/log/$pkgname/admin
+	mv "$pkgdir"/$_pkghome/Example/logs "$pkgdir"/var/log/$pkgname/Example
+	ln -s /var/log/$pkgname "$pkgdir"/$_pkghome/logs
+	ln -s /var/log/$pkgname/admin "$pkgdir"/$_pkghome/admin/logs
+	ln -s /var/log/$pkgname/Example "$pkgdir"/$_pkghome/Example/logs
 
 	# install backend
-	ln -s /usr/bin/ls$_php "$pkgdir"/$_pkghome/fcgi-bin/ls$_php || return 1
-	ln -s /etc/$_php/php.ini "$pkgdir"/etc/$pkgname/php.ini || return 1
-	ln -s /etc/$_php/php.ini "$pkgdir"/etc/$pkgname/admin/php.ini || return 1
+	ln -s /usr/bin/ls$_php "$pkgdir"/$_pkghome/fcgi-bin/lsphp
+	ln -s /etc/$_php/php.ini "$pkgdir"/etc/$pkgname/php.ini
+	ln -s /etc/$_php/php.ini "$pkgdir"/etc/$pkgname/admin/php.ini
 }
 
 snmp() {
 	pkgdesc="$pkgdesc (snmp monitoring add-on + cacti templates)"
 	depends="$pkgname net-snmp"
 
-	mkdir -p "$subpkgdir"/$_pkghome/add-ons || return 1
+	mkdir -p "$subpkgdir"/$_pkghome/add-ons
 	mv "$pkgdir"/$_pkghome/add-ons/snmp_monitoring \
 		"$subpkgdir"/$_pkghome/add-ons
 }
 
-sha512sums="fb99beb724a8c324e37e1529267d9a5a57cb5f924896ba321f4f4781f77e18d689f6c77e162ab29951bf80633d20c867bd3453e6c61dd150b47071a92b80bd98  openlitespeed-1.4.40.src.tgz
+sha512sums="c770e46f3ad18e6e6a80164b86e00da15eaa974292e46a18a866fe5426ec6fc266b8174c437bf7c76c05df55da0c8853d3a73f39eab5a5eb42f49a7e4b41c40d  openlitespeed-1.4.41.src.tgz
 2b0299246aaeb885122d8f939437f0e4701f6a79ea976f725ba8765d8b295c2797c0cac30e639d5eda665b9589710ee55acc4d03b078c4b9cc1e564994ccb9f5  litespeed.initd
 5f45f665f8305d849ba58398700f83f4a9ded82b3b2445698ea5d12c3b7bfbb2cb55d0cfc13b6021326d140fbd84600503012e82d826f5767d8e4ee20f3ac912  include.patch
 4c8c3dc0624b7be30f25b5f25a9ab9890d6ffb101379b457e63e334cd42592eb1abef231506038ab6037040e7a98db02f00d6651547bd4a5f800c5ac671eba56  install.patch