testing/aconf: upgrade to 0.4.0 (formerly acf2)

3 files changed, 78 insertions, 64 deletions

diff --git a/testing/acf2/APKBUILD b/testing/acf2/APKBUILD
deleted file mode 100644
index 3fb2b3789c..0000000000
--- a/testing/acf2/APKBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-# Maintainer:
-pkgname=acf2
-pkgver=0.3.0
-pkgrel=0
-pkgdesc="Alpine Configuration Framework, 2nd generation"
-url="http://git.alpinelinux.org/cgit/kunkku/acf2/"
-arch="noarch"
-license="BSD"
-depends="lua5.2-augeas lua5.2-b64 lua5.2-cjson lua5.2-crypto \
-         lua5.2-file-magic lua5.2-openrc lua5.2-posix lua5.2-stringy uwsgi \
-         uwsgi-lua"
-makedepends=""
-source="${url}snapshot/${pkgname}-${pkgver}.tar.bz2 $pkgname.initd"
-
-_modules="network openssh"
-subpackages=""
-for _m in $_modules; do
-	subpackages="$subpackages acf2-mod-$_m:_$_m"
-done
-
-_builddir=$srcdir/$pkgname-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
-build() {
-	return 0
-}
-
-package() {
-	cd "$_builddir"
-	make ROOT_DIR=$pkgdir install || return 1
-	install -m755 -D "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname || return 1
-}
-
-_moddir=usr/share/lua/5.2/acf2/modules
-_module() {
-	depends=$pkgname
-	mkdir -p "$subpkgdir/$_moddir"
-	mv "$pkgdir/$_moddir/$1.lua" "$subpkgdir/$_moddir" || return 1
-}
-
-for _m in $_modules; do
-	eval "_$_m() { _module $_m; }"
-done
-
-md5sums="3cf9af77ca0a10f831df5376980be6c7  acf2-0.3.0.tar.bz2
-23fd4825db4365e646dbbf7a235db5f5  acf2.initd"
-sha256sums="e856d977d337afc8a5190eff49e8fabd106b2a083127d8c7fa263b6f9e570156  acf2-0.3.0.tar.bz2
-c1fa434a9b75ea10e9d0c3d48ec27c4dff2613e413d154486122ce9c1f011e23  acf2.initd"
-sha512sums="bbe33aaa9b663142ca65020e3109db1caae6a8f3466b8c5b5c9b9a41b7ba6182b2bbae32a1206bcfcfa2bbffcfadead9cfe6a4b86c9ccb9a881b4581f16153be  acf2-0.3.0.tar.bz2
-6db21a9a4aa83c9ad75d1cf026d7e270ef38dce43a5aa340b61c149eb261e5bc587a282566fedc0cf96044425f49448eba8f37e1a7be96cda1a8369c2d831ada  acf2.initd"
diff --git a/testing/aconf/APKBUILD b/testing/aconf/APKBUILD
new file mode 100644
index 0000000000..a2a9a88344
--- /dev/null
+++ b/testing/aconf/APKBUILD
@@ -0,0 +1,74 @@
+# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Maintainer:
+pkgname=aconf
+pkgver=0.4.0
+pkgrel=0
+pkgdesc="Alpine Configurator"
+url="http://git.alpinelinux.org/cgit/kunkku/aconf/"
+arch="noarch"
+license="BSD"
+depends="lua5.2-augeas lua5.2-b64 lua5.2-cjson lua5.2-crypto \
+         lua5.2-file-magic lua5.2-openrc lua5.2-posix lua5.2-stringy uwsgi \
+         uwsgi-lua"
+makedepends=""
+source="${url}snapshot/${pkgname}-${pkgver}.tar.bz2 $pkgname.initd"
+
+
+_modules="dnsmasq network openssh"
+
+subpackages=""
+for _m in $_modules; do
+	subpackages="$subpackages $pkgname-mod-$_m:_$_m"
+	eval "_deps_$_m=$_m"
+done
+
+_deps_network=
+
+
+_builddir=$srcdir/$pkgname-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+	make ROOT_DIR=$pkgdir install || return 1
+	install -m755 -D "$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname || return 1
+}
+
+
+_moddir=usr/share/lua/5.2/$pkgname/modules
+_augdir=usr/share/$pkgname/augeas
+
+_module() {
+	eval "depends=\"$pkgname \$_deps_$1\""
+	mkdir -p "$subpkgdir/$_moddir" || return 1
+	mv "$pkgdir/$_moddir/$1.lua" "$subpkgdir/$_moddir" || return 1
+
+	_lens=$pkgdir/$_augdir/aconf_$1.aug
+	[ -f "$_lens" ] || return 0
+	mkdir -p "$subpkgdir/$_augdir" || return 1
+	mv "$_lens" "$subpkgdir/$_augdir"
+}
+
+for _m in $_modules; do
+	eval "_$_m() { _module $_m; }"
+done
+
+md5sums="e320eec530f477e4647111de40de5f35  aconf-master.tar.bz2
+77004904f5d4637f807e2d084a0e2085  aconf.initd"
+sha256sums="baee13ea13f9d0e81b9663c5998f377ed7262e6e93a4a9aacf245a1d1102ed4e  aconf-master.tar.bz2
+76b01d0184dbd01ec712c362d7ef561d58b7cd59568833d5e6fa874ea4ac4f8e  aconf.initd"
+sha512sums="1e13bf28d416314c4a122f92603a5b8871886e3c1c1c878cea16882a81ffcde6e4e0c090929f0defafb6e7ea3596500c355b4a855eb84c9bf795ed43eb5e3035  aconf-master.tar.bz2
+aea5ac6daa63326b69920ad3ed7e36ed832caef34400b5a47b41fe20aed67a5975876739b483c0296fadcec8fbffbb60c80fb261950ce264fe29356fb17caebe  aconf.initd"
diff --git a/testing/acf2/acf2.initd b/testing/aconf/aconf.initd
index f0525c08fd..38334fbf5f 100644
--- a/testing/acf2/acf2.initd
+++ b/testing/aconf/aconf.initd
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 
-# init.d file for acf2
-# Copyright (c) 2013 Kaarle Ritvanen
+# init.d file for aconf
+# Copyright (c) 2013-2014 Kaarle Ritvanen
 
-name=acf2
-command=/usr/sbin/$name
+name=aconf
+command=/usr/sbin/aconfd
 pidfile=/var/run/$name.pid
 
 depend() {