[Pkg-nagios-changes] [SCM] debian packaging of icinga(-core) branch, master, updated. debian/1.9.0-1-6-gde9a084
Alexander Wirt
formorer at debian.org
Mon Jun 3 06:05:44 UTC 2013
The following commit has been merged in the master branch:
commit e07a105d9b08c803e0bbd1216deb7a0c78a05ca0
Author: Alexander Wirt <formorer at debian.org>
Date: Wed May 22 21:07:29 2013 +0200
Imported Upstream version 1.9.1
diff --git a/Changelog b/Changelog
index e562a6b..55c5b30 100644
--- a/Changelog
+++ b/Changelog
@@ -13,6 +13,16 @@ UPGRADE NOTES
- idoutils: ${source}/module/idoutils/config/updates
* package locations may differ!
+1.9.1 - 22/05/2013
+
+FIXES
+* core: fix objects.cache does not get updated on (re)start, but config verify (Christian Ruppert) #4155 - MF
+
+* classic ui: fixed UNICODE characters in JSON output from getting discarded #4193 - RB
+
+* idoutils: fix segfaults on reload with multiple neb modules of the same binary #4033 - MF
+
+
1.9.0 - 07/05/2013
NOTES
diff --git a/Makefile.in b/Makefile.in
index ece5437..1fd2e14 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,7 +81,7 @@ MKDIR=/bin/mkdir
###############################
# Global
###############################
-ICINGA_VERSION=1.9.0
+ICINGA_VERSION=1.9.1
CP=@CP@
diff --git a/THANKS b/THANKS
index bd6fa0c..d1eaa4d 100644
--- a/THANKS
+++ b/THANKS
@@ -267,6 +267,7 @@ in various ways. If we missed your name, let us know.
* John Rouillard
* Guillaume Rousse
* Yves Rubin
+* Christian Ruppert
* Elan Ruusamäe
* Mattias Ryrlen
* Jonathan Saggau
diff --git a/base/config.c b/base/config.c
index ba2f116..f4ca0b1 100644
--- a/base/config.c
+++ b/base/config.c
@@ -252,7 +252,7 @@ int read_all_object_data(char *main_config_file) {
options = READ_ALL_OBJECT_DATA;
/* cache object definitions if we're up and running */
- if (verify_config && test_scheduling == FALSE)
+ if (verify_config == FALSE && test_scheduling == FALSE)
cache = TRUE;
/* precache object definitions */
diff --git a/base/nebmods.c b/base/nebmods.c
index 3395a54..5264ebc 100644
--- a/base/nebmods.c
+++ b/base/nebmods.c
@@ -124,14 +124,13 @@ int neb_free_module_list(void) {
nebmodule *next_module = NULL;
int x = OK;
- for (temp_module = neb_module_list; temp_module;) {
+ for (temp_module = neb_module_list; temp_module; temp_module = next_module) {
next_module = temp_module->next;
my_free(temp_module->filename);
my_free(temp_module->args);
for (x = 0; x < NEBMODULE_MODINFO_NUMITEMS; x++)
my_free(temp_module->info[x]);
my_free(temp_module);
- temp_module = next_module;
}
neb_module_list = NULL;
diff --git a/cgi/cgiutils.c b/cgi/cgiutils.c
index dbc8c83..5cdbc25 100644
--- a/cgi/cgiutils.c
+++ b/cgi/cgiutils.c
@@ -3295,7 +3295,7 @@ char *json_encode(char *input) {
encoded_string[j++] = 'n';
/* ignore control caracters */
- } else if (input[i] < 32 || input[i] == 127) {
+ } else if ((input[i] > 1 && input[i] < 32) || input[i] == 127) {
continue;
} else
diff --git a/configure b/configure
index cdc97de..17a90dd 100755
--- a/configure
+++ b/configure
@@ -2491,9 +2491,9 @@ ac_config_headers="$ac_config_headers include/config.h"
PKG_NAME=icinga-core
-PKG_VERSION="1.9.0"
+PKG_VERSION="1.9.1"
PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="05-07-2013"
+PKG_REL_DATE="05-22-2013"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 600a16e..4f07823 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.9.0"
+PKG_VERSION="1.9.1"
PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="05-07-2013"
+PKG_REL_DATE="05-22-2013"
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 62d5fbc..82ac16f 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
</div>
<div id="currentversioninfo">
-<div class="version">Version 1.9.0</div>
-<div class="releasedate">May 07, 2013</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.9.0</a></div>
+<div class="version">Version 1.9.1</div>
+<div class="releasedate">Mai 22, 2013</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.9.1</a></div>
</div>
<div id="developer">
diff --git a/icinga.spec b/icinga.spec
index 1a623f1..00a0916 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -20,7 +20,7 @@
Summary: Open Source host, service and network monitoring program
Name: icinga
-Version: 1.9.0
+Version: 1.9.1
Release: %{revision}%{?dist}
License: GPLv2
Group: Applications/System
@@ -438,6 +438,9 @@ fi
%changelog
+* Wed May 22 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.9.1-1
+- bump 1.9.1
+
* Tue May 07 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.9.0-1
- bump 1.9.0
diff --git a/include/common.h b/include/common.h
index 0373102..d5a19b3 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.9.0"
-#define PROGRAM_MODIFICATION_DATE "05-07-2013"
+#define PROGRAM_VERSION "1.9.1"
+#define PROGRAM_MODIFICATION_DATE "05-22-2013"
/*#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 b33273c..e10717c 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 "05-07-2013"
-#define IDO_VERSION "1.9.0"
+#define IDO_DATE "05-22-2013"
+#define IDO_VERSION "1.9.1"
#define IDO_SCHEMA_VERSION "1.9.0"
diff --git a/update-version b/update-version
index 07dc95a..55d6aa2 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
fi
# Current version number
-CURRENTVERSION=1.9.0
+CURRENTVERSION=1.9.1
# Last date
-LASTDATE=05-07-2013
+LASTDATE=05-22-2013
if [ "x$1" = "x" ]
then
--
debian packaging of icinga(-core)
More information about the Pkg-nagios-changes
mailing list