[Pkg-nagios-changes] [pkg-nagios-plugins] 39/413: check_tcp fix

[Jan Wagner]

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

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

commit 2d4b03770569440906a4d6b5ea88f5e900d6ba87
Author: Sean Finney <seanius at debian.org>
Date:   Wed Nov 1 21:28:30 2006 +0000

    check_tcp fix
---
 debian/changelog                          |  4 +++-
 debian/patches/00list                     |  1 +
 debian/patches/25_check_tcp-expect.dpatch | 18 ++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d858b8a..b1488b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,10 @@ nagios-plugins (1.4.4-1) unstable; urgency=low
     from nagios-plugins to nagios-plugins-foo, so we're now managing
     all the config files via ucf (closes: #339971).
   * remove some unneeded build-deps, and bump Standards-Version
+  * fix for multiple expect strings in check_tcp.c.  thanks to Ralph Rößner
+    for finding this (closes: #395176).
 
- -- sean finney <seanius at debian.org>  Sat, 02 Sep 2006 23:03:45 +0200
+ -- sean finney <seanius at debian.org>  Wed, 01 Nov 2006 22:28:14 +0100
 
 nagios-plugins (1.4.3.0cvs.20060707-3) unstable; urgency=high
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 39058b3..66ab61c 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -5,3 +5,4 @@
 22_check_smb_hostaddress.dpatch
 23_check_axis.dpatch
 24_check_ups.dpatch
+25_check_tcp-expect.dpatch
diff --git a/debian/patches/25_check_tcp-expect.dpatch b/debian/patches/25_check_tcp-expect.dpatch
new file mode 100755
index 0000000..6079e98
--- /dev/null
+++ b/debian/patches/25_check_tcp-expect.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25_check_tcp-expect.dpatch by  <seanius at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad nagios-plugins-1.4.4~/plugins/check_tcp.c nagios-plugins-1.4.4/plugins/check_tcp.c
+--- nagios-plugins-1.4.4~/plugins/check_tcp.c	2006-09-02 22:32:27.000000000 +0200
++++ nagios-plugins-1.4.4/plugins/check_tcp.c	2006-11-01 22:20:43.000000000 +0100
+@@ -494,7 +494,6 @@
+ 				asprintf(&server_send, "%s", optarg);
+ 			break;
+ 		case 'e': /* expect string (may be repeated) */
+-			EXPECT = NULL;
+ 			flags &= ~FLAG_EXACT_MATCH;
+ 			if (server_expect_count == 0)
+ 				server_expect = malloc (sizeof (char *) * (++server_expect_count));

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