[pkg-nagios-changes] [Git][nagios-team/pkg-nagios-plugins-contrib][master] 3 commits: Auto update of debian/control
Bernd Zeimetz
gitlab at salsa.debian.org
Mon May 11 15:12:42 BST 2020
Bernd Zeimetz pushed to branch master at Debian Nagios Maintainer Group / pkg-nagios-plugins-contrib
Commits:
1831f8b7 by Bernd Zeimetz at 2020-05-11T16:11:18+02:00
Auto update of debian/control
- - - - -
5612aacf by Bernd Zeimetz at 2020-05-11T16:11:23+02:00
Auto update of debian/copyright
- - - - -
45d41ae7 by Bernd Zeimetz at 2020-05-11T16:11:45+02:00
check_libs is now a symlink to check_libs_ng
- - - - -
15 changed files:
- − check_libs/Makefile
- − check_libs/control
- − check_libs/copyright
- − check_libs/nagios-check-libs
- − check_libs/nagios-check-libs.conf
- − check_libs/tests
- − check_libs/update-check_libs-status
- − check_libs/update_files.sh
- debian/control
- debian/copyright
- + debian/monitoring-plugins-contrib.links
- − debian/patches/check_libs/config_path
- − debian/patches/check_libs/lsof-speedup
- − debian/patches/check_libs/space_before_deleted
- debian/patches/series
Changes:
=====================================
check_libs/Makefile deleted
=====================================
@@ -1,16 +0,0 @@
-#!/usr/bin/make -f
-
-INIFILES = check-libs.conf
-PLUGIN = check_libs
-CLEANFILES = $(INIFILES) $(PLUGIN)
-CRONJOBS:= update-check_libs-status
-
-include ../common.mk
-
-check_libs:
- cp nagios-check-libs $@
- chmod 755 $@
-
-check-libs.conf:
- cp nagios-check-libs.conf $@
-
=====================================
check_libs/control deleted
=====================================
@@ -1,7 +0,0 @@
-Homepage: https://gitweb.noreply.org/tools/monitoring.git/
-Watch: https://gitweb.noreply.org/tools/monitoring.git/plain/nagios-checks/nagios-check-libs VERSION = '([0-9.]+)';
-Uploaders: Bernd Zeimetz <bzed at debian.org>
-Description: plugin to report the usage of no longer existing
- libraries by running processes
-Recommends: lsof, libyaml-syck-perl
-Version: 0.2015012901
=====================================
check_libs/copyright deleted
=====================================
@@ -1,52 +0,0 @@
-
-check_libs:
-
-Copyright (C) 2005, 2006, 2007, 2008, 2012 Peter Palfrader <peter at palfrader.org>
- 2012 Uli Martens <uli at youam.net>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-update-check_libs-status:
-
-Based on update-apt-status
-Copyright 2009 Peter Palfrader
-
-Copyright 2014 conova communications GmbH
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
=====================================
check_libs/nagios-check-libs deleted
=====================================
@@ -1,199 +0,0 @@
-#!/usr/bin/perl -w
-
-# Copyright (C) 2005, 2006, 2007, 2008, 2012, 2015 Peter Palfrader <peter at palfrader.org>
-# 2012 Uli Martens <uli at youam.net>
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-use strict;
-use English;
-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 $VERSION = '0.2015012901';
-
-# nagios exit codes
-my $OK = 0;
-my $WARNING = 1;
-my $CRITICAL = 2;
-my $UNKNOWN = 3;
-
-my $params;
-my $config;
-
-Getopt::Long::config('bundling');
-
-sub dief {
- print STDERR @_;
- exit $UNKNOWN;
-}
-
-if (!GetOptions (
- '--help' => \$params->{'help'},
- '--version' => \$params->{'version'},
- '--quiet' => \$params->{'quiet'},
- '--verbose' => \$params->{'verbose'},
- '--config=s' => \$params->{'config'},
- )) {
- dief ("$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help|--version] [--verbose] [--quiet] [--config=<CONFIGFILE>]\n");
-};
-if ($params->{'help'}) {
- print "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help|--version] [--verbose] [--quiet] [--config=<CONFIGFILE>]\n";
- print "Reports processes that are linked against libraries that no longer exist.\n";
- print "The optional config file can specify ignore rules - see the sample config file.\n";
- exit (0);
-};
-if ($params->{'version'}) {
- print "nagios-check-libs $VERSION\n";
- print "nagios check for availability of debian (security) updates\n";
- print "Copyright (c) 2005, 2006, 2007, 2008, 2012 Peter Palfrader <peter\@palfrader.org>\n";
- exit (0);
-};
-
-if (! defined $params->{'config'}) {
- $params->{'config'} = '/etc/nagios/check-libs.conf';
-} elsif (! -e $params->{'config'}) {
- dief("Config file $params->{'config'} does not exist.\n");
-}
-
-if (-e $params->{'config'}) {
- eval "use YAML::Syck; 1" or dief "you need YAML::Syck (libyaml-syck-perl) to load a config file";
- open(my $fh, '<', $params->{'config'}) or dief "Cannot open config file $params->{'config'}: $!";
- $config = LoadFile($fh);
- close($fh);
- if (!(ref($config) eq "HASH")) {
- dief("Loaded config is not a hash!\n");
- }
-} else {
- $config = {
- 'ignorelist' => [
- '$path =~ m#^/proc/#',
- '$path =~ m#^/var/tmp/#',
- '$path =~ m#^/SYS#',
- '$path =~ m#^/drm$# # xserver stuff',
- '$path =~ m#^/dev/zero#',
- '$path =~ m#^/dev/shm/#',
- ]
- };
-}
-
-if (! exists $config->{'ignorelist'}) {
- $config->{'ignorelist'} = [];
-} elsif (! (ref($config->{'ignorelist'}) eq 'ARRAY')) {
- dief("Config->ignorelist is not an array!\n");
-}
-
-
-my %processes;
-
-sub getPIDs($$) {
- my ($user, $process) = @_;
- return join(', ', sort keys %{ $processes{$user}->{$process} });
-};
-sub getProcs($) {
- my ($user) = @_;
-
- return join(', ', map { $_.' ('.getPIDs($user, $_).')' } (sort {$a cmp $b} keys %{ $processes{$user} }));
-};
-sub getUsers() {
- return join('; ', (map { $_.': '.getProcs($_) } (sort {$a cmp $b} keys %processes)));
-};
-sub inVserver() {
- my ($f, $key);
- if (-e "/proc/self/vinfo" ) {
- $f = "/proc/self/vinfo";
- $key = "XID";
- } else {
- $f = "/proc/self/status";
- $key = "s_context";
- };
- open(F, "< $f") or return 0;
- while (<F>) {
- my ($k, $v) = split(/: */, $_, 2);
- if ($k eq $key) {
- close F;
- return ($v > 0);
- };
- };
- close F;
- return 0;
-}
-
-my $INVSERVER = inVserver();
-
-print STDERR "Running $LSOF -n\n" if $params->{'verbose'};
-open (LSOF, "$LSOF -n|") or dief ("Cannot run $LSOF -n: $!\n");
-my @lsof=<LSOF>;
-close LSOF;
-if ($CHILD_ERROR) { # program failed
- dief("$LSOF -n returned with non-zero exit code: ".($CHILD_ERROR / 256)."\n");
-};
-
-my ($process, $pid, $user);
-LINE: for my $line (@lsof) {
- if ( $line =~ /^p/ ) {
- my %fields = map { m/^(.)(.*)$/ ; $1 => $2 } grep { defined $_ and length $_ >1} split /\0/, $line;
- $process = $fields{c};
- $pid = $fields{p};
- $user = $fields{L};
- next;
- }
-
- unless ( $line =~ /^f/ ) {
- dief("UNKNOWN strange line read from lsof\n");
- # don't print it because it contains NULL characters...
- }
-
- my %fields = map { m/^(.)(.*)$/ ; $1 => $2 } grep { defined $_ and length $_ >1} split /\0/, $line;
-
- my $fd = $fields{f};
- 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
- for my $i (@{$config->{'ignorelist'}}) {
- my $ignore = eval($i);
- next LINE if $ignore;
- }
- next if ($INVSERVER && ($process eq 'init') && ($pid == 1) && ($user eq 'root'));
- if ( $params->{'verbose'} ) {
- print STDERR "adding $process($pid) because of [$path]:\n";
- print STDERR $line;
- }
- $processes{$user}->{$process}->{$pid} = 1;
- };
-};
-
-
-
-my $message='';
-my $exit = $OK;
-if (keys %processes) {
- $exit = $WARNING;
- $message = 'The following processes have libs linked that were upgraded: '. getUsers()."\n";
-} else {
- $message = "No upgraded libs linked in running processes\n" unless $params->{'quiet'};
-};
-
-print $message;
-exit $exit;
=====================================
check_libs/nagios-check-libs.conf deleted
=====================================
@@ -1,21 +0,0 @@
----
- ignorelist:
- - '$path =~ m#^/proc/#'
- - '$path =~ m#^/var/tmp/#'
- - '$path =~ m#^/tmp/#'
- - '$path =~ m#^/var/run/#'
- - '$path =~ m#^/run/#'
- - '$path =~ m#^/dev/pts/#'
- - '$path =~ m#^/SYS#'
- - '$path =~ m#^/sys/#'
- - '$path =~ m#^/drm$# # xserver stuff'
- - '$path =~ m#^/dev/zero#'
- - '$path =~ m#^/dev/shm/#'
- - '$path =~ m#^/var/lib/postgresql/#'
- - '$path =~ m#^/var/log/#'
- - '$path =~ m#^/var/spool/#'
- - '$path =~ m#^/var/lib/ganeti/#'
- - '$path =~ m#^/usr/lib/locale/locale-archive#'
- - '$path =~ m#^/var/lib/nginx/#'
- - '$path =~ m#^/\[aio\]$#'
-# vim:syn=yaml
=====================================
check_libs/tests deleted
=====================================
@@ -1,2 +0,0 @@
-Depends: lsof, libyaml-syck-perl
-Test-Command: /usr/lib/nagios/plugins/check_libs
=====================================
check_libs/update-check_libs-status deleted
=====================================
@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# Based on update-apt-status
-# Copyright 2009 Peter Palfrader
-#
-# Copyright 2014 conova communications GmbH
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-UPDATE_RUNS=3
-STATUSDIR=/var/cache/nagios_status
-STATUS=${STATUSDIR}/check_libs
-SLEEP_MAX=$(( 15 * 60 ))
-MAX_AGE=$(( 23 * 60 * 60 ))
-
-# we want to run if any of the following things is true
-# - we have never run before
-# - var/lib/dpkg/status has been touched since the last run
-# - var/cache/apt/pkgcache.bin has been touched since the last run
-# - our last run ended with 'apt-get update failed'
-# - our last run has been more than MAX_AGE (23hrs) ago
-run_required() {
- local run=0
- local norun=1
-
- [ -e "$STATUS" ] || return $run
- [ /var/lib/dpkg/status -nt "$STATUS" ] && return $run
- [ /var/cache/apt/pkgcache.bin -nt "$STATUS" ] && return $run
- grep "apt-get update failed" "$STATUS" > /dev/null && return $run
-
- local last_mod
- last_mod=`stat -c "%Y" "$STATUS"`
- now=`date +%s`
- age=$(( $now - $last_mod ))
- [ "$age" -gt "$MAX_AGE" ] && return $run
-
- return $norun
-}
-
-if [ ! -d ${STATUSDIR} ]; then
- mkdir -p ${STATUSDIR}
-fi
-
-# do stuff only when required, or when asked to
-if [ "${1:-""}" != "-f" ] ; then
- run_required || exit 0
-fi
-
-# sleep if called non-interactively
-if [ -z "$TERM" -o "$TERM" = "dumb" ]; then
- sleep $(( $RANDOM % $SLEEP_MAX ))
-fi
-
-# run the apt check itself
-tmp=`tempfile`
-trap "rm -f '$tmp'" exit
-/usr/lib/nagios/plugins/check_libs > "$tmp"
-result="$?"
-case "$result" in
- 0)
- st="OK"
- ;;
- 1)
- st="WARNING"
- ;;
- 2)
- st="CRITICAL"
- ;;
- *)
- st="UNKNOWN"
- ;;
-esac
-(echo "$st"; cat "$tmp") > "$STATUS"
=====================================
check_libs/update_files.sh deleted
=====================================
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-for i in nagios-check-libs nagios-check-libs.conf; do
- tmp=`mktemp`
- if wget -O ${tmp} "http://svn.noreply.org/svn/weaselutils/trunk/${i}"; then
- mv ${tmp} ${i}
- else
- rm -f ${tmp}
- fi
-done
=====================================
debian/control
=====================================
@@ -16,7 +16,7 @@ Vcs-Browser: https://salsa.debian.org/nagios-team/pkg-nagios-plugins-contrib
Package: monitoring-plugins-contrib
Architecture: any
Depends: ${misc:Depends}
-Recommends: libsocket-perl, libmonitoring-plugin-perl | libnagios-plugin-perl, libnet-snmp-perl, whois, nagios-plugins-basic, libnet-dns-perl, libdate-manip-perl, libmonitoring-plugin-perl | libnagios-plugin-perl (>= 0.31), libnet-cups-perl, debsecan, libio-socket-ssl-perl, libmail-imapclient-perl, libnet-smtp-tls-perl, libnet-smtp-ssl-perl, libnet-ssleay-perl, libnet-smtpauth-perl, bind9-host | knot-host, python3, liblocale-gettext-perl, liblwp-useragent-determined-perl, snmp, freeipmi-tools, libipc-run-perl, lsof, libyaml-syck-perl, libxml-simple-perl, python3-pymongo, libdbd-mysql-perl, libreadonly-perl, libdata-validate-domain-perl, libdata-validate-ip-perl, libredis-perl, libnet-snmp-perl (>= 5), libtimedate-perl, curl, file, openssl, libwebinject-perl, libnet-dns-sec-perl, ruby | ruby-interpreter, binutils,
+Recommends: libsocket-perl, libmonitoring-plugin-perl | libnagios-plugin-perl, libnet-snmp-perl, whois, nagios-plugins-basic, libnet-dns-perl, libdate-manip-perl, libmonitoring-plugin-perl | libnagios-plugin-perl (>= 0.31), libnet-cups-perl, debsecan, libio-socket-ssl-perl, libmail-imapclient-perl, libnet-smtp-tls-perl, libnet-smtp-ssl-perl, libnet-ssleay-perl, libnet-smtpauth-perl, bind9-host | knot-host, python3, liblocale-gettext-perl, liblwp-useragent-determined-perl, snmp, freeipmi-tools, libipc-run-perl, libxml-simple-perl, python3-pymongo, libdbd-mysql-perl, libreadonly-perl, libdata-validate-domain-perl, libdata-validate-ip-perl, libredis-perl, libnet-snmp-perl (>= 5), libtimedate-perl, curl, file, openssl, libwebinject-perl, libnet-dns-sec-perl, ruby | ruby-interpreter, binutils,
${perl:Depends},
${python3:Depends},
${shlibs:Depends}
@@ -97,8 +97,6 @@ Description: Plugins for nagios compatible monitoring systems
* check_ipmi_sensor (3.13): IPMI Sensor Monitoring Plugin
Plugin to monitor the hardware status (fan speed, temperaturs,
voltages, power usage, ...) of a server using IPMI.
- * check_libs (0.2015012901 ): plugin to report the usage of no longer existing
- libraries by running processes
* check_libs_ng (0.1.0): plugin to report processes using outdated libraries
depents on kernel features present in kernels newer than 3.3
* check_libvirt (v7.0.3): monitor virtualization solutions using libvirt
=====================================
debian/copyright
=====================================
@@ -448,67 +448,6 @@ http://www.thomas-krenn.com/en/oss/ipmi-plugin.html
-------------------------------------------------------------------------------
-
-check_libs:
-
-The plugin was downloaded from:
-https://gitweb.noreply.org/tools/monitoring.git/
-
-
- check_libs:
-
- Copyright (C) 2005, 2006, 2007, 2008, 2012 Peter Palfrader <peter at palfrader.org>
- 2012 Uli Martens <uli at youam.net>
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
- update-check_libs-status:
-
- Based on update-apt-status
- Copyright 2009 Peter Palfrader
-
- Copyright 2014 conova communications GmbH
-
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
------------------------------------------------------------------------------
check_libs_ng:
=====================================
debian/monitoring-plugins-contrib.links
=====================================
@@ -0,0 +1 @@
+usr/lib/nagios/plugins/check_libs_ng usr/lib/nagios/plugins/check_libs
=====================================
debian/patches/check_libs/config_path deleted
=====================================
@@ -1,11 +0,0 @@
---- 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");
- }
=====================================
debian/patches/check_libs/lsof-speedup deleted
=====================================
@@ -1,27 +0,0 @@
---- 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);
=====================================
debian/patches/check_libs/space_before_deleted deleted
=====================================
@@ -1,12 +0,0 @@
-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;
=====================================
debian/patches/series
=====================================
@@ -16,9 +16,6 @@ check_haproxy_stats/socket
check_httpd_status/epn
check_httpd_status/monitoring-plugin
check_imap_quota/syntax_error_fix
-check_libs/lsof-speedup
-check_libs/config_path
-check_libs/space_before_deleted
check_libvirt/monitoring-plugin
check_libvirt/fix_uom
check_lm_sensors/manpage_whatis_fix
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagios-plugins-contrib/-/compare/4df94e81f42b442d0a1f5e38f1dde7b75cc196d8...45d41ae738e99bdcc49a0c2d83319a3998805179
--
View it on GitLab: https://salsa.debian.org/nagios-team/pkg-nagios-plugins-contrib/-/compare/4df94e81f42b442d0a1f5e38f1dde7b75cc196d8...45d41ae738e99bdcc49a0c2d83319a3998805179
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20200511/c191dd98/attachment-0001.html>
More information about the pkg-nagios-changes
mailing list