diff --git a/nrpe-0001-Add-reload-target-to-the-init-script.patch b/nrpe-0001-Add-reload-target-to-the-init-script.patch deleted file mode 100644 index 7b45f37..0000000 --- a/nrpe-0001-Add-reload-target-to-the-init-script.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a3528084ceb16047ccfec1b8a0a04dddec9535d3 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 18 Jun 2010 13:45:05 +0400 -Subject: [PATCH 1/8] Add reload target to the init-script - ---- - startup/default-init.in | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/startup/default-init.in b/startup/default-init.in -index 07b17c7..0bd7629 100644 ---- a/startup/default-init.in -+++ b/startup/default-init.in -@@ -51,11 +51,16 @@ case "$1" in - $0 stop - $0 start - ;; -+ reload) -+ echo -n "Reloading nrpe" -+ killproc nrpe -HUP -+ echo -+ ;; - status) - status nrpe - ;; - *) -- echo "Usage: nrpe {start|stop|restart|status}" -+ echo "Usage: nrpe {start|stop|restart|reload|status}" - exit 1 - esac - --- -1.8.3.1 - diff --git a/nrpe-0002-Read-extra-configuration-from-etc-sysconfig-nrpe.patch b/nrpe-0002-Read-extra-configuration-from-etc-sysconfig-nrpe.patch deleted file mode 100644 index a3b0ac2..0000000 --- a/nrpe-0002-Read-extra-configuration-from-etc-sysconfig-nrpe.patch +++ /dev/null @@ -1,39 +0,0 @@ -From bd0add531b840f6419794e4d628e816658272ef3 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 18 Jun 2010 13:46:00 +0400 -Subject: [PATCH 2/8] Read extra configuration from /etc/sysconfig/nrpe - -See this rhbz for the details: -https://bugzilla.redhat.com/show_bug.cgi?id=449174 ---- - startup/default-init.in | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/startup/default-init.in b/startup/default-init.in -index 0bd7629..720a96d 100644 ---- a/startup/default-init.in -+++ b/startup/default-init.in -@@ -24,6 +24,11 @@ fi - # Source networking configuration. - . /etc/sysconfig/network - -+# Read configuration (environment etc.) for nrpe and plugins -+if [ -f /etc/sysconfig/nrpe ]; then -+ . /etc/sysconfig/nrpe -+fi -+ - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - -@@ -36,7 +41,7 @@ case "$1" in - start) - # Start daemons. - echo -n "Starting nrpe: " -- daemon $NrpeBin -c $NrpeCfg -d -+ daemon $NrpeBin -c $NrpeCfg -d $NRPE_SSL_OPT - echo - touch $LockFile - ;; --- -1.8.3.1 - diff --git a/nrpe-0004-Fix-initscript-return-codes.patch b/nrpe-0004-Fix-initscript-return-codes.patch deleted file mode 100644 index 8df1cee..0000000 --- a/nrpe-0004-Fix-initscript-return-codes.patch +++ /dev/null @@ -1,65 +0,0 @@ -From e41bce1404c055a6c2e9c17fcf89443142fc552b Mon Sep 17 00:00:00 2001 -From: Ricky Zhou -Date: Fri, 18 Jun 2010 14:02:02 +0400 -Subject: [PATCH 4/8] Fix initscript return codes - -See this rhbz for the details: -https://bugzilla.redhat.com/show_bug.cgi?id=567141 ---- - startup/default-init.in | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/startup/default-init.in b/startup/default-init.in -index 720a96d..186c757 100644 ---- a/startup/default-init.in -+++ b/startup/default-init.in -@@ -36,21 +36,25 @@ NrpeBin=@bindir@/nrpe - NrpeCfg=@sysconfdir@/nrpe.cfg - LockFile=/var/lock/subsys/nrpe - -+RETVAL=0 -+ - # See how we were called. - case "$1" in - start) - # Start daemons. - echo -n "Starting nrpe: " - daemon $NrpeBin -c $NrpeCfg -d $NRPE_SSL_OPT -+ RETVAL=$? - echo -- touch $LockFile -+ [ $RETVAL = 0 ] && touch $LockFile - ;; - stop) - # Stop daemons. - echo -n "Shutting down nrpe: " - killproc nrpe -+ RETVAL=$? - echo -- rm -f $LockFile -+ [ $RETVAL = 0 ] && rm -f $LockFile - ;; - restart) - $0 stop -@@ -59,14 +63,16 @@ case "$1" in - reload) - echo -n "Reloading nrpe" - killproc nrpe -HUP -+ RETVAL=$? - echo - ;; - status) - status nrpe -+ RETVAL=$? - ;; - *) - echo "Usage: nrpe {start|stop|restart|reload|status}" -- exit 1 -+ RETVAL=2 - esac - --exit 0 -+exit $RETVAL --- -1.8.3.1 - diff --git a/nrpe-0005-Do-not-start-by-default.patch b/nrpe-0005-Do-not-start-by-default.patch deleted file mode 100644 index 06f39f0..0000000 --- a/nrpe-0005-Do-not-start-by-default.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0c0bf12492b81b53bed71901e1d2a43d3cc4e7c0 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 18 Jun 2010 14:11:33 +0400 -Subject: [PATCH 5/8] Do not start by default - ---- - startup/default-init.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/startup/default-init.in b/startup/default-init.in -index 186c757..ed6c366 100644 ---- a/startup/default-init.in -+++ b/startup/default-init.in -@@ -5,7 +5,7 @@ - # nrpe This shell script takes care of starting and stopping - # nrpe. - # --# chkconfig: 2345 80 30 -+# chkconfig: - 80 30 - # description: nrpe is a daemon for a remote nagios server, \ - # running nagios plugins on this host. - # processname: nrpe --- -1.8.3.1 - diff --git a/nrpe-0006-Relocate-pid-file.patch b/nrpe-0006-Relocate-pid-file.patch deleted file mode 100644 index be13c60..0000000 --- a/nrpe-0006-Relocate-pid-file.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 080da5b0438bbdfac29ebb37919c870336bf759d Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 18 Jun 2010 14:14:13 +0400 -Subject: [PATCH 6/8] Relocate pid-file - -See this rhbz for the details: -https://bugzilla.redhat.com/show_bug.cgi?id=575544 ---- - sample-config/nrpe.cfg.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sample-config/nrpe.cfg.in b/sample-config/nrpe.cfg.in -index 1b72141..20eb927 100644 ---- 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/nrpe/nrpe.pid - - - --- -1.8.3.1 - diff --git a/nrpe-0007-Add-condrestart-try-restart-target-to-initscript.patch b/nrpe-0007-Add-condrestart-try-restart-target-to-initscript.patch deleted file mode 100644 index 1a233b5..0000000 --- a/nrpe-0007-Add-condrestart-try-restart-target-to-initscript.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 048153101214b5daa9f5b717f1b2bf9d3d1c93e6 Mon Sep 17 00:00:00 2001 -From: Todd Zullinger -Date: Sun, 28 Apr 2013 19:01:08 -0700 -Subject: [PATCH 7/8] Add condrestart/try-restart target to initscript - -The spec file calls this in %postun. It simply fails but the error -output is eaten by the redirection to /dev/null. ---- - startup/default-init.in | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/startup/default-init.in b/startup/default-init.in -index ed6c366..96e17a7 100644 ---- a/startup/default-init.in -+++ b/startup/default-init.in -@@ -66,12 +66,17 @@ case "$1" in - RETVAL=$? - echo - ;; -+ condrestart|try-restart) -+ status nrpe >/dev/null 2>&1 || exit 0 -+ $0 stop -+ $0 start -+ ;; - status) - status nrpe - RETVAL=$? - ;; - *) -- echo "Usage: nrpe {start|stop|restart|reload|status}" -+ echo "Usage: nrpe {start|stop|restart|reload|condrestart|status}" - RETVAL=2 - esac - --- -1.8.3.1 - diff --git a/nrpe-0008-Allow-user-to-override-all-defaults-even-command-def.patch b/nrpe-0008-Allow-user-to-override-all-defaults-even-command-def.patch deleted file mode 100644 index 7c98473..0000000 --- a/nrpe-0008-Allow-user-to-override-all-defaults-even-command-def.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7fad8bf3b07257c4507f5abe207e707525ec9432 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Wed, 16 Oct 2013 17:34:41 +0400 -Subject: [PATCH 8/8] Allow user to override all defaults (even command - definitions) - -Signed-off-by: Peter Lemenkov ---- - sample-config/nrpe.cfg.in | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/sample-config/nrpe.cfg.in b/sample-config/nrpe.cfg.in -index 20eb927..38fa875 100644 ---- a/sample-config/nrpe.cfg.in -+++ b/sample-config/nrpe.cfg.in -@@ -185,14 +185,6 @@ connection_timeout=300 - - - --# INCLUDE CONFIG DIRECTORY --# This directive allows you to include definitions from config files (with a --# .cfg extension) in one or more directories (with recursion). -- --include_dir=/etc/nrpe.d/ -- -- -- - # COMMAND DEFINITIONS - # Command definitions that this daemon will run. Definitions - # are in the following format: -@@ -232,3 +224,11 @@ command[check_total_procs]=@libexecdir@/check_procs -w 150 -c 200 - #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$ -+ -+ -+ -+# INCLUDE CONFIG DIRECTORY -+# This directive allows you to include definitions from config files (with a -+# .cfg extension) in one or more directories (with recursion). -+ -+include_dir=/etc/nrpe.d/ --- -1.8.3.1 - diff --git a/nrpe-0009-CVE-2014-2913-nasty-metacharacters.patch b/nrpe-0009-CVE-2014-2913-nasty-metacharacters.patch deleted file mode 100644 index 556f449..0000000 --- a/nrpe-0009-CVE-2014-2913-nasty-metacharacters.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git b/src/nrpe.c a/src/nrpe.c -index 381f0ac..ad1e05d 100644 ---- b/src/nrpe.c -+++ a/src/nrpe.c -@@ -53,7 +53,7 @@ int use_ssl=FALSE; - - #define DEFAULT_COMMAND_TIMEOUT 60 /* default timeout for execution of plugins */ - #define MAXFD 64 --#define NASTY_METACHARS "|`&><'\"\\[]{};" -+#define NASTY_METACHARS "|`&><'\"\\[]{};\n" - #define howmany(x,y) (((x)+((y)-1))/(y)) - #define MAX_LISTEN_SOCKS 16 -