[Pkg-nagios-changes] [pkg-nrpe] 09/12: Refresh patches.

Bas Couwenberg sebastic at debian.org
Wed Jul 5 08:55:13 UTC 2017


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

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

commit 7618010aaefe3d7d7e9c23b8d384d351ae6f9998
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Jul 5 09:52:10 2017 +0200

    Refresh patches.
---
 debian/changelog                                           |  1 +
 .../patches/02_nrpe.cfg_local-include_support_nrpe.d.patch |  8 ++++----
 debian/patches/07_warn_ssloption.patch                     | 14 +++++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6eeea9..bad0717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ nagios-nrpe (3.2.0-1) UNRELEASED; urgency=medium
   * Set --with-logdir configure option to /var/log.
   * Update watch file for GitHub releases.
   * Update copyright file.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 05 Jul 2017 09:34:53 +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 8b583cf..5e98b7d 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,10 @@ Forwarded: not-needed
 
 --- a/sample-config/nrpe.cfg.in
 +++ b/sample-config/nrpe.cfg.in
-@@ -317,3 +317,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$
+@@ -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
 +
 +# local configuration:
 +# if you'd prefer, you can instead place directives here
diff --git a/debian/patches/07_warn_ssloption.patch b/debian/patches/07_warn_ssloption.patch
index 42377ec..a6f9686 100644
--- a/debian/patches/07_warn_ssloption.patch
+++ b/debian/patches/07_warn_ssloption.patch
@@ -4,19 +4,19 @@ Forwarded: not-needed
 
 --- a/SECURITY.md
 +++ b/SECURITY.md
-@@ -82,14 +82,17 @@ daemon should run as.
- #### ENCRYPTION ####
+@@ -91,14 +91,17 @@ 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 (See the `README.SSL.md` file for more info)
+-   2.  Native SSL support (See the [SSL Readme](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
- that you are safe!  Always encrypt NRPE traffic!
+ 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
 +adequante protection, because it does not verify clients and
@@ -24,5 +24,5 @@ Forwarded: not-needed
 +advised against. For more information, see Debian bug #547092.
 +
  
- #### USING ARGUMENTS ####
- 
+ Using Arguments
+ ---------------

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



More information about the Pkg-nagios-changes mailing list