Merge branch 'master' of git://git.alpinelinux.org/aports

8 files changed, 97 insertions, 9 deletions

diff --git a/main/acf-asterisk/APKBUILD b/main/acf-asterisk/APKBUILD
index c7abd3b02f..0c31452636 100644
--- a/main/acf-asterisk/APKBUILD
+++ b/main/acf-asterisk/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-asterisk
-pkgver=0.2.0
+pkgver=0.2.1
 pkgrel=0
 pkgdesc="A web-based system administration interface for asterisk"
 url="http://git.alpinelinux.org/cgit/acf-asterisk"
@@ -18,4 +18,4 @@ build() {
 
 }
 
-md5sums="50481ed7662a93f24610e2af92ca6cd5  acf-asterisk-0.2.0.tar.bz2"
+md5sums="94ae07a0eb03fd50ad433fa3c90ee74b  acf-asterisk-0.2.1.tar.bz2"
diff --git a/main/acf-kamailio/APKBUILD b/main/acf-kamailio/APKBUILD
new file mode 100644
index 0000000000..d6c11598a6
--- /dev/null
+++ b/main/acf-kamailio/APKBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Ted Trask <ttrask01@yahoo.com>
+pkgname=acf-kamailio
+pkgver=0.1.0
+pkgrel=0
+pkgdesc="A web-based system administration interface for kamailio"
+url="http://git.alpinelinux.org/cgit/acf-kamailio"
+license="GPL-2"
+depends="acf-core lua kamailio"
+makedepends=""
+install=
+subpackages=""
+source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	make DESTDIR="$pkgdir" install
+
+}
+
+md5sums="60f6701de0c252b485a3a19c393750a6  acf-kamailio-0.1.0.tar.bz2"
diff --git a/main/acf-tinydns/APKBUILD b/main/acf-tinydns/APKBUILD
index 75eeab0b1a..6a68200fbc 100644
--- a/main/acf-tinydns/APKBUILD
+++ b/main/acf-tinydns/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=acf-tinydns
-pkgver=0.3.0
+pkgver=0.3.1
 pkgrel=0
 pkgdesc="A web-based system administration interface for tinydns"
 url="http://git.alpinelinux.org/cgit/acf-tinydns"
@@ -12,4 +12,4 @@ build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-md5sums="0f24bd338b0918fcc2047c42e2d59522  acf-tinydns-0.3.0.tar.bz2"
+md5sums="5f943c24ee3d12861e97365691c39434  acf-tinydns-0.3.1.tar.bz2"
diff --git a/main/pingu/APKBUILD b/main/pingu/APKBUILD
index ae39271283..e0baef59ab 100644
--- a/main/pingu/APKBUILD
+++ b/main/pingu/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pingu
-pkgver=0.3
-pkgrel=3
+pkgver=0.4
+pkgrel=0
 pkgdesc="Small daemon that pings hosts and executes a script when status change"
 url="http://git.alpinelinux.org/cgit/pingu"
 license="GPL"
@@ -16,9 +16,9 @@ build() {
 
 	make || return 1
 	make BINDIR=/usr/sbin DESTDIR="$pkgdir" install
-	install -m644 -D pingu.conf "$pkgdir"/etc/pingu.conf
+	install -m644 -D pingu.conf "$pkgdir"/etc/pingu/pingu.conf
 	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-md5sums="59f9c927a80c71d85f2363e314a25197  pingu-0.3.tar.bz2
+md5sums="7ef410315d8f3a437810add10de33a3e  pingu-0.4.tar.bz2
 318110763cc8ba23a61455d16cb23f97  pingu.initd"
diff --git a/main/pingu/commit-queue b/main/pingu/commit-queue
deleted file mode 100644
index d4bd0e4128..0000000000
--- a/main/pingu/commit-queue
+++ /dev/null
@@ -1 +0,0 @@
-pingu
diff --git a/main/tftpd-hpa/APKBUILD b/main/tftpd-hpa/APKBUILD
new file mode 100644
index 0000000000..c507e2f68c
--- /dev/null
+++ b/main/tftpd-hpa/APKBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=tftp-hpa
+pkgver=5.0
+pkgrel=0
+pkgdesc="Official tftp server"
+url="http://www.kernel.org/pub/software/network/tftp/"
+license="BSD"
+depends=
+makedepends=
+subpackage="$pkgname-doc"
+source="http://www.kernel.org/pub/software/network/tftp/$pkgname-$pkgver.tar.gz
+	in.tftpd.initd
+	in.tftpd.confd
+	"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	./configure --prefix=/usr \
+		--mandir=/usr/share/man || return 1
+	make
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make INSTALLROOT="$pkgdir" install || return 1
+	install -d "$pkgdir"/var/tftpboot
+	install -Dm755 ../in.tftpd.initd "$pkgdir"/etc/init.d/in.tftpd
+	install -Dm755 ../in.tftpd.confd "$pkgdir"/etc/conf.d/in.tftpd
+}
+md5sums="1ae813a94670f0d8c294aafa9f5ecf65  tftp-hpa-5.0.tar.gz
+3430e0b0e42c3321689d2c87e73d0749  in.tftpd.initd
+914b43dd531176a8bb58fdb23d900fef  in.tftpd.confd"
diff --git a/main/tftpd-hpa/in.tftpd.confd b/main/tftpd-hpa/in.tftpd.confd
new file mode 100644
index 0000000000..5d74ac15fa
--- /dev/null
+++ b/main/tftpd-hpa/in.tftpd.confd
@@ -0,0 +1,15 @@
+# /etc/init.d/in.tftpd
+
+# Path to server files from
+# Depending on your application you may have to change this.
+INTFTPD_PATH="/var/tftpboot/"
+#INTFTPD_PATH="/var/tftp/"
+#INTFTPD_PATH="/tftpboot/"
+#INTFTPD_PATH="/tftproot/"
+
+# For more options, see in.tftpd(8)
+# -R 4096:32767 solves problems with ARC firmware, and obsoletes
+# the /proc/sys/net/ipv4/ip_local_port_range hack.
+# -s causes $INTFTPD_PATH to be the root of the TFTP tree.
+# -l is passed by the init script in addition to these options.
+INTFTPD_OPTS="-R 4096:32767 -s ${INTFTPD_PATH}"
diff --git a/main/tftpd-hpa/in.tftpd.initd b/main/tftpd-hpa/in.tftpd.initd
new file mode 100644
index 0000000000..c8657634bf
--- /dev/null
+++ b/main/tftpd-hpa/in.tftpd.initd
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tftp-hpa/files/in.tftpd.rc6,v 1.2 2005/07/30 06:29:14 vapier Exp $
+
+depend() {
+	need net
+	after firewall
+}
+
+start() {
+	ebegin "Starting tftpd"
+	/usr/sbin/in.tftpd -l ${INTFTPD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping tftpd"
+	start-stop-daemon --stop --exec /usr/sbin/in.tftpd
+	eend $?
+}