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

[Jan Wagner]

Author: waja-guest
Date: 2008-08-23 13:41:17 +0000 (Sat, 23 Aug 2008)
New Revision: 1556

Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/40_check_http_status_line.dpatch
Log:
let the patch apply

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2008-08-23 13:31:26 UTC (rev 1555)
+++ nagios-plugins/trunk/debian/changelog	2008-08-23 13:41:17 UTC (rev 1556)
@@ -1,6 +1,7 @@
 nagios-plugins (1.4.12-3) UNRELEASED; urgency=low
 
   * rename 40_check_http_status_line.patch to 40_check_http_status_line.dpatch
+    and make it able to apply
   * 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/40_check_http_status_line.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/40_check_http_status_line.dpatch	2008-08-23 13:31:26 UTC (rev 1555)
+++ nagios-plugins/trunk/debian/patches/40_check_http_status_line.dpatch	2008-08-23 13:41:17 UTC (rev 1556)
@@ -5,9 +5,10 @@
 ## DP: adds status_line to check_http output
 
 @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 @@
+diff -urNad nagios-plugins-1.4.12~/plugins/check_http.c nagios-plugins-1.4.12/plugins/check_http.c
+--- nagios-plugins-1.4.12~/plugins/check_http.c	2008-08-23 15:34:17.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_http.c	2008-08-23 15:36:20.000000000 +0200
+@@ -879,11 +879,12 @@
    if (!strstr (status_line, server_expect)) {
      if (server_port == HTTP_PORT)
        asprintf (&msg,
@@ -20,6 +21,6 @@
 -                server_port);
 +                _("Invalid HTTP response received from host on port %d: %s\n"),
 +                server_port, status_line);
-     die (STATE_CRITICAL, "%s", msg);
+     die (STATE_CRITICAL, "HTTP CRITICAL - %s", msg);
    }