[Pkg-nagios-changes] [pkg-nagios] r1162 - in nagios-plugins/trunk/debian: . patches

Sean Finney seanius at alioth.debian.org
Sun May 20 18:19:43 UTC 2007


Author: seanius
Date: 2007-05-20 18:19:43 +0000 (Sun, 20 May 2007)
New Revision: 1162

Removed:
   nagios-plugins/trunk/debian/patches/28_check_tcp.expect_reporting.dpatch
   nagios-plugins/trunk/debian/patches/29_check_tcp.check_jabber-returns-warning.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
new upstream changes

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2007-05-20 18:14:28 UTC (rev 1161)
+++ nagios-plugins/trunk/debian/changelog	2007-05-20 18:19:43 UTC (rev 1162)
@@ -11,19 +11,18 @@
   * fixed static community string for check_snmp_bgpstate in snmp.cfg
     (closes: #403892).
   * remove static community string in ifstatus.cfg
-  * add 28_check_tcp.expect_reporting.dpatch to fix broken response for
-    check_jabber
-  * add 29_check_tcp.check_jabber-returns-warning.dpatch to fix return of
-    check_jabber (closes: #392610).
   * add check_mysql_database to mysql.cfg
   * add check_cups to http.cfg
 
   [sean finney]
   * the Architecture should be "all" for the empty nagios-plugins 
     metapackage (closes: #422083).
-  * Merge changes from and ack NMU. Thanks to Michael Tautschnig 
+  * merge changes from and ack NMU. Thanks to Michael Tautschnig 
     (closes: #420954).
-  * Modify the Suggests to prefer nagios2 to nagios-text.
+  * modify the Suggests to prefer nagios2 to nagios-text.
+  * remove the following patches, which have been included upstream:
+    - 28_check_tcp.expect_reporting.dpatch
+    - 29_check_tcp.check_jabber-returns-warning.dpatch
 
  -- sean finney <seanius at debian.org>  Sun, 20 May 2007 20:12:32 +0200
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2007-05-20 18:14:28 UTC (rev 1161)
+++ nagios-plugins/trunk/debian/patches/00list	2007-05-20 18:19:43 UTC (rev 1162)
@@ -7,5 +7,3 @@
 25_check_tcp-expect.dpatch
 26_implicit-basename.dpatch
 27_check_radius_segfault.dpatch
-28_check_tcp.expect_reporting.dpatch
-29_check_tcp.check_jabber-returns-warning.dpatch

Deleted: nagios-plugins/trunk/debian/patches/28_check_tcp.expect_reporting.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/28_check_tcp.expect_reporting.dpatch	2007-05-20 18:14:28 UTC (rev 1161)
+++ nagios-plugins/trunk/debian/patches/28_check_tcp.expect_reporting.dpatch	2007-05-20 18:19:43 UTC (rev 1162)
@@ -1,93 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 28_check_tcp.expect_reporting.dpatch by 
-## Thomas Guyot-Sionnest <dermoth at aei.ca>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: nagios-plugins-1.4.5/plugins/check_tcp.c
-===================================================================
-RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
-retrieving revision 1.82
-retrieving revision 1.83
-diff -u -r1.82 -r1.83
---- nagios-plugins-1.4.5/plugins/check_tcp.c	28 Jan 2007 21:46:40 -0000	1.82
-+++ nagios-plugins-1.4.5/plugins/check_tcp.c	30 Jan 2007 05:01:00 -0000	1.83
-@@ -347,7 +347,10 @@
- 	if(match == -2 && len && !(flags & FLAG_HIDE_OUTPUT))
- 		printf("Unexpected response from host/socket: %s", status);
- 	else {
--		printf("%.3f second response time on ", elapsed_time);
-+		if(match == -2)
-+			printf("Unexpected response from host/socket on ");
-+		else
-+			printf("%.3f second response time on ", elapsed_time);
- 		if(server_address[0] != '/')
- 			printf("port %d", server_port);
- 		else
-@@ -358,17 +361,24 @@
- 		printf (" [%s]", status);
- 
- 	/* perf-data doesn't apply when server doesn't talk properly,
--	 * so print all zeroes on warn and crit */
-+	 * so print all zeroes on warn and criti. Use fperfdata since
-+	 * localisation settings can make different outputs */
- 	if(match == -2)
--		printf ("|time=%fs;0.0;0.0;0.0;0.0", elapsed_time);
-+		printf ("|%s",
-+				fperfdata ("time", elapsed_time, "s",
-+				TRUE, 0,
-+				TRUE, 0,
-+				TRUE, 0,
-+				TRUE, socket_timeout)
-+			);
- 	else
- 		printf("|%s",
- 				fperfdata ("time", elapsed_time, "s",
--		                   TRUE, warning_time,
--		                   TRUE, critical_time,
--		                   TRUE, 0,
--		                   TRUE, socket_timeout)
--		      );
-+				TRUE, warning_time,
-+				TRUE, critical_time,
-+				TRUE, 0,
-+				TRUE, socket_timeout)
-+			);
- 
- 	putchar('\n');
- 	return result;
-Index: nagios-plugins-1.4.5/plugins/t/check_tcp.t
-===================================================================
-RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/t/check_tcp.t,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -r1.3 -r1.4
---- nagios-plugins-1.4.5/plugins/t/check_tcp.t	25 Jul 2005 01:47:15 -0000	1.3
-+++ nagios-plugins-1.4.5/plugins/t/check_tcp.t	30 Jan 2007 05:01:00 -0000	1.4
-@@ -10,7 +10,7 @@
- use NPTest;
- 
- use vars qw($tests);
--BEGIN {$tests = 5; plan tests => $tests}
-+BEGIN {$tests = 7; plan tests => $tests}
- 
- my $host_tcp_http      = getTestParameter( "host_tcp_http",      "NP_HOST_TCP_HTTP",      "localhost",
- 					   "A host providing the HTTP Service (a web server)" );
-@@ -23,12 +23,15 @@
- 
- my $successOutput = '/^TCP OK\s-\s+[0-9]?\.?[0-9]+ second response time on port [0-9]+/';
- 
-+my $failedExpect = '/^TCP WARNING\s-\sUnexpected response from host/socket on port [0-9]+/';
-+
- my $t;
- 
- $t += checkCmd( "./check_tcp $host_tcp_http      -p 80 -wt 300 -ct 600",       0, $successOutput );
- $t += checkCmd( "./check_tcp $host_tcp_http      -p 81 -wt   0 -ct   0 -to 1", 2 ); # use invalid port for this test
- $t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt   0 -ct   0 -to 1", 2 );
- $t += checkCmd( "./check_tcp $hostname_invalid   -p 80 -wt   0 -ct   0 -to 1", 2 );
-+$t += checkCmd( "./check_tcp $host_tcp_http      -p 80 -s 'GET /\n' -e 'ThisShouldntMatch' -j", 1, $failedExpect );
- 
- exit(0) if defined($Test::Harness::VERSION);
- exit($tests - $t);

Deleted: nagios-plugins/trunk/debian/patches/29_check_tcp.check_jabber-returns-warning.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/29_check_tcp.check_jabber-returns-warning.dpatch	2007-05-20 18:14:28 UTC (rev 1161)
+++ nagios-plugins/trunk/debian/patches/29_check_tcp.check_jabber-returns-warning.dpatch	2007-05-20 18:19:43 UTC (rev 1162)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 29_check_tcp.check_jabber-returns-warning.dpatch
-## Thomas Guyot-Sionnest <dermoth at aei.ca>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: nagios-plugins-1.4.5/plugins/check_tcp.c
-===================================================================
-RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_tcp.c,v
-retrieving revision 1.84
-diff -u -r1.84 check_tcp.c
---- nagios-plugins-1.4.5/plugins/check_tcp.c	30 Jan 2007 14:24:10 -0000	1.84
-+++ nagios-plugins-1.4.5/plugins/check_tcp.c	31 Jan 2007 04:45:13 -0000
-@@ -166,9 +166,9 @@
- 	}
- 	else if (!strncmp(SERVICE, "JABBER", 6)) {
- 		SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
--		EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns:stream=\'http://etherx.jabber.org/streams\'";
-+		EXPECT = "<?xml version=\'1.0\'?><stream:stream xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'";
- 		QUIT = "</stream:stream>\n";
--		flags |= FLAG_SSL | FLAG_HIDE_OUTPUT;
-+		flags |= FLAG_HIDE_OUTPUT;
- 		PORT = 5222;
- 	}
- 	else if (!strncmp (SERVICE, "NNTPS", 5)) {




More information about the Pkg-nagios-changes mailing list