|
[-]
[+]
|
Changed |
icinga.changes
|
|
|
|
[-]
[+]
|
Changed |
icinga.spec
^
|
|
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/Changelog
^
|
| @@ -13,6 +13,21 @@
- idoutils: ${source}/module/idoutils/config/updates
* package locations may differ!
+1.9.5 - 11/02/2014
+
+* core: fix host state translation for passive host check results #5575 - MF
+
+* classic ui: aggressively check for possible buffer overflows in cmd.cgi (thx GitHub) #5434 - MF
+
+
+1.9.4 - 13/12/2013
+
+FIXES
+* classic ui: fix status output in JSON format not including short and long plugin output properly #5217 - RB
+* classic ui: fix possible buffer overflows #5250 - RB
+* classic ui: fix Off-by-one memory access in process_cgivars() #5251 - RB
+
+
1.9.3 - 07/07/2013
FIXES
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/Makefile.in
^
|
| @@ -81,7 +81,7 @@
###############################
# Global
###############################
-ICINGA_VERSION=1.9.3
+ICINGA_VERSION=1.9.5
CP=@CP@
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/base/checks.c
^
|
| @@ -3627,21 +3627,17 @@
}
/* translate return code to basic UP/DOWN state - the DOWN/UNREACHABLE state determination is made later */
- /* NOTE: only do this for active checks - passive check results already have the final state */
- if (queued_check_result->check_type == HOST_CHECK_ACTIVE) {
-
- /* if we're not doing aggressive host checking, let WARNING states indicate the host is up (fake the result to be STATE_OK) */
- if (use_aggressive_host_checking == FALSE && result == STATE_WARNING)
- result = STATE_OK;
-
- /* OK states means the host is UP */
- if (result == STATE_OK)
- result = HOST_UP;
-
- /* any problem state indicates the host is not UP */
- else
- result = HOST_DOWN;
- }
+ /* if we're not doing aggressive host checking, let WARNING states indicate the host is up (fake the result to be STATE_OK) */
+ if (use_aggressive_host_checking == FALSE && result == STATE_WARNING)
+ result = STATE_OK;
+
+ /* OK states means the host is UP */
+ if (result == STATE_OK)
+ result = HOST_UP;
+
+ /* any problem state indicates the host is not UP */
+ else
+ result = HOST_DOWN;
/******************* PROCESS THE CHECK RESULTS ******************/
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/avail.c
^
|
| @@ -1110,10 +1110,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found the hostgroup argument */
else if (!strcmp(variables[x], "hostgroup")) {
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/cgiutils.c
^
|
| @@ -2166,12 +2166,18 @@
/* get url options but filter out "ts_end", "ts_start" and "start" */
if (getenv("QUERY_STRING") != NULL && strcmp(getenv("QUERY_STRING"), "")) {
if(strlen(getenv("QUERY_STRING")) > MAX_INPUT_BUFFER) {
- printf("display_nav_table(): Could not allocate memory for stripped_query_string\n");
- exit(1);
+ write_to_cgi_log("display_nav_table(): Query string exceeds max length. Returning without displaying nav table.\n");
+ return;
}
strcpy(stripped_query_string, getenv("QUERY_STRING"));
strip_html_brackets(stripped_query_string);
+ /* check if concatenated strings exceed MAX_INPUT_BUFFER */
+ if (strlen(url) + strlen(stripped_query_string) + 1 > MAX_INPUT_BUFFER) {
+ write_to_cgi_log("display_nav_table(): Full query string exceeds max length. Returning without displaying nav table.\n");
+ return;
+ }
+
for (temp_buffer = my_strtok(stripped_query_string, "&"); temp_buffer != NULL; temp_buffer = my_strtok(NULL, "&")) {
if (strncmp(temp_buffer, "ts_start=", 9) != 0 && strncmp(temp_buffer, "ts_end=", 6) != 0 && strncmp(temp_buffer, "start=", 6) != 0) {
if (strstr(url, "?"))
@@ -2788,17 +2794,24 @@
/* just do stuff if some options are requested */
if (getenv("QUERY_STRING") != NULL && strcmp(getenv("QUERY_STRING"), "")) {
if(strlen(getenv("QUERY_STRING")) > MAX_INPUT_BUFFER) {
- printf("print_export_link(): Could not allocate memory for stripped_query_string\n");
- exit(1);
+ write_to_cgi_log("print_export_link(): Query string exceeds max length. Returning without displaying export link.\n");
+ return;
}
strcpy(stripped_query_string, getenv("QUERY_STRING"));
strip_html_brackets(stripped_query_string);
+
+ /* check if concatenated strings exceed MAX_INPUT_BUFFER */
+ if (strlen(link) + strlen(stripped_query_string) + 2 > MAX_INPUT_BUFFER) {
+ write_to_cgi_log("print_export_link(): Full query string exceeds max length. Returning without displaying export link.\n");
+ return;
+ }
+
strcat(link, "?");
strcat(link, stripped_query_string);
}
/* add string to url */
- if (add_to_url != NULL && (strlen(add_to_url) != 0)) {
+ if (add_to_url != NULL && strlen(add_to_url) != 0 && strlen(link) + strlen(stripped_query_string) + strlen(add_to_url) + 2 <= MAX_INPUT_BUFFER) {
if (strlen(stripped_query_string) != 0)
strcat(link, "&");
else
@@ -3611,12 +3624,18 @@
/* get url options but filter out "limit" and "status" */
if (getenv("QUERY_STRING") != NULL && strcmp(getenv("QUERY_STRING"), "")) {
if(strlen(getenv("QUERY_STRING")) > MAX_INPUT_BUFFER) {
- printf("page_num_selector(): Could not allocate memory for stripped_query_string\n");
- exit(1);
+ write_to_cgi_log("page_num_selector(): Query string exceeds max length. Returning without displaying num selector.\n");
+ return;
}
strcpy(stripped_query_string, getenv("QUERY_STRING"));
strip_html_brackets(stripped_query_string);
+ /* check if concatenated strings exceed MAX_INPUT_BUFFER */
+ if (strlen(link) + strlen(stripped_query_string) + 1 > MAX_INPUT_BUFFER) {
+ write_to_cgi_log("page_num_selector(): Full query string exceeds max length. Returning without displaying num selector.\n");
+ return;
+ }
+
for (temp_buffer = my_strtok(stripped_query_string, "&"); temp_buffer != NULL; temp_buffer = my_strtok(NULL, "&")) {
if (strncmp(temp_buffer, "limit=", 6) != 0 && strncmp(temp_buffer, "start=", 6) != 0) {
if (strstr(link, "?"))
@@ -3728,12 +3747,18 @@
/* get url options but filter out "limit" and "status" */
if (getenv("QUERY_STRING") != NULL && strcmp(getenv("QUERY_STRING"), "")) {
if(strlen(getenv("QUERY_STRING")) > MAX_INPUT_BUFFER) {
- printf("display_nav_table(): Could not allocate memory for stripped_query_string\n");
- exit(1);
+ write_to_cgi_log("page_limit_selector(): Query string exceeds max length. Returning without displaying page limit selector.\n");
+ return;
}
strcpy(stripped_query_string, getenv("QUERY_STRING"));
strip_html_brackets(stripped_query_string);
+ /* check if concatenated strings exceed MAX_INPUT_BUFFER */
+ if (strlen(link) + strlen(stripped_query_string) + 1 > MAX_INPUT_BUFFER) {
+ write_to_cgi_log("page_limit_selector(): Full query string exceeds max length. Returning without displaying page limit selector.\n");
+ return;
+ }
+
for (temp_buffer = my_strtok(stripped_query_string, "&"); temp_buffer != NULL; temp_buffer = my_strtok(NULL, "&")) {
if (strncmp(temp_buffer, "limit=", 6) != 0 && strncmp(temp_buffer, "start=", 6) != 0) {
if (strstr(link, "?"))
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/cmd.c
^
|
| @@ -416,10 +416,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found the command type */
else if (!strcmp(variables[x], "cmd_typ")) {
@@ -2638,14 +2636,14 @@
len = snprintf(cmd, sizeof(cmd) - 1, "[%lu] %s;", time(NULL), command);
- if (len < 0)
+ if (len < 0 || len >= sizeof(cmd))
return ERROR;
if (fmt) {
va_start(ap, fmt);
len2 = vsnprintf(&cmd[len], sizeof(cmd) - len - 1, fmt, ap);
va_end(ap);
- if (len2 < 0)
+ if (len2 < 0 || len2 >= sizeof(cmd) - len)
return ERROR;
}
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/config.c
^
|
| @@ -582,10 +582,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found the search_string argument */
else if (!strcmp(variables[x], "search_string")) {
@@ -4264,6 +4262,7 @@
for (c = commandline; c && (cc = strstr(c, "$"));) {
(*(cc++)) = '\0';
printf("%s", html_encode(c, FALSE));
+ if (strlen(commandline_pre_processed) + strlen(c) + 1 > MAX_COMMAND_BUFFER) return;
strcat(commandline_pre_processed, c);
if ((*cc) == '$') {
/* Escaped '$' */
@@ -4274,6 +4273,7 @@
c = strstr(cc, "$");
if (c)(*(c++)) = '\0';
printf("<FONT COLOR='#777777'>$%s%s</FONT>", html_encode(cc, FALSE), (c ? "$" : ""));
+ if (strlen(commandline_pre_processed) + strlen(cc) + 3 > MAX_COMMAND_BUFFER) return;
strcat(commandline_pre_processed, "$");
strcat(commandline_pre_processed, cc);
if (c) strcat(commandline_pre_processed, "$");
@@ -4289,8 +4289,9 @@
if (command_args[i]) {
if (*(command_args[i]) != '\0') {
printf("<FONT COLOR='%s'><B>%s%s%s</B></FONT>",
- hash_color(i), ((lead_space[i] > 0) || (trail_space[i] > 0) ? "<U>‍" : ""),
- escape_string(command_args[i]), ((lead_space[i] > 0) || (trail_space[i] > 0) ? "‍</U>" : ""));
+ hash_color(i), ((lead_space[i] > 0) || (trail_space[i] > 0) ? "<u>‍" : ""),
+ escape_string(command_args[i]), ((lead_space[i] > 0) || (trail_space[i] > 0) ? "‍</u>" : ""));
+ if (strlen(commandline_pre_processed) + strlen(command_args[i]) + 1 > MAX_COMMAND_BUFFER) return;
strcat(commandline_pre_processed, command_args[i]);
} else printf("<FONT COLOR='#0000FF'>(empty)</FONT>");
} else printf("<FONT COLOR='#0000FF'>(undefined)</FONT>");
@@ -4307,6 +4308,7 @@
}
if (c) {
printf("%s", html_encode(c, FALSE));
+ if (strlen(commandline_pre_processed) + strlen(c) + 1 > MAX_COMMAND_BUFFER) return;
strcat(commandline_pre_processed, c);
}
commandline_pre_processed[MAX_COMMAND_BUFFER - 1] = '\0';
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/extinfo.c
^
|
| @@ -824,10 +824,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found the display type */
else if (!strcmp(variables[x], "type")) {
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/histogram.c
^
|
| @@ -901,10 +901,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found the host argument */
else if (!strcmp(variables[x], "host")) {
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/notifications.c
^
|
| @@ -362,10 +362,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found the host argument */
else if (!strcmp(variables[x], "host")) {
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/outages.c
^
|
| @@ -206,10 +206,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found the service severity divisor option */
if (!strcmp(variables[x], "service_divisor")) {
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/status.c
^
|
| @@ -1546,10 +1546,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found the search_string argument */
else if (!strcmp(variables[x], "search_string")) {
@@ -2641,7 +2639,7 @@
printf("<TD onClick=\"toggle_checkbox('service_%d','tableformservice');\" CLASS='status%s' nowrap>%s</TD>\n", total_service_entries, status_bg_class, temp_status->last_check);
printf("<TD onClick=\"toggle_checkbox('service_%d','tableformservice');\" CLASS='status%s' nowrap>%s</TD>\n", total_service_entries, status_bg_class, temp_status->state_duration);
printf("<TD onClick=\"toggle_checkbox('service_%d','tableformservice');\" CLASS='status%s'>%s</TD>\n", total_service_entries, status_bg_class, temp_status->attempts);
- printf("<TD onClick=\"toggle_checkbox('service_%d','tableformservice');\" CLASS='status%s' valign='center'>%s</TD>\n", total_service_entries, status_bg_class, temp_status->plugin_output);
+ printf("<td onClick=\"toggle_checkbox('service_%d','tableformservice');\" class='status%s' valign='middle'>%s</td>\n", total_service_entries, status_bg_class, (temp_status->plugin_output == NULL) ? " " : html_encode(temp_status->plugin_output, TRUE));
/* Checkbox for service(s) */
if (is_authorized_for_read_only(¤t_authdata) == FALSE) {
@@ -2701,7 +2699,7 @@
printf("%s%s%s%s", csv_data_enclosure, temp_status->last_check, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_status->state_duration, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_status->attempts, csv_data_enclosure, csv_delimiter);
- printf("%s%s%s%s", csv_data_enclosure, (temp_status->plugin_output == NULL) ? "" : temp_status->plugin_output, csv_data_enclosure, csv_delimiter);
+ printf("%s%s%s%s", csv_data_enclosure, (temp_status->plugin_output == NULL) ? "" : escape_newlines(temp_status->plugin_output), csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_status->is_flapping == TRUE) ? "true" : "false", csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_status->scheduled_downtime_depth > 0) ? "true" : "false", csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_status->checks_enabled == TRUE) ? "true" : "false", csv_data_enclosure, csv_delimiter);
@@ -3098,7 +3096,7 @@
printf("<TD onClick=\"toggle_checkbox('host_%d','tableformhost');\" CLASS='status%s' nowrap>%s</TD>\n", total_host_entries, status_bg_class, temp_statusdata->last_check);
printf("<TD onClick=\"toggle_checkbox('host_%d','tableformhost');\" CLASS='status%s' nowrap>%s</TD>\n", total_host_entries, status_bg_class, temp_statusdata->state_duration);
printf("<TD onClick=\"toggle_checkbox('host_%d','tableformhost');\" CLASS='status%s'>%s</TD>\n", total_host_entries, status_bg_class, temp_statusdata->attempts);
- printf("<TD onClick=\"toggle_checkbox('host_%d','tableformhost');\" CLASS='status%s' valign='center'>%s</TD>\n", total_host_entries, status_bg_class, temp_statusdata->plugin_output);
+ printf("<td onClick=\"toggle_checkbox('host_%d','tableformhost');\" class='status%s' valign='middle'>%s</td>\n", total_host_entries, status_bg_class, (temp_statusdata->plugin_output == NULL) ? " " : html_encode(temp_statusdata->plugin_output, TRUE));
/* Checkbox for host(s) */
if (is_authorized_for_read_only(¤t_authdata) == FALSE) {
@@ -3154,7 +3152,7 @@
printf("%s%s%s%s", csv_data_enclosure, temp_statusdata->last_check, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_statusdata->state_duration, csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, temp_statusdata->attempts, csv_data_enclosure, csv_delimiter);
- printf("%s%s%s%s", csv_data_enclosure, (temp_statusdata->plugin_output == NULL) ? "" : temp_statusdata->plugin_output, csv_data_enclosure, csv_delimiter);
+ printf("%s%s%s%s", csv_data_enclosure, (temp_statusdata->plugin_output == NULL) ? "" : escape_newlines(temp_statusdata->plugin_output), csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_statusdata->is_flapping == TRUE) ? "true" : "false", csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_statusdata->scheduled_downtime_depth > 0) ? "true" : "false", csv_data_enclosure, csv_delimiter);
printf("%s%s%s%s", csv_data_enclosure, (temp_statusdata->checks_enabled == TRUE) ? "true" : "false", csv_data_enclosure, csv_delimiter);
@@ -5997,23 +5995,12 @@
/* plugin ouput */
if (status_show_long_plugin_output != FALSE && plugin_output_long != NULL) {
- if (content_type == CSV_CONTENT || content_type == JSON_CONTENT) {
- if (plugin_output_short != NULL)
- dummy = asprintf(&plugin_output, "%s", escape_newlines(plugin_output_long));
- else
- dummy = asprintf(&plugin_output, "%s %s", plugin_output_short, escape_newlines(plugin_output_long));
- } else
- dummy = asprintf(&plugin_output, "%s<BR>%s", (plugin_output_short == NULL) ? "" : html_encode(plugin_output_short, TRUE), html_encode(plugin_output_long, TRUE));
- } else if (plugin_output_short != NULL) {
- if (content_type == CSV_CONTENT || content_type == JSON_CONTENT)
- dummy = asprintf(&plugin_output, "%s", plugin_output_short);
+ if (plugin_output_short == NULL)
+ asprintf(&plugin_output, "%s", plugin_output_long);
else
- dummy = asprintf(&plugin_output, "%s ", html_encode(plugin_output_short, TRUE));
- } else {
- if (content_type == CSV_CONTENT || content_type == JSON_CONTENT)
- plugin_output = NULL;
- else
- dummy = asprintf(&plugin_output, " ");
+ asprintf(&plugin_output, "%s\n%s", plugin_output_short, plugin_output_long);
+ } else if (plugin_output_short != NULL) {
+ asprintf(&plugin_output, "%s", plugin_output_short);
}
/* allocating new memory */
@@ -6941,12 +6928,18 @@
/* get url options but filter out "limit" and "status" */
if (getenv("QUERY_STRING") != NULL && strcmp(getenv("QUERY_STRING"), "")) {
if(strlen(getenv("QUERY_STRING")) > MAX_INPUT_BUFFER) {
- printf("status_page_num_selector(): Could not allocate memory for stripped_query_string\n");
- exit(1);
+ write_to_cgi_log("status_page_num_selector(): Query string exceeds max length. Returning without displaying page num selector.\n");
+ return;
}
strcpy(stripped_query_string, getenv("QUERY_STRING"));
strip_html_brackets(stripped_query_string);
+ /* check if concatenated strings exceed MAX_INPUT_BUFFER */
+ if (strlen(link) + strlen(stripped_query_string) + 1 > MAX_INPUT_BUFFER) {
+ write_to_cgi_log("status_page_num_selector(): Full query string exceeds max length. Returning without displaying page num selector.\n");
+ return;
+ }
+
for (temp_buffer = my_strtok(stripped_query_string, "&"); temp_buffer != NULL; temp_buffer = my_strtok(NULL, "&")) {
if (strncmp(temp_buffer, "limit=", 6) != 0 && strncmp(temp_buffer, "start=", 6) != 0) {
if (strstr(link, "?"))
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/statusmap.c
^
|
| @@ -309,10 +309,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found the host argument */
else if (!strcmp(variables[x], "host")) {
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/summary.c
^
|
| @@ -626,10 +626,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found first time argument */
else if (!strcmp(variables[x], "t1")) {
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/cgi/trends.c
^
|
| @@ -1117,10 +1117,8 @@
for (x = 0; variables[x] != NULL; x++) {
/* do some basic length checking on the variable identifier to prevent buffer overflows */
- if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
- x++;
+ if (strlen(variables[x]) >= MAX_INPUT_BUFFER - 1)
continue;
- }
/* we found the host argument */
else if (!strcmp(variables[x], "host")) {
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/configure
^
|
| @@ -2491,9 +2491,9 @@
PKG_NAME=icinga-core
-PKG_VERSION="1.9.3"
+PKG_VERSION="1.9.5"
PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="07-07-2013"
+PKG_REL_DATE="02-11-2014"
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/configure.in
^
|
| @@ -9,9 +9,9 @@
AC_PREFIX_DEFAULT(/usr/local/icinga)
PKG_NAME=icinga-core
-PKG_VERSION="1.9.3"
+PKG_VERSION="1.9.5"
PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="07-07-2013"
+PKG_REL_DATE="02-11-2014"
dnl Figure out how to invoke "install" and what install options to use.
AC_PROG_INSTALL
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/html/main.html
^
|
| @@ -18,9 +18,9 @@
</div>
<div id="currentversioninfo">
-<div class="version">Version 1.9.3</div>
-<div class="releasedate">July 07, 2013</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.9.3</a></div>
+<div class="version">Version 1.9.5</div>
+<div class="releasedate">Februar 11, 2014</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.9.5</a></div>
</div>
<div id="developer">
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/icinga.spec
^
|
| @@ -20,7 +20,7 @@
Summary: Open Source host, service and network monitoring program
Name: icinga
-Version: 1.9.3
+Version: 1.9.5
Release: %{revision}%{?dist}
License: GPLv2
Group: Applications/System
@@ -153,7 +153,6 @@
--enable-embedded-perl \
--enable-idoutils \
--with-httpd-conf=%{apacheconfdir} \
- --with-init-dir=%{_initrddir} \
--with-log-dir=%{logdir} \
--enable-cgi-log \
--with-cgi-log-dir=%{logdir}/gui \
@@ -438,6 +437,12 @@
%changelog
+* Tue Feb 11 2013 Michael Friedrich <michael.friedrich@netways.de> - 1.9.5-1
+- bump 1.9.5
+
+* Fri Dec 13 2013 Ricardo Bartels <ricardo@bitchbrothers.com> - 1.9.4-1
+- bump 1.9.4
+
* Sun Jul 07 2013 Michael Friedrich <michael.friedrich@netways.de> - 1.9.3-1
- bump 1.9.3
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/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.3"
-#define PROGRAM_MODIFICATION_DATE "07-07-2013"
+#define PROGRAM_VERSION "1.9.5"
+#define PROGRAM_MODIFICATION_DATE "02-11-2014"
/*#define DEBUG_CHECK_IPC 1 */
/*#define DEBUG_CHECK_IPC2 1*/
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/module/idoutils/include/common.h
^
|
| @@ -22,8 +22,8 @@
#define LOG2IDO_NAME "LOG2IDO"
/* only one space for update-version matching */
-#define IDO_DATE "07-07-2013"
-#define IDO_VERSION "1.9.3"
+#define IDO_DATE "02-11-2014"
+#define IDO_VERSION "1.9.5"
#define IDO_SCHEMA_VERSION "1.9.0"
|
|
[-]
[+]
|
Changed |
icinga-1.9.5.tar.bz2/update-version
^
|
| @@ -10,10 +10,10 @@
fi
# Current version number
-CURRENTVERSION=1.9.3
+CURRENTVERSION=1.9.5
# Last date
-LASTDATE=07-07-2013
+LASTDATE=02-11-2014
if [ "x$1" = "x" ]
then
|
