debian/pkg-monitoring-plugins
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Droping patches applied upstream

Browse source 
- 11_check_http_arguments.dpatch
 - 12_check_ssh_read_socket.dpatch
This commit is contained in:
Jan Wagner 2014-01-23 02:45:28 +01:00
parent 03eb8d0215
commit 5070f23c48
3 changed files with 0 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/patches/00list vendored
View file

@ -1,4 +1,2 @@
02_check_icmp_links.dpatch
# commited upstream
11_check_http_arguments.dpatch
12_check_ssh_read_socket.dpatch

33
debian/patches/11_check_http_arguments.dpatch vendored
View file

@ -1,33 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 11_check_http_arguments.dpatch by Jan Wagner <waja@cyconet.org>
##
## From c91ff7539af65f95c2bcef69e5643bd99773c80f Mon Sep 17 00:00:00 2001
## From: Holger Weiss <holger@zedat.fu-berlin.de>
## Date: Thu, 5 Dec 2013 20:13:31 +0100
## Subject: [PATCH] check_http: Don't let "-N" expect an argument
##
## Fix the problem that check_http's "-N" option expects an argument
## although it shouldn't. The corresponding long option ("--no-body")
## wasn't affected.
##
## This error was introduced in ee3c4014d511e105489b081390636cacd4c53e3f.
## Thanks to Kerry Hughes for reporting it on the devel@ list.
@DPATCH@
diff --git a/plugins/check_http.c b/plugins/check_http.c
index 0ffb0c1..1595a59 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -257,7 +257,7 @@ enum {
}
while (1) {
- c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:N:E", longopts, &option);
+ c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:NE", longopts, &option);
if (c == -1 || c == EOF)
break;
--
1.8.5.1

41
debian/patches/12_check_ssh_read_socket.dpatch vendored
View file

@ -1,41 +0,0 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 12_check_ssh_read_socket.dpatch by Jan Wagner <waja@cyconet.org>
##
## From a3871201821d9abe8a12e637e7dd00d9d1dde2a5 Mon Sep 17 00:00:00 2001
## From: Jan Wagner <waja@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
@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