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

6 files changed, 83 insertions, 10 deletions

diff --git a/testing/gnash/APKBUILD b/testing/gnash/APKBUILD
index 9f791462b..432bbd652 100644
--- a/testing/gnash/APKBUILD
+++ b/testing/gnash/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=gnash
 pkgver=0.8.10
-pkgrel=1
+pkgrel=2
 pkgdesc="GNU flash player implementation"
 url="http://www.gnashdev.org/"
 arch="all"
diff --git a/testing/pdns/APKBUILD b/testing/pdns/APKBUILD
index 04dfb62bb..a55655e64 100644
--- a/testing/pdns/APKBUILD
+++ b/testing/pdns/APKBUILD
@@ -4,7 +4,7 @@ pkgname=pdns
 pkgver=3.0
 _extver=rc1
 _realver=$pkgver-$_extver
-pkgrel=2
+pkgrel=3
 pkgdesc="PowerDNS Authoritative Server"
 url="http://www.powerdns.com/"
 arch="all"
diff --git a/testing/rrdcollect/APKBUILD b/testing/rrdcollect/APKBUILD
index 36e55972b..56e6499aa 100644
--- a/testing/rrdcollect/APKBUILD
+++ b/testing/rrdcollect/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=rrdcollect
-pkgver=0.2.4
-pkgrel=1
+pkgver=0.2.9
+pkgrel=2
 pkgdesc="Read system statistical data and feed it to RRDtool"
 url="http://rrdcollect.sourceforge.net/"
 arch="all"
@@ -11,22 +11,43 @@ depends="rrdtool"
 makedepends="libpcap-dev"
 install=
 subpackages="$pkgname-doc" 
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	rrdcollect.conf.patch
+	rrdcollect.initd"
+
+_builddir="$srcdir/$pkgname-$pkgver"
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac;
+	done
+}
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 
 	./configure --prefix=/usr \
-		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--sysconfdir=/etc/rrdcollect \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
 	make || return 1
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 
+	install -m755 -D "$srcdir"/rrdcollect.initd \
+		"$pkgdir"/etc/init.d/rrdcollect || return 1
+	install -m755 -d "$pkgdir"/var/lib/rrdtool || return 1
 }
 
-md5sums="fd7ac95195e3e5cbab0677629505d9be  rrdcollect-0.2.4.tar.gz"
+md5sums="1e94eb0f8d55ebf0f042c10baebc2d3d  rrdcollect-0.2.9.tar.gz
+e09d7a588e31c9ecfc44fd1747ad732b  rrdcollect.conf.patch
+d5a892939ee11351f6bbbf9218694f8b  rrdcollect.initd"
diff --git a/testing/rrdcollect/rrdcollect.conf.patch b/testing/rrdcollect/rrdcollect.conf.patch
new file mode 100644
index 000000000..9b1d7b355
--- /dev/null
+++ b/testing/rrdcollect/rrdcollect.conf.patch
@@ -0,0 +1,46 @@
+--- rrdcollect-0.2.9.org/doc/sample-rrdcollect.conf
++++ rrdcollect-0.2.9/doc/sample-rrdcollect.conf
+@@ -4,12 +4,12 @@
+ # Configuration values:
+ 
+ #step = 60
+-#directory = /var/lib/rrdtool
++directory = /var/lib/rrdtool
+ #loglevel = LOG_NOTICE
+ 
+ # System statistics:
+ file:///proc/stat
+-"cpu %d %d %d %d"	stat.rrd:cpu_user,cpu_nice,cpu_system,cpu_idle
++"cpu %d %d %d %d %d %d %d"	stat.rrd:cpu_user,cpu_nice,cpu_system,cpu_idle,cpu_iowait,cpu_irq,cpu_softirq
+ "ctxt %u"		stat.rrd:ctxt
+ "page %u %u"		stat.rrd:page_in,page_out
+ "processes %u"		stat.rrd:processes
+@@ -21,15 +21,15 @@
+ "Swap: %*d %d %*d"		memory.rrd:swap_used
+ 
+ # S.M.A.R.T. HDD temperature:
+-file:///proc/ide/hda/smart_values
+-7:"%*04x %*04x %02x%*02x"       temperature.rrd:hda
+-file:///proc/ide/hdb/smart_values
+-7:"%*04x %*04x %02x%*02x"       temperature.rrd:hdb
++#file:///proc/ide/hda/smart_values
++#7:"%*04x %*04x %02x%*02x"       temperature.rrd:hda
++#file:///proc/ide/hdb/smart_values
++#7:"%*04x %*04x %02x%*02x"       temperature.rrd:hdb
+ 
+ # Net: statistics
+ file:///proc/net/dev
+ " eth0: %d %d %*d %*d %*d %*d %*d %*d %d %d"	eth0.rrd:bytes_in,pkts_in,bytes_out,pkts_out
+-" eth1: %d %d %*d %*d %*d %*d %*d %*d %d %d"	eth1.rrd:bytes_in,pkts_in,bytes_out,pkts_out
++#" eth1: %d %d %*d %*d %*d %*d %*d %*d %d %d"	eth1.rrd:bytes_in,pkts_in,bytes_out,pkts_out
+ 
+ # NEW!
+ # exec:/// -- instead of reading from /proc/ file data is read from
+@@ -40,5 +40,5 @@
+ #
+ # To use it, you must compile with --enable-exec
+ # Remember, programs run with root permissions.  Use at your own risk.
+-exec:///bin/df
+-"/dev/hda1 %*d %d %d"	hda1.rrd:used,empty
++#exec:///bin/df
++#"/dev/sda1 %*d %d %d"	sda1.rrd:used,empty
diff --git a/testing/rrdcollect/rrdcollect.initd b/testing/rrdcollect/rrdcollect.initd
new file mode 100755
index 000000000..883e574e1
--- /dev/null
+++ b/testing/rrdcollect/rrdcollect.initd
@@ -0,0 +1,6 @@
+#!/sbin/runscript
+
+description="rrdcollect daemon"
+pidfile="/var/run/${RC_SVCNAME}.pid"
+command="/usr/sbin/rrdcollect"
+
diff --git a/testing/wanpipe-grsec/APKBUILD b/testing/wanpipe-grsec/APKBUILD
index 2a249eb39..46232b7bb 100644
--- a/testing/wanpipe-grsec/APKBUILD
+++ b/testing/wanpipe-grsec/APKBUILD
@@ -3,7 +3,7 @@ _flavor=${FLAVOR:-grsec}
 _realname=wanpipe
 _name=$_realname-$_flavor
 
-_kver=3.2.11
+_kver=3.2.12
 _kpkgrel=0
 
 # source the kernel version