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

[Jan Wagner]

Author: waja-guest
Date: 2008-08-23 13:31:26 +0000 (Sat, 23 Aug 2008)
New Revision: 1555

Added:
   nagios-plugins/trunk/debian/patches/40_check_http_status_line.dpatch
Removed:
   nagios-plugins/trunk/debian/patches/40_check_http_status_line.patch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
really fix #486932

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2008-08-06 19:29:39 UTC (rev 1554)
+++ nagios-plugins/trunk/debian/changelog	2008-08-23 13:31:26 UTC (rev 1555)
@@ -1,6 +1,7 @@
 nagios-plugins (1.4.12-3) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * rename 40_check_http_status_line.patch to 40_check_http_status_line.dpatch
+  * add 40_check_http_status_line.dpatch to 00list to really fix #486932
 
  -- Jan Wagner <waja at cyconet.org>  Fri, 04 Jul 2008 17:04:02 +0200
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2008-08-06 19:29:39 UTC (rev 1554)
+++ nagios-plugins/trunk/debian/patches/00list	2008-08-23 13:31:26 UTC (rev 1555)
@@ -14,4 +14,5 @@
 37_check_radius_nas-ip-address.dpatch
 38_fix_libexec.dpatch
 39_check_dig_options.dpatch
+40_check_http_status_line.dpatch
 50_misc_typos.dpatch

Copied: nagios-plugins/trunk/debian/patches/40_check_http_status_line.dpatch (from rev 1554, nagios-plugins/trunk/debian/patches/40_check_http_status_line.patch)
===================================================================
--- nagios-plugins/trunk/debian/patches/40_check_http_status_line.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/40_check_http_status_line.dpatch	2008-08-23 13:31:26 UTC (rev 1555)
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_check_http_status_line.dpatch by Jan Wagner <waja at cyconet.org>
+## patch provided by Josip Rodin <joy at debbugs.entuzijast.net>
+##
+## DP: adds status_line to check_http output
+
+ at DPATCH@
+--- check_http.c~	2008-06-19 11:42:25.000000000 +0200
++++ check_http.c	2008-06-19 11:42:25.000000000 +0200
+@@ -912,11 +912,12 @@
+   if (!strstr (status_line, server_expect)) {
+     if (server_port == HTTP_PORT)
+       asprintf (&msg,
+-                _("Invalid HTTP response received from host\n"));
++                _("Invalid HTTP response received from host: %s\n"),
++                status_line);
+     else
+       asprintf (&msg,
+-                _("Invalid HTTP response received from host on port %d\n"),
+-                server_port);
++                _("Invalid HTTP response received from host on port %d: %s\n"),
++                server_port, status_line);
+     die (STATE_CRITICAL, "%s", msg);
+   }
+ 


Property changes on: nagios-plugins/trunk/debian/patches/40_check_http_status_line.dpatch
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: nagios-plugins/trunk/debian/patches/40_check_http_status_line.patch
===================================================================
--- nagios-plugins/trunk/debian/patches/40_check_http_status_line.patch	2008-08-06 19:29:39 UTC (rev 1554)
+++ nagios-plugins/trunk/debian/patches/40_check_http_status_line.patch	2008-08-23 13:31:26 UTC (rev 1555)
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40_check_http_status_line.dpatch by Jan Wagner <waja at cyconet.org>
-## patch provided by Josip Rodin <joy at debbugs.entuzijast.net>
-##
-## DP: adds status_line to check_http output
-
- at DPATCH@
---- check_http.c~	2008-06-19 11:42:25.000000000 +0200
-+++ check_http.c	2008-06-19 11:42:25.000000000 +0200
-@@ -912,11 +912,12 @@
-   if (!strstr (status_line, server_expect)) {
-     if (server_port == HTTP_PORT)
-       asprintf (&msg,
--                _("Invalid HTTP response received from host\n"));
-+                _("Invalid HTTP response received from host: %s\n"),
-+                status_line);
-     else
-       asprintf (&msg,
--                _("Invalid HTTP response received from host on port %d\n"),
--                server_port);
-+                _("Invalid HTTP response received from host on port %d: %s\n"),
-+                server_port, status_line);
-     die (STATE_CRITICAL, "%s", msg);
-   }
-