[Pkg-nagios-changes] [pkg-nagios-plugins] 01/01: check_ssh: Drop 12_check_ssh_read_socket.dpatch (Closes: #734811), this seems to make more touble in the wild as fixing #739254, Thanks Jim Barber

[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 7091aae478d39a7247da5ff21f5f539c06a1d680
Author: Jan Wagner <waja at cyconet.org>
Date:   Mon Feb 17 12:35:59 2014 +0100

    check_ssh: Drop 12_check_ssh_read_socket.dpatch
    (Closes: #734811), this seems to make more touble in the wild as
    fixing #739254, Thanks Jim Barber
---
 debian/patches/00list                          |  1 -
 debian/patches/12_check_ssh_read_socket.dpatch | 41 --------------------------
 2 files changed, 42 deletions(-)

diff --git a/debian/patches/00list b/debian/patches/00list
index db01fc7..7022837 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,5 +1,4 @@
 02_check_icmp_links.dpatch
 # commited upstream
 11_check_http_arguments.dpatch
-12_check_ssh_read_socket.dpatch
 13_check_proc_parent_process.dpatch
diff --git a/debian/patches/12_check_ssh_read_socket.dpatch b/debian/patches/12_check_ssh_read_socket.dpatch
deleted file mode 100644
index 4ca9fe3..0000000
--- a/debian/patches/12_check_ssh_read_socket.dpatch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_check_ssh_read_socket.dpatch by Jan Wagner <waja at cyconet.org>
-##
-## From a3871201821d9abe8a12e637e7dd00d9d1dde2a5 Mon Sep 17 00:00:00 2001
-## From: Jan Wagner <waja at cyconet.org>
-## Date: Fri, 10 Jan 2014 15:56:30 +0100
-## Subject: [PATCH] check_ssh: Get rid of sshd: Read from socket failed:
-##  Connection reset by peer
-##
-## This fix was grabbed from FreeBSD downstream and provided by Dmitry Sivachenko.
-## Fixes Debian Bug #734811
-
- at DPATCH@
-
----
- plugins/check_ssh.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
-index 1c032a4..2d63528 100644
---- a/plugins/check_ssh.c
-+++ b/plugins/check_ssh.c
-@@ -250,6 +250,7 @@
- 			printf
- 				(_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"),
- 				 ssh_server, ssh_proto, remote_version);
-+			recv (sd, output, BUFF_SZ, 0);
- 			close(sd);
- 			exit (STATE_WARNING);
- 		}
-@@ -260,6 +261,7 @@
- 			(_("SSH OK - %s (protocol %s) | %s\n"),
- 			 ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
- 			 FALSE, 0, FALSE, 0, TRUE, 0, TRUE, (int)socket_timeout));
-+		recv (sd, output, BUFF_SZ, 0);
- 		close(sd);
- 		exit (STATE_OK);
- 	}
--- 
-1.8.5.1
-

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