[Pkg-nagios-changes] [SCM] Debian packaging for nagios nrpe branch, master, updated. debian/2.12-6-10-gda31b98

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 71e50f267ddf548693b2470cb432a00ac1207344
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat Jun 30 11:04:15 2012 +0200

    Refresh patch

diff --git a/debian/patches/05_pid_privileges.dpatch b/debian/patches/05_pid_privileges.dpatch
index ec1e156..45214a8 100755
--- a/debian/patches/05_pid_privileges.dpatch
+++ b/debian/patches/05_pid_privileges.dpatch
@@ -5,23 +5,23 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad nagios-nrpe-2.12~/src/nrpe.c nagios-nrpe-2.12/src/nrpe.c
---- nagios-nrpe-2.12~/src/nrpe.c	2009-07-06 10:20:37.000000000 +0200
-+++ nagios-nrpe-2.12/src/nrpe.c	2009-07-06 10:22:00.000000000 +0200
-@@ -296,12 +296,13 @@
- 		/* log info to syslog facility */
- 		syslog(LOG_NOTICE,"Starting up daemon");
- 
-+				
-+		/* drop privileges */
-+		drop_privileges(nrpe_user,nrpe_group);
-+
- 		/* write pid file */
- 		if(write_pid_file()==ERROR)
- 			return STATE_CRITICAL;
--		
--		/* drop privileges */
--		drop_privileges(nrpe_user,nrpe_group);
- 
- 		/* make sure we're not root */
- 		check_privileges();
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' pkg-nrpe~/src/nrpe.c pkg-nrpe/src/nrpe.c
+--- pkg-nrpe~/src/nrpe.c	2012-06-30 11:03:29.000000000 +0200
++++ pkg-nrpe/src/nrpe.c	2012-06-30 11:03:46.791280548 +0200
+@@ -301,13 +301,13 @@
+ 		/* log info to syslog facility */
+ 		syslog(LOG_NOTICE,"Starting up daemon");
+ 
++		/* drop privileges */
++		drop_privileges(nrpe_user,nrpe_group);
++
+ 		/* write pid file */
+ 		if(write_pid_file()==ERROR)
+ 			return STATE_CRITICAL;
+ 		
+-		/* drop privileges */
+-		drop_privileges(nrpe_user,nrpe_group);
+-
+ 		/* make sure we're not root */
+ 		check_privileges();
+ 

-- 
Debian packaging for nagios nrpe