ports/97189: [maintainer-update] net-mgmt/nagios-plugins: Update to 1.4.3
Jarrod Sayers
jarrod at netleader.com.au
Sat May 13 04:00:44 UTC 2006
>Number: 97189
>Category: ports
>Synopsis: [maintainer-update] net-mgmt/nagios-plugins: Update to 1.4.3
>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 May 13 04:00:41 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jarrod Sayers
>Release: FreeBSD 4.11-RELEASE-p17 i386
>Organization:
>Environment:
System: FreeBSD wallace.netleader.com.au 4.11-RELEASE-p17 FreeBSD 4.11-RELEASE-p17 #20: Thu Apr 20 10:12:15 CST 2006 root at wallace.netleader.com.au:/usr/obj/usr/src/sys/WALLACE i386
>Description:
Update to Nagios Plugins 1.4.3:
- Variable ordering and style realigned with bsd.port.mk
- Moved manual pre-configure aclocal call to use bsd.autotools.mk (with manual
tweak to ACLOCAL_ARGS required)
- Listed resulting plug-in name in user configurable options
- Removed remaining hard-coded variables including local state directory
- Correctly identified location of Perl to configure script
- Removed setlocale (LC_NUMERIC, "C") patch to plug-ins containing scanf(3) and
an already defined LC_NUMERIC
- Reworked all patches (named using make makepatch)
- Corrected minor warning in check_ntp.pl regarding undefined use of $jitter
All build options individually tested with functional operation and pkg-plist
listings confirmed for both FreeBSD 4.11 and FreeBSD 6.1. A large thanks goes
to Martin Matuska for the initial set of groundwork patches supplied for this
update. Note: This PR supersedes ports/96694.
Files changed:
- ports/net-mgmt/nagios-plugins/Makefile
- ports/net-mgmt/nagios-plugins/distinfo
- ports/net-mgmt/nagios-plugins/pkg-plist
- ports/net-mgmt/nagios-plugins/files/patch-configure.in
Files created:
- ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl
- ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl
- ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__utils.sh.in
- ports/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am
- ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c
- ports/net-mgmt/nagios-plugins/files/patch-plugins__check_snmp.c
- ports/net-mgmt/nagios-plugins/files/patch-plugins__check_tcp.c
Files removed:
- ports/net-mgmt/nagios-plugins/files/patch-Makefile.am
- ports/net-mgmt/nagios-plugins/files/patch-check_http.c
- ports/net-mgmt/nagios-plugins/files/patch-check_ircd.pl
- ports/net-mgmt/nagios-plugins/files/patch-check_nagios.c
- ports/net-mgmt/nagios-plugins/files/patch-check_ntp.pl
- ports/net-mgmt/nagios-plugins/files/patch-check_radius.c
- ports/net-mgmt/nagios-plugins/files/patch-check_snmp.c
- ports/net-mgmt/nagios-plugins/files/patch-check_tcp.c
- ports/net-mgmt/nagios-plugins/files/patch-utils.sh.in
>How-To-Repeat:
>Fix:
Downloadable diff from:
http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-plugins-1.4.3.diff
--- net-mgmt-nagios-plugins-1.4.3.diff begins here ---
diff -ruN ports/net-mgmt/nagios-plugins.orig/Makefile ports/net-mgmt/nagios-plugins/Makefile
--- ports/net-mgmt/nagios-plugins.orig/Makefile Tue Nov 15 17:20:43 2005
+++ ports/net-mgmt/nagios-plugins/Makefile Sat May 13 00:49:46 2006
@@ -6,56 +6,79 @@
#
PORTNAME= nagios-plugins
-PORTVERSION= 1.4.2
-PORTREVISION= 2
+PORTVERSION= 1.4.3
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= nagiosplug
MAINTAINER= jarrod at netleader.com.au
-COMMENT= Plugins for nagios
-
-OPTIONS= QSTAT "Game server query support" off \
- FPING "Support for non-flooding fast ping" off \
- NETSNMP "SNMP support" off \
- RADIUS "Radius support" off \
- MYSQL "MySQL support" off \
- PGSQL "PostgreSQL support" off \
- LDAP "OpenLDAP support" off \
- IPV6 "IPV6 support" on
-
-.include <bsd.port.pre.mk>
+COMMENT= Plugins for Nagios
USE_SUBMAKE= yes
+USE_GMAKE= yes
+USE_ICONV= yes
USE_GETTEXT= yes
+USE_PERL5= yes
+USE_AUTOTOOLS= aclocal:19 automake:19 autoconf:259
+ACLOCAL_ARGS= --acdir=${ACLOCAL_DIR} -I m4
+
+OPTIONS= QSTAT "Game server query support (check_game)" OFF \
+ FPING "Support for non-flooding fast ping (check_fping)" OFF \
+ NETSNMP "SNMP support (check_snmp)" OFF \
+ RADIUS "Radius support (check_radius)" OFF \
+ MYSQL "MySQL support (check_mysql)" OFF \
+ PGSQL "PostgreSQL support (check_pgsql)" OFF \
+ LDAP "OpenLDAP support (check_ldap)" OFF \
+ IPV6 "IPv6 support" ON
+
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --sbindir=${PREFIX}/share/nagios/cgi-bin \
+
+NAGIOSUSER?= nagios
+NAGIOSGROUP?= nagios
+NAGIOSDIR?= /var/spool/nagios
+
+NAGIOSWWWDIR?= www/nagios
+NAGIOSHTMURL?= /nagios
+NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin
+
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS= --with-nagios-user=${NAGIOSUSER} \
+ --with-nagios-group=${NAGIOSGROUP} \
+ --with-cgiurl=${NAGIOSCGIURL} \
+ --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \
--libexecdir=${PREFIX}/libexec/nagios \
--datadir=${PREFIX}/share/nagios \
--sysconfdir=${PREFIX}/etc/nagios \
- --localstatedir=/var/spool/nagios \
- --with-df-command="/bin/df -Pkt noprocfs"
+ --localstatedir=${NAGIOSDIR} \
+ --prefix=${PREFIX}
+
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ LIBS="-L${LOCALBASE}/lib" \
+ PERL=${PERL}
.if defined(WITH_QSTAT)
BUILD_DEPENDS+= qstat:${PORTSDIR}/games/qstat
RUN_DEPENDS+= qstat:${PORTSDIR}/games/qstat
-CONFIGURE_ARGS+=--enable-qstat
+CONFIGURE_ARGS+= --enable-qstat
PLIST_SUB+= SUB_QSTAT=""
.else
PLIST_SUB+= SUB_QSTAT="@comment "
.endif
.if !defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--with-ipv6
+CONFIGURE_ARGS+= --with-ipv6
.else
-CONFIGURE_ARGS+=--without-ipv6
+CONFIGURE_ARGS+= --without-ipv6
.endif
.if defined(WITH_FPING)
BUILD_DEPENDS+= fping:${PORTSDIR}/net/fping
RUN_DEPENDS+= fping:${PORTSDIR}/net/fping
-CONFIGURE_ARGS+=--enable-fping
+CONFIGURE_ARGS+= --enable-fping
PLIST_SUB+= SUB_FPING=""
.else
PLIST_SUB+= SUB_FPING="@comment "
@@ -66,7 +89,7 @@
${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
RUN_DEPENDS+= snmpcheck:${PORTSDIR}/net-mgmt/net-snmp \
${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP
-CONFIGURE_ARGS+=--enable-snmp
+CONFIGURE_ARGS+= --enable-snmp
PLIST_SUB+= SUB_SNMP=""
.else
PLIST_SUB+= SUB_SNMP="@comment "
@@ -74,7 +97,7 @@
.if defined(WITH_RADIUS)
LIB_DEPENDS+= radiusclient-ng.2:${PORTSDIR}/net/radiusclient
-CONFIGURE_ARGS+=--enable-radius
+CONFIGURE_ARGS+= --enable-radius
PLIST_SUB+= SUB_RADIUS=""
.else
PLIST_SUB+= SUB_RADIUS="@comment "
@@ -82,7 +105,7 @@
.if defined(WITH_MYSQL)
USE_MYSQL= YES
-CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
+CONFIGURE_ARGS+= --with-mysql=${LOCALBASE}
PLIST_SUB+= SUB_MYSQL=""
.else
PLIST_SUB+= SUB_MYSQL="@comment "
@@ -90,38 +113,26 @@
.if defined(WITH_PGSQL)
USE_PGSQL= YES
-CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
+CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE}
PLIST_SUB+= SUB_PGSQL=""
.else
-CONFIGURE_ARGS+=--with-pgsql=${NONEXISTENT}
+CONFIGURE_ARGS+= --with-pgsql=${NONEXISTENT}
PLIST_SUB+= SUB_PGSQL="@comment "
.endif
.if defined(WITH_LDAP)
USE_OPENLDAP= YES
-CONFIGURE_ARGS+=--enable-ldap
+CONFIGURE_ARGS+= --enable-ldap
PLIST_SUB+= SUB_LDAP=""
.else
PLIST_SUB+= SUB_LDAP="@comment "
.endif
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE} LDFLAGS="-L${LOCALBASE}/lib" \
- CPPFLAGS="-I${LOCALBASE}/include"
-USE_AUTOTOOLS= automake:19 autoconf:259
-USE_GMAKE= yes
-USE_PERL5= yes
-USE_REINPLACE= yes
-
post-patch:
-.for file in check_by_ssh.c check_disk.c check_http.c check_load.c \
- check_mrtgtraf.c check_nagios.c check_pgsql.c check_ping.c \
- check_procs.c check_snmp.c check_ssh.c check_swap.c check_time.c \
- check_users.c utils.c
+.for file in check_by_ssh.c check_disk.c check_http.c check_mrtgtraf.c \
+ check_nagios.c check_pgsql.c check_snmp.c check_ssh.c check_swap.c \
+ check_time.c check_users.c utils.c
@${REINPLACE_CMD} -e 's|setlocale (LC_ALL, "");|setlocale (LC_ALL, ""); setlocale(LC_NUMERIC, "C");|g' ${WRKSRC}/plugins/${file}
.endfor
-
-pre-configure:
- @(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \
- --acdir=${ACLOCAL_DIR} -I m4)
.include <bsd.port.post.mk>
diff -ruN ports/net-mgmt/nagios-plugins.orig/distinfo ports/net-mgmt/nagios-plugins/distinfo
--- ports/net-mgmt/nagios-plugins.orig/distinfo Wed Feb 1 11:38:07 2006
+++ ports/net-mgmt/nagios-plugins/distinfo Fri May 12 23:21:15 2006
@@ -1,3 +1,3 @@
-MD5 (nagios-plugins-1.4.2.tar.gz) = 1f2bee15ade3d98ec79964a43479e328
-SHA256 (nagios-plugins-1.4.2.tar.gz) = a329b3e1c7daf79dc002eacc44af9d4706555342b7d20227cc8eb3139767e652
-SIZE (nagios-plugins-1.4.2.tar.gz) = 971447
+MD5 (nagios-plugins-1.4.3.tar.gz) = 2c40fc69d51cc979e85150870a1daa93
+SHA256 (nagios-plugins-1.4.3.tar.gz) = e1178d639bef1b45a7bddb61899217122840382ee180594f0262fb4a1e6a8c70
+SIZE (nagios-plugins-1.4.3.tar.gz) = 1257775
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-Makefile.am ports/net-mgmt/nagios-plugins/files/patch-Makefile.am
--- ports/net-mgmt/nagios-plugins.orig/files/patch-Makefile.am Fri Sep 30 17:55:47 2005
+++ ports/net-mgmt/nagios-plugins/files/patch-Makefile.am Thu Jan 1 09:30:00 1970
@@ -1,11 +0,0 @@
---- 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@
-+INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @RADIUSINCLUDE@
-
- datadir = @datadir@
- localedir = $(datadir)/locale
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-check_http.c ports/net-mgmt/nagios-plugins/files/patch-check_http.c
--- ports/net-mgmt/nagios-plugins.orig/files/patch-check_http.c Thu Dec 2 08:49:44 2004
+++ ports/net-mgmt/nagios-plugins/files/patch-check_http.c Thu Jan 1 09:30:00 1970
@@ -1,20 +0,0 @@
---- plugins/check_http.c.orig Mon Sep 15 07:03:47 2003
-+++ plugins/check_http.c Sat Nov 27 12:32:09 2004
-@@ -83,7 +83,7 @@
- #define HTTP_URL "/"
- #define CRLF "\r\n"
-
--char timestamp[17] = "";
-+char timestamp[256] = "";
- int specify_port = FALSE;
- int server_port = HTTP_PORT;
- char server_port_text[6] = "";
-@@ -1010,7 +1010,7 @@
-
- days_left = (mktime (&stamp) - time (NULL)) / 86400;
- snprintf
-- (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
-+ (timestamp, sizeof(timestamp), "%02d/%02d/%04d %02d:%02d",
- stamp.tm_mon + 1,
- stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
-
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-check_ircd.pl ports/net-mgmt/nagios-plugins/files/patch-check_ircd.pl
--- ports/net-mgmt/nagios-plugins.orig/files/patch-check_ircd.pl Thu Aug 12 06:15:51 2004
+++ ports/net-mgmt/nagios-plugins/files/patch-check_ircd.pl Thu Jan 1 09:30:00 1970
@@ -1,10 +0,0 @@
---- plugins-scripts/check_ircd.pl.orig Tue May 7 07:35:49 2002
-+++ plugins-scripts/check_ircd.pl Wed Aug 11 21:15:56 2004
-@@ -67,6 +67,7 @@
- $ENV{PATH} = "";
- $ENV{ENV} = "";
- $ENV{BASH_ENV} = "";
-+$ENV{CDPATH} = "";
-
- # -----------------------------------------------------------------[ Global ]--
-
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-check_nagios.c ports/net-mgmt/nagios-plugins/files/patch-check_nagios.c
--- ports/net-mgmt/nagios-plugins.orig/files/patch-check_nagios.c Mon Jun 20 15:18:16 2005
+++ ports/net-mgmt/nagios-plugins/files/patch-check_nagios.c Thu Jan 1 09:30:00 1970
@@ -1,53 +0,0 @@
---- plugins/check_nagios.c.orig Sun Jun 19 09:51:52 2005
-+++ plugins/check_nagios.c Sun Jun 19 09:53:28 2005
-@@ -26,6 +26,8 @@
- #include "common.h"
- #include "popen.h"
- #include "utils.h"
-+#include <sys/types.h>
-+#include <sys/stat.h>
-
- int process_arguments (int, char **);
- void print_help (void);
-@@ -42,12 +44,12 @@
- {
- int result = STATE_UNKNOWN;
- char input_buffer[MAX_INPUT_BUFFER];
-- unsigned long latest_entry_time = 0L;
-- unsigned long temp_entry_time = 0L;
-+ unsigned long latest_entry_time;
- int proc_entries = 0;
- time_t current_time;
- char *temp_ptr;
-- FILE *fp;
-+ struct stat sb;
-+ int err;
- int procuid = 0;
- int procppid = 0;
- int procvsz = 0;
-@@ -78,21 +80,14 @@
- alarm (timeout_interval);
-
- /* open the status log */
-- fp = fopen (status_log, "r");
-- if (fp == NULL) {
-- printf (_("CRITICAL - Cannot open status log for reading!\n"));
-+ err = stat(status_log, &sb);
-+ if (err) {
-+ printf (_("CRITICAL - Cannot get modification time of status log!\n"));
- return STATE_CRITICAL;
- }
-
- /* get the date/time of the last item updated in the log */
-- while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
-- temp_ptr = strtok (input_buffer, "]");
-- temp_entry_time =
-- (temp_ptr == NULL) ? 0L : strtoul (temp_ptr + 1, NULL, 10);
-- if (temp_entry_time > latest_entry_time)
-- latest_entry_time = temp_entry_time;
-- }
-- fclose (fp);
-+ latest_entry_time = sb.st_mtime;
-
- if (verbose >= 2)
- printf(_("command: %s\n"), PS_COMMAND);
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-check_ntp.pl ports/net-mgmt/nagios-plugins/files/patch-check_ntp.pl
--- ports/net-mgmt/nagios-plugins.orig/files/patch-check_ntp.pl Wed Aug 31 22:01:36 2005
+++ ports/net-mgmt/nagios-plugins/files/patch-check_ntp.pl Thu Jan 1 09:30:00 1970
@@ -1,10 +0,0 @@
---- plugins-scripts/check_ntp.pl.orig Wed May 25 16:05:41 2005
-+++ plugins-scripts/check_ntp.pl Wed Aug 3 10:23:37 2005
-@@ -309,7 +309,6 @@
- }
- } else {
- print "No match!\n" if $verbose;
-- $jitter = '(not parsed)';
- }
-
- }
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-check_radius.c ports/net-mgmt/nagios-plugins/files/patch-check_radius.c
--- ports/net-mgmt/nagios-plugins.orig/files/patch-check_radius.c Fri Sep 2 22:25:55 2005
+++ ports/net-mgmt/nagios-plugins/files/patch-check_radius.c Thu Jan 1 09:30:00 1970
@@ -1,65 +0,0 @@
---- plugins/check_radius.c.orig Sun Dec 26 02:17:44 2004
-+++ plugins/check_radius.c Fri Aug 12 13:53:36 2005
-@@ -27,7 +27,7 @@
- #include "utils.h"
- #include "netutils.h"
-
--#include <radiusclient.h>
-+#include <radiusclient-ng.h>
-
- int process_arguments (int, char **);
- void print_help (void);
-@@ -108,6 +108,7 @@
- int result = STATE_UNKNOWN;
- UINT4 client_id;
- char *str;
-+ rc_handle *rh;
-
- setlocale (LC_ALL, "");
- bindtextdomain (PACKAGE, LOCALEDIR);
-@@ -117,32 +118,35 @@
- 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;
-
-- 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);
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-check_snmp.c ports/net-mgmt/nagios-plugins/files/patch-check_snmp.c
--- ports/net-mgmt/nagios-plugins.orig/files/patch-check_snmp.c Sat Oct 15 21:15:50 2005
+++ ports/net-mgmt/nagios-plugins/files/patch-check_snmp.c Thu Jan 1 09:30:00 1970
@@ -1,18 +0,0 @@
---- plugins/check_snmp.c.orig Sat Oct 15 09:41:06 2005
-+++ plugins/check_snmp.c Sat Oct 15 09:48:43 2005
-@@ -206,6 +206,7 @@
- strcat(perfstr, "| ");
- while (ptr) {
- char *foo;
-+ char *str[MAX_INPUT_BUFFER];
-
- foo = strstr (ptr, delimiter);
- strncat(perfstr, ptr, foo-ptr);
-@@ -338,7 +339,6 @@
-
- i++;
-
-- char *str[MAX_INPUT_BUFFER];
- asprintf(str, "=%s%s;;;; ", show, type ? type : "");
- strcat(perfstr, *str);
-
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-check_tcp.c ports/net-mgmt/nagios-plugins/files/patch-check_tcp.c
--- ports/net-mgmt/nagios-plugins.orig/files/patch-check_tcp.c Fri Sep 2 22:25:55 2005
+++ ports/net-mgmt/nagios-plugins/files/patch-check_tcp.c Thu Jan 1 09:30:00 1970
@@ -1,11 +0,0 @@
---- plugins/check_tcp.c.orig Sun Jun 5 19:43:58 2005
-+++ plugins/check_tcp.c Mon Aug 15 21:05:57 2005
-@@ -179,7 +179,7 @@
- SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
- EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'";
- QUIT = "</stream:stream>\n";
-- flags |= FLAG_SSL | FLAG_HIDE_OUTPUT;
-+ flags |= FLAG_HIDE_OUTPUT;
- PORT = 5222;
- }
- else if (!strncmp (SERVICE, "NNTPS", 5)) {
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-configure.in ports/net-mgmt/nagios-plugins/files/patch-configure.in
--- ports/net-mgmt/nagios-plugins.orig/files/patch-configure.in Fri Sep 30 17:55:48 2005
+++ ports/net-mgmt/nagios-plugins/files/patch-configure.in Fri May 12 23:43:36 2006
@@ -1,24 +1,32 @@
---- configure.in.orig Mon Sep 19 15:51:19 2005
-+++ configure.in Thu Sep 22 14:57:12 2005
-@@ -10,7 +10,7 @@
+--- configure.in.orig Wed Apr 19 13:12:33 2006
++++ configure.in Fri May 12 23:42:58 2006
+@@ -10,8 +10,6 @@
RELEASE=1
AC_SUBST(RELEASE)
-AC_PREFIX_DEFAULT(/usr/local/nagios)
-+dnl AC_PREFIX_DEFAULT(/usr/local/nagios)
+-
+ dnl Deprecated configure options
dnl Figure out how to invoke "install" and what install options to use.
- AC_PROG_INSTALL
-@@ -71,8 +71,6 @@
+@@ -25,7 +23,6 @@
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_PROG_GCC_TRADITIONAL
+-AC_PROG_LIBTOOL
+
+ AC_PROG_MAKE_SET
+ AC_PROG_AWK
+@@ -73,7 +70,7 @@
with_nagios_group=nagios)
AC_SUBST(with_nagios_user)
AC_SUBST(with_nagios_group)
-INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group"
--AC_SUBST(INSTALL_OPTS)
++INSTALL_OPTS="-o root -g wheel"
+ AC_SUBST(INSTALL_OPTS)
AC_ARG_WITH(trusted_path,
- ACX_HELP_STRING([--with-trusted-path=PATH],
-@@ -149,11 +147,12 @@
+@@ -181,11 +178,12 @@
ACX_HELP_STRING([--with-pgsql=DIR],
[sets path to pgsql installation]),
PGSQL=$withval,)
@@ -33,7 +41,7 @@
fi
AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
-@@ -190,30 +189,42 @@
+@@ -222,30 +220,42 @@
AC_MSG_WARN([Skipping PostgreSQL plugin (check_pgsql)])
AC_MSG_WARN([install lib crypt and PostgreSQL libs to compile this plugin (see REQUIREMENTS).])
fi
@@ -83,22 +91,46 @@
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)
-@@ -222,6 +233,7 @@
+@@ -254,6 +264,7 @@
AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
fi
LIBS="$_SAVEDLIBS"
+fi
-
dnl Check for mysql libraries
-@@ -597,245 +609,11 @@
-
- AC_PATH_PROG(PATH_TO_PS,ps)
-
--AC_MSG_CHECKING(for ps syntax)
+ AC_ARG_WITH(mysql,
+@@ -664,47 +675,10 @@
+ ac_cv_ps_cols="$PS_COLS"
+ AC_MSG_RESULT([(command-line) $ac_cv_ps_command])
+
+-dnl Now using the pst3/kmem hack for solaris systems to avoid truncation
+-elif test "$ac_cv_uname_s" = "SunOS"; then
+- #
+- # this is a very, very ugly hack, to hardcode the location for plugins
+- #
+- if test "$libexecdir" = '${exec_prefix}/libexec'; then
+- if test "$exec_prefix" = "NONE"; then
+- if test "$prefix" = "NONE"; then
+- pst3="$ac_default_prefix/libexec/pst3"
+- else
+- pst3="$prefix/libexec/pst3"
+- fi
+- else
+- pst3="$exec_prefix/libexec/pst3"
+- fi
+- else
+- pst3="$libexecdir/pst3"
+- fi
+- ac_cv_ps_command="$pst3"
+- ac_cv_ps_format="%s %d %d %d %d %f %s %n"
+- ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+- ac_cv_ps_cols=8
+- AC_MSG_RESULT([using nagios-plugins internal ps for solaris])
+- AM_CONDITIONAL(WANT_PST3, true)
+-
-dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
-dnl so test for this first...
--if ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
+-elif ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
- egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
-then
- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
@@ -110,27 +142,30 @@
-dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
-dnl Should also work for FreeBSD 5.2.1 and 5.3
-dnl STAT UCOMM VSZ RSS USER PPID COMMAND
--elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
++dnl FreeBSD 5.x and above
++dnl STAT COMMAND VSZ RSS USER UID PID PPID COMMAND
+ elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
- egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
--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'"
-- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-- ac_cv_ps_cols=9
-- AC_MSG_RESULT([$ac_cv_ps_command])
--
++ egrep -i ["^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
+ 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'"
+@@ -712,9 +686,8 @@
+ ac_cv_ps_cols=9
+ AC_MSG_RESULT([$ac_cv_ps_command])
+
-dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4.
-dnl Limitation: Only first 16 chars returned for ucomm field
-dnl Must come before ps -weo
--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
-- 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 ucomm command'"
-- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
-- ac_cv_ps_cols=9
-- AC_MSG_RESULT([$ac_cv_ps_command])
--
++dnl FreeBSD 4.x
++dnl STAT UID PID PPID VSZ RSS %CPU UCOMM COMMAND
+ 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
+@@ -724,209 +697,6 @@
+ ac_cv_ps_cols=9
+ AC_MSG_RESULT([$ac_cv_ps_command])
+
-dnl STAT UCOMM VSZ RSS USER UID PPID COMMAND
-elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \
- egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
@@ -196,20 +231,23 @@
- ac_cv_ps_cols=9
- AC_MSG_RESULT([$ac_cv_ps_command])
-
--dnl Tru64 - needs %*[ +] in PS_FORMAT
--elif ps -ao 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
-- egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
--then
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-- ac_cv_ps_command="$PATH_TO_PS -ao 'stat uid pid ppid vsz rss pcpu comm args'"
-- ac_cv_ps_format=["%s%*[ +] %d %d %d %d %d %f %s %n"]
-- ac_cv_ps_cols=9
+-dnl Tru64 - needs %*[ +<>] in PS_FORMAT.
+-dnl Has /usr/bin/ps and /sbin/ps - force sbin version
+-dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead
+-dnl of 1500). Will need big changes to check_procs to support
+-elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \
+- egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null
+-then
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos]"
+- ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'"
+- ac_cv_ps_format=["%s%*[ +<>] %d %d %d %f %s %s %n"]
+- ac_cv_ps_cols=8
- AC_MSG_RESULT([$ac_cv_ps_command])
-
-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
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
- ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'"
- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
- ac_cv_ps_cols=9
@@ -219,7 +257,7 @@
-elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \
- egrep -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
-then
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procpcpu,procprog,&pos]"
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]"
- ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'"
- ac_cv_ps_format="%s %d %d %d %d %f %s %n"
- ac_cv_ps_cols=8
@@ -229,7 +267,7 @@
-elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \
- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
- ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'"
- # There must be no space between the %s and %n due to a wierd problem in sscanf where
- # it will return %n as longer than the line length
@@ -240,7 +278,7 @@
-elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \
- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
- ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'"
- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
- ac_cv_ps_cols=9
@@ -249,7 +287,7 @@
-elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
- ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'"
- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
- ac_cv_ps_cols=9
@@ -259,7 +297,7 @@
-elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \
- egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
-then
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
- ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'"
- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
- ac_cv_ps_cols=8
@@ -269,7 +307,7 @@
-elif ps -el 2>/dev/null | \
- egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
-then
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&procvsz,&procrss,&pos,procprog]"
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog]"
- ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)"
- ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %d %d %*s %*s %*s %n%s"
- ac_cv_ps_cols=8
@@ -279,7 +317,7 @@
-elif ps -el 2>/dev/null | \
- egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
-then
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&pos,procprog]"
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
- ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)"
- ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
- ac_cv_ps_cols=6
@@ -291,7 +329,7 @@
-elif ps -el 2>/dev/null | \
- egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
-then
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&pos,procprog]"
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
- ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)"
- ac_cv_ps_format="%*s %s %d %d %d %*s %*s %*s %*s %*s %*s %*s %*s %n%s"
- ac_cv_ps_cols=6
@@ -301,7 +339,7 @@
-elif ps glaxen 2>/dev/null | \
- egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
-then
-- ac_cv_ps_varlist="[&procuid,&procpid,&procpid,&procvsz,&procrss,procstat,&pos,procprog]"
+- ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
- ac_cv_ps_command="$PATH_TO_PS glaxen"
- ac_cv_ps_format="%*s %d %d %d %*s %*s %d %d %*s %s %*s %*s %n%s"
- ac_cv_ps_cols=8
@@ -316,7 +354,7 @@
- egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null
-then
- ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'"
-- ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procpid,&procpcpu,procprog,&pos]"
+- ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos]"
- ac_cv_ps_format="%s %d %d %d %d %d %f %s %n"
- ac_cv_ps_cols=8
- AC_MSG_RESULT([$ac_cv_ps_command])
@@ -325,33 +363,25 @@
-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
-- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procpid,&pos,procprog]"
+- ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
- ac_cv_ps_command="$PATH_TO_PS -Al"
- 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])
-
--else
-- AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
--fi
-+ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-+ac_cv_ps_command="$PATH_TO_PS axwo 'state uid ppid vsz rss pcpu ucomm command'"
-+ac_cv_ps_format="%s %d %d %d %d %f %s %n"
-+ac_cv_ps_cols=8
-+AC_MSG_RESULT([$ac_cv_ps_command])
-
- if test -n "$ac_cv_ps_varlist" ; then
- AC_DEFINE_UNQUOTED(PS_VARLIST,$ac_cv_ps_varlist,
-@@ -1196,6 +974,8 @@
+ else
+ AC_MSG_WARN([unable to find usable ps syntax - check_procs and check_nagios will not be compiled])
+ fi
+@@ -1310,6 +1080,8 @@
AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
[path and arguments for invoking 'who'])
+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
+if test x$enable_snmp = xyes; then
AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
- if test -x "$PATH_TO_SNMPGET"
- then
-@@ -1218,7 +998,10 @@
+ AC_ARG_WITH(snmpget_command,
+ ACX_HELP_STRING([--with-snmpget-command=PATH],
+@@ -1340,7 +1112,10 @@
else
AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
fi
@@ -361,8 +391,8 @@
+if test x$enable_qstat = xyes; then
AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
AC_PATH_PROG(PATH_TO_QSTAT,qstat)
-
-@@ -1240,7 +1023,10 @@
+ AC_ARG_WITH(qstat_command,
+@@ -1365,7 +1140,10 @@
AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
[path to qstat/quakestat])
fi
@@ -371,17 +401,17 @@
+AC_ARG_ENABLE(fping,--enable-fping compile check_fping)
+if test x$enable_fping = xyes; then
AC_PATH_PROG(PATH_TO_FPING,fping)
- if test -x "$PATH_TO_FPING"
- then
-@@ -1249,6 +1035,7 @@
+ AC_ARG_WITH(fping_command,
+ ACX_HELP_STRING([--with-fping-command=PATH],
+@@ -1377,6 +1155,7 @@
else
AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
fi
+fi
AC_PATH_PROG(PATH_TO_SSH,ssh)
-
-@@ -1311,32 +1098,12 @@
+ AC_ARG_WITH(ssh_command,
+@@ -1444,32 +1223,12 @@
dnl end if for PATH_TO_SWAP
fi
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins-scripts__check_ircd.pl ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl
--- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins-scripts__check_ircd.pl Thu Jan 1 09:30:00 1970
+++ ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ircd.pl Fri May 12 23:43:42 2006
@@ -0,0 +1,10 @@
+--- plugins-scripts/check_ircd.pl.orig Tue May 7 15:05:49 2002
++++ plugins-scripts/check_ircd.pl Fri May 12 23:40:44 2006
+@@ -67,6 +67,7 @@
+ $ENV{PATH} = "";
+ $ENV{ENV} = "";
+ $ENV{BASH_ENV} = "";
++$ENV{CDPATH} = "";
+
+ # -----------------------------------------------------------------[ Global ]--
+
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins-scripts__check_ntp.pl ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl
--- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins-scripts__check_ntp.pl Thu Jan 1 09:30:00 1970
+++ ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__check_ntp.pl Fri May 12 23:43:45 2006
@@ -0,0 +1,19 @@
+--- plugins-scripts/check_ntp.pl.orig Wed Nov 30 11:19:47 2005
++++ plugins-scripts/check_ntp.pl Fri May 12 23:39:15 2006
+@@ -314,7 +314,6 @@
+ }
+ } else {
+ print "No match!\n" if $verbose;
+- $jitter = '(not parsed)';
+ }
+
+ }
+@@ -428,7 +427,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;
+ }
+ }
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins-scripts__utils.sh.in ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__utils.sh.in
--- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins-scripts__utils.sh.in Thu Jan 1 09:30:00 1970
+++ ports/net-mgmt/nagios-plugins/files/patch-plugins-scripts__utils.sh.in Fri May 12 23:43:48 2006
@@ -0,0 +1,15 @@
+--- 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
+@@ -14,10 +14,10 @@
+
+ print_revision() {
+ echo "$1 (@PACKAGE@ @VERSION@) $2"
+- $ECHO "@WARRANTY@" | sed -e 's/\n/ /g'
++ $ECHO "@WARRANTY@" | /usr/bin/sed -e 's/\n/ /g'
+ }
+
+ support() {
+- $ECHO "@SUPPORT@" | sed -e 's/\n/ /g'
++ $ECHO "@SUPPORT@" | /usr/bin/sed -e 's/\n/ /g'
+ }
+
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__Makefile.am ports/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am
--- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__Makefile.am Thu Jan 1 09:30:00 1970
+++ ports/net-mgmt/nagios-plugins/files/patch-plugins__Makefile.am Fri May 12 23:43:53 2006
@@ -0,0 +1,11 @@
+--- plugins/Makefile.am.orig Tue Mar 21 22:12:59 2006
++++ plugins/Makefile.am Fri May 12 23:37:04 2006
+@@ -4,7 +4,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@ @SSLINCLUDE@
++INCLUDES = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/intl @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@ @RADIUSINCLUDE@
+
+ datadir = @datadir@
+ localedir = $(datadir)/locale
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_radius.c ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c
--- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_radius.c Thu Jan 1 09:30:00 1970
+++ ports/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c Fri May 12 23:43:56 2006
@@ -0,0 +1,65 @@
+--- plugins/check_radius.c.orig Sun Dec 26 09:47:44 2004
++++ plugins/check_radius.c Fri May 12 23:35:17 2006
+@@ -27,7 +27,7 @@
+ #include "utils.h"
+ #include "netutils.h"
+
+-#include <radiusclient.h>
++#include <radiusclient-ng.h>
+
+ int process_arguments (int, char **);
+ void print_help (void);
+@@ -108,6 +108,7 @@
+ int result = STATE_UNKNOWN;
+ UINT4 client_id;
+ char *str;
++ rc_handle *rh;
+
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+@@ -117,32 +118,35 @@
+ 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;
+
+- 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);
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_snmp.c ports/net-mgmt/nagios-plugins/files/patch-plugins__check_snmp.c
--- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_snmp.c Thu Jan 1 09:30:00 1970
+++ ports/net-mgmt/nagios-plugins/files/patch-plugins__check_snmp.c Fri May 12 23:44:01 2006
@@ -0,0 +1,18 @@
+--- plugins/check_snmp.c.orig Tue Nov 1 06:33:19 2005
++++ plugins/check_snmp.c Fri May 12 23:29:24 2006
+@@ -206,6 +206,7 @@
+ strcat(perfstr, "| ");
+ while (ptr) {
+ char *foo;
++ char *str[MAX_INPUT_BUFFER];
+
+ foo = strstr (ptr, delimiter);
+ strncat(perfstr, ptr, foo-ptr);
+@@ -338,7 +339,6 @@
+
+ i++;
+
+- char *str[MAX_INPUT_BUFFER];
+ asprintf(str, "=%s%s;;;; ", show, type ? type : "");
+ strcat(perfstr, *str);
+
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_tcp.c ports/net-mgmt/nagios-plugins/files/patch-plugins__check_tcp.c
--- ports/net-mgmt/nagios-plugins.orig/files/patch-plugins__check_tcp.c Thu Jan 1 09:30:00 1970
+++ ports/net-mgmt/nagios-plugins/files/patch-plugins__check_tcp.c Fri May 12 23:44:05 2006
@@ -0,0 +1,11 @@
+--- plugins/check_tcp.c.orig Thu Mar 30 02:03:36 2006
++++ plugins/check_tcp.c Fri May 12 23:27:44 2006
+@@ -155,7 +155,7 @@
+ SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
+ EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'";
+ QUIT = "</stream:stream>\n";
+- flags |= FLAG_SSL | FLAG_HIDE_OUTPUT;
++ flags |= FLAG_HIDE_OUTPUT;
+ PORT = 5222;
+ }
+ else if (!strncmp (SERVICE, "NNTPS", 5)) {
diff -ruN ports/net-mgmt/nagios-plugins.orig/files/patch-utils.sh.in ports/net-mgmt/nagios-plugins/files/patch-utils.sh.in
--- ports/net-mgmt/nagios-plugins.orig/files/patch-utils.sh.in Mon Jul 22 10:33:42 2002
+++ ports/net-mgmt/nagios-plugins/files/patch-utils.sh.in Thu Jan 1 09:30:00 1970
@@ -1,15 +0,0 @@
---- plugins-scripts/utils.sh.in.orig Thu Jun 6 06:16:56 2002
-+++ plugins-scripts/utils.sh.in Sun Jul 14 17:40:56 2002
-@@ -14,10 +14,10 @@
-
- print_revision() {
- echo "$1 (@PACKAGE@ @VERSION@) $2"
-- $ECHO "@WARRANTY@" | /bin/sed -e 's/\n/ /g'
-+ $ECHO "@WARRANTY@" | /usr/bin/sed -e 's/\n/ /g'
- }
-
- support() {
-- $ECHO "@SUPPORT@" | /bin/sed -e 's/\n/ /g'
-+ $ECHO "@SUPPORT@" | /usr/bin/sed -e 's/\n/ /g'
- }
-
diff -ruN ports/net-mgmt/nagios-plugins.orig/pkg-plist ports/net-mgmt/nagios-plugins/pkg-plist
--- ports/net-mgmt/nagios-plugins.orig/pkg-plist Sun Jan 22 13:17:18 2006
+++ ports/net-mgmt/nagios-plugins/pkg-plist Fri May 12 23:46:00 2006
@@ -1,5 +1,6 @@
libexec/nagios/check_breeze
libexec/nagios/check_by_ssh
+libexec/nagios/check_clamd
libexec/nagios/check_dhcp
libexec/nagios/check_dig
libexec/nagios/check_disk
@@ -27,6 +28,7 @@
libexec/nagios/check_mrtg
libexec/nagios/check_mrtgtraf
%%SUB_MYSQL%%libexec/nagios/check_mysql
+%%SUB_MYSQL%%libexec/nagios/check_mysql_query
libexec/nagios/check_nagios
libexec/nagios/check_nntp
libexec/nagios/check_nntps
@@ -63,10 +65,10 @@
libexec/nagios/utils.sh
@dirrmtry libexec/nagios
share/nagios/locale/de/LC_MESSAGES/nagios-plugins.mo
-share/nagios/locale/fr/LC_MESSAGES/nagios-plugins.mo
@dirrm share/nagios/locale/de/LC_MESSAGES
- at dirrm share/nagios/locale/fr/LC_MESSAGES
@dirrm share/nagios/locale/de
+share/nagios/locale/fr/LC_MESSAGES/nagios-plugins.mo
+ at dirrm share/nagios/locale/fr/LC_MESSAGES
@dirrm share/nagios/locale/fr
@dirrm share/nagios/locale
@dirrmtry share/nagios
--- net-mgmt-nagios-plugins-1.4.3.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list