- Update to 1.4.2
PR: 86697 Submitted by: Blaz Zupan (maintainer)
This commit is contained in:
Vsevolod Stakhov
parent
f7054d75fc
commit
a7ef203ab8
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=143824
6 changed files with 18 additions and 39 deletions
|
|
@ -6,8 +6,7 @@
|
|||
#
|
||||
|
||||
PORTNAME= nagios-plugins
|
||||
PORTVERSION= 1.4.1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.4.2
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= net-mgmt
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
|
||||
|
|
|
|||
|
|
@ -1,2 +1,2 @@
|
|||
MD5 (nagios-plugins-1.4.1.tar.gz) = 5bdd5dd7fca92a2aeb29683866ee42f1
|
||||
SIZE (nagios-plugins-1.4.1.tar.gz) = 967552
|
||||
MD5 (nagios-plugins-1.4.2.tar.gz) = 1f2bee15ade3d98ec79964a43479e328
|
||||
SIZE (nagios-plugins-1.4.2.tar.gz) = 971447
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
--- plugins/Makefile.am.orig Fri Aug 12 14:09:44 2005
|
||||
+++ plugins/Makefile.am Fri Aug 12 14:10:51 2005
|
||||
@@ -3,7 +3,7 @@
|
||||
--- plugins/Makefile.am.orig Wed Sep 14 14:40:26 2005
|
||||
+++ plugins/Makefile.am Thu Sep 22 14:54:50 2005
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
|
||||
|
||||
INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl \
|
||||
-@LDAPINCLUDE@ @PGINCLUDE@
|
||||
+@LDAPINCLUDE@ @PGINCLUDE@ @RADIUSINCLUDE@
|
||||
-INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@
|
||||
+INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @RADIUSINCLUDE@
|
||||
|
||||
datadir = @datadir@
|
||||
localedir = $(datadir)/locale
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
--- plugins/check_snmp.c.orig Wed Sep 7 12:35:57 2005
|
||||
+++ plugins/check_snmp.c Wed Sep 7 12:43:03 2005
|
||||
@@ -141,6 +141,7 @@
|
||||
char *p2 = NULL;
|
||||
char *show = NULL;
|
||||
char type[8];
|
||||
+ char *str[MAX_INPUT_BUFFER];
|
||||
|
||||
setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");
|
||||
bindtextdomain (PACKAGE, LOCALEDIR);
|
||||
@@ -338,7 +339,6 @@
|
||||
|
||||
i++;
|
||||
|
||||
- char *str[MAX_INPUT_BUFFER];
|
||||
asprintf(str, "=%s%s;;;; ", show, type ? type : "");
|
||||
strcat(perfstr, *str);
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
--- configure.in.orig Mon Aug 1 23:24:51 2005
|
||||
+++ configure.in Mon Aug 15 21:20:53 2005
|
||||
--- configure.in.orig Mon Sep 19 15:51:19 2005
|
||||
+++ configure.in Thu Sep 22 14:57:12 2005
|
||||
@@ -10,7 +10,7 @@
|
||||
RELEASE=1
|
||||
AC_SUBST(RELEASE)
|
||||
|
|
@ -91,7 +91,7 @@
|
|||
|
||||
|
||||
dnl Check for mysql libraries
|
||||
@@ -597,247 +609,11 @@
|
||||
@@ -597,245 +609,11 @@
|
||||
|
||||
AC_PATH_PROG(PATH_TO_PS,ps)
|
||||
|
||||
|
|
@ -206,7 +206,6 @@
|
|||
- ac_cv_ps_cols=9
|
||||
- AC_MSG_RESULT([$ac_cv_ps_command])
|
||||
-
|
||||
-XXX
|
||||
-elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \
|
||||
- egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
|
||||
-then
|
||||
|
|
@ -331,7 +330,6 @@
|
|||
- ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
|
||||
- ac_cv_ps_cols=8
|
||||
- AC_MSG_RESULT([$ac_cv_ps_command])
|
||||
-XXX
|
||||
-
|
||||
-else
|
||||
- AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
|
||||
|
|
@ -344,7 +342,7 @@
|
|||
|
||||
if test -n "$ac_cv_ps_varlist" ; then
|
||||
AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,
|
||||
@@ -1198,6 +974,8 @@
|
||||
@@ -1196,6 +974,8 @@
|
||||
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
|
||||
[path and arguments for invoking 'who'])
|
||||
|
||||
|
|
@ -353,7 +351,7 @@
|
|||
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
|
||||
if test -x "$PATH_TO_SNMPGET"
|
||||
then
|
||||
@@ -1220,7 +998,10 @@
|
||||
@@ -1218,7 +998,10 @@
|
||||
else
|
||||
AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
|
||||
fi
|
||||
|
|
@ -364,7 +362,7 @@
|
|||
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
|
||||
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
|
||||
|
||||
@@ -1242,7 +1023,10 @@
|
||||
@@ -1240,7 +1023,10 @@
|
||||
AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
|
||||
[path to qstat/quakestat])
|
||||
fi
|
||||
|
|
@ -375,7 +373,7 @@
|
|||
AC_PATH_PROG(PATH_TO_FPING,fping)
|
||||
if test -x "$PATH_TO_FPING"
|
||||
then
|
||||
@@ -1251,6 +1035,7 @@
|
||||
@@ -1249,6 +1035,7 @@
|
||||
else
|
||||
AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
|
||||
fi
|
||||
|
|
@ -383,7 +381,7 @@
|
|||
|
||||
AC_PATH_PROG(PATH_TO_SSH,ssh)
|
||||
|
||||
@@ -1313,32 +1098,12 @@
|
||||
@@ -1311,32 +1098,12 @@
|
||||
dnl end if for PATH_TO_SWAP
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ libexec/nagios/check_imap
|
|||
libexec/nagios/check_ircd
|
||||
libexec/nagios/check_jabber
|
||||
%%SUB_LDAP%%libexec/nagios/check_ldap
|
||||
libexec/nagios/check_ldaps
|
||||
%%SUB_LDAP%%libexec/nagios/check_ldaps
|
||||
libexec/nagios/check_load
|
||||
libexec/nagios/check_log
|
||||
libexec/nagios/check_mailq
|
||||
|
|
|
|||
Loading…
Reference in a new issue