Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Hi Release Team, please unblock package nagios-plugins-contrib as discussed on IRC earlier today. The full debdiff stat is: check_email_delivery/control | 2 +- check_ipmi_sensor/README | 2 +- check_ipmi_sensor/changelog.txt | 26 ++++++++++++++++++++++++++ check_ipmi_sensor/check_ipmi_sensor | 4 ++-- check_ipmi_sensor/control | 2 +- debian/changelog | 12 ++++++++++++ debian/control | 2 +- dsa/control | 2 +- 8 files changed, 45 insertions(+), 7 deletions(-) Filtered for the relevant files: check_email_delivery/control | 2 +- check_ipmi_sensor/check_ipmi_sensor | 4 ++-- check_ipmi_sensor/control | 2 +- debian/control | 2 +- dsa/control | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) You can even ignore check_email_delivery/control, check_ipmi_sensor/control and dsa/control, these are only needed for generating d/control by hand. So we end up with check_ipmi_sensor/check_ipmi_sensor | 4 ++-- debian/control | 2 +- The check_ipmi_sensor change is the fix for #768018. Without that calling check_ipmi_sensor -H localhost is not possible, which would be a regression from wheezy. [KiBi-notice: localhost is special-cased in the code to not use network at all]. The d/control change is adding two more Recommends binutils for check_running_kernel libnet-smtp-ssl-perl for check_email_delivery both are needed for the named plugins to work properly. Both, unfiltered and filtered diffs are attached. unblock nagios-plugins-contrib/14.20141104 Regards Evgeni -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff --git a/check_email_delivery/control b/check_email_delivery/control index e0d3112..aab5a4d 100644 --- a/check_email_delivery/control +++ b/check_email_delivery/control @@ -1,5 +1,5 @@ Uploaders: Bernd Zeimetz <[email protected]> -Recommends: libnagios-plugin-perl (>= 0.31), libio-socket-ssl-perl, libmail-imapclient-perl, libnet-smtp-tls-perl, libnet-ssleay-perl +Recommends: libnagios-plugin-perl (>= 0.31), libio-socket-ssl-perl, libmail-imapclient-perl, libnet-smtp-tls-perl, libnet-smtp-ssl-perl, libnet-ssleay-perl Suggests: perl-doc Version: 0.7.1b Homepage: http://buhacoff.net/software/check_email_delivery/ diff --git a/check_ipmi_sensor/README b/check_ipmi_sensor/README index fcaf135..aa151a1 100644 --- a/check_ipmi_sensor/README +++ b/check_ipmi_sensor/README @@ -4,7 +4,7 @@ check_ipmi_sensor: Nagios/Icinga plugin to check IPMI sensors - Copyright (C) 2009-2012 Thomas-Krenn.AG, + Copyright (C) 2009-2013 Thomas-Krenn.AG, additional contributors see changelog.txt This program is free software; you can redistribute it and/or modify it under diff --git a/check_ipmi_sensor/changelog.txt b/check_ipmi_sensor/changelog.txt index 0653e2f..5457cd8 100644 --- a/check_ipmi_sensor/changelog.txt +++ b/check_ipmi_sensor/changelog.txt @@ -2,6 +2,31 @@ Changelog for check_ipmi_sensor, a Nagios/Icinga plugin to check IPMI sensors ################################################################################ +Version 3.5 20141031 + * Fix LAN Driver if called on localhost + +Version 3.4 20140929 + * Fix implicit array warning with split + * Add option to disable LAN protocol version 2.0 + +Version 3.3 20140606 + * Print a warning if ipmi-sensors only returned a single output row + * Ignore sudo errors and warnings in IPMI command output + (Thanks to Robert Heinzmann for contributing) + * Use LAN protocol version 2.0 per default + * Print empty output error only if return code was 0 + * Exit the plugin with return code 3 if fru command fails + * Added an include list option to only include specific sensors + +Version 3.2 20131028 + * Added FRU serial number to output + * Add check if ipmimonitoring output is empty + * Print correct command in verbose output + * Number of fans can be compared to a desired number of fans + +Version 3.2-dev 20120627 + * Help text cleanups (hint on 'ipmi-sensors -L'). + Version 3.1 20120524 Version 3.1-dev (20120312-20120508) * Documentation cleanups. @@ -33,6 +58,7 @@ List of contributors to version 3.* branch: Werner Fischer, Thomas-Krenn.AG Georg Schönberger, Thomas-Krenn.AG Václav Ovsík (ported version 2 to Perl) + Robert Heinzmann List of contributors to version 2.* branch: Werner Fischer, Thomas-Krenn.AG (author) diff --git a/check_ipmi_sensor/check_ipmi_sensor b/check_ipmi_sensor/check_ipmi_sensor index 7acef5c..429e72c 100755 --- a/check_ipmi_sensor/check_ipmi_sensor +++ b/check_ipmi_sensor/check_ipmi_sensor @@ -35,7 +35,7 @@ use Getopt::Long qw(:config no_ignore_case); use IPC::Run qw( run ); #interact with processes ################################################################################ # set text variables -our $check_ipmi_sensor_version = "3.4"; +our $check_ipmi_sensor_version = "3.5"; sub get_version { @@ -417,7 +417,7 @@ MAIN: { if(!defined($lanVersion)){ $lanVersion = 'LAN_2_0'; } - if($lanVersion ne 'default'){ + if($lanVersion ne 'default' && $ipmi_host ne 'localhost'){ push @getstatus, "--driver-type=$lanVersion"; } diff --git a/check_ipmi_sensor/control b/check_ipmi_sensor/control index e483ffe..5dde928 100644 --- a/check_ipmi_sensor/control +++ b/check_ipmi_sensor/control @@ -1,5 +1,5 @@ Recommends: freeipmi-tools, libipc-run-perl -Version: 3.4 +Version: 3.5 Uploaders: Bernd Zeimetz <[email protected]> Homepage: http://www.thomas-krenn.com/en/oss/ipmi-plugin.html Description: IPMI Sensor Monitoring Plugin diff --git a/debian/changelog b/debian/changelog index b283f06..1e8446a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +nagios-plugins-contrib (14.20141104) unstable; urgency=medium + + [ Jan Wagner ] + * [0b3a2c4] check_email_delivery: Adding libnet-smtp-ssl-perl to Recommends + * [7c8eeb2] check_running_kernel: Add binutils to Recommends + + [ Evgeni Golov ] + * [4df550b] check_ipmi_sensor: update to v3.5. + Thanks to Werner Fischer <[email protected]> (Closes: #768018) + + -- Evgeni Golov <[email protected]> Tue, 04 Nov 2014 15:03:27 +0100 + nagios-plugins-contrib (13.20141017) unstable; urgency=medium * [87b2651] check_rbl: Adding libdata-validate-domain-perl, diff --git a/debian/control b/debian/control index 2e0e10e..e5796f6 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-nagios/pkg-nagios-plugins-contri Package: nagios-plugins-contrib Architecture: any Depends: ${misc:Depends} -Recommends: ${shlibs:Depends}, ${python:Depends}, libsocket-perl, libnagios-plugin-perl, libnet-snmp-perl, whois, nagios-plugins-basic, libnet-dns-perl, libdate-manip-perl, libnagios-plugin-perl (>= 0.31), libnet-cups-perl, libio-socket-ssl-perl, libmail-imapclient-perl, libnet-smtp-tls-perl, libnet-ssleay-perl, python, liblocale-gettext-perl, liblwp-useragent-determined-perl, snmp, freeipmi-tools, libipc-run-perl, ldap-utils, lsof, libyaml-syck-perl, python-pymongo, libdbd-mysql-perl, libreadonly-perl, libdata-validate-domain-perl, libdata-validate-ip-perl, procps, libnet-snmp-perl (>= 5), libtimedate-perl, openssl, libwebinject-perl, libnet-dns-sec-perl, ruby | ruby-interpreter, ${perl:Depends} +Recommends: ${shlibs:Depends}, ${python:Depends}, libsocket-perl, libnagios-plugin-perl, libnet-snmp-perl, whois, nagios-plugins-basic, libnet-dns-perl, libdate-manip-perl, libnagios-plugin-perl (>= 0.31), libnet-cups-perl, libio-socket-ssl-perl, libmail-imapclient-perl, libnet-smtp-tls-perl, libnet-smtp-ssl-perl, libnet-ssleay-perl, python, liblocale-gettext-perl, liblwp-useragent-determined-perl, snmp, freeipmi-tools, libipc-run-perl, ldap-utils, lsof, libyaml-syck-perl, python-pymongo, libdbd-mysql-perl, libreadonly-perl, libdata-validate-domain-perl, libdata-validate-ip-perl, procps, libnet-snmp-perl (>= 5), libtimedate-perl, openssl, libwebinject-perl, libnet-dns-sec-perl, ruby | ruby-interpreter, binutils, ${perl:Depends} Suggests: backuppc, perl-doc, cciss-vol-status (>= 1.10), mpt-status, smstools (>= 3~), expect, nagios-plugin-check-multi, moreutils, percona-toolkit Enhances: nagios-plugins, nagios-plugins-basic, nagios-plugins-standard Description: Plugins for nagios compatible monitoring systems diff --git a/dsa/control b/dsa/control index 1fe5f3b..829d40f 100644 --- a/dsa/control +++ b/dsa/control @@ -14,4 +14,4 @@ Description: plugins from the Debian System Administrators * check_soas: check SOA records * check_statusfile: deliver the content of a status file as check result -Recommends: ruby | ruby-interpreter, openssl, libnet-dns-perl +Recommends: ruby | ruby-interpreter, openssl, libnet-dns-perl, binutils
diff --git a/check_email_delivery/control b/check_email_delivery/control index e0d3112..aab5a4d 100644 --- a/check_email_delivery/control +++ b/check_email_delivery/control @@ -1,5 +1,5 @@ Uploaders: Bernd Zeimetz <[email protected]> -Recommends: libnagios-plugin-perl (>= 0.31), libio-socket-ssl-perl, libmail-imapclient-perl, libnet-smtp-tls-perl, libnet-ssleay-perl +Recommends: libnagios-plugin-perl (>= 0.31), libio-socket-ssl-perl, libmail-imapclient-perl, libnet-smtp-tls-perl, libnet-smtp-ssl-perl, libnet-ssleay-perl Suggests: perl-doc Version: 0.7.1b Homepage: http://buhacoff.net/software/check_email_delivery/ diff --git a/check_ipmi_sensor/check_ipmi_sensor b/check_ipmi_sensor/check_ipmi_sensor index 7acef5c..429e72c 100755 --- a/check_ipmi_sensor/check_ipmi_sensor +++ b/check_ipmi_sensor/check_ipmi_sensor @@ -35,7 +35,7 @@ use Getopt::Long qw(:config no_ignore_case); use IPC::Run qw( run ); #interact with processes ################################################################################ # set text variables -our $check_ipmi_sensor_version = "3.4"; +our $check_ipmi_sensor_version = "3.5"; sub get_version { @@ -417,7 +417,7 @@ MAIN: { if(!defined($lanVersion)){ $lanVersion = 'LAN_2_0'; } - if($lanVersion ne 'default'){ + if($lanVersion ne 'default' && $ipmi_host ne 'localhost'){ push @getstatus, "--driver-type=$lanVersion"; } diff --git a/check_ipmi_sensor/control b/check_ipmi_sensor/control index e483ffe..5dde928 100644 --- a/check_ipmi_sensor/control +++ b/check_ipmi_sensor/control @@ -1,5 +1,5 @@ Recommends: freeipmi-tools, libipc-run-perl -Version: 3.4 +Version: 3.5 Uploaders: Bernd Zeimetz <[email protected]> Homepage: http://www.thomas-krenn.com/en/oss/ipmi-plugin.html Description: IPMI Sensor Monitoring Plugin diff --git a/debian/control b/debian/control index 2e0e10e..e5796f6 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-nagios/pkg-nagios-plugins-contri Package: nagios-plugins-contrib Architecture: any Depends: ${misc:Depends} -Recommends: ${shlibs:Depends}, ${python:Depends}, libsocket-perl, libnagios-plugin-perl, libnet-snmp-perl, whois, nagios-plugins-basic, libnet-dns-perl, libdate-manip-perl, libnagios-plugin-perl (>= 0.31), libnet-cups-perl, libio-socket-ssl-perl, libmail-imapclient-perl, libnet-smtp-tls-perl, libnet-ssleay-perl, python, liblocale-gettext-perl, liblwp-useragent-determined-perl, snmp, freeipmi-tools, libipc-run-perl, ldap-utils, lsof, libyaml-syck-perl, python-pymongo, libdbd-mysql-perl, libreadonly-perl, libdata-validate-domain-perl, libdata-validate-ip-perl, procps, libnet-snmp-perl (>= 5), libtimedate-perl, openssl, libwebinject-perl, libnet-dns-sec-perl, ruby | ruby-interpreter, ${perl:Depends} +Recommends: ${shlibs:Depends}, ${python:Depends}, libsocket-perl, libnagios-plugin-perl, libnet-snmp-perl, whois, nagios-plugins-basic, libnet-dns-perl, libdate-manip-perl, libnagios-plugin-perl (>= 0.31), libnet-cups-perl, libio-socket-ssl-perl, libmail-imapclient-perl, libnet-smtp-tls-perl, libnet-smtp-ssl-perl, libnet-ssleay-perl, python, liblocale-gettext-perl, liblwp-useragent-determined-perl, snmp, freeipmi-tools, libipc-run-perl, ldap-utils, lsof, libyaml-syck-perl, python-pymongo, libdbd-mysql-perl, libreadonly-perl, libdata-validate-domain-perl, libdata-validate-ip-perl, procps, libnet-snmp-perl (>= 5), libtimedate-perl, openssl, libwebinject-perl, libnet-dns-sec-perl, ruby | ruby-interpreter, binutils, ${perl:Depends} Suggests: backuppc, perl-doc, cciss-vol-status (>= 1.10), mpt-status, smstools (>= 3~), expect, nagios-plugin-check-multi, moreutils, percona-toolkit Enhances: nagios-plugins, nagios-plugins-basic, nagios-plugins-standard Description: Plugins for nagios compatible monitoring systems diff --git a/dsa/control b/dsa/control index 1fe5f3b..829d40f 100644 --- a/dsa/control +++ b/dsa/control @@ -14,4 +14,4 @@ Description: plugins from the Debian System Administrators * check_soas: check SOA records * check_statusfile: deliver the content of a status file as check result -Recommends: ruby | ruby-interpreter, openssl, libnet-dns-perl +Recommends: ruby | ruby-interpreter, openssl, libnet-dns-perl, binutils
