[Pkg-nagios-changes] [pkg-monitoring-plugins] 04/04: Add 13_check_jabber_openfire.dpatch from upstream

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-monitoring-plugins.

commit 9a7840a3af29f03c0df5c8fc8a1b862b9391af75
Author: Jan Wagner <waja at cyconet.org>
Date:   Thu Sep 18 22:35:58 2014 +0200

    Add 13_check_jabber_openfire.dpatch from upstream
---
 debian/patches/00list                          |  1 +
 debian/patches/13_check_jabber_openfire.dpatch | 38 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/00list b/debian/patches/00list
index f4039dc..ed6e195 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -3,3 +3,4 @@
 10_check_oracle_tns_bad_string.dpatch
 11_check_log_fix_basename_path.dpatch
 12_PATH_in_scripts_first.dpatch
+13_check_jabber_openfire.dpatch
diff --git a/debian/patches/13_check_jabber_openfire.dpatch b/debian/patches/13_check_jabber_openfire.dpatch
new file mode 100644
index 0000000..a4a4aaf
--- /dev/null
+++ b/debian/patches/13_check_jabber_openfire.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_check_jabber_openfire.dpatch by Jan Wagner <waja at cyconet.org>
+##
+## DP: Fix check_jabber to work with Openfire servers
+
+From 013ca2c508386c548ec145832ab8be1e8306cca0 Mon Sep 17 00:00:00 2001
+From: Holger Weiss <holger at zedat.fu-berlin.de>
+Date: Tue, 16 Sep 2014 12:28:51 +0200
+Subject: [PATCH] Fix check_jabber to work with Openfire servers
+
+The plugin expected:
+
+        <?xml version='1.0'?>
+
+But Openfire sends:
+
+        <?xml version='1.0' encoding='UTF-8'?>
+
+Origin: upstream, https://github.com/monitoring-plugins/monitoring-plugins/commit/013ca2c508386c548ec145832ab8be1e8306cca0.patch
+---
+
+ plugins/check_tcp.c | 2 +-
+ 1 file changed, 1 insertions(+), 1 deletion(-)
+
+ at DPATCH@
+diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
+index bd7736b..fc0adba 100644
+--- a/plugins/check_tcp.c
++++ b/plugins/check_tcp.c
+@@ -172,7 +172,7 @@ main (int argc, char **argv)
+ 	}
+ 	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=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'";
++		EXPECT = "<?xml version=\'1.0\'";
+ 		QUIT = "</stream:stream>\n";
+ 		flags |= FLAG_HIDE_OUTPUT;
+ 		PORT = 5222;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-monitoring-plugins.git