Attachment #48659 for bug #74446

View | Details | Raw Unified | Return to bug 74446
Collapse All | Expand All




#

PORTNAME=	nagios-plugins
PORTVERSION=	1.4.0.a1
PORTREVISION=	6
CATEGORIES=	net-mgmt
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR=	nagiosplug
DISTNAME=	nagios-plugins-1.4.0alpha1

MAINTAINER=	blaz@si.FreeBSD.org
COMMENT=	Plugins for nagios

.endif

CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
USE_AUTOMAKE_VER=	18
USE_AUTOCONF_VER=	259
USE_GMAKE=	yes
USE_PERL5=	yes

pre-configure:
	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \
		--acdir=${ACLOCAL_DIR} -I lib)

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)nagios-plugins/distinfo (-2 / +2 lines)
1	MD5 (nagios-plugins-1.3.1.tar.gz) = 0078c9c8137694181a4cdf596fdbd74f	1	MD5 (nagios-plugins-1.4.0alpha1.tar.gz) = 96f8fc532943bada48ca677d12f5a5a7
2	SIZE (nagios-plugins-1.3.1.tar.gz) = 532516	2	SIZE (nagios-plugins-1.4.0alpha1.tar.gz) = 811705




--- plugins-scripts/check_breeze.pl.orig	Tue May  7 07:35:49 2002
+++ plugins-scripts/check_breeze.pl	Fri Jul 19 20:46:00 2002
@@ -1,9 +1,9 @@
-#! /usr/bin/perl -wT
+#! /usr/bin/perl -w
 
 
 use strict;
 use Getopt::Long;
-use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $PROGNAME);
+use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $opt_C $PROGNAME);
 use lib utils.pm ;
 use utils qw(%ERRORS &print_revision &support &usage);
 
@@ -47,7 +47,7 @@
 ($opt_C) || ($opt_C = "public") ;
 
 my $sig=0;
-$sig = `/usr/bin/snmpget $host $opt_C .1.3.6.1.4.1.710.3.2.3.1.3.0`;
+$sig = `/usr/bin/snmpget -c $opt_C $host .1.3.6.1.4.1.710.3.2.3.1.3.0`;
 my @test=split(/ /,$sig);
 $sig=$test[2];
 $sig=int($sig);




--- plugins/check_by_ssh.c.orig	Wed Nov 20 02:19:07 2002
+++ plugins/check_by_ssh.c	Tue Nov 26 14:20:28 2002
@@ -361,6 +361,8 @@
 		 "   list of nagios service names, separated by ':' [optional]\n"
 		 "-n, --name=NAME\n"
 		 "   short name of host in nagios configuration [optional]\n"
+		 "-v, --verbose\n"
+		 "   display command being executed\n"
 		 "-4, --use-ipv4\n"
 		 "   tell ssh to use IPv4\n"
 		 "-6, --use-ipv6\n"
@@ -388,7 +390,7 @@
 {
 	printf
 		("Usage:\n"
-		 "check_by_ssh [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n"
+		 "check_by_ssh [-fv46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n"
 		 "             [-n name] [-s servicelist] [-O outputfile] [-p port]\n"
 		 "check_by_ssh  -V prints version info\n"
 		 "check_by_ssh  -h prints more detailed help\n");

Lines 1-12 Link Here

(-)nagios-plugins/files/patch-check_http.c (-5 / +13 lines)
1	--- plugins/check_http.c.orig Mon Jun 30 11:56:08 2003	1	--- plugins/check_http.c.orig Mon Sep 15 07:03:47 2003
2	+++ plugins/check_http.c Fri Dec 19 23:03:52 2003	2	+++ plugins/check_http.c Sat Nov 27 12:32:09 2004
3	@@ -198,3 +198,3 @@	3	@@ -83,7 +83,7 @@
		4	#define HTTP_URL "/"
		5	#define CRLF "\r\n"
4		6
5	-char timestamp[17] = "";	7	-char timestamp[17] = "";
6	+char timestamp[256] = "";	8	+char timestamp[256] = "";
7	int specify_port = FALSE;	9	int specify_port = FALSE;
8	@@ -975,3 +975,3 @@	10	int server_port = HTTP_PORT;
		11	char server_port_text[6] = "";
		12	@@ -1010,7 +1010,7 @@
		13
		14	days_left = (mktime (&stamp) - time (NULL)) / 86400;
9	snprintf	15	snprintf
10	- (timestamp, 16, "%02d/%02d/%04d %02d:%02d",	16	- (timestamp, 17, "%02d/%02d/%04d %02d:%02d",
11	+ (timestamp, sizeof(timestamp), "%02d/%02d/%04d %02d:%02d",	17	+ (timestamp, sizeof(timestamp), "%02d/%02d/%04d %02d:%02d",
12	stamp.tm_mon + 1,	18	stamp.tm_mon + 1,
		19	stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
		20




--- 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 @@
 	int result;
 	UINT4 client_id;
 	char *str;
+	rc_handle *rh;
 
 	setlocale (LC_ALL, "");
 	bindtextdomain (PACKAGE, LOCALEDIR);
@@ -111,31 +112,34 @@
 		usage (_("Could not parse arguments\n"));
 
 	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)))
+	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)))
 		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);




