[Pkg-nagios-changes] [SCM] Debian packaging for Nagios3 branch, master, updated. debian/3.2.3-3-17-g05584c8

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 5ff27804b57e8a3c36f988fca0bf596a0f01b782
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat May 5 13:35:17 2012 +0200

    Refresh 55_strip_logarchivepath.dpatch

diff --git a/debian/patches/55_strip_logarchivepath.dpatch b/debian/patches/55_strip_logarchivepath.dpatch
index 5ebbddd..6e4b8e5 100755
--- a/debian/patches/55_strip_logarchivepath.dpatch
+++ b/debian/patches/55_strip_logarchivepath.dpatch
@@ -4,16 +4,15 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: stripping the log_archive_path value from cgi.cfg (#578232) 
 @DPATCH@
-diff -uNr nagios3-3.2.0.orig/cgi/cgiutils.c nagios3-3.2.0/cgi/cgiutils.c
---- nagios3-3.2.0.orig/cgi/cgiutils.c	2009-07-31 10:54:20.000000000 -0600
-+++ nagios3-3.2.0/cgi/cgiutils.c	2010-04-18 00:52:00.000000000 -0600
-@@ -481,7 +481,7 @@
- 			temp_buffer=strtok(NULL,"\n");
- 			strncpy(log_archive_path,(temp_buffer==NULL)?"":temp_buffer,sizeof(log_archive_path));
- 			log_archive_path[sizeof(log_archive_path)-1]='\x0';
--			strip(physical_html_path);
-+			strip(log_archive_path);
- 			if(log_archive_path[strlen(log_archive_path)-1]!='/' && (strlen(log_archive_path) < sizeof(log_archive_path)-1))
- 				strcat(log_archive_path,"/");
- 		        }
-
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nagios3~/cgi/cgiutils.c pkg-nagios3/cgi/cgiutils.c
+--- pkg-nagios3~/cgi/cgiutils.c	2011-07-29 15:56:26.000000000 +0200
++++ pkg-nagios3/cgi/cgiutils.c	2012-05-05 13:32:59.823005928 +0200
+@@ -489,7 +489,7 @@
+ 			temp_buffer = strtok(NULL, "\n");
+ 			strncpy(log_archive_path, (temp_buffer == NULL) ? "" : temp_buffer, sizeof(log_archive_path));
+ 			log_archive_path[sizeof(log_archive_path)-1] = '\x0';
+-			strip(physical_html_path);
++			strip(log_archive_path);
+ 			if(log_archive_path[strlen(log_archive_path)-1] != '/' && (strlen(log_archive_path) < sizeof(log_archive_path) - 1))
+ 				strcat(log_archive_path, "/");
+ 			}

-- 
Debian packaging for Nagios3