diff -u nagios-plugins-1.4.12/debian/changelog nagios-plugins-1.4.12/debian/changelog --- nagios-plugins-1.4.12/debian/changelog +++ nagios-plugins-1.4.12/debian/changelog @@ -1,3 +1,30 @@ +nagios-plugins (1.4.12-5ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #376459), remaining changes: + - Keeping 99_check_ntp_segfaults.dpatch: Fix for check_ntp and check_ntp_peer + segfaults (LP: #291265 + - debian/control: keep on building with libradius1-dev to avoid pushing + radiusclient-ng to main + - Don't depend on nagios-plugins-extra, we dont need qstat and fping in main. + - Updated translations in po/ + * Adding XSBC-Original-Maintainer to debian/control + + -- Andreas Olsson Thu, 14 May 2009 14:32:12 +0200 + +nagios-plugins (1.4.12-5) unstable; urgency=low + + * add missing auth pair parameter to check_https_auth_hostname* command + definitions + * changing check_cups command to use host headers anymore, since cups changed + it's behavior in etch, thanks Maximilian Gass (Closes: #505610) + * add -e to all preconfigured check commands using check_disk, to only display + effected partitions, when warning or critical, thanks to + Filip Van Raemdonck and Jacob L. Anawalt (Closes: #395389) + * add 42_check_ups_logoutfix.dpatch to fix logout problem with check_ups + (Closes: #387001) + + -- Jan Wagner Fri, 30 Jan 2009 22:50:35 +0100 + nagios-plugins (1.4.12-4ubuntu2) jaunty; urgency=low * Added 99_check_ntp_segfaults.dpatch: Fix for check_ntp and check_ntp_peer @@ -23,7 +50,7 @@ definition * fix check_http?_hostname* command definitions * adjust 'check_ssh_4' command definition, it needs the v4 argument at first, - thanks Julien Ozog (Closes #500774). + thanks Julien Ozog (Closes: #500774). -- Jan Wagner Sun, 24 Aug 2008 07:40:12 +0200 diff -u nagios-plugins-1.4.12/debian/control nagios-plugins-1.4.12/debian/control --- nagios-plugins-1.4.12/debian/control +++ nagios-plugins-1.4.12/debian/control @@ -2,6 +2,7 @@ Section: net Priority: extra Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian Nagios Maintainer Group Uploaders: Sean Finney , Guido Trotter , Jan Wagner , Alexander Wirt Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0.9), autotools-dev, libldap2-dev, libpq-dev, libmysqlclient15-dev | libmysqlclient12-dev | libmysqlclient-dev, libradius1-dev, libkrb5-dev, libnet-snmp-perl, procps, coreutils, mawk | awk Homepage: http://nagiosplug.sourceforge.net diff -u nagios-plugins-1.4.12/debian/patches/00list nagios-plugins-1.4.12/debian/patches/00list --- nagios-plugins-1.4.12/debian/patches/00list +++ nagios-plugins-1.4.12/debian/patches/00list @@ -17,4 +17,5 @@ 40_check_http_status_line.dpatch 41_check_http_fix_http_header.dpatch +42_check_ups_logoutfix.dpatch 50_misc_typos.dpatch 99_check_ntp_segfaults.dpatch diff -u nagios-plugins-1.4.12/debian/pluginconfig/http.cfg nagios-plugins-1.4.12/debian/pluginconfig/http.cfg --- nagios-plugins-1.4.12/debian/pluginconfig/http.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/http.cfg @@ -43,13 +43,13 @@ # 'check_https_auth_hostname' command definition define command{ command_name check_https_auth_hostname - command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME$' -I '$HOSTADDRESS$' -a '$ARG1$' } # 'check_cups' command definition define command{ command_name check_cups - command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p 631 + command_line /usr/lib/nagios/plugins/check_http -I '$HOSTADDRESS$' -p 631 } #### @@ -103,9 +103,9 @@ command_name check_https_auth_hostname_4 - command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME' -I '$HOSTADDRESS$' -4 + command_line /usr/lib/nagios/plugins/check_http --ssl -H '$HOSTNAME' -I '$HOSTADDRESS$' -a '$ARG1$' -4 } # 'check_cups_4' command definition define command{ command_name check_cups_4 - command_line /usr/lib/nagios/plugins/check_http -H '$HOSTADDRESS$' -p 631 -4 + command_line /usr/lib/nagios/plugins/check_http -I '$HOSTADDRESS$' -p 631 -4 } diff -u nagios-plugins-1.4.12/debian/pluginconfig/disk.cfg nagios-plugins-1.4.12/debian/pluginconfig/disk.cfg --- nagios-plugins-1.4.12/debian/pluginconfig/disk.cfg +++ nagios-plugins-1.4.12/debian/pluginconfig/disk.cfg @@ -1,19 +1,19 @@ # 'check_disk' command definition define command{ command_name check_disk - command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -p '$ARG3$' + command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -e -p '$ARG3$' } # 'check_all_disks' command definition define command{ command_name check_all_disks - command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' + command_line /usr/lib/nagios/plugins/check_disk -w '$ARG1$' -c '$ARG2$' -e } # 'ssh_disk' command definition define command{ command_name ssh_disk - command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$' -c '\''$ARG2$'\'' -p '\''$ARG3$'\' + command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$' -c '\''$ARG2$'\'' -e -p '\''$ARG3$'\' } #### @@ -25,3 +25,3 @@ command_name ssh_disk_4 - command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$'\'' -c '\''$ARG2$'\'' -p '\''$ARG3$'\' -4 + command_line /usr/lib/nagios/plugins/check_by_ssh -H '$HOSTADDRESS$' -C '/usr/lib/nagios/plugins/check_disk -w '\''$ARG1$'\'' -c '\''$ARG2$'\'' -e -p '\''$ARG3$'\' -4 } only in patch2: unchanged: --- nagios-plugins-1.4.12.orig/debian/patches/42_check_ups_logoutfix.dpatch +++ nagios-plugins-1.4.12/debian/patches/42_check_ups_logoutfix.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 42_check_ups_logoutfix.dpatch by Olivier 'Babar' Raginel +## +## DP: Fixing Lougout + +@DPATCH@ +diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c nagios-plugins-1.4.12/plugins/check_ups.c +--- nagios-plugins-1.4.12~/plugins/check_ups.c 2008-05-07 12:02:42.000000000 +0200 ++++ nagios-plugins-1.4.12/plugins/check_ups.c 2009-01-30 22:31:37.000000000 +0100 +@@ -398,12 +398,15 @@ + char temp_buffer[MAX_INPUT_BUFFER]; + char send_buffer[MAX_INPUT_BUFFER]; + char *ptr; ++ char *logout = "OK Goodbye\n"; ++ int logout_len = strlen(logout); + int len; + + *buf=0; + + /* create the command string to send to the UPS daemon */ +- sprintf (send_buffer, "GET VAR %s %s\n", ups_name, varname); ++ /* Add LOGOUT to avoid read failure logs */ ++ sprintf (send_buffer, "GET VAR %s %s\nLOGOUT\n", ups_name, varname); + + /* send the command to the daemon and get a response back */ + if (process_tcp_request +@@ -415,6 +418,7 @@ + + ptr = temp_buffer; + len = strlen(ptr); ++ if (len > logout_len && strcmp (ptr + len - logout_len, logout) == 0) len -= logout_len; + if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0; + if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) { + printf (_("CRITICAL - no such ups '%s' on that host\n"), ups_name);