--- configure.in.orig	Mon Dec  1 03:55:32 2003
+++ configure.in	Sat Nov 27 13:52:10 2004
@@ -10,7 +10,7 @@
 RELEASE=1
 AC_SUBST(RELEASE)
 
-AC_PREFIX_DEFAULT(/usr/local/nagios)
+dnl AC_PREFIX_DEFAULT(/usr/local/nagios)
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
@@ -71,8 +71,6 @@
 	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)
 
 AC_ARG_WITH(trusted_path,
 	ACX_HELP_STRING([--with-trusted-path=PATH],
@@ -181,25 +179,32 @@
 LIBS="$_SAVEDLIBS"
 CPPFLAGS="$_SAVEDCPPFLAGS"
 
+AC_ARG_ENABLE(radius,--enable-radius compile check_radius)
+if test x$enable_radius = xyes; then
+dnl Check for radiusclient header file
+_SAVEDCPPFLAGS="$CPPFLAGS"
+CPPFLAGS="-I${LOCALBASE}/include"
+AC_CHECK_HEADERS(radiusclient.h,RADIUSINCLUDE="-I${LOCALBASE}/include")
+AC_SUBST(RADIUSINCLUDE)
+CPPFLAGS="$_SAVEDCPPFLAGS $RADIUSINCLUDE"
+
 dnl Check for radius libraries
 _SAVEDLIBS="$LIBS"
-AC_CHECK_LIB(radiusclient,rc_read_config)

 if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
   EXTRAS="$EXTRAS check_radius"
-	RADIUSLIBS="-lradiusclient"
+  RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient"\
+  RADIUSINCLUDE="-I${LOCALBASE}/include"
   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).])

+  LDAPINCLUDE="-I${LOCALBASE}/include"
   AC_SUBST(LDAPLIBS)
   AC_SUBST(LDAPINCLUDE)
   AC_CHECK_FUNCS(ldap_set_option)
@@ -209,6 +214,7 @@
   AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
 fi
 LIBS="$_SAVEDLIBS"
-
+fi
 
 
 dnl Check for mysql libraries
@@ -251,7 +257,7 @@
@@ -209,7 +220,7 @@
   AC_MSG_WARN([Skipping mysql plugin])
   AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
 fi

 LIBS="$_SAVEDLIBS"
 
 dnl Check for OpenSSL location
@@ -658,7 +664,7 @@
 	egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null
 
 AC_PATH_PROG(PATH_TO_PS,ps)
+dnl For FreeBSD
+dnl  STAT UCOMM              VSZ   RSS USER      PPID COMMAND
+if ps -axwo 'stat ucomm vsz rss user uid ppid command' 2>/dev/null | egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
+then
+	AC_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
+	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])
+	AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axwo 'stat uid ppid command'",[Verbatim command to execute for ps in check_netsaint])
+	EXTRAS="$EXTRAS check_nagios"
+	AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axwo 'stat uid ppid ucomm command'",[Verbatim command to execute for ps in check_procs])
+	AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
+	AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axwo 'vsz ucomm'",[Verbatim command to execute for ps in check_vsz])
+	AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[Format string for scanning ps output in check_vsz])
+	AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axwo 'rss ucomm'",[Verbatim command to execute for ps in check_rss])
+	AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[Format string for scanning ps output in check_rss])
+  echo "      ps syntax... $PATH_TO_PS -axwo 'stat uid ppid ucomm command'"
 dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
 dnl  STAT UCOMM              VSZ   RSS USER      PPID COMMAND
