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

7 files changed, 92 insertions, 48 deletions

diff --git a/main/wireless_tools/APKBUILD b/main/wireless_tools/APKBUILD
deleted file mode 100644
index fe8c72ef91..0000000000
--- a/main/wireless_tools/APKBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=wireless_tools
-pkgver=29
-pkgrel=0
-pkgdesc="Wireless Tools"
-url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
-license="GPL"
-subpackages="$pkgname-dev $pkgname-doc"
-depends=
-makedepends=
-source="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$pkgname.$pkgver.tar.gz"
-
-build ()
-{
-	cd $srcdir/wireless_tools.$pkgver
-	make || return 1
-	make INSTALL_DIR=$pkgdir/usr/sbin \
-		INSTALL_LIB=$pkgdir/usr/lib \
-		INSTALL_INC=$pkgdir/usr/include \
-		INSTALL_MAN=$pkgdir/usr/share/man install || return 1
-}
-md5sums="e06c222e186f7cc013fd272d023710cb  wireless_tools.29.tar.gz"
diff --git a/testing/php/gd-info-segfault.patch b/testing/php/gd-info-segfault.patch
deleted file mode 100644
index 846a19ef74..0000000000
--- a/testing/php/gd-info-segfault.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: ext/gd/libgd/gd_compat.c
-===================================================================
---- ext/gd/libgd/gd_compat.c	(Revision 286947)
-+++ ext/gd/libgd/gd_compat.c	(Revision 286948)
-@@ -14,7 +14,7 @@
- 	return JPEG_LIB_VERSION;
- }
- 
--int gdJpegGetVersionString()
-+const char * gdJpegGetVersionString()
- {
- 	switch(JPEG_LIB_VERSION) {
- 		case 62:
-Index: ext/gd/libgd/gd_compat.h
-===================================================================
---- ext/gd/libgd/gd_compat.h	(Revision 286947)
-+++ ext/gd/libgd/gd_compat.h	(Revision 286948)
-@@ -8,7 +8,7 @@
- #endif
- 
- const char * gdPngGetVersionString();
--int gdJpegGetVersionString();
-+const char * gdJpegGetVersionString();
- int gdJpegGetVersionInt();
- int overflow2(int a, int b);
- 
diff --git a/testing/rrdbot/APKBUILD b/testing/rrdbot/APKBUILD
new file mode 100644
index 0000000000..d1f1e17d33
--- /dev/null
+++ b/testing/rrdbot/APKBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=rrdbot
+pkgver=0.9.6
+pkgrel=0
+pkgdesc="an SNMP polling daemon which writes the polled values to an RRD database"
+url="http://memberwebs.com/stef/software/rrdbot/"
+license="BSD"
+depends=
+makedepends=rrdtool-dev
+install="$pkgname.pre-install $pkgname.post-install"
+subpackages="$pkgname-doc"
+source="http://memberwebs.com/stef/software/rrdbot/rrdbot-$pkgver.tar.gz
+	rrdbotd.initd
+	rrdbotd.confd
+	"
+
+# append extra dependencies to -dev subpackage
+# remove if not used.
+# depends_dev="somepackage-dev"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	# apply patches here
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+	install -m755 -D "$srcdir"/rrdbotd.initd "$pkgdir"/etc/init.d/rrdbotd
+	install -m644 -D "$srcdir"/rrdbotd.confd "$pkgdir"/etc/conf.d/rrdbotd
+}
+
+md5sums="8329c8f58136158b25c3179e825c66e6  rrdbot-0.9.6.tar.gz
+e74785806860537d38a5863fc90b324f  rrdbotd.initd
+cbcac88f5b728b1441891947a4babbcb  rrdbotd.confd"
diff --git a/testing/rrdbot/rrdbot.post-install b/testing/rrdbot/rrdbot.post-install
new file mode 100644
index 0000000000..0586fcd5c5
--- /dev/null
+++ b/testing/rrdbot/rrdbot.post-install
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# add something which happends after install
+
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
new file mode 100644
index 0000000000..2c35d02d17
--- /dev/null
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# this user should be included in alpine-baselayout-1.2.
+# included here for backward compability.
+adduser -H -s /bin/false -D rrdbotd  2>/dev/null
+
+exit 0
diff --git a/testing/rrdbot/rrdbotd.confd b/testing/rrdbot/rrdbotd.confd
new file mode 100644
index 0000000000..486252b03c
--- /dev/null
+++ b/testing/rrdbot/rrdbotd.confd
@@ -0,0 +1,7 @@
+# Sample conf.d file for alpine linux
+
+#
+# Specify daemon options here.
+#
+
+sample_opts=""
diff --git a/testing/rrdbot/rrdbotd.initd b/testing/rrdbot/rrdbotd.initd
new file mode 100644
index 0000000000..d0fcdc4a6d
--- /dev/null
+++ b/testing/rrdbot/rrdbotd.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+
+name=rrdbotd
+daemon=/usr/sbin/$name
+pidfile=${rrdbotd_pidfile:-/var/run/rrdbotd/rrdbotd.pid}
+
+depend() {
+	need net
+	after firewall
+}
+
+start() {
+	ebegin "Starting ${name}"
+	start-stop-daemon --start --quiet \
+		--pidfile "$pidfile" \
+		--chuid ${rrdbotd_user:-rrdbotd}:${rrdbotd_group:-rrdbotd} \
+		--exec ${daemon} -- ${rrdbotd_opts} -p "$pidfile"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${name}"
+	start-stop-daemon --stop --quiet \
+		--pidfile "$pidfile" \
+		--exec ${daemon}
+	eend $?
+}
+