[Pkg-nagios-changes] [pkg-nagios3] 01/01: push 3.4.1-3+deb7u1 to wheezy branch

[Jonas Meurer]

This is an automated email from the git hooks/post-receive script.

mejo pushed a commit to branch wheezy
in repository pkg-nagios3.

commit dc766fa159fafeda62fdbef3b8012062f1baefec
Author: Jonas Meurer <jonas at freesources.org>
Date:   Mon Nov 4 20:45:33 2013 +0100

    push 3.4.1-3+deb7u1 to wheezy branch
---
 debian/changelog                   |   19 +++++++++++++++++++
 debian/nagios3-common.nagios3.init |    2 +-
 debian/patches/00list              |    3 +++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f878ac3..3751a5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+nagios3 (3.4.1-3+deb7u1) wheezy; urgency=low
+
+  * Backport the following changes to wheezy:
+  * [cd50049] Add missing check command in initscript (Closes: #680615)
+  * [77c9d0e] Fix typo in initscript
+  * [a2c78a1] Stop status.cgi from listing unauthorized hosts and services in servicegroup view (CVE-2013-2214)
+    Thanks to Jonas Meurer for the report and the patch (Closes: #714171)
+  * [51fb59b] Backport upstream r1953 to fix downtime retention across restarts.
+    Thanks to Didier 'OdyX' Raboud for the patch (Closes: #710356)
+
+ -- Jonas Meurer <mejo at debian.org>  Fri, 01 Nov 2013 14:32:18 +0100
+
+nagios3 (3.4.1-3) unstable; urgency=low
+
+  * Fix several overflows in getcgi.cgi and history.cgi
+    This is fix for CVE 2012-6096 (Closes: #697930)
+
+ -- Alexander Wirt <formorer at debian.org>  Sun, 27 Jan 2013 19:24:49 +0100
+
 nagios3 (3.4.1-2) unstable; urgency=low
 
   * [265c38d] Don't call the updatecheck on debian
diff --git a/debian/nagios3-common.nagios3.init b/debian/nagios3-common.nagios3.init
index 6db94eb..558c957 100644
--- a/debian/nagios3-common.nagios3.init
+++ b/debian/nagios3-common.nagios3.init
@@ -126,7 +126,7 @@ THEPIDFILE=$(get_config "lock_file")
 start () {
 
   if [ "$ENABLED" = "no"  ]; then
-	  log_warning_msg "Not starting Nagios3 - set ENABLED to yes in /etc/defrault/nagios3"
+	  log_warning_msg "Not starting Nagios3 - set ENABLED to yes in /etc/default/nagios3"
 	  exit 0
   fi
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 2a4b0e7..f42393d 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,3 +8,6 @@
 70_fix_eventhandler_paths.dpatch
 99_remove_update-check.dpatch
 99_fix_php_warning.dpatch
+99_security_cve_2012_6096.dpatch
+99_security_status_cgi_servicegroup.dpatch
+999_daemon-downtime-Handle-loading-effective-downtime-fr.dpatch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios3.git