-if ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null | egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
+elif ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null | egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
 then
 	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
-	ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid vsz rss pcpu command command'"
+	ac_cv_ps_command="$PATH_TO_PS -axwo 'state uid ppid vsz rss pcpu command 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])
@@ -1184,6 +1190,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
@@ -1206,7 +1214,10 @@
 else
 	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
 fi
+fi
 

+if test x$enable_qstat = xyes; then
 AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
 AC_PATH_PROG(PATH_TO_QSTAT,qstat)
 
@@ -1228,7 +1239,10 @@
 	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
 		[path to qstat/quakestat])
 fi
+fi
 

 AC_PATH_PROG(PATH_TO_FPING,fping)
 if test -x "$PATH_TO_FPING"
 then
@@ -1236,6 +1250,7 @@
 	EXTRAS="$EXTRAS check_fping"
 else
 	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
+fi
 fi
 




--- 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;

Line 0 Link Here

(-)nagios-plugins/files/patch-netutils.h (+11 lines)
	1	--- plugins/netutils.h.orig Sat Aug 9 01:05:17 2003
	2	+++ plugins/netutils.h Sat Nov 27 13:10:26 2004
	3	@@ -47,7 +47,7 @@
	4
	5	int my_tcp_connect (const char address, int port, int sd);
	6	int my_udp_connect (const char address, int port, int sd);
	7	-int my_connect (const char address, int port, int sd, int proto);
	8	+int nagios_my_connect (const char address, int port, int sd, int proto);
	9
	10	int is_host (const char *);
	11	int is_addr (const char *);

Lines 1-36 Link Here

(-)nagios-plugins/files/patch-subst.in (-36 lines)
1	--- plugins-scripts/subst.in.orig Thu Jun 6 06:16:56 2002
2	+++ plugins-scripts/subst.in Sun Jul 14 13:38:22 2002
3	@@ -37,6 +37,16 @@
4
5	}
6
7	+# Specific programs
8	+
9	+#
10	+/^[^#]/ && /(\/.*)?\/(bin\|sbin\|lib\|libexec)\// {
11	+ match($0,/(\/.*)?\/(bin\|sbin\|lib\|libexec)\/[-_a-zA-Z0-9]+/);
12	+ start=RSTART+RLENGTH;
13	+ c=substr($0,RSTART,RLENGTH);
14	+ sub(c,which(c,path));
15	+}
16	+
17	# scripting language (first line)
18
19	/^#! ?\/.\/python/ {sub(/^#! ?\/.\/python/,"#! @PYTHON@");}
20	@@ -56,16 +66,6 @@
21
22	/^[\t ](export[\t ])?PATH[\t ]*=['"]+.+["']$/ {
23	sub(/\=.*$/,"='@trusted_path@' # autoconf-derived");
24	-}
25	-
26	-# Specific programs
27	-
28	-#
29	-/^[^#]/ && /(\/.*)?\/(bin\|sbin\|lib\|libexec)\// {
30	- match($0,/(\/.*)?\/(bin\|sbin\|lib\|libexec)\/[-_a-zA-Z0-9]+/);
31	- start=RSTART+RLENGTH;
32	- c=substr($0,RSTART,RLENGTH);
33	- sub(c,which(c,path));
34	}
35
36	{




libexec/nagios/check_disk_smb
libexec/nagios/check_dns
libexec/nagios/check_dummy
libexec/nagios/check_file_age
libexec/nagios/check_flexlm
%%SUB_FPING%%libexec/nagios/check_fping
libexec/nagios/check_ftp

libexec/nagios/check_tcp
libexec/nagios/check_time
libexec/nagios/check_udp
libexec/nagios/check_udp2
libexec/nagios/check_ups
libexec/nagios/check_users
libexec/nagios/check_vsz
libexec/nagios/check_wave
libexec/nagios/negate
libexec/nagios/urlize
libexec/nagios/utils.pm
libexec/nagios/utils.sh
@unexec rmdir %D/libexec/nagios 2>/dev/null || true
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
@dirrm share/nagios/locale/fr/LC_MESSAGES
@dirrm share/nagios/locale/de
@dirrm share/nagios/locale/fr
@dirrm share/nagios/locale
@unexec rmdir %D/share/nagios 2>/dev/null || true

Return to bug 74446

Lines 6-16 Link Here

(-)nagios-plugins/Makefile (-5 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= nagios-plugins	8	PORTNAME= nagios-plugins
9	PORTVERSION= 1.3.1	9	PORTVERSION= 1.4.0.a1
10	PORTREVISION= 6
11	CATEGORIES= net-mgmt	10	CATEGORIES= net-mgmt
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
13	MASTER_SITE_SUBDIR= nagiosplug	12	MASTER_SITE_SUBDIR= nagiosplug
		13	DISTNAME= nagios-plugins-1.4.0alpha1
14		14
15	MAINTAINER= blaz@si.FreeBSD.org	15	MAINTAINER= blaz@si.FreeBSD.org
16	COMMENT= Plugins for nagios	16	COMMENT= Plugins for nagios
Lines 97-109 Link Here
97	.endif	97	.endif
98		98
99	CONFIGURE_ENV= LOCALBASE=${LOCALBASE}	99	CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
100	USE_AUTOMAKE_VER= 14	100	USE_AUTOMAKE_VER= 18
101	USE_AUTOCONF_VER= 213	101	USE_AUTOCONF_VER= 259
102	USE_GMAKE= yes	102	USE_GMAKE= yes
103	USE_PERL5= yes	103	USE_PERL5= yes
104		104
105	pre-configure:	105	pre-configure:
106	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \	106	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} \
107	--acdir=${ACLOCAL_DIR})	107	--acdir=${ACLOCAL_DIR} -I lib)
108		108
109	.include <bsd.port.post.mk>	109	.include <bsd.port.post.mk>

