From bbd84c65edd5fdbdf11a61e62ddb3bf4e9ad9e51 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@icinga.com>
Date: Thu, 22 Dec 2016 19:46:17 +0000
Subject: [PATCH] Release v1.11.8

---
 Changelog                        | 9 +++++++++
 Makefile.in                      | 2 +-
 configure                        | 4 ++--
 configure.in                     | 4 ++--
 html/main.html                   | 6 +++---
 icinga.spec                      | 2 +-
 include/common.h                 | 4 ++--
 module/idoutils/include/common.h | 4 ++--
 update-version                   | 4 ++--
 9 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Changelog b/Changelog
index 747677abc..698aadaa0 100644
--- a/Changelog
+++ b/Changelog
@@ -23,6 +23,15 @@ NEWS
 
 * Mailinglists have been migrated to icinga.org. Please check https://www.icinga.org/support for details!
 
+1.11.8 - 22/12/2016
+
+SECURITY FIXES
+
+* Fix possible root privilege escalation during opening logs (CVE-2016-9566) #13709
+
+Icinga is **not** vulnerable to CVE-2016-9565 since we do not provide any PHP
+files nor external advertising RSS feeds inside the Classic UI.
+
 
 1.11.7 - 03/09/2014
 
diff --git a/Makefile.in b/Makefile.in
index 03013e57a..1f8cd15d6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,7 +88,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.11.7
+ICINGA_VERSION=1.11.8
 
 CP=@CP@
 
diff --git a/configure b/configure
index 1929620e4..80c979751 100755
--- a/configure
+++ b/configure
@@ -2507,9 +2507,9 @@ ac_config_headers="$ac_config_headers include/config.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.11.7"
+PKG_VERSION="1.11.8"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="09-03-2014"
+PKG_REL_DATE="12-22-2016"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 72127b049..910639180 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.11.7"
+PKG_VERSION="1.11.8"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="09-03-2014"
+PKG_REL_DATE="12-22-2016"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
diff --git a/html/main.html b/html/main.html
index 7d5e70b11..cf6cbd985 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.11.7</div>
-<div class="releasedate">September 03, 2014</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.11.7</a></div>
+<div class="version">Version 1.11.8</div>
+<div class="releasedate">December 22, 2016</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.11.8</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index be85a8b06..b7b8ec474 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -54,7 +54,7 @@
 
 Summary: Open Source host, service and network monitoring program
 Name: icinga
-Version: 1.11.7
+Version: 1.11.8
 Release: %{revision}%{?dist}
 License: GPLv2
 Group: Applications/System
diff --git a/include/common.h b/include/common.h
index d2c100904..f186232f5 100644
--- a/include/common.h
+++ b/include/common.h
@@ -27,8 +27,8 @@
 #define PROGRAM_NAME "Icinga"
 #define PROGRAM_NAME_UC "ICINGA"
 #define PROGRAM_NAME_LC "icinga"
-#define PROGRAM_VERSION "1.11.7"
-#define PROGRAM_MODIFICATION_DATE "09-03-2014"
+#define PROGRAM_VERSION "1.11.8"
+#define PROGRAM_MODIFICATION_DATE "12-22-2016"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/
diff --git a/module/idoutils/include/common.h b/module/idoutils/include/common.h
index 70a290a5e..30389bac1 100644
--- a/module/idoutils/include/common.h
+++ b/module/idoutils/include/common.h
@@ -22,8 +22,8 @@
 #define LOG2IDO_NAME 		"LOG2IDO"
 
 /* only one space for update-version matching */
-#define IDO_DATE "09-03-2014"
-#define IDO_VERSION "1.11.7"
+#define IDO_DATE "12-22-2016"
+#define IDO_VERSION "1.11.8"
 
 #define IDO_SCHEMA_VERSION "1.11.7"
 
diff --git a/update-version b/update-version
index 9d743bfb9..29a5d40ed 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.11.7
+CURRENTVERSION=1.11.8
 
 # Last date
-LASTDATE=09-03-2014
+LASTDATE=12-22-2016
 
 if [ "x$1" = "x" ]
 then