rpms/nagios/EL-5 output_buffer.patch, NONE, 1.1 nagios-initrd.patch, 1.1, 1.2 nagios.spec, 1.36, 1.37

[Mike McGrath]

Author: mmcgrath

Update of /cvs/pkgs/rpms/nagios/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17103

Modified Files:
	nagios-initrd.patch nagios.spec 
Added Files:
	output_buffer.patch 
Log Message:
Increasing output buffer size

output_buffer.patch:

--- NEW FILE output_buffer.patch ---
diff -uNr nagios-2.12.bak/include/common.h nagios-2.12/include/common.h
--- nagios-2.12.bak/include/common.h	2008-05-19 12:04:40.000000000 -0500
+++ nagios-2.12/include/common.h	2009-03-03 08:45:44.000000000 -0600
@@ -379,7 +379,7 @@
 /************************** MISC DEFINITIONS ****************************/
 
 #define MAX_FILENAME_LENGTH			256	/* max length of path/filename that Nagios will process */
-#define MAX_INPUT_BUFFER			1024	/* size in bytes of max. input buffer (for reading files) */
+#define MAX_INPUT_BUFFER			8192	/* size in bytes of max. input buffer (for reading files) */
 #define MAX_COMMAND_BUFFER                      8192    /* max length of raw or processed command line */
 
 #define MAX_DATETIME_LENGTH			48
diff -uNr nagios-2.12.bak/include/objects.h nagios-2.12/include/objects.h
--- nagios-2.12.bak/include/objects.h	2006-03-21 16:21:51.000000000 -0600
+++ nagios-2.12/include/objects.h	2009-03-03 08:46:28.000000000 -0600
@@ -45,7 +45,7 @@
 
 #define MAX_HOSTNAME_LENGTH            		64	/* max. host name length */
 #define MAX_SERVICEDESC_LENGTH			64	/* max. service description length */
-#define MAX_PLUGINOUTPUT_LENGTH			332	/* max. length of plugin output */
+#define MAX_PLUGINOUTPUT_LENGTH			8192	/* max. length of plugin output */
 
 #define MAX_STATE_HISTORY_ENTRIES		21	/* max number of old states to keep track of for flap detection */
 

nagios-initrd.patch:

Index: nagios-initrd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/EL-5/nagios-initrd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nagios-initrd.patch	9 May 2006 23:25:13 -0000	1.1
+++ nagios-initrd.patch	3 Mar 2009 14:54:51 -0000	1.2
@@ -1,7 +1,7 @@
---- nagios	2006-05-08 10:39:49.000000000 -0300
-+++ daemon-init.in	2006-05-08 10:33:26.000000000 -0300
-@@ -114,11 +114,13 @@
- 		echo "Starting network monitor: nagios"
+--- daemon-init.in.orig	2007-04-09 12:43:30.000000000 -0500
++++ daemon-init.in	2009-03-03 08:50:15.000000000 -0600
+@@ -124,11 +124,13 @@
+ 		echo -n "Starting nagios:"
  		$NagiosBin -v $NagiosCfgFile > /dev/null 2>&1;
  		if [ $? -eq 0 ]; then
 -			su - $NagiosUser -c "touch $NagiosVarDir/nagios.log $NagiosRetentionFile"
@@ -13,5 +13,5 @@
  			$NagiosBin -d $NagiosCfgFile
 +                        pidof nagios > $NagiosRunFile
  			if [ -d $NagiosLockDir ]; then touch $NagiosLockDir/$NagiosLockFile; fi
- 			#sleep 1
- 			#status_nagios nagios
+ 			echo " done."
+ 			exit 0


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/EL-5/nagios.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- nagios.spec	5 Oct 2008 20:51:00 -0000	1.36
+++ nagios.spec	3 Mar 2009 14:54:51 -0000	1.37
@@ -2,7 +2,7 @@
 Name: nagios
 
 Version: 2.12
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -12,6 +12,7 @@
 Source1: nagios.logrotate
 Source2: nagios.htaccess
 Patch0: nagios-initrd.patch
+Patch1: output_buffer.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gd-devel > 1.8, mailx, libjpeg-devel, libpng-devel
@@ -61,6 +62,7 @@
 %prep
 %setup -q
 %patch0 -p0 
+%patch1 -p1 
 
 %build
 ./configure \
@@ -169,6 +171,9 @@
 %{_includedir}/%{name}
 
 %changelog
+* Tue Mar  3 2009 Mike McGrath <mmcgrath at redhat.com> 2.12-5
+- Fix for bug 469198, increased plugin output buffer
+
 * Sun Oct  5 2008 Mike McGrath <mmcgrath at redhat.com> 2.12-4
 - Rebuild to test build system