diff --git a/debian/patches/00list b/debian/patches/00list index ed6e195..35b85ec 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,6 +1,2 @@ 02_check_icmp_links.dpatch # commited upstream -10_check_oracle_tns_bad_string.dpatch -11_check_log_fix_basename_path.dpatch -12_PATH_in_scripts_first.dpatch -13_check_jabber_openfire.dpatch diff --git a/debian/patches/10_check_oracle_tns_bad_string.dpatch b/debian/patches/10_check_oracle_tns_bad_string.dpatch deleted file mode 100644 index 559fb73..0000000 --- a/debian/patches/10_check_oracle_tns_bad_string.dpatch +++ /dev/null @@ -1,35 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_10_check_oracle_tns_bad_string.dpatch by Jan Wagner -## -## DP: Create symlinks for check_icmp to provide default values for some situations - -From: Frederic Krueger -Subject: Fix check_oracle --tns bad string matching - -check_oracle in the 1.4.15 release doesn't correctly parse the output gotten -from at least Oracle 11 (with german locales). I guess it's probably more. -Also it completely needlessly uses sed where basic bash string parsing actually -does more than suffice (and does not run into possible problems with locales -like sed ;)). - -Origin: upstream, https://github.com/monitoring-plugins/monitoring-plugins/pull/1191.patch -Bug: https://github.com/monitoring-plugins/monitoring-plugins/issues/1015 - -@DPATCH@ ---- -diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh -index ceac95d..1873a3c 100755 ---- a/plugins-scripts/check_oracle.sh -+++ b/plugins-scripts/check_oracle.sh -@@ -137,7 +137,7 @@ case "$cmd" in - tnschk=` tnsping $2` - tnschk2=` echo $tnschk | grep -c OK` - if [ ${tnschk2} -eq 1 ] ; then -- tnschk3=` echo $tnschk | sed -e 's/.*(//' -e 's/).*//'` -+ tnschk3=${tnschk##*(}; tnschk3=${tnschk3%)*} - echo "OK - reply time ${tnschk3} from $2" - exit $STATE_OK - else --- -2.0.3 - diff --git a/debian/patches/11_check_log_fix_basename_path.dpatch b/debian/patches/11_check_log_fix_basename_path.dpatch deleted file mode 100644 index 7dc9d13..0000000 --- a/debian/patches/11_check_log_fix_basename_path.dpatch +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 11_check_log_fix_basename_path.dpatch by Jan Wagner -## -## DP: Drop absolut patch from basename - -From d4b6d09f104f73c462e0e0c8a297ba9fc7c5a53e Mon Sep 17 00:00:00 2001 -From: Jan Wagner -Date: Wed, 20 Aug 2014 20:29:23 +0200 -Subject: [PATCH] check_log.sh: droping path from basename while evaluating - PROGNAME (Closes Debian Bug #758662) - -Origin: upstream, https://github.com/monitoring-plugins/monitoring-plugins/commit/d4b6d09f104f73c462e0e0c8a297ba9fc7c5a53e.patch -Bug: https://bugs.debian.org/758662 ---- - plugins-scripts/check_log.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -@DPATCH@ -diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh -index 8653a5e..f67eff6 100755 ---- a/plugins-scripts/check_log.sh -+++ b/plugins-scripts/check_log.sh -@@ -58,7 +58,7 @@ - # Paths to commands used in this script. These - # may have to be modified to match your system setup. - --PROGNAME=`/bin/basename $0` -+PROGNAME=`basename $0` - PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` - REVISION="@NP_VERSION@" - PATH="@TRUSTED_PATH@" --- -2.0.4 - diff --git a/debian/patches/12_PATH_in_scripts_first.dpatch b/debian/patches/12_PATH_in_scripts_first.dpatch deleted file mode 100644 index 76090b0..0000000 --- a/debian/patches/12_PATH_in_scripts_first.dpatch +++ /dev/null @@ -1,75 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 12_PATH_in_scripts_first.dpatch by Jan Wagner -## -## DP: Set PATH at first in shell scripts - -From 3a668c0f87f3ad31f28997ed43b374edf78f6227 Mon Sep 17 00:00:00 2001 -From: Jan Wagner -Date: Wed, 20 Aug 2014 20:32:09 +0200 -Subject: [PATCH] Setting PATH at first - -Origin: upstream, https://github.com/monitoring-plugins/monitoring-plugins/commit/3a668c0f87f3ad31f28997ed43b374edf78f6227.patch ---- - plugins-scripts/check_log.sh | 5 ++--- - plugins-scripts/check_oracle.sh | 3 ++- - plugins-scripts/check_sensors.sh | 5 ++--- - 3 files changed, 6 insertions(+), 7 deletions(-) - -@DPATCH@ -diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh -index f67eff6..d28c8d0 100755 ---- a/plugins-scripts/check_log.sh -+++ b/plugins-scripts/check_log.sh -@@ -58,12 +58,11 @@ - # Paths to commands used in this script. These - # may have to be modified to match your system setup. - -+PATH="@TRUSTED_PATH@" -+export PATH - PROGNAME=`basename $0` - PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` - REVISION="@NP_VERSION@" --PATH="@TRUSTED_PATH@" -- --export PATH - - . $PROGPATH/utils.sh - -diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh -index 1873a3c..96078ac 100755 ---- a/plugins-scripts/check_oracle.sh -+++ b/plugins-scripts/check_oracle.sh -@@ -6,10 +6,11 @@ - # This Monitoring plugin was created to check Oracle status - # - -+PATH="@TRUSTED_PATH@" -+export PATH - PROGNAME=`basename $0` - PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` - REVISION="@NP_VERSION@" --PATH="@TRUSTED_PATH@" - - . $PROGPATH/utils.sh - -diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh -index 05c64c4..f742830 100755 ---- a/plugins-scripts/check_sensors.sh -+++ b/plugins-scripts/check_sensors.sh -@@ -1,11 +1,10 @@ - #!/bin/sh - -+PATH="@TRUSTED_PATH@" -+export PATH - PROGNAME=`basename $0` - PROGPATH=`echo $0 | sed -e 's,[\\/][^\\/][^\\/]*$,,'` - REVISION="@NP_VERSION@" --PATH="@TRUSTED_PATH@" -- --export PATH - - . $PROGPATH/utils.sh - --- -2.0.4 - diff --git a/debian/patches/13_check_jabber_openfire.dpatch b/debian/patches/13_check_jabber_openfire.dpatch deleted file mode 100644 index a4a4aaf..0000000 --- a/debian/patches/13_check_jabber_openfire.dpatch +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 13_check_jabber_openfire.dpatch by Jan Wagner -## -## DP: Fix check_jabber to work with Openfire servers - -From 013ca2c508386c548ec145832ab8be1e8306cca0 Mon Sep 17 00:00:00 2001 -From: Holger Weiss -Date: Tue, 16 Sep 2014 12:28:51 +0200 -Subject: [PATCH] Fix check_jabber to work with Openfire servers - -The plugin expected: - - - -But Openfire sends: - - - -Origin: upstream, https://github.com/monitoring-plugins/monitoring-plugins/commit/013ca2c508386c548ec145832ab8be1e8306cca0.patch ---- - - plugins/check_tcp.c | 2 +- - 1 file changed, 1 insertions(+), 1 deletion(-) - -@DPATCH@ -diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c -index bd7736b..fc0adba 100644 ---- a/plugins/check_tcp.c -+++ b/plugins/check_tcp.c -@@ -172,7 +172,7 @@ main (int argc, char **argv) - } - else if (!strncmp(SERVICE, "JABBER", 6)) { - SEND = "\n"; -- EXPECT = "