Nagios

Update of /cvsroot/nagios/nagios/include
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15312/include

Modified Files:
	common.h 
Log Message:
Prep for new release

Index: common.h
===================================================================
RCS file: /cvsroot/nagios/nagios/include/common.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** common.h	14 Dec 2008 14:52:23 -0000	1.77
--- common.h	25 Jan 2009 14:59:47 -0000	1.78
***************
*** 22,27 ****
  
  
! #define PROGRAM_VERSION "3.0.6"
! #define PROGRAM_MODIFICATION_DATE "12-14-2008"
  
  /*#define DEBUG_CHECK_IPC 1 */
--- 22,27 ----
  
  
! #define PROGRAM_VERSION "3.1.0"
! #define PROGRAM_MODIFICATION_DATE "01-25-2009"
  
  /*#define DEBUG_CHECK_IPC 1 */

Update of /cvsroot/nagios/nagios
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15312

Modified Files:
	configure configure.in nagios.spec update-version 
Log Message:
Prep for new release

Index: nagios.spec
===================================================================
RCS file: /cvsroot/nagios/nagios/nagios.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** nagios.spec	15 Jan 2009 20:40:29 -0000	1.66
--- nagios.spec	25 Jan 2009 14:59:46 -0000	1.67
***************
*** 1,4 ****
  %define name nagios
! %define version 3.0.6
  %define release 1
  %define nsusr nagios
--- 1,4 ----
  %define name nagios
! %define version 3.1.0
  %define release 1
  %define nsusr nagios

Index: configure
===================================================================
RCS file: /cvsroot/nagios/nagios/configure,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** configure	14 Dec 2008 18:00:46 -0000	1.137
--- configure	25 Jan 2009 14:59:46 -0000	1.138
***************
*** 1308,1314 ****
  
  PKG_NAME=nagios
! PKG_VERSION="3.0.6"
  PKG_HOME_URL="http://www.nagios.org/"
! PKG_REL_DATE="12-14-2008"
  
  ac_aux_dir=
--- 1308,1314 ----
  
  PKG_NAME=nagios
! PKG_VERSION="3.1.0"
  PKG_HOME_URL="http://www.nagios.org/"
! PKG_REL_DATE="01-25-2009"
  
  ac_aux_dir=

Index: update-version
===================================================================
RCS file: /cvsroot/nagios/nagios/update-version,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** update-version	14 Dec 2008 14:52:23 -0000	1.49
--- update-version	25 Jan 2009 14:59:46 -0000	1.50
***************
*** 11,18 ****
  
  # Current version number
! CURRENTVERSION=3.0.6
  
  # Last date
! LASTDATE=12-14-2008
  
  if [ "x$1" = "x" ]
--- 11,18 ----
  
  # Current version number
! CURRENTVERSION=3.1.0
  
  # Last date
! LASTDATE=01-25-2009
  
  if [ "x$1" = "x" ]

Index: configure.in
===================================================================
RCS file: /cvsroot/nagios/nagios/configure.in,v
retrieving revision 1.138
retrieving revision 1.139
diff -C2 -d -r1.138 -r1.139
*** configure.in	14 Dec 2008 18:00:46 -0000	1.138
--- configure.in	25 Jan 2009 14:59:46 -0000	1.139
***************
*** 10,16 ****
  
  PKG_NAME=nagios
! PKG_VERSION="3.0.6"
  PKG_HOME_URL="http://www.nagios.org/"
! PKG_REL_DATE="12-14-2008"
  
  dnl Figure out how to invoke "install" and what install options to use.
--- 10,16 ----
  
  PKG_NAME=nagios
! PKG_VERSION="3.1.0"
  PKG_HOME_URL="http://www.nagios.org/"
! PKG_REL_DATE="01-25-2009"
  
  dnl Figure out how to invoke "install" and what install options to use.

Update of /cvsroot/nagios/nagios/html
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15312/html

Modified Files:
	main.php 
Log Message:
Prep for new release

Index: main.php
===================================================================
RCS file: /cvsroot/nagios/nagios/html/main.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** main.php	23 Jan 2009 16:12:17 -0000	1.4
--- main.php	25 Jan 2009 14:59:46 -0000	1.5
***************
*** 25,30 ****
  
  <div id="currentversioninfo">
! <div class="version">Version 3.0.6</div>
! <div class="releasedate">December 14, 2008</div>
  <div class="whatsnew"><a href="docs/whatsnew.html">Read what's new in Nagios 3</a></div>
  </div>
