[Pkg-nagios-changes] [pkg-nagios] r1489 - in nagios3/trunk/debian: . patches

[Alexander Wirt]

tags 479061 pending
thanks

Author: formorer
Date: 2008-06-10 19:47:01 +0000 (Tue, 10 Jun 2008)
New Revision: 1489

Added:
   nagios3/trunk/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch
Modified:
   nagios3/trunk/debian/changelog
   nagios3/trunk/debian/patches/00list
Log:
Fix the output of spurious $ signs in commandoutput (479061)


Modified: nagios3/trunk/debian/changelog
===================================================================
--- nagios3/trunk/debian/changelog	2008-06-10 19:27:12 UTC (rev 1488)
+++ nagios3/trunk/debian/changelog	2008-06-10 19:47:01 UTC (rev 1489)
@@ -4,6 +4,8 @@
   * Remove bashism from rules file (Closes: #479324, #478412)
   * Set p1.pl DEBUG_LOG_PATH to /var/log/nagios3/ (Closes: #478877)
   * Start nagios3 in nagios3.postinst (Closes: #481334)
+  * Add a patch from Stephane Chazelas which fixes the incluѕion of spurious $
+    signs into command output (Closes: #479061)
 
   [ Jan Wagner ]
   * New upstream release (Closes: #485439)

Modified: nagios3/trunk/debian/patches/00list
===================================================================
--- nagios3/trunk/debian/patches/00list	2008-06-10 19:27:12 UTC (rev 1488)
+++ nagios3/trunk/debian/patches/00list	2008-06-10 19:47:01 UTC (rev 1489)
@@ -1,2 +1,3 @@
 10_p1_pl_shebang.dpatch
 20_submit_check_result_386152.dpatch
+40_fix_spurious_dollar_signs_added_to_command_lines.dpatch

Added: nagios3/trunk/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch
===================================================================
--- nagios3/trunk/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch	                        (rev 0)
+++ nagios3/trunk/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch	2008-06-10 19:47:01 UTC (rev 1489)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_fix_spurious_dollar_signs_added_to_command_lines.dpatch by Alexander Wirt <formorer at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagios3-3.0.2~/common/macros.c nagios3-3.0.2/common/macros.c
+--- nagios3-3.0.2~/common/macros.c	2008-05-19 20:01:58.000000000 +0200
++++ nagios3-3.0.2/common/macros.c	2008-06-10 21:43:03.000000000 +0200
+@@ -195,7 +195,8 @@
+ 				*output_buffer=(char *)realloc(*output_buffer,strlen(*output_buffer)+strlen(temp_buffer)+3);
+ 				strcat(*output_buffer,"$");
+ 				strcat(*output_buffer,temp_buffer);
+-				strcat(*output_buffer,"$");
++				if (buf_ptr!=NULL)
++					strcat(*output_buffer,"$");
+ 				}
+ 
+ 			/* insert macro */


Property changes on: nagios3/trunk/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch
___________________________________________________________________
Name: svn:executable
   + *