Lines 1-23 Link Here

(-)nagios-plugins/files/patch-check_breeze.pl (-23 lines)
1	--- plugins-scripts/check_breeze.pl.orig Tue May 7 07:35:49 2002
2	+++ plugins-scripts/check_breeze.pl Fri Jul 19 20:46:00 2002
3	@@ -1,9 +1,9 @@
4	-#! /usr/bin/perl -wT
5	+#! /usr/bin/perl -w
6
7
8	use strict;
9	use Getopt::Long;
10	-use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $PROGNAME);
11	+use vars qw($opt_V $opt_h $opt_H $opt_w $opt_c $opt_C $PROGNAME);
12	use lib utils.pm ;
13	use utils qw(%ERRORS &print_revision &support &usage);
14
15	@@ -47,7 +47,7 @@
16	($opt_C) \|\| ($opt_C = "public") ;
17
18	my $sig=0;
19	-$sig = `/usr/bin/snmpget $host $opt_C .1.3.6.1.4.1.710.3.2.3.1.3.0`;
20	+$sig = `/usr/bin/snmpget -c $opt_C $host .1.3.6.1.4.1.710.3.2.3.1.3.0`;
21	my @test=split(/ /,$sig);
22	$sig=$test[2];
23	$sig=int($sig);

Lines 1-20 Link Here