--- 25,30 ----
  
  <div id="currentversioninfo">
! <div class="version">Version 3.1.0</div>
! <div class="releasedate">January 25, 2009</div>
  <div class="whatsnew"><a href="docs/whatsnew.html">Read what's new in Nagios 3</a></div>
  </div>

Update of /cvsroot/nagios/nagios/base
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15312/base

Modified Files:
	nagios.c nagiostats.c 
Log Message:
Prep for new release

Index: nagiostats.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/nagiostats.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** nagiostats.c	20 Dec 2008 17:17:23 -0000	1.74
--- nagiostats.c	25 Jan 2009 14:59:46 -0000	1.75
***************
*** 4,8 ****
   *
   * Program: Nagiostats
!  * Version: 3.0.6
   * License: GPL
   * Copyright (c) 2003-2008 Ethan Galstad (egalstad@...)
--- 4,8 ----
   *
   * Program: Nagiostats
!  * Version: 3.1.0
   * License: GPL
   * Copyright (c) 2003-2008 Ethan Galstad (egalstad@...)

Index: nagios.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/nagios.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -C2 -d -r1.166 -r1.167
*** nagios.c	2 Jan 2009 18:56:09 -0000	1.166
--- nagios.c	25 Jan 2009 14:59:46 -0000	1.167
***************
*** 4,13 ****
   *
   * Program: Nagios
