[Pkg-nagios-changes] [pkg-nrpe] 26/41: Merge nrpe.cfg patches into single patch. (closes: #660583)

[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 2e536484f7735f9c61044f2047fa8da748d86d2b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Dec 4 15:52:47 2016 +0100

    Merge nrpe.cfg patches into single patch. (closes: #660583)
---
 debian/changelog                                   |  2 ++
 debian/patches/02_nrpe.cfg_local-include.patch     | 15 ---------------
 .../02_nrpe.cfg_local-include_support_nrpe.d.patch | 22 ++++++++++++++++++++++
 debian/patches/03_support_nrpe.d.patch             | 16 ----------------
 debian/patches/series                              |  3 +--
 5 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a987fbd..a9f0817 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,8 @@ nagios-nrpe (3.0.1-1) UNRELEASED; urgency=medium
     (closes: #662249)
   * Update watch file to handle common issues.
   * Add upstream metadata.
+  * Merge nrpe.cfg patches into single patch.
+    (closes: #660583)
 
   [ Benjamin Drung ]
   * Use dh_auto_configure to enable default hardening flags.
diff --git a/debian/patches/02_nrpe.cfg_local-include.patch b/debian/patches/02_nrpe.cfg_local-include.patch
deleted file mode 100644
index 848f44f..0000000
--- a/debian/patches/02_nrpe.cfg_local-include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Support nrpe_local.cfg
-Author: Sean Finney <seanius at debian.org>
-Forwarded: not-needed
-
---- a/sample-config/nrpe.cfg.in
-+++ b/sample-config/nrpe.cfg.in
-@@ -233,3 +233,8 @@ command[check_total_procs]=@libexecdir@/
- #command[check_load]=@libexecdir@/check_load -w $ARG1$ -c $ARG2$
- #command[check_disk]=@libexecdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
- #command[check_procs]=@libexecdir@/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
-+
-+#
-+# local configuration:
-+#	if you'd prefer, you can instead place directives here
-+include=/etc/nagios/nrpe_local.cfg
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
new file mode 100644
index 0000000..29f9f83
--- /dev/null
+++ b/debian/patches/02_nrpe.cfg_local-include_support_nrpe.d.patch
@@ -0,0 +1,22 @@
+Description: Support nrpe_local.cfg & nrpe.d directory.
+Author: Sean Finney <seanius at debian.org>
+Author: Alexander Wirt <formorer at debian.org>
+Forwarded: not-needed
+
+--- a/sample-config/nrpe.cfg.in
++++ b/sample-config/nrpe.cfg.in
+@@ -301,3 +301,14 @@ command[check_total_procs]=@pluginsdir@/
+ #command[check_load]=@pluginsdir@/check_load -w $ARG1$ -c $ARG2$
+ #command[check_disk]=@pluginsdir@/check_disk -w $ARG1$ -c $ARG2$ -p $ARG3$
+ #command[check_procs]=@pluginsdir@/check_procs -w $ARG1$ -c $ARG2$ -s $ARG3$
++
++# local configuration:
++# if you'd prefer, you can instead place directives here
++
++include=/etc/nagios/nrpe_local.cfg
++
++# you can place your config snipplets into nrpe.d/
++# only snipplets ending in .cfg will get included
++
++include_dir=/etc/nagios/nrpe.d/
++
diff --git a/debian/patches/03_support_nrpe.d.patch b/debian/patches/03_support_nrpe.d.patch
deleted file mode 100644
index faabe92..0000000
--- a/debian/patches/03_support_nrpe.d.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Support an nrpe.d directory
-Author: Alexander Wirt <formorer at debian.org>
-Forwarded: not-needed
-
---- a/sample-config/nrpe.cfg.in
-+++ b/sample-config/nrpe.cfg.in
-@@ -238,3 +238,9 @@ command[check_total_procs]=@libexecdir@/
- # local configuration:
- #	if you'd prefer, you can instead place directives here
- include=/etc/nagios/nrpe_local.cfg
-+
-+# 
-+# you can place your config snipplets into nrpe.d/
-+# only snipplets ending in .cfg will get included
-+include_dir=/etc/nagios/nrpe.d/
-+
diff --git a/debian/patches/series b/debian/patches/series
index aeecc17..72776d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
-02_nrpe.cfg_local-include.patch
-03_support_nrpe.d.patch
+02_nrpe.cfg_local-include_support_nrpe.d.patch
 05_pid_privileges.patch
 06_pid_directory.patch
 07_warn_ssloption.patch

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