[Pkg-nagios-changes] [icinga] 05/08: Refresh patches.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository icinga.

commit e238653f0d8cb869a6f42a9ce3d97919a15b0cc6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 23 09:49:44 2016 +0100

    Refresh patches.
---
 debian/changelog                     |  1 +
 debian/patches/53_jquery-ui.patch    | 12 ++++++------
 debian/patches/spelling-errors.patch |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db202c0..6c0d275 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ icinga (1.13.4-1) UNRELEASED; urgency=medium
   * New upstream release.
     - Fixes CVE-2016-9566.
   * Update watch file to match tagged releases too (not only downloads).
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 23 Dec 2016 09:40:28 +0100
 
diff --git a/debian/patches/53_jquery-ui.patch b/debian/patches/53_jquery-ui.patch
index c028b7c..3af1cd5 100644
--- a/debian/patches/53_jquery-ui.patch
+++ b/debian/patches/53_jquery-ui.patch
@@ -32,7 +32,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	<div id="menu">
 --- a/include/cgiutils.h
 +++ b/include/cgiutils.h
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ extern "C" {
  
  #define CHECKBOX_FUNCTIONS_JS   "checkbox_functions.js"
  #define COMMON_FUNCTIONS_JS	"common_functions.js"
@@ -41,7 +41,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #define JQUERY_DD_JS		"jquery.dd.min.js"
  #define SKINNYTIP_JS		"skinnytip.js"
  #define PAGE_REFRESH_JS		"page_refresh.js"
-@@ -122,17 +122,16 @@
+@@ -122,17 +122,16 @@ extern "C" {
  
  /**************************** JQUERY-UI PATH ******************************/
  
@@ -69,7 +69,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
 --- a/cgi/cgiutils.c
 +++ b/cgi/cgiutils.c
-@@ -46,6 +46,7 @@
+@@ -46,6 +46,7 @@ char            url_images_path[MAX_FILE
  char            url_logo_images_path[MAX_FILENAME_LENGTH];
  char            url_stylesheets_path[MAX_FILENAME_LENGTH];
  char            url_js_path[MAX_FILENAME_LENGTH];
@@ -77,7 +77,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  char            url_jquiryui_path[MAX_FILENAME_LENGTH];
  char            url_jquiryui_addon_path[MAX_FILENAME_LENGTH];
  char            url_media_path[MAX_FILENAME_LENGTH];
-@@ -520,6 +521,9 @@
+@@ -520,6 +521,9 @@ int read_cgi_config_file(char *filename)
  			snprintf(url_js_path, sizeof(url_js_path), "%sjs/", url_html_path);
  			url_js_path[sizeof(url_js_path) - 1] = '\x0';
  
@@ -87,7 +87,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  			snprintf(url_jquiryui_path, sizeof(url_jquiryui_path), "%sjquery-ui/", url_html_path);
  			url_jquiryui_path[sizeof(url_jquiryui_path) - 1] = '\x0';
  
-@@ -1368,7 +1372,7 @@
+@@ -1368,7 +1372,7 @@ void document_header(int cgi_id, int use
  	}
  
  	/* first: jQuery JavaScript library */
@@ -96,7 +96,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  	/* second: common functions library */
  	printf("<script type='text/javascript' src='%s%s'></script>\n", url_js_path, COMMON_FUNCTIONS_JS);
-@@ -1385,7 +1389,6 @@
+@@ -1385,7 +1389,6 @@ void document_header(int cgi_id, int use
  
  	/* forth: jquery-ui libs and css */
  	if (cgi_id == CMD_CGI_ID || cgi_id == NOTIFICATIONS_CGI_ID || cgi_id == SHOWLOG_CGI_ID || cgi_id == HISTORY_CGI_ID || cgi_id == STATUS_CGI_ID) {
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
index b74bb4b..f5cbfb8 100644
--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -101,7 +101,7 @@ Applied-Upstream: https://github.com/Icinga/icinga-core/commit/0b216eaa5ca072f4c
      can read more on how to configure graphing <a class="link" href="perfgraphs.html" title="8.7. Graphing Performance Info With PNP4Nagios">here</a>.</p>
 --- a/Changelog
 +++ b/Changelog
-@@ -2651,7 +2651,7 @@ WARNINGS
+@@ -2660,7 +2660,7 @@ WARNINGS
  ------------------
  * Configure script fix for no mail program found/installed on system
  * Fix for compilation warnings about implicit declaration of round() - may (strangely enough) also

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