[Pkg-nagios-changes] [pkg-nagios] r1481 - nagios3/trunk/debian

[Jan Wagner]

tags 482178 pending
tags 485439 pending
thanks

Author: waja-guest
Date: 2008-06-09 18:57:11 +0000 (Mon, 09 Jun 2008)
New Revision: 1481

Modified:
   nagios3/trunk/debian/cfg-cgi.cfg.diff
   nagios3/trunk/debian/cfg-commands.cfg.diff
   nagios3/trunk/debian/cfg-nagios.cfg.diff
   nagios3/trunk/debian/changelog
Log:
new upstream

Modified: nagios3/trunk/debian/cfg-cgi.cfg.diff
===================================================================
--- nagios3/trunk/debian/cfg-cgi.cfg.diff	2008-06-07 09:59:19 UTC (rev 1480)
+++ nagios3/trunk/debian/cfg-cgi.cfg.diff	2008-06-09 18:57:11 UTC (rev 1481)
@@ -1,14 +1,15 @@
---- cgi.cfg.orig	2008-02-06 19:32:12.000000000 +0100
-+++ cgi.cfg	2008-02-06 19:33:26.000000000 +0100
-@@ -2,8 +2,6 @@
+--- cgi.cfg.orig	2008-06-09 17:27:40.000000000 +0200
++++ cgi.cfg	2008-06-09 20:42:54.000000000 +0200
+@@ -1,8 +1,6 @@
+ #################################################################
  #
- # CGI.CFG - Sample CGI Configuration File for Nagios 3.0rc2
+-# CGI.CFG - Sample CGI Configuration File for Nagios 3.0.2
+-#
+-# Last Modified: 10-07-2007
++# CGI.CFG - Sample CGI Configuration File for Nagios
  #
--# Last Modified: 10-07-2007
--#
  #################################################################
  
- 
 @@ -43,7 +41,7 @@
  # Values: 0 = disables context-sensitive help
  #         1 = enables context-sensitive help

Modified: nagios3/trunk/debian/cfg-commands.cfg.diff
===================================================================
--- nagios3/trunk/debian/cfg-commands.cfg.diff	2008-06-07 09:59:19 UTC (rev 1480)
+++ nagios3/trunk/debian/cfg-commands.cfg.diff	2008-06-09 18:57:11 UTC (rev 1481)
@@ -2,7 +2,7 @@
 +++ commands.cfg	2008-04-08 19:50:20.000000000 +0200
 @@ -1,29 +1,13 @@
  ###############################################################################
--# COMMANDS.CFG - SAMPLE COMMAND DEFINITIONS FOR NAGIOS 3.0.1
+-# COMMANDS.CFG - SAMPLE COMMAND DEFINITIONS FOR NAGIOS 3.0.2
 -#
 -# Last Modified: 05-31-2007
 -#

Modified: nagios3/trunk/debian/cfg-nagios.cfg.diff
===================================================================
--- nagios3/trunk/debian/cfg-nagios.cfg.diff	2008-06-07 09:59:19 UTC (rev 1480)
+++ nagios3/trunk/debian/cfg-nagios.cfg.diff	2008-06-09 18:57:11 UTC (rev 1481)
@@ -1,28 +1,29 @@
---- nagios.cfg.orig	2008-04-16 06:26:11.000000000 +0200
-+++ nagios.cfg	2008-04-16 06:26:46.000000000 +0200
-@@ -2,12 +2,6 @@
+--- nagios.cfg.orig	2008-06-09 20:04:37.000000000 +0200
++++ nagios.cfg	2008-06-09 20:17:45.000000000 +0200
+@@ -1,12 +1,6 @@
+ ##############################################################################
  #
- # NAGIOS.CFG - Sample Main Config File for Nagios 3.0.1
- #
+-# NAGIOS.CFG - Sample Main Config File for Nagios 3.0.2
+-#
 -# Read the documentation for more information on this configuration
 -# file.  I've provided some comments here, but things may not be so
 -# clear without further explanation.
 -#
--# Last Modified: 12-14-2007
--#
+-# Last Modified: 05-19-2008
++# NAGIOS.CFG - Sample Main Config File for Nagios
+ #
  ##############################################################################
  
- 
 @@ -16,8 +10,14 @@
  # for historical purposes.  This should be the first option specified 
  # in the config file!!!
  
 -log_file=/var/lib/nagios3/nagios.log
 +log_file=/var/log/nagios3/nagios.log
- 
++
 +# Commands definitions
 +cfg_file=/etc/nagios3/commands.cfg
-+
+ 
 +# Debian also defaults to using the check commands defined by the debian
 +# nagios-plugins package
 +cfg_dir=/etc/nagios-plugins/config
@@ -139,7 +140,7 @@
  
  
  
-@@ -1281,4 +1281,9 @@
+@@ -1286,4 +1286,8 @@
  
  max_debug_file_size=1000000
  
@@ -147,5 +148,4 @@
 +# other packages and the local admin can dump or link configuration
 +# files into.
 +cfg_dir=/etc/nagios3/conf.d
-+
  

Modified: nagios3/trunk/debian/changelog
===================================================================
--- nagios3/trunk/debian/changelog	2008-06-07 09:59:19 UTC (rev 1480)
+++ nagios3/trunk/debian/changelog	2008-06-09 18:57:11 UTC (rev 1481)
@@ -1,10 +1,15 @@
-nagios3 (3.0.1-2) unstable; urgency=low
+nagios3 (3.0.2-1) unstable; urgency=low
 
   [ Alexander Wirt ]
   * Remove bashism from rules file (Closes: #479324, #478412)
   * Set p1.pl DEBUG_LOG_PATH to /var/log/nagios3/ (Closes: #478877)
 
   [ Jan Wagner ]
+  * New upstream release (Closes: #485439)
+    * Fix XSS vulnerability (CVE-2007-5803).
+  * updated cfg-cgi.cfg.diff, cfg-commands.cfg.diff and cfg-nagios.cfg.diff
+    for new upstream release and remove version from config files 
+    (Closes: #482178)
   * Updating standards version to 3.8.0, no changes needed
   * add myself fo Uploaders