[Pkg-nagios-changes] [pkg-nrpe] 04/05: Drop patches included 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 c746f5b48f937ca6b9eb38908a4146f3b7f36ed2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Sep 3 10:50:30 2017 +0200

    Drop patches included upstream, refresh remaining patches.
---
 debian/changelog                                   |  1 +
 .../02_nrpe.cfg_local-include_support_nrpe.d.patch | 10 +++++---
 .../patches/change-seteuid-errors-to-warning.patch | 29 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b29007..24c6581 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 nagios-nrpe (3.2.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches included upstream, refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 03 Sep 2017 10:45:28 +0200
 
diff --git a/debian/patches/02_nrpe.cfg_local-include_support_nrpe.d.patch b/debian/patches/02_nrpe.cfg_local-include_support_nrpe.d.patch
index 5e98b7d..6c607fd 100644
--- a/debian/patches/02_nrpe.cfg_local-include_support_nrpe.d.patch
+++ b/debian/patches/02_nrpe.cfg_local-include_support_nrpe.d.patch
@@ -5,10 +5,12 @@ Forwarded: not-needed
 
 --- a/sample-config/nrpe.cfg.in
 +++ b/sample-config/nrpe.cfg.in
-@@ -358,3 +358,14 @@ command[check_total_procs]=@pluginsdir@/
- #command[check_asterisk_channels]=@pluginsdir@/nagisk.pl -c channels 
- #command[check_asterisk_zaptel]=@pluginsdir@/nagisk.pl -c zaptel 
- #command[check_asterisk_span]=@pluginsdir@/nagisk.pl -c span -s 1
+@@ -359,3 +359,16 @@ command[check_total_procs]=@pluginsdir@/
+ 
+ #include_dir=<somedirectory>
+ #include_dir=<someotherdirectory>
++
++
 +
 +# local configuration:
 +# if you'd prefer, you can instead place directives here
diff --git a/debian/patches/change-seteuid-errors-to-warning.patch b/debian/patches/change-seteuid-errors-to-warning.patch
deleted file mode 100644
index aeafee2..0000000
--- a/debian/patches/change-seteuid-errors-to-warning.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: changed the seteuid(0) errors to warning, and only print if debugging is enabled
-Author: Bryan Heden <bheden at nagios.com>
-Origin: https://github.com/NagiosEnterprises/nrpe/commit/005e20ffec489bb56871911463d41ca5a465583d
-Bug-Debian: https://bugs.debian.org/868326
-
---- a/src/nrpe.c
-+++ b/src/nrpe.c
-@@ -2221,8 +2221,8 @@ int my_system(char *command, int timeout
- 	if (pid == 0) {
- 
- 		/* get root back so the next call works correctly */
--		if (SETEUID(0) == -1)
--			logit(LOG_ERR, "ERROR: my_system() seteuid(0): %s", strerror(errno));
-+		if (SETEUID(0) == -1 && debug)
-+			logit(LOG_WARNING, "WARNING: my_system() seteuid(0): %s", strerror(errno));
- 
- 		drop_privileges(nrpe_user, nrpe_group, 1);	/* drop privileges */
- 		close(fd[0]);			/* close pipe for reading */
-@@ -2493,8 +2493,8 @@ int remove_pid_file(void)
- 		return OK;				/* pid file was not written */
- 
- 	/* get root back so we can delete the pid file */
--	if (SETEUID(0) == -1)
--		logit(LOG_ERR, "ERROR: remove_pid_file() seteuid(0): %s", strerror(errno));
-+	if (SETEUID(0) == -1 && debug)
-+		logit(LOG_WARNING, "WARNING: remove_pid_file() seteuid(0): %s", strerror(errno));
- 
- 	if (unlink(pid_file) == -1) {
- 		logit(LOG_ERR, "Cannot remove pidfile '%s' - check your privileges.", pid_file);
diff --git a/debian/patches/series b/debian/patches/series
index a5e9d10..15e2844 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 02_nrpe.cfg_local-include_support_nrpe.d.patch
 07_warn_ssloption.patch
 11_reproducible_dh.h.patch
-change-seteuid-errors-to-warning.patch

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