(-)nagios-plugins/files/patch-check_by_ssh.c (-20 lines)
1	--- plugins/check_by_ssh.c.orig Wed Nov 20 02:19:07 2002
2	+++ plugins/check_by_ssh.c Tue Nov 26 14:20:28 2002
3	@@ -361,6 +361,8 @@
4	" list of nagios service names, separated by ':' [optional]\n"
5	"-n, --name=NAME\n"
6	" short name of host in nagios configuration [optional]\n"
7	+ "-v, --verbose\n"
8	+ " display command being executed\n"
9	"-4, --use-ipv4\n"
10	" tell ssh to use IPv4\n"
11	"-6, --use-ipv6\n"
12	@@ -388,7 +390,7 @@
13	{
14	printf
15	("Usage:\n"
16	- "check_by_ssh [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n"
17	+ "check_by_ssh [-fv46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n"
18	" [-n name] [-s servicelist] [-O outputfile] [-p port]\n"
19	"check_by_ssh -V prints version info\n"
20	"check_by_ssh -h prints more detailed help\n");

Line 0 Link Here

(-)nagios-plugins/files/patch-check_radius.c (+54 lines)
	1	--- plugins/check_radius.c.orig Fri Aug 22 08:22:38 2003
	2	+++ plugins/check_radius.c Sat Nov 27 13:25:35 2004
	3	@@ -102,6 +102,7 @@
	4	int result;
	5	UINT4 client_id;
	6	char *str;
	7	+ rc_handle *rh;
	8
	9	setlocale (LC_ALL, "");
	10	bindtextdomain (PACKAGE, LOCALEDIR);
	11	@@ -111,31 +112,34 @@
	12	usage (_("Could not parse arguments\n"));
	13
	14	str = strdup ("dictionary");
	15	- if ((config_file && rc_read_config (config_file)) \|\|
	16	- rc_read_dictionary (rc_conf_str (str)))
	17	+ if (config_file)
	18	+ rh = rc_read_config (config_file);
	19	+ else
	20	+ rh = NULL;
	21	+ if (!rh \|\| rc_read_dictionary (rh, rc_conf_str (rh, str)))
	22	die (STATE_UNKNOWN, _("Config file error"));
	23
	24	service = PW_AUTHENTICATE_ONLY;
	25
	26	- if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
	27	- rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
	28	- rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0)))
	29	+ if (!(rc_avpair_add (rh, &data.send_pairs, PW_SERVICE_TYPE, &service, -1, 0) &&
	30	+ rc_avpair_add (rh, &data.send_pairs, PW_USER_NAME, username, -1, 0) &&
	31	+ rc_avpair_add (rh, &data.send_pairs, PW_USER_PASSWORD, password, -1, 0)))
	32	die (STATE_UNKNOWN, _("Out of Memory?"));
	33
	34	/*
	35	* Fill in NAS-IP-Address
	36	*/
	37
	38	- if ((client_id = rc_own_ipaddress ()) == 0)
	39	+ if ((client_id = rc_own_ipaddress (rh)) == 0)
	40	return (ERROR_RC);
	41
	42	- if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
	43	+ if (rc_avpair_add (rh, &(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, -1, 0) ==
	44	NULL) return (ERROR_RC);
	45
	46	- rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
	47	+ rc_buildreq (rh, &data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
	48	retries);
	49
	50	- result = rc_send_server (&data, msg);
	51	+ result = rc_send_server (rh, &data, msg);
	52	rc_avpair_free (data.send_pairs);
	53	if (data.receive_pairs)
	54	rc_avpair_free (data.receive_pairs);

Lines 1-35 Link Here

(-)nagios-plugins/files/patch-configure.in (-65 / +43 lines)
1	--- configure.in.orig Fri Jul 11 08:12:23 2003	1	--- configure.in.orig Mon Dec 1 03:55:32 2003
2	+++ configure.in Sun Apr 4 01:03:13 2004	2	+++ configure.in Sat Nov 27 13:52:10 2004
3	@@ -12,7 +12,7 @@	3	@@ -10,7 +10,7 @@
4	AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION})	4	RELEASE=1
5	AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h)	5	AC_SUBST(RELEASE)
6		6
7	-AC_PREFIX_DEFAULT(/usr/local/nagios)	7	-AC_PREFIX_DEFAULT(/usr/local/nagios)
8	+dnl AC_PREFIX_DEFAULT(/usr/local/nagios)	8	+dnl AC_PREFIX_DEFAULT(/usr/local/nagios)
9		9
10	dnl Figure out how to invoke "install" and what install options to use.	10	dnl Figure out how to invoke "install" and what install options to use.
11		11	AC_PROG_INSTALL
12	@@ -60,7 +60,6 @@	12	@@ -71,8 +71,6 @@
13	AC_ARG_WITH(nagios_group,--with-nagios-group=<group> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios)	13	with_nagios_group=nagios)
14	AC_SUBST(nagios_usr)	14	AC_SUBST(with_nagios_user)
15	AC_SUBST(nagios_grp)	15	AC_SUBST(with_nagios_group)
16	-INSTALL_OPTS="-o $nagios_usr -g $nagios_grp"	16	-INSTALL_OPTS="-o $with_nagios_user -g $with_nagios_group"
17	AC_SUBST(INSTALL_OPTS)	17	-AC_SUBST(INSTALL_OPTS)
18		18
19	AC_ARG_WITH(trusted_path,--with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin sets trusted path for executables called by scripts,trusted_path=$withval,trusted_path=/bin:/sbin:/usr/bin:/usr/sbin)	19	AC_ARG_WITH(trusted_path,
20	@@ -143,25 +142,37 @@	20	ACX_HELP_STRING([--with-trusted-path=PATH],
		21	@@ -181,25 +179,32 @@
21	LIBS="$_SAVEDLIBS"	22	LIBS="$_SAVEDLIBS"
22	CPPFLAGS="$_SAVEDCPPFLAGS"	23	CPPFLAGS="$_SAVEDCPPFLAGS"
23		24
24	+AC_ARG_ENABLE(radius,--enable-radius compile check_radius)	25	+AC_ARG_ENABLE(radius,--enable-radius compile check_radius)
25	+if test x$enable_radius = xyes; then	26	+if test x$enable_radius = xyes; then
26	+dnl Check for radiusclient header file
27	+_SAVEDCPPFLAGS="$CPPFLAGS"
28	+CPPFLAGS="-I${LOCALBASE}/include"
29	+AC_CHECK_HEADERS(radiusclient.h,RADIUSINCLUDE="-I${LOCALBASE}/include")
30	+AC_SUBST(RADIUSINCLUDE)
31	+CPPFLAGS="$_SAVEDCPPFLAGS $RADIUSINCLUDE"
32	+
33	dnl Check for radius libraries	27	dnl Check for radius libraries
34	_SAVEDLIBS="$LIBS"	28	_SAVEDLIBS="$LIBS"
35	-AC_CHECK_LIB(radiusclient,rc_read_config)	29	-AC_CHECK_LIB(radiusclient,rc_read_config)
Lines 37-44 Link Here
37	if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then	31	if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
38	EXTRAS="$EXTRAS check_radius"	32	EXTRAS="$EXTRAS check_radius"
39	- RADIUSLIBS="-lradiusclient"	33	- RADIUSLIBS="-lradiusclient"
40	+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient"	34	+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient"\
		35	+ RADIUSINCLUDE="-I${LOCALBASE}/include"
41	AC_SUBST(RADIUSLIBS)	36	AC_SUBST(RADIUSLIBS)
		37	+ AC_SUBST(RADIUSINCLUDE)
42	else	38	else
43	AC_MSG_WARN([Skipping radius plugin])	39	AC_MSG_WARN([Skipping radius plugin])
44	AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])	40	AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
Lines 60-76 Link Here
60	+ LDAPINCLUDE="-I${LOCALBASE}/include"	56	+ LDAPINCLUDE="-I${LOCALBASE}/include"
61	AC_SUBST(LDAPLIBS)	57	AC_SUBST(LDAPLIBS)
62	AC_SUBST(LDAPINCLUDE)	58	AC_SUBST(LDAPINCLUDE)
63	EXTRAS="$EXTRAS check_ldap"	59	AC_CHECK_FUNCS(ldap_set_option)
64	@@ -170,7 +181,7 @@	60	@@ -209,6 +214,7 @@
65	AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])	61	AC_MSG_WARN([install LDAP libs to compile this plugin (see REQUIREMENTS).])
66	fi	62	fi
67	LIBS="$_SAVEDLIBS"	63	LIBS="$_SAVEDLIBS"
68	-
69	+fi	64	+fi
70		65
		66
