From 94ec5a983f71fb0fe8c94fe6bd2b2edd656803d4 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Wed, 20 Aug 2014 21:20:59 +0200 Subject: [PATCH] check_log: Fixing basename path (Closes #758662) - Adding 11_check_log_fix_basename_path.dpatch taken from upstream --- debian/patches/00list | 1 + .../11_check_log_fix_basename_path.dpatch | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 debian/patches/11_check_log_fix_basename_path.dpatch diff --git a/debian/patches/00list b/debian/patches/00list index c41ae2e..4480684 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,4 @@ 02_check_icmp_links.dpatch # commited upstream 10_check_oracle_tns_bad_string.dpatch +11_check_log_fix_basename_path.dpatch diff --git a/debian/patches/11_check_log_fix_basename_path.dpatch b/debian/patches/11_check_log_fix_basename_path.dpatch new file mode 100644 index 0000000..7dc9d13 --- /dev/null +++ b/debian/patches/11_check_log_fix_basename_path.dpatch @@ -0,0 +1,34 @@ +#! /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 +