[Pkg-nagios-changes] [pkg-nrpe] 27/41: Use configure option to set custom PID directory instead of patch.

[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 e4e0a08bfb5fd5ec72d600ea38e7dff71791cff8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Dec 4 16:01:59 2016 +0100

    Use configure option to set custom PID directory instead of patch.
---
 debian/changelog                      |  1 +
 debian/patches/06_pid_directory.patch | 15 ---------------
 debian/patches/series                 |  1 -
 debian/rules                          |  3 ++-
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9f0817..038538f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ nagios-nrpe (3.0.1-1) UNRELEASED; urgency=medium
   * Add upstream metadata.
   * Merge nrpe.cfg patches into single patch.
     (closes: #660583)
+  * Use configure option to set custom PID directory instead of patch.
 
   [ Benjamin Drung ]
   * Use dh_auto_configure to enable default hardening flags.
diff --git a/debian/patches/06_pid_directory.patch b/debian/patches/06_pid_directory.patch
deleted file mode 100644
index 4d90602..0000000
--- a/debian/patches/06_pid_directory.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Use /var/run/nagios directory for PID file
-Author: Alexander Wirt <formorer at debian.org>
-Bug-Debian: https://bugs.debian.org/411046
-
---- a/sample-config/nrpe.cfg.in
-+++ b/sample-config/nrpe.cfg.in
-@@ -23,7 +23,7 @@ log_facility=@log_facility@
- # number.  The file is only written if the NRPE daemon is started by the root
- # user and is running in standalone mode.
- 
--pid_file=/var/run/nrpe.pid
-+pid_file=/var/run/nagios/nrpe.pid
- 
- 
- 
diff --git a/debian/patches/series b/debian/patches/series
index 72776d0..1744621 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 02_nrpe.cfg_local-include_support_nrpe.d.patch
 05_pid_privileges.patch
-06_pid_directory.patch
 07_warn_ssloption.patch
 09_noremove_pid.patch
 10_reproducible_build.patch
diff --git a/debian/rules b/debian/rules
index 56a0e7e..98f408d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,8 @@ override_dh_auto_configure:
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--libexecdir=/usr/lib/nagios/plugins \
-		--libdir=/usr/lib/nagios
+		--libdir=/usr/lib/nagios \
+		--with-piddir=/var/run/nagios
 
 	# Restore deterministic "openssl dhparam" output.
 	cp include/dh.h.orig include/dh.h

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