[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 316fd7ac3f0ac690e58afc2a4ffa3ad6c1726754
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat May 5 13:27:47 2012 +0200

    Update 40_fix_spurious_dollar_signs_added_to_command_lines

diff --git a/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch b/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch
index 10948e0..c06ad24 100755
--- a/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch
+++ b/debian/patches/40_fix_spurious_dollar_signs_added_to_command_lines.dpatch
@@ -5,16 +5,16 @@
 ## DP: Fixes the output of spurious $ signs in commandoutput (#480001)
 
 @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 */
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nagios3~/common/macros.c pkg-nagios3/common/macros.c
+--- pkg-nagios3~/common/macros.c	2011-07-29 15:56:26.000000000 +0200
++++ pkg-nagios3/common/macros.c	2012-05-05 13:26:59.858996712 +0200
+@@ -185,7 +185,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 */

-- 
Debian packaging for Nagios3