Attachment 84816 Details for Bug 120874 – net-mgmt-nrpe2-2.11.diff

[patch] net-mgmt-nrpe2-2.11.diff

net-mgmt-nrpe2-2.11.diff (text/plain), 3.50 KB, created by Jarrod Sayers on 2008-02-20 09:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jarrod Sayers

Created: 2008-02-20 09:20:01 UTC

Size: 3.50 KB

patch

obsolete

>diff -ruN ports/net-mgmt/nrpe2.orig/Makefile ports/net-mgmt/nrpe2/Makefile
>--- ports/net-mgmt/nrpe2.orig/Makefile	2007-07-26 22:33:44.000000000 +0930
>+++ ports/net-mgmt/nrpe2/Makefile	2008-02-20 18:32:54.000000000 +1030
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	nrpe2
>-PORTVERSION=	2.7
>-PORTREVISION=	2
>+PORTVERSION=	2.11
> CATEGORIES=	net-mgmt
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	nagios
>diff -ruN ports/net-mgmt/nrpe2.orig/distinfo ports/net-mgmt/nrpe2/distinfo
>--- ports/net-mgmt/nrpe2.orig/distinfo	2007-03-04 04:01:53.000000000 +1030
>+++ ports/net-mgmt/nrpe2/distinfo	2008-02-20 18:33:10.000000000 +1030
>@@ -1,3 +1,3 @@
>-MD5 (nrpe-2.7.tar.gz) = c50b89d27f4ebbcedcb2bc6ab9f56a4e
>-SHA256 (nrpe-2.7.tar.gz) = 13c25b63f07b96fbf4ca07dba6950309f2b350f19b9b48f36c067e127ebb352a
>-SIZE (nrpe-2.7.tar.gz) = 101921
>+MD5 (nrpe-2.11.tar.gz) = dcf3b7c5b7c94c0ba6cbb4999c1161f0
>+SHA256 (nrpe-2.11.tar.gz) = 4cedfc2588ba65ebfe4e3310c9fbda08c6f0912cfcc2c1ac96636b6f5c839e1d
>+SIZE (nrpe-2.11.tar.gz) = 405643
>diff -ruN ports/net-mgmt/nrpe2.orig/files/patch-sample-config-nrpe.cfg.in ports/net-mgmt/nrpe2/files/patch-sample-config-nrpe.cfg.in
>--- ports/net-mgmt/nrpe2.orig/files/patch-sample-config-nrpe.cfg.in	2007-07-24 22:27:40.000000000 +0930
>+++ ports/net-mgmt/nrpe2/files/patch-sample-config-nrpe.cfg.in	2008-02-20 18:40:51.000000000 +1030
>@@ -1,15 +1,14 @@
>---- sample-config/nrpe.cfg.in.orig	Tue Dec 12 12:34:00 2006
>-+++ sample-config/nrpe.cfg.in	Tue Jun 26 20:16:45 2007
>-@@ -190,8 +190,10 @@
>+--- sample-config/nrpe.cfg.in.orig	2007-11-24 04:01:23.000000000 +1030
>++++ sample-config/nrpe.cfg.in	2008-02-20 18:39:58.000000000 +1030
>+@@ -198,7 +198,10 @@
>  
>  command[check_users]=@libexecdir@/check_users -w 5 -c 10
>  command[check_load]=@libexecdir@/check_load -w 15,10,5 -c 30,25,20
>--command[check_disk1]=@libexecdir@/check_disk -w 20 -c 10 -p /dev/hda1
>--command[check_disk2]=@libexecdir@/check_disk -w 20 -c 10 -p /dev/hdb1
>-+command[check_disk_root]=@libexecdir@/check_disk -w 20 -c 10 --path /
>-+command[check_disk_var]=@libexecdir@/check_disk -w 20 -c 10 --path /var
>-+command[check_disk_tmp]=@libexecdir@/check_disk -w 20 -c 10 --path /tmp
>-+command[check_disk_usr]=@libexecdir@/check_disk -w 20 -c 10 --path /usr
>+-command[check_hda1]=@libexecdir@/check_disk -w 20% -c 10% -p /dev/hda1
>++command[check_root]=@libexecdir@/check_disk -w 20% -c 10% -p /
>++command[check_var]=@libexecdir@/check_disk -w 20% -c 10% -p /var
>++command[check_tmp]=@libexecdir@/check_disk -w 20% -c 10% -p /tmp
>++command[check_usr]=@libexecdir@/check_disk -w 20% -c 10% -p /usr
>  command[check_zombie_procs]=@libexecdir@/check_procs -w 5 -c 10 -s Z
>  command[check_total_procs]=@libexecdir@/check_procs -w 150 -c 200 
>  
>diff -ruN ports/net-mgmt/nrpe2.orig/files/patch-src-nrpe.c ports/net-mgmt/nrpe2/files/patch-src-nrpe.c
>--- ports/net-mgmt/nrpe2.orig/files/patch-src-nrpe.c	1970-01-01 09:30:00.000000000 +0930
>+++ ports/net-mgmt/nrpe2/files/patch-src-nrpe.c	2008-02-20 19:20:01.000000000 +1030
>@@ -0,0 +1,15 @@
>+--- src/nrpe.c.orig	2007-12-27 05:55:05.000000000 +1030
>++++ src/nrpe.c	2008-02-20 19:19:03.000000000 +1030
>+@@ -1458,8 +1458,10 @@
>+ 		                }while(bytes_read==-1 && errno==EINTR);
>+ 		        }
>+ 
>+-		if(bytes_read==-1 && output!=NULL)
>+-			strcpy(output,"");
>++			if(bytes_read==-1)
>++				*output='\0';
>++			else
>++				output[bytes_read]='\0';
>+ 
>+ 		/* if there was a critical return code and no output AND the command time exceeded the timeout thresholds, assume a timeout */
>+ 		if(result==STATE_CRITICAL && bytes_read==-1 && (end_time-start_time)>=timeout){

Actions: View | Diff

Attachments on bug 120874: 84816