From 1e2387474a449452b78520b9ad96a8b4b5e99722 Mon Sep 17 00:00:00 2001
From: Harald Pfeiffer <coding@lirion.de>
Date: Wed, 17 Apr 2019 19:07:19 +0200
Subject: initial commit of source fetch

---
 .../debian/patches/check_nfsmounts/nfs4_support    | 11 ++++++
 .../patches/check_nfsmounts/nfs_write_location     | 20 ++++++++++
 .../debian/patches/check_nfsmounts/perl_module     | 43 ++++++++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/nfs4_support
 create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/nfs_write_location
 create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/perl_module

(limited to 'nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts')

diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/nfs4_support b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/nfs4_support
new file mode 100644
index 0000000..482541f
--- /dev/null
+++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/nfs4_support
@@ -0,0 +1,11 @@
+--- a/check_nfsmounts/check_nfsmounts
++++ b/check_nfsmounts/check_nfsmounts
+@@ -101,7 +101,7 @@
+ my @dirs=();
+ my %mountmodes=();
+ while(my $line=<MTAB>) {
+-  if($line =~ /^[^ ]+ [^ ]+ nfs /) {
++  if($line =~ /^[^ ]+ [^ ]+ nfs4? /) {
+     my @fields=split(/\s+/,$line);
+     my $mountpoint=$fields[1];
+     push(@dirs,$mountpoint);
diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/nfs_write_location b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/nfs_write_location
new file mode 100644
index 0000000..feb3e23
--- /dev/null
+++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/nfs_write_location
@@ -0,0 +1,20 @@
+--- a/check_nfsmounts/check_nfsmounts
++++ b/check_nfsmounts/check_nfsmounts
+@@ -45,6 +45,7 @@
+ }
+ 
+ use Time::HiRes qw{time alarm};
++use Sys::Hostname;
+ use Getopt::Long;
+ use strict;
+ 
+@@ -129,7 +130,8 @@
+   if($pid==0) {
+     chdir $dir or &bad_mount($dir,$!);
+     if($writemode and exists($mountmodes{$dir}->{"rw"})) {
+-      open X,"> $dir/.nfscheck" or exit $?;
++      my $check_filename="$dir/.nfscheck_" . hostname;
++      open X,"> $check_filename" or exit $?;
+       print X $ENV{HOSTNAME}."\n".localtime()."\n"; # XXX Full disk may fail..
+       close X or exit $?;
+     }
diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/perl_module b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/perl_module
new file mode 100644
index 0000000..86c8c81
--- /dev/null
+++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_nfsmounts/perl_module
@@ -0,0 +1,43 @@
+diff --git a/check_nfsmounts/check_nfsmounts b/check_nfsmounts/check_nfsmounts
+index fbfb1f8..51ed625 100644
+--- a/check_nfsmounts/check_nfsmounts
++++ b/check_nfsmounts/check_nfsmounts
+@@ -21,14 +21,36 @@
+ #    along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+ #
+ 
+-use utils qw{$TIMEOUT %ERRORS};
++sub load_module {
++    my @names = @_;
++    my $module;
++    for my $name (@names) {
++        my $file = $name;
++        # requires need either a bare word or a file name
++        $file =~ s{::}{/}gsxm;
++        $file .= '.pm';
++        eval {
++            require $file;
++            $name->import(qw(%ERRORS));
++            $module = $name;
++		};
++		last if $module;
++    }
++    return $module;
++}
++
++my $plugin_module;
++BEGIN {
++	$plugin_module = load_module( 'Monitoring::Plugin', 'Nagios::Plugin' );
++}
++
+ use Time::HiRes qw{time alarm};
+ use Getopt::Long;
+ use strict;
+ 
+ my $version="1.0";
+ 
+-my $nfs_timeout=$TIMEOUT;
++my $nfs_timeout=15;
+ my $nfs_warn=-1;
+ my $writemode=0;
+ my $help=0;
-- 
cgit v1.2.3