Hello community, here is the log from the commit of package nagios for openSUSE:Factory checked in at 2014-05-06 14:02:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nagios (Old) and /work/SRC/openSUSE:Factory/.nagios.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nagios" Changes: -------- --- /work/SRC/openSUSE:Factory/nagios/nagios.changes 2014-04-15 11:46:48.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios.changes 2014-05-06 14:02:16.000000000 +0200 @@ -1,0 +2,19 @@ +Sat May 3 18:27:45 UTC 2014 - [email protected] + +- update to 4.0.6: + ENHANCEMENTS + * Added name of authenticated user to JSON CGI results object + * Added Nagios Core version to the Status JSON CGI programstatus query + * Added daemon status to main page + FIXES + * Fixed bug #600: Service Check Timeout State always returns OK (0) status + * Fixed bug #583: Status Check Output of (No output on stdout) stderr + * Fixed bug #573: Service checks returns (No output on stdout) stderr + * Fixed bug #438: Reloads during downtime causes wrong availability + calculations + * Fixed feed updates when daemon can not access external networks + * Archive JSON: Fixed bugs calculating availability + * Archive JSON: Allow missing logs to be skipped +- refreshed patches to apply with latest source + +------------------------------------------------------------------- Old: ---- nagios-4.0.4-remove-date-time.patch nagios-4.0.5.tar.bz2 New: ---- nagios-4.0.6-remove-date-time.patch nagios-4.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nagios.spec ++++++ --- /var/tmp/diff_new_pack.1rre8V/_old 2014-05-06 14:02:17.000000000 +0200 +++ /var/tmp/diff_new_pack.1rre8V/_new 2014-05-06 14:02:17.000000000 +0200 @@ -17,7 +17,7 @@ Name: nagios -Version: 4.0.5 +Version: 4.0.6 Release: 0 Summary: The Nagios Network Monitor License: GPL-2.0+ @@ -43,9 +43,10 @@ Patch4: nagios-random_data.patch # PATCH-FIX-OPENSUSE disable Nagios online update checks for distributed packages Patch11: nagios-disable_phone_home.patch -Patch12: nagios-4.0.4-remove-date-time.patch # PATCH-FIX-UPSTREAM fix against CVE-2014-1878 Patch13: nagios-CVE-2014-1878.patch +# PATCH-FIX-OPENSUSE fake compile time in json sources to avoid problems in OBS +Patch14: nagios-4.0.6-remove-date-time.patch BuildRequires: doxygen # yes: we still build for SLE10 %if 0%{?suse_version} > 1020 @@ -198,12 +199,12 @@ %prep %setup -q -%patch2 -p0 -%patch3 -p0 +%patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch11 -p1 -%patch12 -p1 %patch13 -p1 +%patch14 -p1 find -name ".gitignore" | xargs rm # fixing permissions the dirty way.... chmod 644 Changelog LEGAL LICENSE README sample-config/README sample-config/template-object/README ++++++ nagios-4.0.4-remove-date-time.patch -> nagios-4.0.6-remove-date-time.patch ++++++ --- /work/SRC/openSUSE:Factory/nagios/nagios-4.0.4-remove-date-time.patch 2014-03-30 12:19:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nagios.new/nagios-4.0.6-remove-date-time.patch 2014-05-06 14:02:15.000000000 +0200 @@ -1,57 +1,45 @@ -From: Andreas Stieger <[email protected]> -Date: Mon, 17 Mar 2014 19:18:34 +0000 -Subject: prevent unneccessary rebuilds due to __DATE__ and __TIME__ macros -Upstream: no - -Fixes build warnings: -nagios-www.i586: W: file-contains-date-and-time /usr/lib/nagios/cgi/statusjson.cgi -nagios-www.i586: W: file-contains-date-and-time /usr/lib/nagios/cgi/objectjson.cgi -nagios-www.i586: W: file-contains-date-and-time /usr/lib/nagios/cgi/archivejson.cgi -Your file uses __DATE and __TIME__ this causes the package to rebuild when -not needed - ---- - cgi/archivejson.c | 2 +- - cgi/objectjson.c | 2 +- - cgi/statusjson.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -Index: nagios-4.0.4/cgi/archivejson.c +Index: nagios-4.0.6/cgi/archivejson.c =================================================================== ---- nagios-4.0.4.orig/cgi/archivejson.c -+++ nagios-4.0.4/cgi/archivejson.c -@@ -742,7 +742,7 @@ int main(void) { +--- nagios-4.0.6.orig/cgi/archivejson.c ++++ nagios-4.0.6/cgi/archivejson.c +@@ -1,4 +1,4 @@ +-/************************************************************************** ++/************************************************************************** + * + * ARCHIVEJSON.C - Nagios CGI for returning JSON-formatted archive data + * +@@ -757,7 +757,7 @@ int main(void) { json_result(query_time, THISCGI, svm_get_string_from_value(cgi_data.query, valid_queries), get_query_status(query_status, cgi_data.query), -- compile_time(__DATE__, __TIME__), RESULT_SUCCESS, "")); -+ compile_time("Jan 1 1970", "00:00:00"), RESULT_SUCCESS, "")); +- compile_time(__DATE__, __TIME__), ¤t_authdata, ++ compile_time("Jan 1 1970", "00:00:00"), ¤t_authdata, + RESULT_SUCCESS, "")); json_object_append_object(json_root, "data", json_help(archive_json_help)); - break; -Index: nagios-4.0.4/cgi/objectjson.c +Index: nagios-4.0.6/cgi/objectjson.c =================================================================== ---- nagios-4.0.4.orig/cgi/objectjson.c -+++ nagios-4.0.4/cgi/objectjson.c -@@ -1090,7 +1090,7 @@ int main(void) { +--- nagios-4.0.6.orig/cgi/objectjson.c ++++ nagios-4.0.6/cgi/objectjson.c +@@ -1122,7 +1122,7 @@ int main(void) { json_result(query_time, THISCGI, svm_get_string_from_value(cgi_data.query, valid_queries), get_query_status(query_status, cgi_data.query), -- compile_time(__DATE__, __TIME__), RESULT_SUCCESS, "")); -+ compile_time("Jan 1 1970", "00:00:00"), RESULT_SUCCESS, "")); +- compile_time(__DATE__, __TIME__), ¤t_authdata, ++ compile_time("Jan 1 1970", "00:00:00"), ¤t_authdata, + RESULT_SUCCESS, "")); json_object_append_object(json_root, "data", json_help(object_json_help)); break; - default: -Index: nagios-4.0.4/cgi/statusjson.c +Index: nagios-4.0.6/cgi/statusjson.c =================================================================== ---- nagios-4.0.4.orig/cgi/statusjson.c -+++ nagios-4.0.4/cgi/statusjson.c -@@ -1111,7 +1111,7 @@ int main(void) { +--- nagios-4.0.6.orig/cgi/statusjson.c ++++ nagios-4.0.6/cgi/statusjson.c +@@ -1128,7 +1128,7 @@ int main(void) { json_result(query_time, THISCGI, svm_get_string_from_value(cgi_data.query, valid_queries), get_query_status(query_status, cgi_data.query), -- compile_time(__DATE__, __TIME__), RESULT_SUCCESS, "")); -+ compile_time("Jan 1 1970", "00:00:00"), RESULT_SUCCESS, "")); +- compile_time(__DATE__, __TIME__), ¤t_authdata, ++ compile_time("Jan 1 1970", "00:00:00"), ¤t_authdata, + RESULT_SUCCESS, "")); json_object_append_object(json_root, "data", json_help(status_json_help)); break; - default: ++++++ nagios-4.0.5.tar.bz2 -> nagios-4.0.6.tar.bz2 ++++++ ++++ 4735 lines of diff (skipped) ++++++ nagios-CVE-2014-1878.patch ++++++ --- /var/tmp/diff_new_pack.1rre8V/_old 2014-05-06 14:02:18.000000000 +0200 +++ /var/tmp/diff_new_pack.1rre8V/_new 2014-05-06 14:02:18.000000000 +0200 @@ -1,7 +1,7 @@ -Index: nagios-4.0.4/cgi/cmd.c +Index: nagios-4.0.6/cgi/cmd.c =================================================================== ---- nagios-4.0.4.orig/cgi/cmd.c -+++ nagios-4.0.4/cgi/cmd.c +--- nagios-4.0.6.orig/cgi/cmd.c ++++ nagios-4.0.6/cgi/cmd.c @@ -1903,14 +1903,14 @@ static int cmd_submitf(int id, const cha return ERROR; ++++++ nagios-disable_phone_home.patch ++++++ --- /var/tmp/diff_new_pack.1rre8V/_old 2014-05-06 14:02:18.000000000 +0200 +++ /var/tmp/diff_new_pack.1rre8V/_new 2014-05-06 14:02:18.000000000 +0200 @@ -1,7 +1,7 @@ -Index: nagios-4.0.4/base/utils.c +Index: nagios-4.0.6/base/utils.c =================================================================== ---- nagios-4.0.4.orig/base/utils.c -+++ nagios-4.0.4/base/utils.c +--- nagios-4.0.6.orig/base/utils.c ++++ nagios-4.0.6/base/utils.c @@ -2833,118 +2833,6 @@ int check_for_nagios_updates(int force, /* checks for updates at api.nagios.org */ ++++++ nagios-fix_encoding_trends.cgi.patch ++++++ --- /var/tmp/diff_new_pack.1rre8V/_old 2014-05-06 14:02:18.000000000 +0200 +++ /var/tmp/diff_new_pack.1rre8V/_new 2014-05-06 14:02:18.000000000 +0200 @@ -2,10 +2,10 @@ cgi/getcgi.c | 3 +++ 1 file changed, 3 insertions(+) -Index: cgi/getcgi.c +Index: nagios-4.0.6/cgi/getcgi.c =================================================================== ---- cgi/getcgi.c.orig -+++ cgi/getcgi.c +--- nagios-4.0.6.orig/cgi/getcgi.c ++++ nagios-4.0.6/cgi/getcgi.c @@ -95,6 +95,9 @@ void unescape_cgi_input(char *input) { break; else if(input[x] == '%') { ++++++ nagios-fix_spurious_dollar_signs_added_to_command_lines.patch ++++++ --- /var/tmp/diff_new_pack.1rre8V/_old 2014-05-06 14:02:18.000000000 +0200 +++ /var/tmp/diff_new_pack.1rre8V/_new 2014-05-06 14:02:18.000000000 +0200 @@ -2,10 +2,10 @@ common/macros.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -Index: common/macros.c +Index: nagios-4.0.6/common/macros.c =================================================================== ---- common/macros.c.orig -+++ common/macros.c +--- nagios-4.0.6.orig/common/macros.c ++++ nagios-4.0.6/common/macros.c @@ -191,7 +191,8 @@ int process_macros_r(nagios_macros *mac, *output_buffer = (char *)realloc(*output_buffer, strlen(*output_buffer) + strlen(temp_buffer) + 3); strcat(*output_buffer, "$"); ++++++ nagios-random_data.patch ++++++ --- /var/tmp/diff_new_pack.1rre8V/_old 2014-05-06 14:02:18.000000000 +0200 +++ /var/tmp/diff_new_pack.1rre8V/_new 2014-05-06 14:02:18.000000000 +0200 @@ -1,7 +1,7 @@ -Index: nagios-4.0.4/worker/ping/worker-ping.c +Index: nagios-4.0.6/worker/ping/worker-ping.c =================================================================== ---- nagios-4.0.4.orig/worker/ping/worker-ping.c -+++ nagios-4.0.4/worker/ping/worker-ping.c +--- nagios-4.0.6.orig/worker/ping/worker-ping.c ++++ nagios-4.0.6/worker/ping/worker-ping.c @@ -84,6 +84,7 @@ main( int argc, char **argv, char **env) if( worker( worker_socket)) { exit( 1); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
