Merge git://dev.alpinelinux.org/aports

5 files changed, 89 insertions, 3 deletions

diff --git a/main/tree/APKBUILD b/main/tree/APKBUILD
new file mode 100644
index 0000000000..7831da03be
--- /dev/null
+++ b/main/tree/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
+pkgname=tree
+pkgver=1.6.0
+pkgrel=0
+pkgdesc="A recursive directory indented listing of files"
+url="http://mama.indstate.edu/users/ice/tree/"
+arch="all"
+license="GPL"
+depends=
+depends_dev=
+makedepends="$depends_dev"
+install=
+subpackages="$pkgname-doc"
+source="http://mama.indstate.edu/users/ice/tree/src/$pkgname-$pkgver.tgz"
+
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	return 0
+}
+
+build() {
+	cd "$_builddir"
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make prefix="$pkgdir/usr" MANDIR="${pkgdir}/usr/share/man/man1" install
+}
+
+md5sums="04e967a3f4108d50cde3b4b0e89e970a  tree-1.6.0.tgz"
diff --git a/testing/awall/APKBUILD b/testing/awall/APKBUILD
new file mode 100644
index 0000000000..31a522ba91
--- /dev/null
+++ b/testing/awall/APKBUILD
@@ -0,0 +1,51 @@
+# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+pkgname=awall
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="Alpine Wall"
+url=http://git.alpinelinux.org/cgit/kunkku/awall/
+arch=noarch
+license=GPL-2
+depends="bind-tools ip6tables ipset iptables lua lua-alt-getopt lua-filesystem lua-json4 lua-pc lua-signal lua-sleep lua-stringy"
+subpackages=$pkgname-nat
+source="${url}snapshot/awall-${pkgver}.tar.bz2"
+
+_builddir=$srcdir/awall-${pkgver}
+_luadir=usr/share/lua/5.1
+
+prepare() {
+	:
+}
+
+build() {
+	:
+}
+
+package() {
+	cd "$_builddir"
+	local dir=$pkgdir/$_luadir/awall
+	local bindir=$pkgdir/usr/sbin
+	local poldir=$pkgdir/usr/share/awall/mandatory
+	install -d "$bindir"
+	install -d "$poldir"
+	install -d "$dir/modules"
+	install -d "$pkgdir/etc/awall"
+	install -d "$pkgdir/var/run/awall"
+	install awall-cli "$bindir/awall"
+	install -m 644 json/services.json "$poldir"
+	install -m 644 awall/*.lua "$dir"
+	install -m 644 awall/modules/filter.lua "$dir/modules"
+}
+
+nat() {
+	depends=awall
+	cd "$_builddir"
+	local moddir=$subpkgdir/$_luadir/awall/modules
+	local poldir=$subpkgdir/usr/share/awall/mandatory
+	install -d "$moddir" "$poldir"
+	install -m 644 json/masquerade.json "$poldir"
+	install -m 644 awall/modules/nat.lua "$moddir"
+}
+
+md5sums="032edeb7e909137f4deee36f009bd68e  awall-0.1.0.tar.bz2"
diff --git a/testing/targetcli/APKBUILD b/testing/targetcli/APKBUILD
index f0639458fc..10d93aa6c5 100644
--- a/testing/targetcli/APKBUILD
+++ b/testing/targetcli/APKBUILD
@@ -4,7 +4,7 @@ pkgname=targetcli
 pkgver=2.0_rc1_p11
 _ver=${pkgver/_rc/rc}
 _ver=${_ver/_p/.fb}
-pkgrel=1
+pkgrel=2
 pkgdesc="An administration shell for storage targets"
 url="https://github.com/agrover/targetcli-fb"
 arch="noarch"
@@ -61,6 +61,7 @@ package() {
 	mkdir -p "$pkgdir"/etc/target
 	install -D -m644 $pkgname.8.gz "$pkgdir"/usr/share/man/man8/$pkgname.8.gz
 	install -D -m755 ../../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -D -m644 ../../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
 md5sums="16f493b0e9f2aa944e6a1de150b7d9ab  targetcli-2.0rc1.fb11.tar.gz"
diff --git a/testing/targetcli/targetcli.confd b/testing/targetcli/targetcli.confd
new file mode 100644
index 0000000000..4cfd31ba90
--- /dev/null
+++ b/testing/targetcli/targetcli.confd
@@ -0,0 +1 @@
+MODULES="configfs target_core_mod iscsi_target_mod"
diff --git a/testing/targetcli/targetcli.initd b/testing/targetcli/targetcli.initd
index 3dbbb9ec53..8527c8476d 100755
--- a/testing/targetcli/targetcli.initd
+++ b/testing/targetcli/targetcli.initd
@@ -2,7 +2,6 @@
 
 description="Administration tool for managing RisingTide Systems storage targets"
 command="/usr/bin/targetcli"
-modules="target_core_mod iscsi_target_mod"
 
 depend() {
 	need net
@@ -11,10 +10,10 @@ depend() {
 
 start() {
 	ebegin "Starting ${RC_SVCNAME}"
-	mount -t configfs none /sys/kernel/config
 	for mod in modules; do
 		modprobe $mod
 	done
+	mount -t configfs none /sys/kernel/config
 	$command restoreconfig clear_existing=true
 	eend $?
 }