Date: Sat, 4 Dec 2004 13:25:36 +0100 (CET) From: Blaz Zupan <blaz@si.FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/74667: MAINTAINER UPDATE: net-mgmt/nagios-plugins Message-ID: <20041204122536.BF72755475@titanic.medinet.si> Resent-Message-ID: <200412041230.iB4CUGAR026878@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74667
>Category: ports
>Synopsis: MAINTAINER UPDATE: net-mgmt/nagios-plugins
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 04 12:30:16 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Blaz Zupan
>Release: FreeBSD 4.10-RELEASE i386
>Organization:
>Environment:
System: FreeBSD titanic.medinet.si 4.10-RELEASE FreeBSD 4.10-RELEASE #1: Sun Jun 27 16:39:26 CEST 2004 root@bigbrother.amis.net:/usr/obj/usr/src/sys/TITANIC i386
>Description:
- update nagios-plugins to 1.4.0 alpha2
- fix check_ntp
- fix compile with LDAP enabled
>How-To-Repeat:
>Fix:
diff -urN nagios-plugins.old/Makefile nagios-plugins/Makefile
--- nagios-plugins.old/Makefile Thu Dec 2 15:09:53 2004
+++ nagios-plugins/Makefile Fri Dec 3 20:31:05 2004
@@ -6,12 +6,11 @@
#
PORTNAME= nagios-plugins
-PORTVERSION= 1.4.0.a1
-PORTREVISION= 1
+PORTVERSION= 1.4.0.a2
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= nagiosplug
-DISTNAME= nagios-plugins-1.4.0alpha1
+DISTNAME= nagios-plugins-1.4.0alpha2
MAINTAINER= blaz@si.FreeBSD.org
COMMENT= Plugins for nagios
diff -urN nagios-plugins.old/distinfo nagios-plugins/distinfo
--- nagios-plugins.old/distinfo Wed Dec 1 23:19:43 2004
+++ nagios-plugins/distinfo Fri Dec 3 20:31:29 2004
@@ -1,2 +1,2 @@
-MD5 (nagios-plugins-1.4.0alpha1.tar.gz) = 96f8fc532943bada48ca677d12f5a5a7
-SIZE (nagios-plugins-1.4.0alpha1.tar.gz) = 811705
+MD5 (nagios-plugins-1.4.0alpha2.tar.gz) = 7dce50240035f0654c17b3c114f44d7b
+SIZE (nagios-plugins-1.4.0alpha2.tar.gz) = 872363
diff -urN nagios-plugins.old/files/patch-check_ifoperstatus.pl nagios-plugins/files/patch-check_ifoperstatus.pl
--- nagios-plugins.old/files/patch-check_ifoperstatus.pl Mon Jul 22 03:03:42 2002
+++ nagios-plugins/files/patch-check_ifoperstatus.pl Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- plugins-scripts/check_ifoperstatus.pl.orig Thu May 9 21:03:51 2002
-+++ plugins-scripts/check_ifoperstatus.pl Fri Jul 19 21:29:02 2002
-@@ -26,7 +26,7 @@
- # 11.01.2000 Version 1.0
- # $Id: check_ifoperstatus.pl,v 1.1 2002/05/09 19:03:51 sghosh Exp $
-
--use POSIX;
-+#use POSIX;
- use strict;
- use lib utils.pm ;
- use utils qw($TIMEOUT %ERRORS &print_revision &support);
diff -urN nagios-plugins.old/files/patch-check_ifstatus.pl nagios-plugins/files/patch-check_ifstatus.pl
--- nagios-plugins.old/files/patch-check_ifstatus.pl Mon Jul 22 03:03:42 2002
+++ nagios-plugins/files/patch-check_ifstatus.pl Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- plugins-scripts/check_ifstatus.pl.orig Wed May 8 06:58:22 2002
-+++ plugins-scripts/check_ifstatus.pl Fri Jul 19 21:28:46 2002
-@@ -27,7 +27,7 @@
- #
- # $Id: check_ifstatus.pl,v 1.1 2002/05/08 04:58:22 sghosh Exp $
-
--use POSIX;
-+#use POSIX;
- use strict;
- use lib utils.pm ;
- use utils qw($TIMEOUT %ERRORS &print_revision &support);
diff -urN nagios-plugins.old/files/patch-check_nagios.c nagios-plugins/files/patch-check_nagios.c
--- nagios-plugins.old/files/patch-check_nagios.c Thu Jan 1 01:00:00 1970
+++ nagios-plugins/files/patch-check_nagios.c Fri Dec 3 22:29:43 2004
@@ -0,0 +1,11 @@
+--- plugins/check_nagios.c.orig Thu Mar 11 16:17:08 2004
++++ plugins/check_nagios.c Fri Dec 3 22:28:53 2004
+@@ -132,7 +132,7 @@
+ }
+
+ /* May get empty procargs */
+- if (!strstr(procargs, argv[0]) && strstr(procprog, process_string) && strcmp(procargs,"")) {
++ if (!strstr(procargs, argv[0]) && strcmp(procargs,"") && strstr(procargs, process_string)) {
+ proc_entries++;
+ if (verbose >= 2) {
+ printf (_("Found process: %s %s\n"), procprog, procargs);
diff -urN nagios-plugins.old/files/patch-check_ntp.pl nagios-plugins/files/patch-check_ntp.pl
--- nagios-plugins.old/files/patch-check_ntp.pl Thu Jan 1 01:00:00 1970
+++ nagios-plugins/files/patch-check_ntp.pl Fri Dec 3 23:54:39 2004
@@ -0,0 +1,20 @@
+--- plugins-scripts/check_ntp.pl.orig Fri Nov 19 04:59:43 2004
++++ plugins-scripts/check_ntp.pl Fri Dec 3 23:54:19 2004
+@@ -274,7 +274,7 @@
+ }
+
+ # match sys.peer or pps.peer
+- if (/^(\*|o)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
++ if (/^(\*|o)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/) {
+ $syspeer = $2;
+ $stratum = $4;
+ $jitter = $11;
+@@ -299,7 +299,7 @@
+ unless (defined $syspeer) {
+ if ($#candidates >0) {
+ foreach my $c (@candidates) {
+- $c =~ /^(#)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/;
++ $c =~ /^(#)([-0-9.\s]+)\s+([-0-9A-Za-z.]+)\s+([-0-9.]+)\s+([lumb-]+)\s+([-0-9m.]+)\s+([-0-9m.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)\s+([-0-9.]+)/;
+ $syspeer = $2;
+ $stratum = $4;
+ $jitter = $11;
diff -urN nagios-plugins.old/files/patch-check_radius.c nagios-plugins/files/patch-check_radius.c
--- nagios-plugins.old/files/patch-check_radius.c Thu Dec 2 15:09:53 2004
+++ nagios-plugins/files/patch-check_radius.c Fri Dec 3 20:38:03 2004
@@ -1,6 +1,6 @@
---- plugins/check_radius.c.orig Fri Aug 22 08:22:38 2003
-+++ plugins/check_radius.c Sat Nov 27 13:25:35 2004
-@@ -102,6 +102,7 @@
+--- plugins/check_radius.c.orig Wed Nov 24 01:46:39 2004
++++ plugins/check_radius.c Fri Dec 3 20:37:30 2004
+@@ -103,6 +103,7 @@
int result;
UINT4 client_id;
char *str;
@@ -8,7 +8,7 @@
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
-@@ -111,31 +112,34 @@
+@@ -112,32 +113,35 @@
usage (_("Could not parse arguments\n"));
str = strdup ("dictionary");
@@ -25,10 +25,12 @@
- if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
- rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
-- rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0)))
+- rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&
+- (nasid==NULL || rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))))
+ if (!(rc_avpair_add (rh, &data.send_pairs, PW_SERVICE_TYPE, &service, -1, 0) &&
+ rc_avpair_add (rh, &data.send_pairs, PW_USER_NAME, username, -1, 0) &&
-+ rc_avpair_add (rh, &data.send_pairs, PW_USER_PASSWORD, password, -1, 0)))
++ rc_avpair_add (rh, &data.send_pairs, PW_USER_PASSWORD, password, -1, 0) &&
++ (nasid==NULL || rc_avpair_add (rh, &data.send_pairs, PW_NAS_IDENTIFIER, nasid, -1, 0))))
die (STATE_UNKNOWN, _("Out of Memory?"));
/*
diff -urN nagios-plugins.old/files/patch-configure.in nagios-plugins/files/patch-configure.in
--- nagios-plugins.old/files/patch-configure.in Wed Dec 1 23:19:44 2004
+++ nagios-plugins/files/patch-configure.in Fri Dec 3 22:27:24 2004
@@ -1,5 +1,5 @@
---- configure.in.orig Mon Dec 1 03:55:32 2003
-+++ configure.in Sat Nov 27 13:52:10 2004
+--- configure.in.orig Wed Dec 1 09:41:08 2004
++++ configure.in Fri Dec 3 22:27:18 2004
@@ -10,7 +10,7 @@
RELEASE=1
AC_SUBST(RELEASE)
@@ -18,7 +18,7 @@
AC_ARG_WITH(trusted_path,
ACX_HELP_STRING([--with-trusted-path=PATH],
-@@ -181,25 +179,32 @@
+@@ -181,27 +179,35 @@
LIBS="$_SAVEDLIBS"
CPPFLAGS="$_SAVEDCPPFLAGS"
@@ -56,8 +56,11 @@
+ LDAPINCLUDE="-I${LOCALBASE}/include"
AC_SUBST(LDAPLIBS)
AC_SUBST(LDAPINCLUDE)
++ LIBS="-L${LOCALBASE}/lib $LIBS"
AC_CHECK_FUNCS(ldap_set_option)
-@@ -209,6 +214,7 @@
+ EXTRAS="$EXTRAS check_ldap"
+ else
+@@ -209,6 +215,7 @@
AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
fi
LIBS="$_SAVEDLIBS"
@@ -65,16 +68,7 @@
dnl Check for mysql libraries
-@@ -251,7 +257,7 @@
- AC_MSG_WARN([Skipping mysql plugin])
- AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
- fi
--CPPFLAGS="$_SAVEDCPPFLAGS"
-+CPPFLAGS="$_SAVEDCPPFLAGS $MYSQLINCLUDE"
- LIBS="$_SAVEDLIBS"
-
- dnl Check for OpenSSL location
-@@ -658,7 +664,7 @@
+@@ -676,7 +683,7 @@
egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null
then
ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
@@ -83,7 +77,7 @@
ac_cv_ps_format="%s %d %d %d %d %f %s %n"
ac_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
-@@ -1184,6 +1190,8 @@
+@@ -1221,6 +1228,8 @@
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
[path and arguments for invoking 'who'])
@@ -92,7 +86,7 @@
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
if test -x "$PATH_TO_SNMPGET"
then
-@@ -1206,7 +1214,10 @@
+@@ -1243,7 +1252,10 @@
else
AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
fi
@@ -103,7 +97,7 @@
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
-@@ -1228,7 +1239,10 @@
+@@ -1265,7 +1277,10 @@
AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
[path to qstat/quakestat])
fi
@@ -114,7 +108,7 @@
AC_PATH_PROG(PATH_TO_FPING,fping)
if test -x "$PATH_TO_FPING"
then
-@@ -1236,6 +1250,7 @@
+@@ -1273,6 +1288,7 @@
EXTRAS="$EXTRAS check_fping"
else
AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
diff -urN nagios-plugins.old/files/patch-netutils.c nagios-plugins/files/patch-netutils.c
--- nagios-plugins.old/files/patch-netutils.c Thu Dec 2 15:09:53 2004
+++ nagios-plugins/files/patch-netutils.c Thu Jan 1 01:00:00 1970
@@ -1,47 +0,0 @@
---- plugins/netutils.c.orig Sun Aug 10 08:31:02 2003
-+++ plugins/netutils.c Sat Nov 27 13:10:43 2004
-@@ -97,7 +97,7 @@
- fd_set readfds;
- int recv_length = 0;
-
-- result = my_connect (server_address, server_port, &sd, IPPROTO_TCP);
-+ result = nagios_my_connect (server_address, server_port, &sd, IPPROTO_TCP);
- if (result != STATE_OK)
- return STATE_CRITICAL;
-
-@@ -175,7 +175,7 @@
-
- result = STATE_OK;
-
-- result = my_connect (server_address, server_port, &sd, proto);
-+ result = nagios_my_connect (server_address, server_port, &sd, proto);
- if (result != STATE_OK)
- return STATE_CRITICAL;
-
-@@ -227,7 +227,7 @@
- {
- int result;
-
-- result = my_connect (host_name, port, sd, IPPROTO_TCP);
-+ result = nagios_my_connect (host_name, port, sd, IPPROTO_TCP);
-
- return result;
- }
-@@ -239,7 +239,7 @@
- {
- int result;
-
-- result = my_connect (host_name, port, sd, IPPROTO_UDP);
-+ result = nagios_my_connect (host_name, port, sd, IPPROTO_UDP);
-
- return result;
- }
-@@ -247,7 +247,7 @@
-
- /* opens a tcp or udp connection to a remote host */
- int
--my_connect (const char *host_name, int port, int *sd, int proto)
-+nagios_my_connect (const char *host_name, int port, int *sd, int proto)
- {
- struct addrinfo hints;
- struct addrinfo *res;
diff -urN nagios-plugins.old/files/patch-netutils.h nagios-plugins/files/patch-netutils.h
--- nagios-plugins.old/files/patch-netutils.h Thu Dec 2 15:09:53 2004
+++ nagios-plugins/files/patch-netutils.h Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- plugins/netutils.h.orig Sat Aug 9 01:05:17 2003
-+++ plugins/netutils.h Sat Nov 27 13:10:26 2004
-@@ -47,7 +47,7 @@
-
- int my_tcp_connect (const char *address, int port, int *sd);
- int my_udp_connect (const char *address, int port, int *sd);
--int my_connect (const char *address, int port, int *sd, int proto);
-+int nagios_my_connect (const char *address, int port, int *sd, int proto);
-
- int is_host (const char *);
- int is_addr (const char *);
diff -urN nagios-plugins.old/pkg-plist nagios-plugins/pkg-plist
--- nagios-plugins.old/pkg-plist Wed Dec 1 23:19:43 2004
+++ nagios-plugins/pkg-plist Fri Dec 3 21:00:46 2004
@@ -16,6 +16,7 @@
libexec/nagios/check_ifstatus
libexec/nagios/check_imap
libexec/nagios/check_ircd
+libexec/nagios/check_jabber
%%SUB_LDAP%%libexec/nagios/check_ldap
libexec/nagios/check_load
libexec/nagios/check_log
@@ -25,6 +26,7 @@
%%SUB_MYSQL%%libexec/nagios/check_mysql
libexec/nagios/check_nagios
libexec/nagios/check_nntp
+libexec/nagios/check_nntps
libexec/nagios/check_nt
libexec/nagios/check_ntp
libexec/nagios/check_nwstat
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041204122536.BF72755475>