mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

Update to 2.0.

Browse Source 
Changes:	https://www.monitoring-plugins.org/news/release-2-0.html
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2014-07-29 14:43:17 +00:00
parent ce5921de98
commit fc70d30ac4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=363333
5 changed files with 14 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net-mgmt/monitoring-plugins/Makefile
View File

@ -2,11 +2,9 @@
# $FreeBSD$
PORTNAME= monitoring-plugins
PORTVERSION= 1.5.99.20140721
PORTREVISION= 1
PORTVERSION= 2.0
CATEGORIES= net-mgmt
MASTER_SITES= LOCAL/mat/${PORTNAME} GH GHC
MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME}
MAINTAINER= mat@FreeBSD.org
COMMENT= Monitoring Plugins for Nagios
@ -14,11 +12,6 @@ COMMENT= Monitoring Plugins for Nagios
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
GH_ACCOUNT= monitoring-plugins
GH_COMMIT= b5611ea
GH_TAGNAME= ${GH_COMMIT}
CONFLICTS_INSTALL= nagios-plugins-*
USES= charsetfix gmake perl5 libtool
@ -57,8 +50,6 @@ EXTRAOPTS_CONFIGURE_ENABLE= extra-opts
GNU_CONFIGURE= yes
NAGIOSUSER?= nagios
NAGIOSGROUP?= nagios
NAGIOSDIR?= /var/spool/nagios
NAGIOSWWWDIR?= www/nagios
@ -68,21 +59,19 @@ NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin
NAGIOSPOLLIP?= 127.0.0.1
NAGIOSPOLLIP6?= ::1
CONFIGURE_ARGS+=--with-nagios-user=${NAGIOSUSER} \
--with-nagios-group=${NAGIOSGROUP} \
--with-cgiurl=${NAGIOSCGIURL} \
CONFIGURE_ARGS+=--with-cgiurl=${NAGIOSCGIURL} \
--sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
--libexecdir=${PREFIX}/libexec/nagios \
--datadir=${PREFIX}/share \
--sysconfdir=${PREFIX}/etc/nagios \
--localstatedir=${NAGIOSDIR} \
--with-perl=${PERL} \
--prefix=${PREFIX}
# Also, force some commands with their expected paths so that they don't get
# disabled.
CONFIGURE_ARGS+=--with-qmail-qstat-command=/var/qmail/bin/qmail-qstat
CONFIGURE_ENV= PERL=${PERL}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS+= -I${LOCALBASE}/include

4
net-mgmt/monitoring-plugins/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (monitoring-plugins-1.5.99.20140721.tar.gz) = bc82a96d8384ec006d3a8f961e60582af87cc2d0a385d02769e73994af31ea50
SIZE (monitoring-plugins-1.5.99.20140721.tar.gz) = 2051048
SHA256 (monitoring-plugins-2.0.tar.gz) = a91b0f68ff00661e0d69f28e3cf577541af98e0f6d09dd014328f132bde6c3fc
SIZE (monitoring-plugins-2.0.tar.gz) = 2610000

8
net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl
View File

@ -1,6 +1,6 @@
--- ./plugins-scripts/check_ircd.pl.orig 2014-04-27 19:59:06.000000000 +0200
+++ ./plugins-scripts/check_ircd.pl 2014-05-09 18:45:31.000000000 +0200
@@ -65,6 +65,7 @@
--- ./plugins-scripts/check_ircd.pl.orig 2014-07-06 19:55:03.000000000 +0200
+++ ./plugins-scripts/check_ircd.pl 2014-07-29 15:15:32.000000000 +0200
@@ -66,6 +66,7 @@
$ENV{'PATH'}='@TRUSTED_PATH@';
$ENV{'BASH_ENV'}='';
$ENV{'ENV'}='';
@ -8,7 +8,7 @@
# -----------------------------------------------------------------[ Global ]--
@@ -152,7 +153,7 @@
@@ -153,7 +154,7 @@
print "IRCD UNKNOWN: Could not start socket ($!)\n";
exit $ERRORS{"UNKNOWN"};
}

19
net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ntp.pl
View File

@ -1,19 +0,0 @@
--- ./plugins-scripts/check_ntp.pl.orig 2014-03-04 20:21:36.000000000 +0100
+++ ./plugins-scripts/check_ntp.pl 2014-04-14 10:22:50.000000000 +0200
@@ -313,7 +313,6 @@
}
} else {
print "No match!\n" if $verbose;
- $jitter = '(not parsed)';
}
}
@@ -427,7 +426,7 @@
foreach my $key (keys %ERRORS) {
if ($state==$ERRORS{$key}) {
# print ("NTP $key: $answer");
- print ("NTP $key: $answer|offset=$offset, jitter=" . $jitter/1000 . ",peer_stratum=$stratum\n");
+ print ("NTP $key: $answer|offset=$offset, jitter=" . ($jitter || 0)/1000 . ",peer_stratum=$stratum\n");
last;
}
}

8
net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c
View File

@ -1,6 +1,6 @@
--- ./plugins/check_ssh.c.orig 2014-04-27 19:59:06.000000000 +0200
+++ ./plugins/check_ssh.c 2014-05-09 18:45:31.000000000 +0200
@@ -250,6 +250,7 @@
--- ./plugins/check_ssh.c.orig 2014-07-06 12:26:39.000000000 +0200
+++ ./plugins/check_ssh.c 2014-07-29 15:15:33.000000000 +0200
@@ -255,6 +255,7 @@
printf
(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
ssh_server, ssh_proto, remote_version);
@ -8,7 +8,7 @@
close(sd);
exit (STATE_WARNING);
}
@@ -260,6 +261,7 @@
@@ -273,6 +274,7 @@
(_("SSH OK - %s (protocol %s) | %s\n"),
ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));