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

[Luk Claes]

tags 409772 pending
tags 411046 pending
thanks

Author: luk
Date: 2008-09-14 19:37:21 +0000 (Sun, 14 Sep 2008)
New Revision: 1574

Added:
   nagios-nrpe/trunk/debian/patches/05_pid_privileges.dpatch
Modified:
   nagios-nrpe/trunk/debian/changelog
   nagios-nrpe/trunk/debian/nagios-nrpe-server.default
   nagios-nrpe/trunk/debian/nagios-nrpe-server.init
   nagios-nrpe/trunk/debian/patches/00list
Log:
* Clean buffer before use (Closes: #498749).
* Remove pid file before creating a new ones (Closes: #411046).
* Include inetd support (Closes: #409772).

Modified: nagios-nrpe/trunk/debian/changelog
===================================================================
--- nagios-nrpe/trunk/debian/changelog	2008-09-14 14:25:51 UTC (rev 1573)
+++ nagios-nrpe/trunk/debian/changelog	2008-09-14 19:37:21 UTC (rev 1574)
@@ -1,7 +1,9 @@
 nagios-nrpe (2.12-2) unstable; urgency=low
 
+  * Add myself to uploaders.
   * Clean buffer before use (Closes: #498749).
-  * Add myself to uploaders.
+  * Remove pid file before creating a new ones (Closes: #411046).
+  * Include inetd support (Closes: #409772).
 
  -- Luk Claes <luk at debian.org>  Sun, 14 Sep 2008 16:04:17 +0200
 

Modified: nagios-nrpe/trunk/debian/nagios-nrpe-server.default
===================================================================
--- nagios-nrpe/trunk/debian/nagios-nrpe-server.default	2008-09-14 14:25:51 UTC (rev 1573)
+++ nagios-nrpe/trunk/debian/nagios-nrpe-server.default	2008-09-14 19:37:21 UTC (rev 1574)
@@ -8,3 +8,5 @@
 # NICENESS is if you want to run the server at a different nice() priority
 #NICENESS=5
 
+# INETD is if you want to run the server via inetd (default=0, run as daemon)
+#INETD=0

Modified: nagios-nrpe/trunk/debian/nagios-nrpe-server.init
===================================================================
--- nagios-nrpe/trunk/debian/nagios-nrpe-server.init	2008-09-14 14:25:51 UTC (rev 1573)
+++ nagios-nrpe/trunk/debian/nagios-nrpe-server.init	2008-09-14 19:37:21 UTC (rev 1574)
@@ -43,6 +43,9 @@
 
 case "$1" in
   start)
+	if [ "$INETD" == 1 ]; then
+		exit 1
+	fi
 	log_daemon_msg "Starting $DESC" "$NAME"
 	start_daemon $NICENESS $DAEMON -c $CONFIG -d $DAEMON_OPTS
 	log_end_msg $?

Modified: nagios-nrpe/trunk/debian/patches/00list
===================================================================
--- nagios-nrpe/trunk/debian/patches/00list	2008-09-14 14:25:51 UTC (rev 1573)
+++ nagios-nrpe/trunk/debian/patches/00list	2008-09-14 19:37:21 UTC (rev 1574)
@@ -2,3 +2,4 @@
 02_nrpe.cfg_local-include.dpatch
 03_support_nrpe.d.dpatch
 04_weird_output.dpatch
+05_pid_privileges.dpatch

Added: nagios-nrpe/trunk/debian/patches/05_pid_privileges.dpatch
===================================================================
--- nagios-nrpe/trunk/debian/patches/05_pid_privileges.dpatch	                        (rev 0)
+++ nagios-nrpe/trunk/debian/patches/05_pid_privileges.dpatch	2008-09-14 19:37:21 UTC (rev 1574)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_pid_privileges.dpatch by  <luk at luknote>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagios-nrpe-2.12~/src/nrpe.c nagios-nrpe-2.12/src/nrpe.c
+--- nagios-nrpe-2.12~/src/nrpe.c	2008-03-10 22:04:43.000000000 +0100
++++ nagios-nrpe-2.12/src/nrpe.c	2008-09-14 21:29:53.000000000 +0200
+@@ -1610,6 +1610,7 @@
+ 	        } 
+ 
+ 	/* write new pid file */
++	unlink(pid_file);
+ 	if((fd=open(pid_file,O_WRONLY | O_CREAT,0644))>=0){
+ 		sprintf(pbuf,"%d\n",(int)getpid());
+ 		write(fd,pbuf,strlen(pbuf));


Property changes on: nagios-nrpe/trunk/debian/patches/05_pid_privileges.dpatch
___________________________________________________________________
Name: svn:executable
   + *