From f9c8bfc9ee759389e4a09b2ea611cd80ebce6348 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 20 Mar 2012 13:55:08 +0000 Subject: testing/wanpipe-grsec: rebuild against 3.2.12 kernel --- testing/wanpipe-grsec/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') 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 -- cgit v1.2.3 From 4f938380447b69c4c289d90f4bc7fe5c60d1f9f7 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 20 Mar 2012 15:57:58 +0000 Subject: testing/gnash: rebuild against boost-1.49 --- testing/gnash/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') 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 pkgname=gnash pkgver=0.8.10 -pkgrel=1 +pkgrel=2 pkgdesc="GNU flash player implementation" url="http://www.gnashdev.org/" arch="all" -- cgit v1.2.3 From d35cd0574e56e393e4fd89bd8795a40313e8def9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Tue, 20 Mar 2012 16:02:54 +0000 Subject: testing/pdns: rebuild against boost-1.49 --- testing/pdns/APKBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testing') 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" -- cgit v1.2.3 From 36d09d5b6774ec30ffb5f996fd849cf42bcf7012 Mon Sep 17 00:00:00 2001 From: Mika Havela Date: Wed, 21 Mar 2012 14:41:41 +0100 Subject: testing/rrdcollect: Version bump. Init.d scripts. Patching default rrdcollect.conf to work with alpine linux --- testing/rrdcollect/APKBUILD | 35 +++++++++++++++++++----- testing/rrdcollect/rrdcollect.conf.patch | 46 ++++++++++++++++++++++++++++++++ testing/rrdcollect/rrdcollect.confd | 3 +++ testing/rrdcollect/rrdcollect.initd | 27 +++++++++++++++++++ 4 files changed, 105 insertions(+), 6 deletions(-) create mode 100644 testing/rrdcollect/rrdcollect.conf.patch create mode 100644 testing/rrdcollect/rrdcollect.confd create mode 100755 testing/rrdcollect/rrdcollect.initd (limited to 'testing') diff --git a/testing/rrdcollect/APKBUILD b/testing/rrdcollect/APKBUILD index 36e55972b..688ccdd37 100644 --- a/testing/rrdcollect/APKBUILD +++ b/testing/rrdcollect/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Michael Mason # Maintainer: Michael Mason pkgname=rrdcollect -pkgver=0.2.4 +pkgver=0.2.9 pkgrel=1 pkgdesc="Read system statistical data and feed it to RRDtool" url="http://rrdcollect.sourceforge.net/" @@ -11,22 +11,45 @@ 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.confd +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 -m644 -D "$srcdir"/rrdcollect.confd "$pkgdir"/etc/conf.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 +b3f64ec3e4578fb4de9614c20c6ea232 rrdcollect.confd +edef974fb5a27279f9347d9eacda4a26 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.confd b/testing/rrdcollect/rrdcollect.confd new file mode 100644 index 000000000..eb7e4fa82 --- /dev/null +++ b/testing/rrdcollect/rrdcollect.confd @@ -0,0 +1,3 @@ +# rrdcollect params suitable for running as a daemon + +RRD_OPTS="" diff --git a/testing/rrdcollect/rrdcollect.initd b/testing/rrdcollect/rrdcollect.initd new file mode 100755 index 000000000..da566116e --- /dev/null +++ b/testing/rrdcollect/rrdcollect.initd @@ -0,0 +1,27 @@ +#!/sbin/runscript + +description="rrdcollect daemon" +pidfile="/var/run/${RC_SVCNAME}.pid" +command="/usr/sbin/rrdcollect" +runas="root" + +start_pre() { + checkpath --directory --owner ${runas}:${runas} --mode 775 ${pidfile%/*} +} + +start() { + ebegin "Starting ${RC_SVCNAME}" + start-stop-daemon --start \ + --user ${runas} \ + --pidfile ${pidfile} \ + --exec ${command} \ + -- ${RRD_OPTS} + eend $? +} + +stop() { + ebegin "Stopping ${RC_SVCNAME}" + start-stop-daemon --stop \ + --pidfile ${pidfile} + eend $? +} -- cgit v1.2.3 From 5d9620463b748f38927b1080a39093cdfb929254 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 21 Mar 2012 14:29:26 +0000 Subject: testing/rrdcollect: simplify init.d --- testing/rrdcollect/APKBUILD | 14 ++++++-------- testing/rrdcollect/rrdcollect.confd | 3 --- testing/rrdcollect/rrdcollect.initd | 21 --------------------- 3 files changed, 6 insertions(+), 32 deletions(-) delete mode 100644 testing/rrdcollect/rrdcollect.confd (limited to 'testing') diff --git a/testing/rrdcollect/APKBUILD b/testing/rrdcollect/APKBUILD index 688ccdd37..56e6499aa 100644 --- a/testing/rrdcollect/APKBUILD +++ b/testing/rrdcollect/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Michael Mason pkgname=rrdcollect pkgver=0.2.9 -pkgrel=1 +pkgrel=2 pkgdesc="Read system statistical data and feed it to RRDtool" url="http://rrdcollect.sourceforge.net/" arch="all" @@ -12,9 +12,8 @@ makedepends="libpcap-dev" install= subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz -rrdcollect.conf.patch -rrdcollect.confd -rrdcollect.initd" + rrdcollect.conf.patch + rrdcollect.initd" _builddir="$srcdir/$pkgname-$pkgver" prepare() { @@ -44,12 +43,11 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" install - install -m755 -D "$srcdir"/rrdcollect.initd "$pkgdir"/etc/init.d/rrdcollect || return 1 - install -m644 -D "$srcdir"/rrdcollect.confd "$pkgdir"/etc/conf.d/rrdcollect || return 1 + install -m755 -D "$srcdir"/rrdcollect.initd \ + "$pkgdir"/etc/init.d/rrdcollect || return 1 install -m755 -d "$pkgdir"/var/lib/rrdtool || return 1 } md5sums="1e94eb0f8d55ebf0f042c10baebc2d3d rrdcollect-0.2.9.tar.gz e09d7a588e31c9ecfc44fd1747ad732b rrdcollect.conf.patch -b3f64ec3e4578fb4de9614c20c6ea232 rrdcollect.confd -edef974fb5a27279f9347d9eacda4a26 rrdcollect.initd" +d5a892939ee11351f6bbbf9218694f8b rrdcollect.initd" diff --git a/testing/rrdcollect/rrdcollect.confd b/testing/rrdcollect/rrdcollect.confd deleted file mode 100644 index eb7e4fa82..000000000 --- a/testing/rrdcollect/rrdcollect.confd +++ /dev/null @@ -1,3 +0,0 @@ -# rrdcollect params suitable for running as a daemon - -RRD_OPTS="" diff --git a/testing/rrdcollect/rrdcollect.initd b/testing/rrdcollect/rrdcollect.initd index da566116e..883e574e1 100755 --- a/testing/rrdcollect/rrdcollect.initd +++ b/testing/rrdcollect/rrdcollect.initd @@ -3,25 +3,4 @@ description="rrdcollect daemon" pidfile="/var/run/${RC_SVCNAME}.pid" command="/usr/sbin/rrdcollect" -runas="root" -start_pre() { - checkpath --directory --owner ${runas}:${runas} --mode 775 ${pidfile%/*} -} - -start() { - ebegin "Starting ${RC_SVCNAME}" - start-stop-daemon --start \ - --user ${runas} \ - --pidfile ${pidfile} \ - --exec ${command} \ - -- ${RRD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping ${RC_SVCNAME}" - start-stop-daemon --stop \ - --pidfile ${pidfile} - eend $? -} -- cgit v1.2.3