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_libs/config_path          | 11 +++++++++
 .../debian/patches/check_libs/lsof-speedup         | 27 ++++++++++++++++++++++
 .../debian/patches/check_libs/space_before_deleted | 12 ++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/config_path
 create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/lsof-speedup
 create mode 100644 nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/space_before_deleted

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

diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/config_path b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/config_path
new file mode 100644
index 0000000..330d637
--- /dev/null
+++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/config_path
@@ -0,0 +1,11 @@
+--- a/check_libs/nagios-check-libs
++++ b/check_libs/nagios-check-libs
+@@ -71,7 +71,7 @@ if ($params->{'version'}) {
+ };
+ 
+ if (! defined $params->{'config'}) {
+-	$params->{'config'} = '/etc/nagios/check-libs.conf';
++	$params->{'config'} = '/etc/nagios-plugins/check-libs.conf';
+ } elsif (! -e $params->{'config'}) {
+ 	dief("Config file $params->{'config'} does not exist.\n");
+ }
diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/lsof-speedup b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/lsof-speedup
new file mode 100644
index 0000000..925aed4
--- /dev/null
+++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/lsof-speedup
@@ -0,0 +1,27 @@
+--- a/check_libs/nagios-check-libs
++++ b/check_libs/nagios-check-libs
+@@ -29,7 +29,7 @@ use Getopt::Long;
+ $ENV{'PATH'} = '/bin:/sbin:/usr/bin:/usr/sbin';
+ delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'};
+ 
+-my $LSOF = '/usr/bin/lsof -F0';
++my $LSOF = '/usr/bin/lsof -nPF0 -a +L1';
+ my $VERSION = '0.2015012901';
+ 
+ # nagios exit codes
+@@ -141,12 +141,12 @@ sub inVserver() {
+ 
+ my $INVSERVER = inVserver();
+ 
+-print STDERR "Running $LSOF -n\n" if $params->{'verbose'};
+-open (LSOF, "$LSOF -n|") or dief ("Cannot run $LSOF -n: $!\n");
++print STDERR "Running $LSOF\n" if $params->{'verbose'};
++open (LSOF, "$LSOF|") or dief ("Cannot run $LSOF: $!\n");
+ my @lsof=<LSOF>;
+ close LSOF;
+ if ($CHILD_ERROR) { # program failed
+-	dief("$LSOF -n returned with non-zero exit code: ".($CHILD_ERROR / 256)."\n");
++	dief("$LSOF returned with non-zero exit code: ".($CHILD_ERROR / 256)."\n");
+ };
+ 
+ my ($process, $pid, $user);
diff --git a/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/space_before_deleted b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/space_before_deleted
new file mode 100644
index 0000000..0840d48
--- /dev/null
+++ b/nagios-plugins-contrib-24.20190301~bpo9+1/debian/patches/check_libs/space_before_deleted
@@ -0,0 +1,12 @@
+diff -Nur a/check_libs/nagios-check-libs b/check_libs/nagios-check-libs
+--- a/check_libs/nagios-check-libs
++++ b/check_libs/nagios-check-libs
+@@ -170,7 +170,7 @@
+ 	my $inode = $fields{i};
+ 	my $path  = $fields{n};
+ 	if ($path =~ m/\.dpkg-/ || $path =~ m/\(deleted\)/ || $path =~ /path inode=/ || $path =~ m#/\.nfs# || $fd eq 'DEL') {
+-		$path =~ s/^\(deleted\)//; # in some cases "(deleted)" is at the beginning of the string
++		$path =~ s/^ ?\(deleted\)//; # in some cases "(deleted)" is at the beginning of the string
+ 		for my $i (@{$config->{'ignorelist'}}) {
+ 			my $ignore = eval($i);
+ 			next LINE if $ignore;
-- 
cgit v1.2.3