Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: freeze-exception
Please unblock the package nagios-plugins (1.4.15-2)
The version in unstable fixes 2 bugs and is raising the standards:
nagios-plugins (1.4.15-2) unstable; urgency=low
[ Alexander Wirt ]
* Call ps with two "w" to ensure unlimited width of ps output
(Closes: #596372)
[ Jan Wagner ]
* Add 05_check_linux_raid_fix_striped.dpatch to fix bad output from
check_linux_raid with RAID0 and linear volumes, thanks to Thomas
Guyot-Sionnest (Closes: #579049) - LP: #621380
* Bump Standards-Version to 3.9.1, no changes needed
-- Jan Wagner <w...@cyconet.org> Thu, 23 Sep 2010 09:24:39 +0200
The fix for #596372 was requested by DSA to be included into squeeze.
Thanks in advance.
unblock: nagios-plugins/1.4.15-2
--
Never write mail to <w...@spamfalle.info>, you have been warned!
-----BEGIN GEEK CODE BLOCK-----
Version: 3.12
GIT d-- s+: a C+++ UL++++ P+ L+++ E--- W+++ N+++ o++ K++ w--- O M V- PS PE Y++
PGP++ t-- 5 X R tv- b+ DI D+ G++ e++ h---- r+++ y++++
------END GEEK CODE BLOCK------
Index: debian/control =================================================================== --- debian/control (revision 1906) +++ debian/control (revision 1911) @@ -7,7 +7,7 @@ Homepage: http://nagiosplug.sourceforge.net Vcs-Browser: http://svn.debian.org/wsvn/pkg-nagios/nagios-plugins/ Vcs-Svn: svn://svn.debian.org/pkg-nagios/nagios-plugins/trunk/ -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Package: nagios-plugins Architecture: all Index: debian/patches/05_check_linux_raid_fix_striped.dpatch =================================================================== --- debian/patches/05_check_linux_raid_fix_striped.dpatch (revision 0) +++ debian/patches/05_check_linux_raid_fix_striped.dpatch (revision 1911) @@ -0,0 +1,47 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_check_linux_raid_fix_striped.dpatch by Thomas Guyot-Sionnest <derm...@aei.ca> +## +## DP: Fix RAID0 and linear volumes (http://bugs.debian.org/579049) +## DP: Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/nagios-plugins/+bug/621380 +## DP: Upstream bug is: http://sourceforge.net/tracker/?func=detail&aid=3049988&group_id=29880&atid=397597 + +...@dpatch@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' nagios-plugins-1.4.15~/contrib/check_linux_raid.pl nagios-plugins-1.4.15/contrib/check_linux_raid.pl +--- nagios-plugins-1.4.15~/contrib/check_linux_raid.pl 2010-07-27 22:47:15.000000000 +0200 ++++ nagios-plugins-1.4.15/contrib/check_linux_raid.pl 2010-09-23 09:00:11.000000000 +0200 +@@ -71,7 +71,8 @@ + } elsif (/^($nextdev)\s*:/) { + $device=$1; + $devices{$device}=$device; +- if (/active/) { ++ if (/\sactive/) { ++ $status{$device} = ''; # Shall be filled later if available + $active{$device} = 1; + } + } +@@ -80,7 +81,11 @@ + } + + foreach my $k (sort keys %devices){ +- if ($status{$k} =~ /_/) { ++ if (!exists($status{$k})) { ++ $msg .= sprintf " %s inactive with no status information.", ++ $devices{$k}; ++ $code = max_state($code, "CRITICAL"); ++ } elsif ($status{$k} =~ /_/) { + if (defined $recovery{$k}) { + $msg .= sprintf " %s status=%s, recovery=%s, finish=%s.", + $devices{$k}, $status{$k}, $recovery{$k}, $finish{$k}; +@@ -94,10 +99,11 @@ + $code = max_state($code, "OK"); + } else { + if ($active{$k}) { +- $msg .= sprintf " %s active with no status information.\n", ++ $msg .= sprintf " %s active with no status information.", + $devices{$k}; + $code = max_state($code, "OK"); + } else { ++ # This should't run anymore, but is left as a catch-all + $msg .= sprintf " %s does not exist.\n", $devices{$k}; + $code = max_state($code, "CRITICAL"); + } Property changes on: debian/patches/05_check_linux_raid_fix_striped.dpatch ___________________________________________________________________ Added: svn:executable + * Index: debian/patches/00list =================================================================== --- debian/patches/00list (revision 1906) +++ debian/patches/00list (revision 1911) @@ -1,3 +1,4 @@ 01_subst.in.dpatch 02_check_icmp_links.dpatch +05_check_linux_raid_fix_striped.dpatch # commited upstream Index: debian/changelog =================================================================== --- debian/changelog (revision 1906) +++ debian/changelog (revision 1911) @@ -1,3 +1,17 @@ +nagios-plugins (1.4.15-2) unstable; urgency=low + + [ Alexander Wirt ] + * Call ps with two "w" to ensure unlimited width of ps output + (Closes: #596372) + + [ Jan Wagner ] + * Add 05_check_linux_raid_fix_striped.dpatch to fix bad output from + check_linux_raid with RAID0 and linear volumes, thanks to Thomas + Guyot-Sionnest (Closes: #579049) - LP: #621380 + * Bump Standards-Version to 3.9.1, no changes needed + + -- Jan Wagner <w...@cyconet.org> Thu, 23 Sep 2010 09:24:39 +0200 + nagios-plugins (1.4.15-1) unstable; urgency=low * New upstream release (Closes: #588273, #522631) Index: debian/rules =================================================================== --- debian/rules (revision 1906) +++ debian/rules (revision 1911) @@ -88,7 +88,7 @@ --with-pgsql=/usr \ --with-mysql=/usr \ --with-proc-loadavg=/proc/loadavg \ - --with-ps-command="/bin/ps axwo 'stat uid pid ppid vsz rss pcpu etime comm args'" \ + --with-ps-command="/bin/ps axwwo 'stat uid pid ppid vsz rss pcpu etime comm args'" \ --with-ps-format="%s %d %d %d %d %d %f %s %s %n" \ --with-ps-cols=10 \ --with-ps-varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos" \
signature.asc
Description: This is a digitally signed message part.
