[Pkg-nagios-changes] [SCM] Debian packaging for Nagios3 branch, master, updated. 3.2.0-5-11-ge97bea6

[Alexander Wirt]

The following commit has been merged in the master branch:
commit e97bea6f02cbebe18e0d8d72f4434bbb88522a0b
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun May 23 21:46:24 2010 +0200

    Fix stripping of the logarchive path

diff --git a/debian/changelog b/debian/changelog
index e824eae..be007fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nagios3 (3.2.1-1) unstable; urgency=low
 
   * New upstream version
+  * Fix strip of logarchivepath (Closes: #578232)
 
  -- Alexander Wirt <formorer at debian.org>  Sat, 08 May 2010 21:36:50 +0200
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 8dcc31a..2b3ed9c 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,5 +3,6 @@
 50_cgi.cfg-debianize.dpatch
 51_commands.cfg-debianize.dpatch
 52_nagios.cfg-debianize.dpatch
+55_strip_logarchivepath.dpatch
 60_fix_p1.pl_patch_mini_epn.dpatch
 70_fix_eventhandler_paths.dpatch
diff --git a/debian/patches/55_strip_logarchivepath.dpatch b/debian/patches/55_strip_logarchivepath.dpatch
new file mode 100755
index 0000000..5ebbddd
--- /dev/null
+++ b/debian/patches/55_strip_logarchivepath.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_strip_logarchivepath.dpatch by Omni Flux <omniflux at omniflux.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: stripping the log_archive_path value from cgi.cfg (#578232) 
+ at 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,"/");
+ 		        }
+

-- 
Debian packaging for Nagios3