main/coova-chilli: upgrade to 1.4, modernize APKBUILD

enabled miniportal
added check()
fixed confd with the right parameters
Fixes #3102

2 files changed, 21 insertions, 29 deletions

diff --git a/main/coova-chilli/APKBUILD b/main/coova-chilli/APKBUILD
index d6f4d9a06f..1ee2c94b7d 100644
--- a/main/coova-chilli/APKBUILD
+++ b/main/coova-chilli/APKBUILD
@@ -1,13 +1,12 @@
 # Contributor: grharry
 # Maintainer:
 pkgname=coova-chilli
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.4
+pkgrel=0
 pkgdesc="CoovaChilli is an open source access controller for wireless LAN"
 url="http://www.coova.org/"
 arch="all"
 license="GPL3+"
-depends=""
 makedepends="perl libressl-dev autoconf automake libtool curl-dev
 	linux-headers gengetopt-dev"
 install="$pkgname.pre-install"
@@ -20,15 +19,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/coova/coova-chilli/archive/$
 	des.patch
 	"
 options="suid"
+builddir="$srcdir/$pkgname-$pkgver"
 
-_builddir="$srcdir/$pkgname-$pkgver"
 prepare() {
-	cd $_builddir
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
+	cd $builddir
 	sed -i 's/-Werror//g' src/Makefile.am || return 1
 	sed -i 's%(localstatedir)/run%(localstatedir)%' src/Makefile.am || return 1
 	libtoolize --force \
@@ -36,7 +31,7 @@ prepare() {
 }
 
 build() {
-	cd $_builddir
+	cd $builddir
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -58,36 +53,33 @@ build() {
 		--enable-redirinject \
 		--enable-debug \
 		--enable-debug2 \
+		--enable-miniportal \
 		--enable-sessgarden \
 		--enable-shared \
 		--enable-chilliredir \
 		--enable-chilliscript \
 		--enable-layer3 \
 		--enable-dhcpopt \
-		--enable-largelimits \
-		|| return 1
+		--enable-largelimits
 	export CFLAGS="$CFLAGS -Wno-error=unused-but-set-variable"
-	make -j1 || return 1
+	make -j1
+}
+
+check() {
+	cd $builddir
+	make check
 }
 
 package() {
-	cd $_builddir
-	make DESTDIR="$pkgdir" install || return 1
-	install -D -m755 ../../chilli.initd $pkgdir/etc/init.d/chilli || return 1
-	install -D -m755 ../../chilli.confd $pkgdir/etc/conf.d/chilli || return 1
+	cd $builddir
+	make DESTDIR="$pkgdir" install
+	install -D -m755 ../../chilli.initd $pkgdir/etc/init.d/chilli
+	install -D -m755 ../../chilli.confd $pkgdir/etc/conf.d/chilli
 	mkdir -p $pkgdir/var/run/chilli
-	chown -R chilli:chilli $pkgdir/var/run/chilli
+	chown -R $pkgusers:$pkggroups $pkgdir/var/run/chilli
 }
 
-md5sums="26e02689f632ad27ad599bc0d9f5ae3d  coova-chilli-1.3.2.tar.gz
-ed92f843b016386373cf75ef103e0c52  posix-regex.patch
-f5362ff39e5f8aebded93600445b33e3  system.patch
-096390f1ad301e3e31343a060acfea9f  des.patch"
-sha256sums="dae4f91a0f735292bf65e2abd2761f83ce1c3f56286165265633fdec8e9e800e  coova-chilli-1.3.2.tar.gz
-4784df2b94fd659699f853a24ed54a74926313d02f6704f3f6d7160c210df895  posix-regex.patch
-89cae49e154e0d4990378c0a3277214a297c86df292ede146781f04f4c98caab  system.patch
-7a6e18bd1d2ee7ff391da1bf1f36c65e44aca1aeaf816a78f85783184882f83b  des.patch"
-sha512sums="03fc50c1c206419b1d785c2b23dab7ebde72e49b5656ee3be6b6110d075ebc91a832d4bdf337f8f446f3c899d75655a7503bbfd4e7aca7889cff1edde596d5ae  coova-chilli-1.3.2.tar.gz
+sha512sums="2ee31731c59af0f4282255a76ef045e9f37dc85da6d18a374154ae5cc690dc485acae2d83372bf48d9326db53292603d69b0093e845b4d08b26d2586455590c5  coova-chilli-1.4.tar.gz
 d47d176d01eda436b04700bb4404fe2a3c17e00bd8c2e4ed08149841c3e692435fee4f7dc22135d07b95556dd2f2d08b540a345bb7d5bdff3266bfcc46dcda76  posix-regex.patch
 7dbfa571f5eb7065a3a6c2f7c14e2d33cec52771e0236f29837d28cc216ca5a12eb31e1f3d3a780964c8e0f65eb057a9c040b14c65d84cd8483858f757240d6b  system.patch
 b2dce18c72808e58dd97a235191e9b843f0bfa06805b12c39488bf4464d055c0734248c89c571cc8069e0f06856f7fcf8458aac84f895da4ed2b0ceb7cbd6f82  des.patch"
diff --git a/main/coova-chilli/chilli.confd b/main/coova-chilli/chilli.confd
index b9c44e34bd..8133a04c58 100644
--- a/main/coova-chilli/chilli.confd
+++ b/main/coova-chilli/chilli.confd
@@ -1 +1 @@
-CHILLI_OPTS="--uid chilli --gid chilli"
+CHILLI_OPTS="--name chilli --group chilli"