71	dnl Check for mysql libraries	67	dnl Check for mysql libraries
72	_SAVEDLIBS="$LIBS"	68	@@ -251,7 +257,7 @@
73	@@ -209,7 +220,7 @@
74	AC_MSG_WARN([Skipping mysql plugin])	69	AC_MSG_WARN([Skipping mysql plugin])
75	AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])	70	AC_MSG_WARN([install mysql client libs to compile this plugin (see REQUIREMENTS).])
76	fi	71	fi
Lines 79-122 Link Here
79	LIBS="$_SAVEDLIBS"	74	LIBS="$_SAVEDLIBS"
80		75
81	dnl Check for OpenSSL location	76	dnl Check for OpenSSL location
82	@@ -418,9 +429,24 @@	77	@@ -658,7 +664,7 @@
83	fi	78	egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PPID"] >/dev/null
84
85	AC_PATH_PROG(PATH_TO_PS,ps)
86	+dnl For FreeBSD
87	+dnl STAT UCOMM VSZ RSS USER PPID COMMAND
88	+if ps -axwo 'stat ucomm vsz rss user uid ppid command' 2>/dev/null \| egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
89	+then
90	+ AC_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])
91	+ AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])
92	+ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS -axwo 'stat uid ppid command'",[Verbatim command to execute for ps in check_netsaint])
93	+ EXTRAS="$EXTRAS check_nagios"
94	+ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS -axwo 'stat uid ppid ucomm command'",[Verbatim command to execute for ps in check_procs])
95	+ AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n",[Format string for scanning ps output in check_procs])
96	+ AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS -axwo 'vsz ucomm'",[Verbatim command to execute for ps in check_vsz])
97	+ AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s",[Format string for scanning ps output in check_vsz])
98	+ AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -axwo 'rss ucomm'",[Verbatim command to execute for ps in check_rss])
99	+ AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s",[Format string for scanning ps output in check_rss])
100	+ echo " ps syntax... $PATH_TO_PS -axwo 'stat uid ppid ucomm command'"
101	dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
102	dnl STAT UCOMM VSZ RSS USER PPID COMMAND
103	-if ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null \| egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
104	+elif ps -axwo 'stat comm vsz rss user uid ppid args' 2>/dev/null \| egrep -i ["^ *STAT +UCOMM +VSZ +RSS +USER +UID +PPID +COMMAND"] > /dev/null
105	then	79	then
106	AC_DEFINE(USE_PS_VARS,1,[Define if 'ps' will be parsed with sscanf])	80	ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
107	AC_DEFINE_UNQUOTED(PS_VARLIST,[procstat,&procuid,&procppid,procprog,&pos],[Variable list for sscanf of 'ps' output])	81	- ac_cv_ps_command="$PATH_TO_PS waxco 'state uid ppid vsz rss pcpu command command'"
108	@@ -841,6 +867,8 @@	82	+ ac_cv_ps_command="$PATH_TO_PS -axwo 'state uid ppid vsz rss pcpu command command'"
109	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking 'who'])	83	ac_cv_ps_format="%s %d %d %d %d %f %s %n"
110	fi	84	ac_cv_ps_cols=8
		85	AC_MSG_RESULT([$ac_cv_ps_command])
		86	@@ -1184,6 +1190,8 @@
		87	AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who",
		88	[path and arguments for invoking 'who'])
