summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorJeff Bilyk <jbilyk@gmail.com>2006-01-08 17:51:45 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-08-26 18:47:34 +0000
commitff5ddc26158de35d99d38d65b512c0ef121ebe27 (patch)
treebdaeb166551908fe86d6237afc3e12e995d23449 /testing
parent8a56519ec8c17ced153faa9938b7f8abed3187f6 (diff)
downloadaports-ff5ddc26158de35d99d38d65b512c0ef121ebe27.tar.bz2
aports-ff5ddc26158de35d99d38d65b512c0ef121ebe27.tar.xz
testing/nagios-plugins: Add nrpe-plugin as dependency
Add nrpe-plugin as dependency so that check_nrpe is available.
Diffstat (limited to 'testing')
-rw-r--r--testing/nagios-plugins/001-busybox-tweaks.patch56
-rw-r--r--testing/nagios-plugins/APKBUILD4
2 files changed, 2 insertions, 58 deletions
diff --git a/testing/nagios-plugins/001-busybox-tweaks.patch b/testing/nagios-plugins/001-busybox-tweaks.patch
deleted file mode 100644
index 4f33c6861..000000000
--- a/testing/nagios-plugins/001-busybox-tweaks.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- ./configure
-+++ ./configure
-@@ -18517,6 +18517,20 @@
- { echo "$as_me:$LINENO: result: $ac_cv_ps_command" >&5
- echo "${ECHO_T}$ac_cv_ps_command" >&6; }
-
-+##########
-+# 8/12/10 R. Boisvert added to work with Busybox ps
-+elif ps 2>/dev/null | \
-+ egrep -i "^PID +USER +TIME +COMMAND" >/dev/null
-+then
-+ ac_cv_ps_command="$PATH_TO_PS"
-+ ac_cv_ps_varlist="&procpid,&procuid,&procpcpu,procprog"
-+ ac_cv_ps_format="%d %s %s %s"
-+ ac_cv_ps_cols=4
-+ { echo "$as_me:$LINENO: result: $ac_cv_ps_command" >&5
-+echo "${ECHO_T}$ac_cv_ps_command" >&6; }
-+# 8/12/10 R. Boisvert added to work with Busybox ps
-+##########
-+
- elif ps -Al 2>/dev/null | \
- egrep -i "^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD" >/dev/null
- then
-@@ -18750,6 +18764,18 @@
- { echo "$as_me:$LINENO: result: $with_ping_command" >&5
- echo "${ECHO_T}$with_ping_command" >&6; }
-
-+##########
-+# 8/12/10 R. Boisvert added to work with Busybox ping
-+elif $PATH_TO_PING -c 1 127.0.0.1 2>/dev/null | \
-+ egrep -i "^round-trip|^rtt" >/dev/null
-+then
-+ with_ping_command="$PATH_TO_PING -c %d %s"
-+ ac_cv_ping_packets_first=yes
-+ { echo "$as_me:$LINENO: result: $with_ping_command" >&5
-+echo "${ECHO_T}$with_ping_command" >&6; }
-+# 8/12/10 R. Boisvert added to work with Busybox ping
-+##########
-+
- else
- { echo "$as_me:$LINENO: WARNING: unable to find usable ping syntax" >&5
- echo "$as_me: WARNING: unable to find usable ping syntax" >&2;}
-@@ -19037,7 +19063,12 @@
- then
- { echo "$as_me:$LINENO: checking for nslookup syntax" >&5
- echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6; }
-- if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
-+##########
-+# 8/12/10 R. Boisvert added to work with Busybox nslookup
-+# original if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null
-+ if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Usage" >/dev/null
-+# 8/12/10 R. Boisvert added to work with Busybox nslookup
-+##########
- then
- ac_cv_nslookup_command="$PATH_TO_NSLOOKUP"
- { echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5
diff --git a/testing/nagios-plugins/APKBUILD b/testing/nagios-plugins/APKBUILD
index f3cb4b40c..da8d871bc 100644
--- a/testing/nagios-plugins/APKBUILD
+++ b/testing/nagios-plugins/APKBUILD
@@ -1,11 +1,11 @@
# Maintainer: Jeff Bilyk <jbilyk@gmail.com>
pkgname=nagios-plugins
pkgver=1.4.15
-pkgrel=1
+pkgrel=2
pkgdesc="Plugins for Nagios to check services on hosts"
url="http://nagiosplugins.org"
license="GPL-2"
-depends="nagios fping net-snmp-tools bind-tools"
+depends="nagios fping net-snmp-tools bind-tools nrpe-plugin"
makedepends="net-snmp-tools openssl-dev openldap-dev mysql-dev postgresql-dev libpq"
source="http://downloads.sourceforge.net/nagiosplug/$pkgname-$pkgver.tar.gz"
pkgusers="nagios"