[Pkg-nagios-changes] [pkg-nagios] r626 - in nagios-nrpe/trunk/debian: . patches

[Sean Finney]

Author: seanius
Date: 2006-01-24 16:53:21 +0000 (Tue, 24 Jan 2006)
New Revision: 626

Added:
   nagios-nrpe/trunk/debian/patches/03_nrpe-trailing-whitespace.dpatch
Modified:
   nagios-nrpe/trunk/debian/changelog
   nagios-nrpe/trunk/debian/patches/00list
Log:
looksie... found a bug

Modified: nagios-nrpe/trunk/debian/changelog
===================================================================
--- nagios-nrpe/trunk/debian/changelog	2006-01-24 15:41:37 UTC (rev 625)
+++ nagios-nrpe/trunk/debian/changelog	2006-01-24 16:53:21 UTC (rev 626)
@@ -8,8 +8,10 @@
     02_global-cmd-prefix.dpatch to apply against the latest
     upstream version.
   * nrpe.cfg has moved location in the upstream tarball.
+  * introduced 03_nrpe-trailing-whitespace.dpatch to fix regression
+    in config file parsing until upstream incorporates it.
 
- -- sean finney <seanius at debian.org>  Tue, 24 Jan 2006 07:46:15 +0100
+ -- sean finney <seanius at debian.org>  Tue, 24 Jan 2006 17:52:54 +0100
 
 nagios-nrpe (2.0-9) unstable; urgency=low
 

Modified: nagios-nrpe/trunk/debian/patches/00list
===================================================================
--- nagios-nrpe/trunk/debian/patches/00list	2006-01-24 15:41:37 UTC (rev 625)
+++ nagios-nrpe/trunk/debian/patches/00list	2006-01-24 16:53:21 UTC (rev 626)
@@ -1,2 +1,3 @@
 01_nodevrandom-and-docoptions.dpatch
 02_global-cmd-prefix.dpatch
+03_nrpe-trailing-whitespace.dpatch

Added: nagios-nrpe/trunk/debian/patches/03_nrpe-trailing-whitespace.dpatch
===================================================================
--- nagios-nrpe/trunk/debian/patches/03_nrpe-trailing-whitespace.dpatch	2006-01-24 15:41:37 UTC (rev 625)
+++ nagios-nrpe/trunk/debian/patches/03_nrpe-trailing-whitespace.dpatch	2006-01-24 16:53:21 UTC (rev 626)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_nrpe-trailing-whitespace.dpatch by  <seanius at debian.org>
+##
+## DP: fix for overzealous whitespace trimming in nrpe config reading code :)
+
+ at DPATCH@
+diff -urNad nagios-nrpe-2.2~/src/nrpe.c nagios-nrpe-2.2/src/nrpe.c
+--- nagios-nrpe-2.2~/src/nrpe.c	2006-01-21 20:23:36.000000000 +0100
++++ nagios-nrpe-2.2/src/nrpe.c	2006-01-24 17:50:43.000000000 +0100
+@@ -307,10 +307,9 @@
+ 
+ 		/* trim trailing whitespace */
+ 		len=strlen(input_line);
+-		for(x=len-1;x>=0;x--){
+-			if(isspace(input_line[x]))
++		for(x=len-1;x>=0 && isspace(input_line[x]);x--){
+ 				input_line[x]='\x0';
+-		        }
++		}
+ 
+ 		/* skip comments and blank lines */
+ 		if(input_line[0]=='#')


Property changes on: nagios-nrpe/trunk/debian/patches/03_nrpe-trailing-whitespace.dpatch
___________________________________________________________________
Name: svn:executable
   + *