111		89
112	+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)	90	+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp)
113	+if test x$enable_snmp = xyes; then	91	+if test x$enable_snmp = xyes; then
114	AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)	92	AC_PATH_PROG(PATH_TO_SNMPGET,snmpget)
115	if test -x "$PATH_TO_SNMPGET"	93	if test -x "$PATH_TO_SNMPGET"
116	then	94	then
117	@@ -863,7 +891,10 @@	95	@@ -1206,7 +1214,10 @@
118	echo "** Tried $PERL - install Net::SNMP perl module if you want to"	96	else
119	echo " use the perl snmp plugins"	97	AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
120	fi	98	fi
121	+fi	99	+fi
122		100
Lines 124-133 Link Here
124	+if test x$enable_qstat = xyes; then	102	+if test x$enable_qstat = xyes; then
125	AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)	103	AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
126	AC_PATH_PROG(PATH_TO_QSTAT,qstat)	104	AC_PATH_PROG(PATH_TO_QSTAT,qstat)
127	if test -x "$PATH_TO_QUAKESTAT"	105
128	@@ -877,7 +908,10 @@	106	@@ -1228,7 +1239,10 @@
129	else	107	AC_DEFINE_UNQUOTED(PATH_TO_QSTAT,"$ac_cv_path_to_qstat",
130	echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin"	108	[path to qstat/quakestat])
131	fi	109	fi
132	+fi	110	+fi
133		111
Lines 136-145 Link Here
136	AC_PATH_PROG(PATH_TO_FPING,fping)	114	AC_PATH_PROG(PATH_TO_FPING,fping)
137	if test -x "$PATH_TO_FPING"	115	if test -x "$PATH_TO_FPING"
138	then	116	then
139	@@ -885,6 +919,7 @@	117	@@ -1236,6 +1250,7 @@
140	EXTRAS="$EXTRAS check_fping"	118	EXTRAS="$EXTRAS check_fping"
141	else	119	else
142	echo "** Get fping from http://www.fping.com in order to make check_fping plugin"	120	AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
143	+fi	121	+fi
144	fi	122	fi
145		123

Line 0 Link Here

(-)nagios-plugins/files/patch-netutils.c (+47 lines)
	1	--- plugins/netutils.c.orig Sun Aug 10 08:31:02 2003
	2	+++ plugins/netutils.c Sat Nov 27 13:10:43 2004
	3	@@ -97,7 +97,7 @@
	4	fd_set readfds;
	5	int recv_length = 0;
	6
	7	- result = my_connect (server_address, server_port, &sd, IPPROTO_TCP);
	8	+ result = nagios_my_connect (server_address, server_port, &sd, IPPROTO_TCP);
	9	if (result != STATE_OK)
	10	return STATE_CRITICAL;
	11
	12	@@ -175,7 +175,7 @@
	13
	14	result = STATE_OK;
	15
	16	- result = my_connect (server_address, server_port, &sd, proto);
	17	+ result = nagios_my_connect (server_address, server_port, &sd, proto);
	18	if (result != STATE_OK)
	19	return STATE_CRITICAL;
	20
	21	@@ -227,7 +227,7 @@
	22	{
	23	int result;
	24
	25	- result = my_connect (host_name, port, sd, IPPROTO_TCP);
	26	+ result = nagios_my_connect (host_name, port, sd, IPPROTO_TCP);
	27
	28	return result;
	29	}
	30	@@ -239,7 +239,7 @@
	31	{
	32	int result;
	33
	34	- result = my_connect (host_name, port, sd, IPPROTO_UDP);
	35	+ result = nagios_my_connect (host_name, port, sd, IPPROTO_UDP);
	36
	37	return result;
	38	}
	39	@@ -247,7 +247,7 @@
	40
	41	/* opens a tcp or udp connection to a remote host */
	42	int
	43	-my_connect (const char host_name, int port, int sd, int proto)
	44	+nagios_my_connect (const char host_name, int port, int sd, int proto)
	45	{
	46	struct addrinfo hints;
	47	struct addrinfo *res;

Lines 5-10 Link Here

(-)nagios-plugins/pkg-plist (-1 / +10 lines)
5	libexec/nagios/check_disk_smb	5	libexec/nagios/check_disk_smb
6	libexec/nagios/check_dns	6	libexec/nagios/check_dns
7	libexec/nagios/check_dummy	7	libexec/nagios/check_dummy
		8	libexec/nagios/check_file_age
8	libexec/nagios/check_flexlm	9	libexec/nagios/check_flexlm
9	%%SUB_FPING%%libexec/nagios/check_fping	10	%%SUB_FPING%%libexec/nagios/check_fping
10	libexec/nagios/check_ftp	11	libexec/nagios/check_ftp
Lines 46-57 Link Here
46	libexec/nagios/check_tcp	47	libexec/nagios/check_tcp
47	libexec/nagios/check_time	48	libexec/nagios/check_time
48	libexec/nagios/check_udp	49	libexec/nagios/check_udp
		50	libexec/nagios/check_udp2
49	libexec/nagios/check_ups	51	libexec/nagios/check_ups
50	libexec/nagios/check_users	52	libexec/nagios/check_users
51	libexec/nagios/check_vsz
52	libexec/nagios/check_wave	53	libexec/nagios/check_wave
53	libexec/nagios/negate	54	libexec/nagios/negate
54	libexec/nagios/urlize	55	libexec/nagios/urlize
55	libexec/nagios/utils.pm	56	libexec/nagios/utils.pm
56	libexec/nagios/utils.sh	57	libexec/nagios/utils.sh
57	@unexec rmdir %D/libexec/nagios 2>/dev/null \|\| true	58	@unexec rmdir %D/libexec/nagios 2>/dev/null \|\| true
		59	share/nagios/locale/de/LC_MESSAGES/nagios-plugins.mo
		60	share/nagios/locale/fr/LC_MESSAGES/nagios-plugins.mo
		61	@dirrm share/nagios/locale/de/LC_MESSAGES
		62	@dirrm share/nagios/locale/fr/LC_MESSAGES
		63	@dirrm share/nagios/locale/de
		64	@dirrm share/nagios/locale/fr
		65	@dirrm share/nagios/locale
		66	@unexec rmdir %D/share/nagios 2>/dev/null \|\| true