From cecb795f6c43b695caad5a0229724e0c49a64c63 Mon Sep 17 00:00:00 2001 From: Jan Wagner Date: Thu, 19 Jun 2008 21:01:38 +0000 Subject: [PATCH] remove reject files from patches --- debian/changelog | 1 + .../34_fix_smbclient_check_disk_smb.dpatch | 70 ------------ debian/patches/50_misc_typos.dpatch | 102 ------------------ 3 files changed, 1 insertion(+), 172 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7691196..1b427dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ nagios-plugins (1.4.12-2) UNRELEASED; urgency=low * add 40_check_http_status_line.dpatch to add content of the status_line into the check_http output (Closes: #486932) + * clean patches from reject files left from dpatch-edit-patch -- Jan Wagner Wed, 18 Jun 2008 13:53:00 +0200 diff --git a/debian/patches/34_fix_smbclient_check_disk_smb.dpatch b/debian/patches/34_fix_smbclient_check_disk_smb.dpatch index 8008e51..231b0a7 100755 --- a/debian/patches/34_fix_smbclient_check_disk_smb.dpatch +++ b/debian/patches/34_fix_smbclient_check_disk_smb.dpatch @@ -38,76 +38,6 @@ diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl nagios-plug # Options checking -diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl.rej nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl.rej ---- nagios-plugins-1.4.12~/plugins-scripts/check_disk_smb.pl.rej 1970-01-01 01:00:00.000000000 +0100 -+++ nagios-plugins-1.4.12/plugins-scripts/check_disk_smb.pl.rej 2008-06-06 12:19:16.000000000 +0200 -@@ -0,0 +1,66 @@ -+*************** -+*** 72,80 **** -+ my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/); -+ ($share) || usage("Invalid share: $opt_s\n"); -+ -+- ($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest"); -+- my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]+)$/); -+- ($user) || usage("Invalid user: $opt_u\n"); -+ -+ ($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = ""); -+ my $pass = $1 if ($opt_p =~ /(.*)/); -+--- 66,74 ---- -+ my $share = $1 if ($opt_s =~ /^([-_.A-Za-z0-9]+\$?)$/); -+ ($share) || usage("Invalid share: $opt_s\n"); -+ -++ defined($opt_u) || ($opt_u = shift @ARGV) || ($opt_u = "guest"); -++ my $user = $1 if ($opt_u =~ /^([-_.A-Za-z0-9\\]*)$/); -++ defined($user) || usage("Invalid user: $opt_u\n"); -+ -+ ($opt_p) || ($opt_p = shift @ARGV) || ($opt_p = ""); -+ my $pass = $1 if ($opt_p =~ /(.*)/); -+*************** -+*** 162,184 **** -+ -+ # Execute an "ls" on the share using smbclient program -+ # get the results into $res -+- if (defined($workgroup)) { -+- if (defined($address)) { -+- print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls\n" if ($verbose); -+- $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -I $address -c ls/; -+- } else { -+- print "$smbclient " . "\/\/$host\/$share" ." $pass -W $workgroup -U $user $smbclientoptions -c ls\n" if ($verbose); -+- $res = qx/$smbclient "\/\/$host\/$share" $pass -W $workgroup -U $user $smbclientoptions -c ls/; -+- } -+- } else { -+- if (defined($address)) { -+- print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -I $address -c ls\n" if ($verbose); -+- $res = qx/$smbclient "\/\/$host\/$share" $pass -U $user $smbclientoptions -I $address -c ls/; -+- } else { -+- print "$smbclient " . "\/\/$host\/$share" ." $pass -U $user $smbclientoptions -c ls\n" if ($verbose); -+- $res = qx/$smbclient "\/\/$host\/$share" $pass -U $user $smbclientoptions -c ls/; -+- } -+- } -+ #Turn off alarm -+ alarm(0); -+ -+--- 156,174 ---- -+ -+ # Execute an "ls" on the share using smbclient program -+ # get the results into $res -++ my @cmd = ( -++ $smbclient, -++ "//$host/$share", -++ "-U", "$user%$pass", -++ defined($workgroup) ? ("-W", $workgroup) : (), -++ defined($address) ? ("-I", $address) : (), -++ defined($opt_P) ? ("-p", $opt_P) : (), -++ "-c", "ls" -++ ); -++ -++ print join(" ", @cmd) . "\n" if ($verbose); -++ $res = output_and_error_of(@cmd) or exit $ERRORS{"UNKNOWN"}; -++ -+ #Turn off alarm -+ alarm(0); -+ diff -urNad nagios-plugins-1.4.12~/plugins-scripts/utils.pm.in nagios-plugins-1.4.12/plugins-scripts/utils.pm.in --- nagios-plugins-1.4.12~/plugins-scripts/utils.pm.in 2007-07-07 13:55:48.000000000 +0200 +++ nagios-plugins-1.4.12/plugins-scripts/utils.pm.in 2008-06-06 12:21:06.000000000 +0200 diff --git a/debian/patches/50_misc_typos.dpatch b/debian/patches/50_misc_typos.dpatch index a40d67b..e6960c0 100644 --- a/debian/patches/50_misc_typos.dpatch +++ b/debian/patches/50_misc_typos.dpatch @@ -111,31 +111,6 @@ diff -urNad nagios-plugins-1.4.12~/plugins/check_procs.c nagios-plugins-1.4.12/p printf (_(UT_SUPPORT)); } -diff -urNad nagios-plugins-1.4.12~/plugins/check_procs.c.rej nagios-plugins-1.4.12/plugins/check_procs.c.rej ---- nagios-plugins-1.4.12~/plugins/check_procs.c.rej 1970-01-01 01:00:00.000000000 +0100 -+++ nagios-plugins-1.4.12/plugins/check_procs.c.rej 2008-06-03 11:08:17.000000000 +0200 -@@ -0,0 +1,21 @@ -+*************** -+*** 781,789 **** -+ printf (" %s\n", _("Warning alert if > 10 processes with command arguments containing")); -+ printf (" %s\n\n", _("'/usr/local/bin/perl' and owned by root")); -+ printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ"); -+- printf (" %s\n\n", _("Alert if vsz of any processes over 50K or 100K")); -+ printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU"); -+- printf (" %s\n\n", _("Alert if cpu of any processes over 10%% or 20%%")); -+ -+ printf (_(UT_SUPPORT)); -+ } -+--- 781,789 ---- -+ printf (" %s\n", _("Warning alert if > 10 processes with command arguments containing")); -+ printf (" %s\n\n", _("'/usr/local/bin/perl' and owned by root")); -+ printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ"); -++ printf (" %s\n\n", _("Alert if VSZ of any processes over 50K or 100K")); -+ printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU"); -++ printf (" %s\n\n", _("Alert if CPU of any processes over 10%% or 20%%")); -+ -+ printf (_(UT_SUPPORT)); -+ } diff -urNad nagios-plugins-1.4.12~/plugins/check_radius.c nagios-plugins-1.4.12/plugins/check_radius.c --- nagios-plugins-1.4.12~/plugins/check_radius.c 2008-06-03 11:08:16.000000000 +0200 +++ nagios-plugins-1.4.12/plugins/check_radius.c 2008-06-03 11:16:39.000000000 +0200 @@ -157,45 +132,6 @@ diff -urNad nagios-plugins-1.4.12~/plugins/check_radius.c nagios-plugins-1.4.12/ printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user")); printf ("%s\n", _("name and password. A configuration file may also be present. The format of")); printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); -diff -urNad nagios-plugins-1.4.12~/plugins/check_radius.c.rej nagios-plugins-1.4.12/plugins/check_radius.c.rej ---- nagios-plugins-1.4.12~/plugins/check_radius.c.rej 1970-01-01 01:00:00.000000000 +0100 -+++ nagios-plugins-1.4.12/plugins/check_radius.c.rej 2008-06-03 11:08:17.000000000 +0200 -@@ -0,0 +1,35 @@ -+*************** -+*** 350,365 **** -+ -+ printf (_(UT_TIMEOUT), timeout_interval); -+ -+- printf ("%s\n", _("This plugin tests a radius server to see if it is accepting connections.")); -+ printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user")); -+ printf ("%s\n", _("name and password. A configuration file may also be present. The format of")); -+ printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); -+ printf ("%s\n", _("The password option presents a substantial security issue because the")); -+ printf ("%s\n", _("password can be determined by careful watching of the command line in")); -+ printf ("%s\n", _("a process listing. This risk is exacerbated because nagios will")); -+- printf ("%s\n", _("run the plugin at regular prdictable intervals. Please be sure that")); -+ printf ("%s\n", _("the password used does not allow access to sensitive system resources,")); -+- printf ("%s\n", _("otherwise compormise could occur.")); -+ -+ printf (_(UT_SUPPORT)); -+ } -+--- 350,365 ---- -+ -+ printf (_(UT_TIMEOUT), timeout_interval); -+ -++ printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); -+ printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user")); -+ printf ("%s\n", _("name and password. A configuration file may also be present. The format of")); -+ printf ("%s\n", _("the configuration file is described in the radiusclient library sources.")); -+ printf ("%s\n", _("The password option presents a substantial security issue because the")); -+ printf ("%s\n", _("password can be determined by careful watching of the command line in")); -+ printf ("%s\n", _("a process listing. This risk is exacerbated because nagios will")); -++ printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that")); -+ printf ("%s\n", _("the password used does not allow access to sensitive system resources,")); -++ printf ("%s\n", _("otherwise compromise could occur.")); -+ -+ printf (_(UT_SUPPORT)); -+ } diff -urNad nagios-plugins-1.4.12~/plugins/check_snmp.c nagios-plugins-1.4.12/plugins/check_snmp.c --- nagios-plugins-1.4.12~/plugins/check_snmp.c 2008-05-07 12:02:42.000000000 +0200 +++ nagios-plugins-1.4.12/plugins/check_snmp.c 2008-06-03 11:08:17.000000000 +0200 @@ -270,44 +206,6 @@ diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c nagios-plugins-1.4.12/plu printf (" %s\n", _("Smart UPS Tools be installed on the remote host. If you do not have the")); printf (" %s\n", _("package installed on your system, you can download it from")); printf (" %s\n", _("http://www.networkupstools.org")); -diff -urNad nagios-plugins-1.4.12~/plugins/check_ups.c.rej nagios-plugins-1.4.12/plugins/check_ups.c.rej ---- nagios-plugins-1.4.12~/plugins/check_ups.c.rej 1970-01-01 01:00:00.000000000 +0100 -+++ nagios-plugins-1.4.12/plugins/check_ups.c.rej 2008-06-03 11:08:17.000000000 +0200 -@@ -0,0 +1,34 @@ -+*************** -+*** 636,642 **** -+ printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power")); -+ printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the")); -+ printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING")); -+- printf ("%s\n", _("state.If the UPS is off or has a low battery the plugin will return a CRITICAL")); -+ printf ("%s\n\n", _("state.")); -+ -+ printf ("%s\n", _("You may also specify a variable to check [such as temperature, utility voltage,")); -+--- 636,642 ---- -+ printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power")); -+ printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the")); -+ printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING")); -++ printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL")); -+ printf ("%s\n\n", _("state.")); -+ -+ printf ("%s\n", _("You may also specify a variable to check [such as temperature, utility voltage,")); -+*************** -+*** 644,650 **** -+ printf ("%s\n", _("that variable. If the remote host has multiple UPS that are being monitored you")); -+ printf ("%s\n", _("will have to use the [ups] option to specify which UPS to check.")); -+ -+- printf ("%s\n", _("This plugin requires that the UPSD daemon distributed with Russel Kroll's")); -+ printf ("%s\n", _("Smart UPS Tools be installed on the remote host. If you do not have the")); -+ printf ("%s\n", _("package installed on your system, you can download it from http://www.networkupstools.org")); -+ -+--- 644,650 ---- -+ printf ("%s\n", _("that variable. If the remote host has multiple UPS that are being monitored you")); -+ printf ("%s\n", _("will have to use the [ups] option to specify which UPS to check.")); -+ -++ printf ("%s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's")); -+ printf ("%s\n", _("Smart UPS Tools be installed on the remote host. If you do not have the")); -+ printf ("%s\n", _("package installed on your system, you can download it from http://www.networkupstools.org")); -+ diff -urNad nagios-plugins-1.4.12~/plugins-scripts/check_mailq.pl nagios-plugins-1.4.12/plugins-scripts/check_mailq.pl --- nagios-plugins-1.4.12~/plugins-scripts/check_mailq.pl 2006-07-05 15:45:57.000000000 +0200 +++ nagios-plugins-1.4.12/plugins-scripts/check_mailq.pl 2008-06-03 11:08:17.000000000 +0200