[Pkg-nagios-devel] Bug#716949: nagios-nrpe-server: removes its PID on connection errors

[Ivo De Decker]

Control: tags -1 +pending

Dear maintainers,

On Thu, Aug 29, 2013 at 02:27:28PM +0900, Satoru KURASHIKI wrote:
> I've prepared the NMU patch simply backporting from ubuntu's.
> Please consider uploading to unstable/stable.

I uploaded an NMU with this fix to DELAYED/2. Also, at Luk's request, I
removed him from uploaders.

The debdiff is attached.

Cheers,

Ivo

-------------- next part --------------
diff -u nagios-nrpe-2.13/debian/control nagios-nrpe-2.13/debian/control
--- nagios-nrpe-2.13/debian/control
+++ nagios-nrpe-2.13/debian/control
@@ -2,7 +2,7 @@
 Section: net
 Priority: optional
 Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian.org>
-Uploaders: sean finney <seanius at debian.org>, Jason Thomas <jason at debian.org>, Alexander Wirt <formorer at debian.org>, Luk Claes <luk at debian.org>
+Uploaders: sean finney <seanius at debian.org>, Jason Thomas <jason at debian.org>, Alexander Wirt <formorer at debian.org>
 Build-Depends: debhelper (>= 9), openssl, dpatch (>= 2.0.32~), libssl-dev, libwrap0-dev, autotools-dev (>= 20100122.1)
 Standards-Version: 3.9.3
 
diff -u nagios-nrpe-2.13/debian/changelog nagios-nrpe-2.13/debian/changelog
--- nagios-nrpe-2.13/debian/changelog
+++ nagios-nrpe-2.13/debian/changelog
@@ -1,3 +1,16 @@
+nagios-nrpe (2.13-3.1) unstable; urgency=low
+
+  [ Ivo De Decker ]
+  * Non-maintainer upload.
+  * Remove Luk Claes from uploaders (Closes: #719636)
+
+  [ KURASHIKI Satoru ]
+  * debian/patches/09_noremove_pid.dpatch:
+    - Do not remove the PID file after a connection error
+      (original patch from Hiren Patel). (Closes: #716949)
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be>  Sat, 05 Oct 2013 20:23:24 +0200
+
 nagios-nrpe (2.13-3) unstable; urgency=high
 
   * [e55afd1] Add 08_CVE-2013-1362.dpatch patch.
diff -u nagios-nrpe-2.13/debian/patches/00list nagios-nrpe-2.13/debian/patches/00list
--- nagios-nrpe-2.13/debian/patches/00list
+++ nagios-nrpe-2.13/debian/patches/00list
@@ -8,0 +9 @@
+09_noremove_pid.dpatch
only in patch2:
unchanged:
--- nagios-nrpe-2.13.orig/debian/patches/09_noremove_pid.dpatch
+++ nagios-nrpe-2.13/debian/patches/09_noremove_pid.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_noremove_pid.dpatch by  <simon.deziel at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Do not remove the PID file after a connection error (original patch 
+## DP: from Hiren Patel)
+
+# Author: Hiren Patel
+# From: http://comments.gmane.org/gmane.network.nagios.devel/6774
+# Bug-Ubuntu: https://launchpad.net/bugs/1126890
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-nrpe-2.13~/src/nrpe.c nagios-nrpe-2.13/src/nrpe.c
+--- nagios-nrpe-2.13~/src/nrpe.c	2013-05-24 17:15:38.000000000 -0400
++++ nagios-nrpe-2.13/src/nrpe.c	2013-05-24 17:16:16.512293650 -0400
+@@ -843,7 +843,7 @@
+ 					/* close socket prioer to exiting */
+ 					close(sock);
+ 			
+-					return;
++					exit(STATE_CRITICAL);
+ 				        }
+ 
+ 				/* handle signals */
+@@ -866,7 +866,7 @@
+ 				        /* close socket prior to exiting */
+ 					close(new_sd);
+ 
+-					return;
++					exit(STATE_CRITICAL);
+ 		                        }
+ 
+ 				nptr=(struct sockaddr_in *)&addr;