!  * Version: 3.0.6
   * License: GPL
   * Copyright (c) 1999-2009 Ethan Galstad (http://www.nagios.org)
   *
   * First Written:   01-28-1999 (start of development)
!  * Last Modified:   01-01-2009
   *
   * Description:
--- 4,13 ----
   *
   * Program: Nagios
!  * Version: 3.1.0
   * License: GPL
   * Copyright (c) 1999-2009 Ethan Galstad (http://www.nagios.org)
   *
   * First Written:   01-28-1999 (start of development)
!  * Last Modified:   01-25-2009
   *
   * Description:

Update of /cvsroot/nagios/nagios/xdata
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14449/xdata

Modified Files:
	xodtemplate.c 
Log Message:
Timeperiod fixes, docs updates

Index: xodtemplate.c
===================================================================
RCS file: /cvsroot/nagios/nagios/xdata/xodtemplate.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -d -r1.184 -r1.185
*** xodtemplate.c	2 Jan 2009 18:56:09 -0000	1.184
--- xodtemplate.c	25 Jan 2009 14:42:35 -0000	1.185
***************
*** 11617,11623 ****
  				switch(temp_daterange->type){
  				case DATERANGE_CALENDAR_DATE:
! 					fprintf(fp,"\t%d-%02d-%02d",temp_daterange->syear,temp_daterange->smon,temp_daterange->smday);
  					if((temp_daterange->smday!=temp_daterange->emday) || (temp_daterange->smon!=temp_daterange->emon) || (temp_daterange->syear!=temp_daterange->eyear))
! 						fprintf(fp," - %d-%02d-%02d",temp_daterange->eyear,temp_daterange->emon,temp_daterange->emday);
  					if(temp_daterange->skip_interval>1)
  						fprintf(fp," / %d",temp_daterange->skip_interval);
--- 11617,11623 ----
  				switch(temp_daterange->type){
  				case DATERANGE_CALENDAR_DATE:
! 					fprintf(fp,"\t%d-%02d-%02d",temp_daterange->syear,temp_daterange->smon+1,temp_daterange->smday);
  					if((temp_daterange->smday!=temp_daterange->emday) || (temp_daterange->smon!=temp_daterange->emon) || (temp_daterange->syear!=temp_daterange->eyear))
! 						fprintf(fp," - %d-%02d-%02d",temp_daterange->eyear,temp_daterange->emon+1,temp_daterange->emday);
  					if(temp_daterange->skip_interval>1)
  						fprintf(fp," / %d",temp_daterange->skip_interval);

Update of /cvsroot/nagios/nagios/base
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14449/base

Modified Files:
	utils.c 
Log Message:
Timeperiod fixes, docs updates

Index: utils.c
===================================================================
RCS file: /cvsroot/nagios/nagios/base/utils.c,v
retrieving revision 1.238
retrieving revision 1.239
diff -C2 -d -r1.238 -r1.239
*** utils.c	23 Jan 2009 16:54:20 -0000	1.238
--- utils.c	25 Jan 2009 14:42:34 -0000	1.239
***************
*** 4,8 ****
   *
   * Copyright (c) 1999-2009 Ethan Galstad (egalstad@...)
!  * Last Modified: 01-15-2009
   *
   * License:
--- 4,8 ----
   *
   * Copyright (c) 1999-2009 Ethan Galstad (egalstad@...)
!  * Last Modified: 01-25-2009
   *
   * License:
***************
*** 1196,1200 ****
  				/* advance an additional month (and possibly the year) if we already passed the end day of month */
  				if(temp_daterange->emday < current_time_mday){
! 					if(month==1){
  						month=0;
  						year++;
--- 1196,1201 ----
  				/* advance an additional month (and possibly the year) if we already passed the end day of month */
  				if(temp_daterange->emday < current_time_mday){
! 					/*if(month==1){*/
! 					if(month==11){
  						month=0;
  						year++;

Update of /cvsroot/nagios/nagios/html/docs
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14449/html/docs

Modified Files:
	quickstart-fedora.html quickstart-opensuse.html 
	quickstart-ubuntu.html 
Log Message:
Timeperiod fixes, docs updates

Index: quickstart-opensuse.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/quickstart-opensuse.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** quickstart-opensuse.html	2 Dec 2008 03:48:17 -0000	1.26
--- quickstart-opensuse.html	25 Jan 2009 14:42:34 -0000	1.27
***************
*** 107,115 ****
  
  <p>
! Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).    At the time of writing, the latest versions of Nagios and the Nagios plugins were 3.0.6 and 1.4.11, respectively.
  </p>
  
  <pre>
! wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.0.6.tar.gz
  wget http://osdn.dl.sourceforge.net/sourceforge/nagiosplug/nagios-plugins-1.4.11.tar.gz
  </pre>
--- 107,115 ----
  
  <p>
! Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).   These directions were tested with Nagios 3.1.0 and Nagios Plugins 1.4.11.
  </p>
  
  <pre>
! wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.1.0.tar.gz
  wget http://osdn.dl.sourceforge.net/sourceforge/nagiosplug/nagios-plugins-1.4.11.tar.gz
  </pre>
***************
*** 125,130 ****
  <pre>
  cd ~/downloads
! tar xzf nagios-3.0.6.tar.gz
! cd nagios-3.0.6
  </pre>
  
--- 125,130 ----
  <pre>
  cd ~/downloads
! tar xzf nagios-3.1.0.tar.gz
! cd nagios-3.1.0
  </pre>
  

Index: quickstart-fedora.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/quickstart-fedora.html,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** quickstart-fedora.html	2 Dec 2008 03:48:17 -0000	1.23
--- quickstart-fedora.html	25 Jan 2009 14:42:34 -0000	1.24
***************
*** 128,136 ****
  
  <p>
! Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).  At the time of writing, the latest versions of Nagios and the Nagios plugins were 3.0.3 and 1.4.11, respectively.
  </p>
  
  <pre>
! wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.0.6.tar.gz
  wget http://osdn.dl.sourceforge.net/sourceforge/nagiosplug/nagios-plugins-1.4.11.tar.gz
  </pre>
--- 128,136 ----
  
  <p>
! Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).  These directions were tested with Nagios 3.1.0 and Nagios Plugins 1.4.11.
  </p>
  
  <pre>
! wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.1.0.tar.gz
  wget http://osdn.dl.sourceforge.net/sourceforge/nagiosplug/nagios-plugins-1.4.11.tar.gz
  </pre>
***************
*** 146,151 ****
  <pre>
  cd ~/downloads
! tar xzf nagios-3.0.6.tar.gz
! cd nagios-3.0.6
  </pre>
  
--- 146,151 ----
  <pre>
  cd ~/downloads
! tar xzf nagios-3.1.0.tar.gz
! cd nagios-3.1.0
  </pre>
  

Index: quickstart-ubuntu.html
===================================================================
RCS file: /cvsroot/nagios/nagios/html/docs/quickstart-ubuntu.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** quickstart-ubuntu.html	15 Jan 2009 18:13:36 -0000	1.28
--- quickstart-ubuntu.html	25 Jan 2009 14:42:34 -0000	1.29
***************
*** 146,154 ****
  
  <p>
! Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).  At the time of writing, the latest versions of Nagios and the Nagios plugins were 3.0.6 and 1.4.11, respectively.
  </p>
  
  <pre>
! wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.0.6.tar.gz
  wget http://osdn.dl.sourceforge.net/sourceforge/nagiosplug/nagios-plugins-1.4.11.tar.gz
  </pre>
--- 146,154 ----
  
  <p>
! Download the source code tarballs of both Nagios and the Nagios plugins (visit <a href="http://www.nagios.org/download/">http://www.nagios.org/download/</a> for links to the latest versions).  These directions were tested with Nagios 3.1.0 and Nagios Plugins 1.4.11.
  </p>
  
  <pre>
! wget http://osdn.dl.sourceforge.net/sourceforge/nagios/nagios-3.1.0.tar.gz
  wget http://osdn.dl.sourceforge.net/sourceforge/nagiosplug/nagios-plugins-1.4.11.tar.gz
  </pre>
***************
*** 164,169 ****
  <pre>
  cd ~/downloads
! tar xzf nagios-3.0.6.tar.gz
! cd nagios-3.0.6
  </pre>
  
--- 164,169 ----
  <pre>
  cd ~/downloads
! tar xzf nagios-3.1.0.tar.gz
! cd nagios-3.1.0
  </pre>
  
***************
*** 326,330 ****
  <pre>
  sudo apt-get install mailx
! sudi apt-get install postfix
  </pre>
  
--- 326,330 ----
  <pre>
  sudo apt-get install mailx
! sudo apt-get install postfix
  </pre>

Update of /cvsroot/nagios/nagios
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14449

Modified Files:
	Changelog 
Log Message:
Timeperiod fixes, docs updates

Index: Changelog
===================================================================
RCS file: /cvsroot/nagios/nagios/Changelog,v
retrieving revision 1.361
retrieving revision 1.362
diff -C2 -d -r1.361 -r1.362
*** Changelog	23 Jan 2009 16:31:32 -0000	1.361
--- Changelog	25 Jan 2009 14:42:34 -0000	1.362
***************
*** 4,8 ****
  
  
! 3.1.0 - ??/??/2009
  ------------------
  * Added automatic update check functionality - runs once a day to check for new Nagios releases
--- 4,8 ----
  
  
! 3.1.0 - 01/25/2009
  ------------------
  * Added automatic update check functionality - runs once a day to check for new Nagios releases
***************
*** 18,21 ****
--- 18,23 ----
  * Minor mods for frameset base for HTML compliance (more fixes coming soon)
  * Fix for bug in handling of hard host and service problem states during restarts that could incorrectly set current check attempt and adversely affect notifications, etc.
+ * Fix for bug in timeperiod calculation of year/month rollovers and display of fixed calendar dates in web interface
+

Update of /cvsroot/nagios/nagios/cgi
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14449/cgi

Modified Files:
	config.c 
Log Message:
Timeperiod fixes, docs updates

Index: config.c
===================================================================
RCS file: /cvsroot/nagios/nagios/cgi/config.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** config.c	30 Nov 2008 17:22:58 -0000	1.47
--- config.c	25 Jan 2009 14:42:34 -0000	1.48
***************
*** 1516,1522 ****
  				switch(temp_daterange->type){
  				case DATERANGE_CALENDAR_DATE:
! 					printf("%d-%02d-%02d",temp_daterange->syear,temp_daterange->smon,temp_daterange->smday);
  					if((temp_daterange->smday!=temp_daterange->emday) || (temp_daterange->smon!=temp_daterange->emon) || (temp_daterange->syear!=temp_daterange->eyear))
! 						printf(" - %d-%02d-%02d",temp_daterange->eyear,temp_daterange->emon,temp_daterange->emday);
  					if(temp_daterange->skip_interval>1)
  						printf(" / %d",temp_daterange->skip_interval);
--- 1516,1522 ----
  				switch(temp_daterange->type){
  				case DATERANGE_CALENDAR_DATE:
! 					printf("%d-%02d-%02d",temp_daterange->syear,temp_daterange->smon+1,temp_daterange->smday);
  					if((temp_daterange->smday!=temp_daterange->emday) || (temp_daterange->smon!=temp_daterange->emon) || (temp_daterange->syear!=temp_daterange->eyear))
! 						printf(" - %d-%02d-%02d",temp_daterange->eyear,temp_daterange->emon+1,temp_daterange->emday);
  					if(temp_daterange->skip_interval>1)
  						printf(" / %d",temp_daterange->skip_interval);