diff -u nagios-nrpe-2.12/debian/rules nagios-nrpe-2.12/debian/rules --- nagios-nrpe-2.12/debian/rules +++ nagios-nrpe-2.12/debian/rules @@ -9,7 +9,7 @@ include /usr/share/hardening-includes/hardening.make CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(HARDENING_CFLAGS) CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(HARDENING_CFLAGS) -LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) $(HARDENING_CFLAGS) +LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) $(HARDENING_LDFLAGS) %: dh $@ --with dpatch,autotools_dev diff -u nagios-nrpe-2.12/debian/changelog nagios-nrpe-2.12/debian/changelog --- nagios-nrpe-2.12/debian/changelog +++ nagios-nrpe-2.12/debian/changelog @@ -1,3 +1,11 @@ +nagios-nrpe (2.12-5ubuntu1.2) precise; urgency=low + + * Do not remove the PID file after a connection error + (original patch from Hiren Patel). (LP: #1126890) + * Fixed compiler hardening configuration. (LP: #1000379) + + -- Simon Deziel Wed, 22 May 2013 10:03:21 -0400 + nagios-nrpe (2.12-5ubuntu1.1) precise-proposed; urgency=low * [4dc53fb] Use retry argument for start-stop-daemon when stopping nrpe, diff -u nagios-nrpe-2.12/debian/patches/00list nagios-nrpe-2.12/debian/patches/00list --- nagios-nrpe-2.12/debian/patches/00list +++ nagios-nrpe-2.12/debian/patches/00list @@ -6,0 +7 @@ +07_noremove_pid.dpatch only in patch2: unchanged: --- nagios-nrpe-2.12.orig/debian/patches/07_noremove_pid.dpatch +++ nagios-nrpe-2.12/debian/patches/07_noremove_pid.dpatch @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_noremove_pid.dpatch by +## +## 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 + +@DPATCH@ + +--- nagios-nrpe-2.12.orig/src/nrpe.c 2013-05-22 08:59:11.210994157 -0400 ++++ nagios-nrpe-2.12/src/nrpe.c 2013-05-22 09:01:15.217992779 -0400 +@@ -839,7 +839,7 @@ + /* close socket prioer to exiting */ + close(sock); + +- return; ++ exit(STATE_CRITICAL); + } + + /* handle signals */ +@@ -862,7 +862,7 @@ + /* close socket prior to exiting */ + close(new_sd); + +- return; ++ exit(STATE_CRITICAL); + } + + nptr=(struct sockaddr_in *)&addr;