[Pkg-nagios-changes] [pkg-nrpe] 28/41: Drop 09_noremove_pid.patch, fixed upstream. Refresh remaining patches.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository pkg-nrpe.

commit 70278794c32c6eeac66d4159c207b06794978c39
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Dec 4 16:21:54 2016 +0100

    Drop 09_noremove_pid.patch, fixed upstream. Refresh remaining patches.
---
 debian/changelog                       |  1 +
 debian/patches/05_pid_privileges.patch | 23 -----------------------
 debian/patches/07_warn_ssloption.patch | 20 ++++++++++----------
 debian/patches/09_noremove_pid.patch   | 27 ---------------------------
 debian/patches/series                  |  2 --
 5 files changed, 11 insertions(+), 62 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 038538f..93958aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ nagios-nrpe (3.0.1-1) UNRELEASED; urgency=medium
   * Merge nrpe.cfg patches into single patch.
     (closes: #660583)
   * Use configure option to set custom PID directory instead of patch.
+  * Drop 09_noremove_pid.patch, fixed upstream. Refresh remaining patches.
 
   [ Benjamin Drung ]
   * Use dh_auto_configure to enable default hardening flags.
diff --git a/debian/patches/05_pid_privileges.patch b/debian/patches/05_pid_privileges.patch
deleted file mode 100644
index 9ea167d..0000000
--- a/debian/patches/05_pid_privileges.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Drop privileges before writing PID file
-Author: Luk Claes <luk at debian.org>
-Bug-Debian: https://bugs.debian.org/498749
-
---- a/src/nrpe.c
-+++ b/src/nrpe.c
-@@ -317,13 +317,13 @@ int main(int argc, char **argv){
- 		/* 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 --git a/debian/patches/07_warn_ssloption.patch b/debian/patches/07_warn_ssloption.patch
index 453dae1..6ba02f4 100644
--- a/debian/patches/07_warn_ssloption.patch
+++ b/debian/patches/07_warn_ssloption.patch
@@ -1,20 +1,20 @@
 Description: Warn against inadequateness of NRPE's own SSL option.
 Author: Thijs Kinkhorst <thijs at debian.org>
 
---- a/SECURITY
-+++ b/SECURITY
-@@ -93,14 +93,17 @@ ENCRYPTION
- ----------
+--- a/SECURITY.md
++++ b/SECURITY.md
+@@ -82,14 +82,17 @@ daemon should run as.
+ #### ENCRYPTION ####
  
  If you do enable support for command arguments in the NRPE daemon,
 -make sure that you encrypt communications either by using:
 -
 -   1.  Stunnel (see http://www.stunnel.org for more info)
--   2.  Native SSL support
-+make sure that you encrypt communications either by using, for
-+example, Stunnel (see http://www.stunnel.org for more info).
+-   2.  Native SSL support (See the `README.SSL.md` file for more info)
++make sure that you encrypt communications by using, for example,
++Stunnel (see http://www.stunnel.org for more info).
  
- Do NOT assume that just because the daemon is behind a firewall
+ *Do NOT* assume that just because the daemon is behind a firewall
  that you are safe!  Always encrypt NRPE traffic!
  
 +NOTE: the currently shipped native SSL support of NRPE is not an
@@ -23,5 +23,5 @@ Author: Thijs Kinkhorst <thijs at debian.org>
 +advised against. For more information, see Debian bug #547092.
 +
  
- USING ARGUMENTS
- ---------------
+ #### USING ARGUMENTS ####
+ 
diff --git a/debian/patches/09_noremove_pid.patch b/debian/patches/09_noremove_pid.patch
deleted file mode 100644
index 5cc4cb2..0000000
--- a/debian/patches/09_noremove_pid.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Do not remove the PID file after a connection error.
- Original patch Hiren Patel.
-Author: Hiren Patel
-Origin: http://comments.gmane.org/gmane.network.nagios.devel/6774
-Bug-Debian: https://bugs.debian.org/716949
-Bug-Ubuntu: https://launchpad.net/bugs/1126890
-
---- a/src/nrpe.c
-+++ b/src/nrpe.c
-@@ -998,7 +998,7 @@ void wait_for_connections(void){
- 						/* close socket prioer to exiting */
- 						close(sock);
- 			
--						return;
-+                        exit(STATE_CRITICAL);
- 						}
- 
- 					/* handle signals */
-@@ -1022,7 +1022,7 @@ void wait_for_connections(void){
- 				        /* close socket prior to exiting */
- 						close(new_sd);
- 
--						return;
-+                        exit(STATE_CRITICAL);
- 						}
- 
- 					/* is this is a blessed machine? */
diff --git a/debian/patches/series b/debian/patches/series
index 1744621..8a338b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 02_nrpe.cfg_local-include_support_nrpe.d.patch
-05_pid_privileges.patch
 07_warn_ssloption.patch
-09_noremove_pid.patch
 10_reproducible_build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nrpe.git