Date: Thu, 11 Oct 2007 15:27:34 +0200 (CEST) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117112: [UPDATE] net-mgmt/nagios-plugins to 1.4.10 Message-ID: <20071011132734.1ED5245516@mail.vx.sk> Resent-Message-ID: <200710111330.l9BDU1ag020800@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117112
>Category: ports
>Synopsis: [UPDATE] net-mgmt/nagios-plugins to 1.4.10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 11 13:30:00 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 6.0-RELEASE
>Organization:
>Environment:
FreeBSD 6.0-RELEASE i386 amd64
>Description:
Update of net-mgmt/nagios-plugins from 1.4.9 to 1.4.10
Updated patchfiles for changes in 1.4.10
Removed radius patch as 1.4.10 supports radiusclient-ng
Tinderbox tested 5.5,6.2,7.0 i386+amd64
>How-To-Repeat:
>Fix:
Index: ports/net-mgmt/nagios-plugins/Makefile
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagios-plugins/Makefile,v
retrieving revision 1.64
diff -u -r1.64 Makefile
--- ports/net-mgmt/nagios-plugins/Makefile 8 Oct 2007 04:14:53 -0000 1.64
+++ ports/net-mgmt/nagios-plugins/Makefile 11 Oct 2007 13:15:16 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= nagios-plugins
-PORTVERSION= 1.4.9
-PORTREVISION= 3
+PORTVERSION= 1.4.10
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
Index: ports/net-mgmt/nagios-plugins/distinfo
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagios-plugins/distinfo,v
retrieving revision 1.24
diff -u -r1.24 distinfo
--- ports/net-mgmt/nagios-plugins/distinfo 9 Jun 2007 08:21:38 -0000 1.24
+++ ports/net-mgmt/nagios-plugins/distinfo 11 Oct 2007 13:15:16 -0000
@@ -1,3 +1,3 @@
-MD5 (nagios-plugins-1.4.9.tar.gz) = 6e617e95cadeedd92870cdbd2f13726c
-SHA256 (nagios-plugins-1.4.9.tar.gz) = 93cf5dadfb092d7c4d600a713bbef75d37141edb4d18ac3bc3c0d1c09f4b7fe2
-SIZE (nagios-plugins-1.4.9.tar.gz) = 1370263
+MD5 (nagios-plugins-1.4.10.tar.gz) = c67841223864ae1626ab2adb2f0b4c9d
+SHA256 (nagios-plugins-1.4.10.tar.gz) = 193ef480cd2b98d63de9183a83e277d6ef3b55032f44bd76616ef5e7a3d4a76e
+SIZE (nagios-plugins-1.4.10.tar.gz) = 1693979
Index: ports/net-mgmt/nagios-plugins/files/patch-configure.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagios-plugins/files/patch-configure.in,v
retrieving revision 1.19
diff -u -r1.19 patch-configure.in
--- ports/net-mgmt/nagios-plugins/files/patch-configure.in 27 May 2007 17:42:13 -0000 1.19
+++ ports/net-mgmt/nagios-plugins/files/patch-configure.in 11 Oct 2007 13:15:16 -0000
@@ -1,5 +1,5 @@
---- configure.in.orig Wed Apr 11 21:38:05 2007
-+++ configure.in Sun May 27 12:27:04 2007
+--- configure.in.orig 2007-09-29 02:44:36.000000000 +0200
++++ configure.in 2007-10-08 21:31:48.000000000 +0200
@@ -12,8 +12,6 @@
RELEASE=1
AC_SUBST(RELEASE)
@@ -33,7 +33,7 @@
fi
AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
-@@ -207,30 +206,42 @@
+@@ -207,16 +206,25 @@
AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).])
fi
@@ -41,6 +41,7 @@
+ AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
+ AC_MSG_WARN([PostgreSQL directory has not been found])
+fi
++
LIBS="$_SAVEDLIBS"
CPPFLAGS="$_SAVEDCPPFLAGS"
@@ -59,14 +60,10 @@
AC_SUBST(RADIUSLIBS)
+ AC_SUBST(RADIUSINCLUDE)
else
- AC_MSG_WARN([Skipping radius plugin])
- AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
- fi
- LIBS="$_SAVEDLIBS"
-+fi
+ AC_CHECK_LIB(radiusclient-ng,rc_read_config)
+ if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
+@@ -232,12 +240,13 @@
-+AC_ARG_ENABLE(ldap,--enable-ldap compile check_ldap)
-+if test x$enable_ldap = xyes; then
dnl Check for LDAP libraries
_SAVEDLIBS="$LIBS"
-AC_CHECK_LIB(ldap,main,,,-llber)
@@ -83,15 +80,15 @@
AC_CHECK_FUNCS(ldap_set_option)
EXTRAS="$EXTRAS check_ldap"
AC_CHECK_FUNCS(ldap_init ldap_set_option ldap_get_option ldap_start_tls_s)
-@@ -239,6 +250,7 @@
+@@ -246,6 +255,7 @@
AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
fi
LIBS="$_SAVEDLIBS"
+fi
- dnl Check for mysql libraries
- np_mysqlclient
-@@ -492,22 +504,10 @@
+ dnl Check for headers used by check_ide_smart
+ AC_CHECK_HEADER(linux/hdreg.h, FOUNDINCLUDE=yes, FOUNDINCLUDE=no)
+@@ -522,22 +532,10 @@
ac_cv_ps_cols=8
AC_MSG_RESULT([$ac_cv_ps_command])
@@ -117,7 +114,7 @@
then
ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
-@@ -515,9 +515,8 @@
+@@ -545,9 +543,8 @@
ac_cv_ps_cols=9
AC_MSG_RESULT([$ac_cv_ps_command])
@@ -129,7 +126,7 @@
elif ps -axwo 'stat uid pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
then
-@@ -527,209 +526,6 @@
+@@ -557,209 +554,6 @@
ac_cv_ps_cols=9
AC_MSG_RESULT([$ac_cv_ps_command])
@@ -339,7 +336,7 @@
else
AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
fi
-@@ -1099,6 +895,8 @@
+@@ -1137,6 +931,8 @@
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
[path and arguments for invoking 'who'])
@@ -348,7 +345,7 @@
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
AC_ARG_WITH(snmpget_command,
ACX_HELP_STRING([--with-snmpget-command=PATH],
-@@ -1129,7 +927,10 @@
+@@ -1167,7 +963,10 @@
else
AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
fi
@@ -359,7 +356,7 @@
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
AC_ARG_WITH(qstat_command,
-@@ -1154,7 +955,10 @@
+@@ -1192,7 +991,10 @@
AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
[path to qstat/quakestat])
fi
@@ -370,7 +367,7 @@
AC_PATH_PROG(PATH_TO_FPING,fping)
AC_ARG_WITH(fping_command,
ACX_HELP_STRING([--with-fping-command=PATH],
-@@ -1166,6 +970,7 @@
+@@ -1204,6 +1006,7 @@
else
AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
fi
@@ -378,7 +375,7 @@
AC_PATH_PROG(PATH_TO_SSH,ssh)
AC_ARG_WITH(ssh_command,
-@@ -1233,32 +1038,12 @@
+@@ -1271,32 +1074,12 @@
dnl end if for PATH_TO_SWAP
fi
Index: ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__utils.sh.in
===================================================================
RCS file: /home/pcvs/ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__utils.sh.in,v
retrieving revision 1.1
diff -u -r1.1 patch-plugins-scripts__utils.sh.in
--- ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__utils.sh.in 15 May 2006 13:07:20 -0000 1.1
+++ ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__utils.sh.in 11 Oct 2007 13:15:16 -0000
@@ -1,9 +1,9 @@
---- plugins-scripts/utils.sh.in.orig Wed Mar 22 23:29:36 2006
-+++ plugins-scripts/utils.sh.in Fri May 12 23:37:49 2006
+--- plugins-scripts/utils.sh.in.orig 2007-07-07 13:40:29.000000000 +0200
++++ plugins-scripts/utils.sh.in 2007-10-08 21:22:49.000000000 +0200
@@ -14,10 +14,10 @@
print_revision() {
- echo "$1 (@PACKAGE@ @VERSION@) $2"
+ echo "$1 v$2 (@PACKAGE@ @VERSION@)"
- $ECHO "@WARRANTY@" | sed -e 's/\n/ /g'
+ $ECHO "@WARRANTY@" | /usr/bin/sed -e 's/\n/ /g'
}
Index: ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c
===================================================================
RCS file: ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c
diff -N ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c
--- ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c 2 Mar 2007 15:33:27 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
---- plugins/check_radius.c.orig Mon Jan 29 08:16:40 2007
-+++ plugins/check_radius.c Tue Feb 27 21:36:09 2007
-@@ -43,7 +43,7 @@
- #include "utils.h"
- #include "netutils.h"
-
--#include <radiusclient.h>
-+#include <radiusclient-ng.h>
-
- int process_arguments (int, char **);
- void print_help (void);
-@@ -124,6 +124,7 @@
- int result = STATE_UNKNOWN;
- UINT4 client_id;
- char *str;
-+ rc_handle *rh;
-
- setlocale (LC_ALL, "");
- bindtextdomain (PACKAGE, LOCALEDIR);
-@@ -133,33 +134,36 @@
- usage4 (_("Could not parse arguments"));
-
- str = strdup ("dictionary");
-- if ((config_file && rc_read_config (config_file)) ||
-- rc_read_dictionary (rc_conf_str (str)))
-+ if (config_file)
-+ rh = rc_read_config (config_file);
-+ else
-+ rh = NULL;
-+ if (!rh || rc_read_dictionary (rh, rc_conf_str (rh, str)))
- die (STATE_UNKNOWN, _("Config file error"));
-
- service = PW_AUTHENTICATE_ONLY;
-
- memset (&data, 0, sizeof(data));
-- 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) &&
-- (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) &&
-+ (nasid==NULL || rc_avpair_add (rh, &data.send_pairs, PW_NAS_IDENTIFIER, nasid, -1, 0))))
- die (STATE_UNKNOWN, _("Out of Memory?"));
-
- /*
- * Fill in NAS-IP-Address
- */
-
-- if ((client_id = rc_own_ipaddress ()) == 0)
-+ if ((client_id = rc_own_ipaddress (rh)) == 0)
- return (ERROR_RC);
-
-- if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
-+ if (rc_avpair_add (rh, &(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, -1, 0) ==
- NULL) return (ERROR_RC);
-
-- rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
-+ rc_buildreq (rh, &data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
- retries);
-
-- result = rc_send_server (&data, msg);
-+ result = rc_send_server (rh, &data, msg);
- rc_avpair_free (data.send_pairs);
- if (data.receive_pairs)
- rc_avpair_free (data.receive_pairs);
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071011132734.1ED5245516>