Accepting request 1266405 from server:monitoring

- Backport MTU checking support for fping, and v4/v6 handling improvements
  * 0001-Backport-fping-MTU-and-ipv4-6-handling-improvements.patch (forwarded request 1264789 from firstyear)

OBS-URL: https://build.opensuse.org/request/show/1266405
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/monitoring-plugins?expand=0&rev=35

monitoring-plugins-2.3.5-check_http-proxy.patch

@@ -1,169 +0,0 @@
-diff --git a/plugins/check_http.c b/plugins/check_http.c
-index 8dda046f..2ab6a7a3 100644
---- a/plugins/check_http.c
-+++ b/plugins/check_http.c
-@@ -126,6 +126,9 @@ int sd;
- int min_page_len = 0;
- int max_page_len = 0;
- int redir_depth = 0;
-+bool ssl_proxy = false;
-+char *proxy_server_address;
-+int proxy_server_port;
- int max_depth = DEFAULT_MAX_REDIRS;
- char *http_method;
- char *http_method_proxy;
-@@ -139,6 +142,7 @@ char *client_privkey = NULL;
- bool process_arguments (int, char **);
- int check_http (void);
- void redir (char *pos, char *status_line);
-+const char *find_uri_path (const char *url);
- bool server_type_check(const char *type);
- int server_port_check(int ssl_flag);
- char *perfd_time (double microsec);
-@@ -609,6 +613,17 @@ bool process_arguments (int argc, char **argv)
-   if (virtual_port == 0)
-     virtual_port = server_port;
- 
-+  /* if we are called with the -I option, the -j method is CONNECT and */
-+  /* we received -S for SSL, then we tunnel the request through a proxy*/
-+  /* @20100414, public[at]frank4dd.com, http://www.frank4dd.com/howto  */
-+
-+  ssl_proxy = server_address != NULL && strcmp(http_method, "CONNECT") == 0
-+    && host_name != NULL && use_ssl == true;
-+  if (ssl_proxy) {
-+    proxy_server_address = strdup(server_address);
-+    proxy_server_port = server_port;
-+  }
-+
-   return true;
- }
- 
-@@ -940,18 +955,18 @@ check_http (void)
- 
-   /* try to connect to the host at the given port number */
-   gettimeofday (&tv_temp, NULL);
--  if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
-+  result = ssl_proxy ?
-+    my_tcp_connect (proxy_server_address, proxy_server_port, &sd) :
-+    my_tcp_connect (server_address, server_port, &sd);
-+  if (result != STATE_OK)
-     die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
-   microsec_connect = deltime (tv_temp);
- 
--    /* if we are called with the -I option, the -j method is CONNECT and */
--    /* we received -S for SSL, then we tunnel the request through a proxy*/
--    /* @20100414, public[at]frank4dd.com, http://www.frank4dd.com/howto  */
-+  /* handle connection via SSL proxy */
-+  if (ssl_proxy) {
- 
--    if ( server_address != NULL && strcmp(http_method, "CONNECT") == 0
--      && host_name != NULL && use_ssl == true) {
--
--    if (verbose) printf ("Entering CONNECT tunnel mode with proxy %s:%d to dst %s:%d\n", server_address, server_port, host_name, HTTPS_PORT);
-+    if (verbose) printf ("Entering CONNECT tunnel mode with proxy %s:%d to dst %s:%d\n",
-+      proxy_server_address, proxy_server_port, host_name, HTTPS_PORT);
-     asprintf (&buf, "%s %s:%d HTTP/1.1\r\n%s\r\n", http_method, host_name, HTTPS_PORT, user_agent);
-     if (strlen(proxy_auth)) {
-       base64_encode_alloc (proxy_auth, strlen (proxy_auth), &auth);
-@@ -986,7 +1001,7 @@ check_http (void)
-   if (use_ssl == true) {
-     gettimeofday (&tv_temp, NULL);
-     result = np_net_ssl_init_with_hostname_version_and_cert(sd, (use_sni ? host_name : NULL), ssl_version, client_cert, client_privkey);
--    if (verbose) printf ("SSL initialized\n");
-+    if (verbose) printf ("SSL initialization %s\n", result == STATE_OK ? "successful" : "failed");
-     if (result != STATE_OK)
-       die (STATE_CRITICAL, NULL);
-     microsec_ssl = deltime (tv_temp);
-@@ -1002,9 +1017,8 @@ check_http (void)
-   }
- #endif /* HAVE_SSL */
- 
--  if ( server_address != NULL && strcmp(http_method, "CONNECT") == 0
--       && host_name != NULL && use_ssl == true)
--    asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method_proxy, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
-+  if (ssl_proxy)
-+    asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method_proxy, find_uri_path(server_url), host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
-   else
-     asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
- 
-@@ -1033,8 +1047,7 @@ check_http (void)
-        */
-       if ((use_ssl == false && virtual_port == HTTP_PORT) ||
-           (use_ssl == true && virtual_port == HTTPS_PORT) ||
--          (server_address != NULL && strcmp(http_method, "CONNECT") == 0
--         && host_name != NULL && use_ssl == true))
-+          ssl_proxy)
-         xasprintf (&buf, "%sHost: %s\r\n", buf, host_name);
-       else
-         xasprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, virtual_port);
-@@ -1138,10 +1151,17 @@ check_http (void)
-   /* leave full_page untouched so we can free it later */
-   page = full_page;
- 
--  if (verbose)
--    printf ("%s://%s:%d%s is %d characters\n",
--      use_ssl ? "https" : "http", server_address,
--      server_port, server_url, (int)pagesize);
-+  if (verbose) {
-+    if (ssl_proxy)  {
-+      printf ("[via proxy %s://%s:%d] %s returned %d bytes\n",
-+        use_ssl ? "https" : "http", proxy_server_address, proxy_server_port,
-+        server_url, (int)pagesize);
-+    } else {
-+      printf ("%s://%s:%d%s returned %d bytes\n",
-+        use_ssl ? "https" : "http", server_address,
-+        server_port, server_url, (int)pagesize);
-+    }
-+  }
- 
-   /* find status line and null-terminate it */
-   status_line = page;
-@@ -1301,7 +1321,12 @@ check_http (void)
-         bcopy("...", &output_string_search[sizeof(output_string_search) - 4],
-               4);
-       }
--      xasprintf (&msg, _("%sstring '%s' not found on '%s://%s:%d%s', "), msg, output_string_search, use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
-+      if (ssl_proxy) {
-+        xasprintf (&msg, _("%sstring '%s' not found on '%s', "), msg, output_string_search, server_url);
-+      } else {
-+        xasprintf (&msg, _("%sstring '%s' not found on '%s://%s:%d%s', "), msg, output_string_search,
-+          use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
-+      }
-       result = STATE_CRITICAL;
-     }
-   }
-@@ -1642,6 +1667,25 @@ redir (char *pos, char *status_line)
-   check_http ();
- }
- 
-+// Locate the URI path inside a complete URL. If we fail, just return the original URL.
-+const char *
-+find_uri_path (const char *url)
-+{
-+  const char *s = url;
-+
-+  if (strncmp(s, "http://", 7) == 0)
-+    s += 7;
-+  else if (strncmp(s, "https://", 8) == 0)
-+    s += 8;
-+  else
-+    return url;
-+  while (*s != '\0') {
-+    if (strchr("/?#", *s) != NULL)
-+      return s;
-+    s++;
-+  }
-+  return url;
-+}
- 
- bool
- server_type_check (const char *type)
-@@ -1861,7 +1905,7 @@ print_help (void)
-   printf (" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
-   printf (" %s\n", _("30 days, but more than 14 days, a STATE_WARNING is returned."));
-   printf (" %s\n", _("A STATE_CRITICAL will be returned when certificate expires in less than 14 days"));
--
-+  printf ("\n");
-   printf (" %s\n\n", "CHECK SSL WEBSERVER CONTENT VIA PROXY USING HTTP 1.1 CONNECT: ");
-   printf (" %s\n", _("check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j CONNECT -H www.verisign.com "));
-   printf (" %s\n", _("all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> -S(sl) -j CONNECT -H <webserver>"));

monitoring-plugins-2.3.5-check_log_-_quoting.patch

@@ -1,33 +0,0 @@
-Index: monitoring-plugins-2.3.3/plugins-scripts/check_log.sh
-===================================================================
---- monitoring-plugins-2.3.3.orig/plugins-scripts/check_log.sh
-+++ monitoring-plugins-2.3.3/plugins-scripts/check_log.sh
-@@ -112,23 +112,23 @@ while test -n "$1"; do
-             exit "$STATE_UNKNOWN"
-             ;;
-         -F | --filename)
--            logfile=$2
-+            logfile="$2"
-             shift 2
-             ;;
-         -O | --oldlog)
--            oldlog=$2
-+            oldlog="$2"
-             shift 2
-             ;;
-         -q | --query)
--            query=$2
-+            query="$2"
-             shift 2
-             ;;
-         --exclude)
--            exclude=$2
-+            exclude="$2"
-             shift 2
-             ;;
-         -x | --exitstatus)
--            exitstatus=$2
-+            exitstatus="$2"
-             shift 2
-             ;;
-         -e | --extended-regex)

monitoring-plugins-2.3.5-check_ntp_perf_absolute.patch

@@ -1,13 +0,0 @@
-Index: monitoring-plugins-2.3.3/plugins/check_ntp_time.c
-===================================================================
---- monitoring-plugins-2.3.3.orig/plugins/check_ntp_time.c
-+++ monitoring-plugins-2.3.3/plugins/check_ntp_time.c
-@@ -533,7 +533,7 @@ int process_arguments(int argc, char **a
- 
- char *perfd_offset (double offset)
- {
--	return fperfdata ("offset", offset, "s",
-+	return fperfdata ("offset", fabs(offset), "s",
- 		TRUE, offset_thresholds->warning->end,
- 		TRUE, offset_thresholds->critical->end,
- 		FALSE, 0, FALSE, 0);

monitoring-plugins-2.3.5-check_ssh.patch

@@ -1,212 +0,0 @@
-From e56255ee2f2887551e15aba2410138238efab030 Mon Sep 17 00:00:00 2001
-From: Anton Lofgren <alofgren@op5.com>
-Date: Mon, 21 Oct 2013 08:18:30 +0200
-Subject: [PATCH 1/4] check_ssh: properly parse a delayed version control
- string
-
-This resolves an issue with SSH servers which do not respond with their
-version control string as the first thing in the SSH protocol version
-exchange phase after connection establishment.
-
-This patch also makes sure that we disregard a potential comment in the
-version exchange string to avoid nonsense mismatches. In the future, we
-might want to add the capability to match against a user specified comment.
-
-In addition, the patch largely improves the communication towards the
-server, which adds better protocol adherence.
-
-Of course, new test cases are added to support the trigger and guard
-against regressions of the bugs solved by this patch.
-
-This fixes op5#7945 (https://bugs.op5.com/view.php?id=7945)
-
-Signed-off-by: Anton Lofgren <alofgren@op5.com>
----
- plugins/check_ssh.c   | 122 +++++++++++++++++++++++++++++-------------
- plugins/t/check_ssh.t |  97 ++++++++++++++++++++++++++-------
- 2 files changed, 164 insertions(+), 55 deletions(-)
-
-Index: monitoring-plugins-2.3.3/plugins/check_ssh.c
-===================================================================
---- monitoring-plugins-2.3.3.orig/plugins/check_ssh.c
-+++ monitoring-plugins-2.3.3/plugins/check_ssh.c
-@@ -106,7 +106,7 @@ process_arguments (int argc, char **argv
- 		{"timeout", required_argument, 0, 't'},
- 		{"verbose", no_argument, 0, 'v'},
- 		{"remote-version", required_argument, 0, 'r'},
--		{"remote-protcol", required_argument, 0, 'P'},
-+		{"remote-protocol", required_argument, 0, 'P'},
- 		{0, 0, 0, 0}
- 	};
- 
-@@ -215,8 +215,13 @@ ssh_connect (char *haddr, int hport, cha
- {
- 	int sd;
- 	int result;
-+	int len = 0;
-+	ssize_t byte_offset = 0;
-+	ssize_t recv_ret = 0;
-+	char *version_control_string = NULL;
- 	char *output = NULL;
- 	char *buffer = NULL;
-+	char *tmp= NULL, *saveptr = NULL;
- 	char *ssh_proto = NULL;
- 	char *ssh_server = NULL;
- 	static char *rev_no = VERSION;
-@@ -231,51 +236,118 @@ ssh_connect (char *haddr, int hport, cha
- 		return result;
- 
- 	output = (char *) malloc (BUFF_SZ + 1);
--	memset (output, 0, BUFF_SZ + 1);
--	recv (sd, output, BUFF_SZ, 0);
--	if (strncmp (output, "SSH", 3)) {
--		printf (_("Server answer: %s"), output);
--		close(sd);
-+	memset(output, 0, BUFF_SZ+1);
-+	while (!version_control_string && (recv_ret = recv(sd, output+byte_offset, BUFF_SZ - byte_offset, 0)) > 0) {
-+		if (strchr(output, '\n')) { /* we've got at least one full line, start parsing*/
-+			byte_offset = 0;
-+			while (strchr(output+byte_offset, '\n') != NULL) {
-+				/*Partition the buffer so that this line is a separate string,
-+				 * by replacing the newline with NUL*/
-+				output[(strchr(output+byte_offset, '\n')-output)]= '\0';
-+				len = strlen(output+byte_offset);
-+				if (len >= 4) {
-+					/*if the string starts with SSH-, this _should_ be a valid version control string*/
-+					if (strncmp (output+byte_offset, "SSH-", 4) == 0) {
-+						version_control_string = output+byte_offset;
-+						break;
-+					}
-+				}
-+
-+				/*the start of the next line (if one exists) will be after the current one (+ NUL)*/
-+				byte_offset+=len+1;
-+			}
-+			if(!version_control_string) {
-+				/* move unconsumed data to beginning of buffer, null rest */
-+				memmove((void *)output, (void *)output+byte_offset+1, BUFF_SZ - len+1);
-+				memset(output+byte_offset+1, 0, BUFF_SZ-byte_offset+1);
-+
-+				/*start reading from end of current line chunk on next recv*/
-+				byte_offset = strlen(output);
-+			}
-+		}
-+		else {
-+			byte_offset += recv_ret;
-+		}
-+	}
-+	tmp = NULL;
-+	if (recv_ret < 0) {
-+		printf("SSH CRITICAL - %s", strerror(errno));
-+		exit(STATE_CRITICAL);
-+	}
-+	if (!version_control_string) {
-+		printf("SSH CRITICAL - No version control string received");
-+		exit(STATE_CRITICAL);
-+	}
-+	/*
-+	 * "When the connection has been established, both sides MUST send an
-+	 * identification string.  This identification string MUST be
-+	 *
-+	 * SSH-protoversion-softwareversion SP comments CR LF"
-+	 *		- RFC 4253:4.2
-+	 */
-+	strip (version_control_string);
-+	if (verbose)
-+		printf ("%s\n", version_control_string);
-+	ssh_proto = version_control_string + 4;
-+
-+	/*
-+	 * We assume the protoversion is of the form Major.Minor, although
-+	 * this is not _strictly_ required. See
-+	 *
-+	 * "Both the 'protoversion' and 'softwareversion' strings MUST consist of
-+	 * printable US-ASCII characters, with the exception of whitespace
-+	 * characters and the minus sign (-)"
-+	 *		- RFC 4253:4.2
-+	 * and,
-+	 *
-+	 * "As stated earlier, the 'protoversion' specified for this protocol is
-+	 * "2.0".  Earlier versions of this protocol have not been formally
-+	 * documented, but it is widely known that they use 'protoversion' of
-+	 * "1.x" (e.g., "1.5" or "1.3")."
-+	 *		- RFC 4253:5
-+	 */
-+	ssh_server = ssh_proto + strspn (ssh_proto, "0123456789.") + 1; /* (+1 for the '-' separating protoversion from softwareversion) */
-+
-+	/* If there's a space in the version string, whatever's after the space is a comment
-+	 * (which is NOT part of the server name/version)*/
-+	tmp = strchr(ssh_server, ' ');
-+	if (tmp) {
-+		ssh_server[tmp - ssh_server] = '\0';
-+	}
-+	if (strlen(ssh_proto) == 0 || strlen(ssh_server) == 0) {
-+		printf(_("SSH CRITICAL - Invalid protocol version control string %s\n"), version_control_string);
- 		exit (STATE_CRITICAL);
- 	}
--	else {
--		strip (output);
--		if (verbose)
--			printf ("%s\n", output);
--		ssh_proto = output + 4;
--		ssh_server = ssh_proto + strspn (ssh_proto, "-0123456789. ");
--		ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0;
--
--		xasprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, rev_no);
--		send (sd, buffer, strlen (buffer), MSG_DONTWAIT);
--		if (verbose)
--			printf ("%s\n", buffer);
--
--		if (remote_version && strcmp(remote_version, ssh_server)) {
--			printf
--				(_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"),
--				 ssh_server, ssh_proto, remote_version);
--			close(sd);
--			exit (STATE_CRITICAL);
--		}
--
--		if (remote_protocol && strcmp(remote_protocol, ssh_proto)) {
--			printf
--				(_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"),
--				 ssh_server, ssh_proto, remote_protocol);
--			close(sd);
--			exit (STATE_CRITICAL);
--		}
-+	ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0;
- 
--		elapsed_time = (double)deltime(tv) / 1.0e6;
-+	xasprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, rev_no);
-+	send (sd, buffer, strlen (buffer), MSG_DONTWAIT);
-+	if (verbose)
-+		printf ("%s\n", buffer);
- 
-+	if (remote_version && strcmp(remote_version, ssh_server)) {
- 		printf
--			(_("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));
-+			(_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"),
-+			 ssh_server, ssh_proto, remote_version);
- 		close(sd);
--		exit (STATE_OK);
-+		exit (STATE_CRITICAL);
- 	}
-+
-+	if (remote_protocol && strcmp(remote_protocol, ssh_proto)) {
-+		printf
-+			(_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s'\n"),
-+			 ssh_server, ssh_proto, remote_protocol);
-+		close(sd);
-+		exit (STATE_CRITICAL);
-+	}
-+	elapsed_time = (double)deltime(tv) / 1.0e6;
-+
-+	printf
-+		(_("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));
-+	close(sd);
-+	exit (STATE_OK);
- }
- 
- 

monitoring-plugins-2.3.5-check_ssh.t_-_improve_testing.patch

@@ -1,139 +0,0 @@
-Index: monitoring-plugins-2.3.3/plugins/t/check_ssh.t
-===================================================================
---- monitoring-plugins-2.3.3.orig/plugins/t/check_ssh.t
-+++ monitoring-plugins-2.3.3/plugins/t/check_ssh.t
-@@ -8,34 +8,105 @@ use strict;
- use Test::More;
- use NPTest;
- 
--# Required parameters
--my $ssh_host           = getTestParameter("NP_SSH_HOST", "A host providing SSH service", "localhost");
--my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", "The hostname of system not responsive to network requests", "10.0.0.1" );
--my $hostname_invalid   = getTestParameter("NP_HOSTNAME_INVALID", "An invalid (not known to DNS) hostname", "nosuchhost" );
--
--
--plan skip_all => "SSH_HOST must be defined" unless $ssh_host;
--plan tests    => 6;
--
--
--my $result = NPTest->testCmd(
--    "./check_ssh -H $ssh_host"
--    );
--cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
--like($result->output, '/^SSH OK - /', "Status text if command returned none (OK)");
-+my $res;
- 
--
--$result = NPTest->testCmd(
--    "./check_ssh -H $host_nonresponsive -t 2"
--    );
--cmp_ok($result->return_code, '==', 2, "Exit with return code 0 (OK)");
--like($result->output, '/^CRITICAL - Socket timeout after 2 seconds/', "Status text if command returned none (OK)");
--
--
--
--$result = NPTest->testCmd(
--    "./check_ssh -H $hostname_invalid -t 2"
--    );
--cmp_ok($result->return_code, '==', 3, "Exit with return code 0 (OK)");
--like($result->output, '/^check_ssh: Invalid hostname/', "Status text if command returned none (OK)");
-+# Required parameters
-+my $ssh_host           = getTestParameter("NP_SSH_HOST",
-+                                          "A host providing SSH service",
-+                                          "localhost");
-+my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE",
-+                                          "The hostname of system not responsive to network requests",
-+                                          "10.0.0.1" );
-+my $hostname_invalid   = getTestParameter("NP_HOSTNAME_INVALID",
-+                                          "An invalid (not known to DNS) hostname",
-+                                          "nosuchhost" );
-+
-+plan tests => 14 + 6;
-+
-+SKIP: {
-+   skip "SSH_HOST must be defined", 6 unless $ssh_host;
-+   my $result = NPTest->testCmd(
-+       "./check_ssh -H $ssh_host"
-+       );
-+   cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
-+   like($result->output, '/^SSH OK - /', "Status text if command returned none (OK)");
-+
-+   $result = NPTest->testCmd(
-+       "./check_ssh -H $host_nonresponsive -t 2"
-+       );
-+   cmp_ok($result->return_code, '==', 2, "Exit with return code 0 (OK)");
-+   like($result->output, '/^CRITICAL - Socket timeout after 2 seconds/', "Status text if command returned none (OK)");
-+
-+   $result = NPTest->testCmd(
-+       "./check_ssh -H $hostname_invalid -t 2"
-+       );
-+   cmp_ok($result->return_code, '==', 3, "Exit with return code 0 (OK)");
-+   like($result->output, '/^check_ssh: Invalid hostname/', "Status text if command returned none (OK)");
-+}
-+
-+SKIP: {
-+   skip "No netcat available", 12 unless (system("which nc > /dev/null") == 0);
-+
-+   my $nc_flags = "-l 5003 -i 1";
-+   #A valid protocol version control string has the form
-+   #       SSH-protoversion-softwareversion SP comments CR LF
-+   #
-+   # where `comments` is optional, protoversion is the SSH protocol version and
-+   # softwareversion is an arbitrary string representing the server software version
-+   open(NC, "echo 'SSH-2.0-nagiosplug.ssh.0.1' | nc ${nc_flags}|");
-+   sleep 1;
-+   $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-+   cmp_ok( $res->return_code, '==', 0, "Got SSH protocol version control string");
-+   like( $res->output, '/^SSH OK - nagiosplug.ssh.0.1 \(protocol 2.0\)/', "Output OK");
-+   close NC;
-+
-+   open(NC, "echo 'SSH-2.0-3.2.9.1' | nc ${nc_flags}|");
-+   sleep 1;
-+   $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-+   cmp_ok( $res->return_code, "==", 0, "Got SSH protocol version control string with non-alpha softwareversion string");
-+   like( $res->output, '/^SSH OK - 3.2.9.1 \(protocol 2.0\)/', "Output OK for non-alpha softwareversion string");
-+   close NC;
-+
-+   open(NC, "echo 'SSH-2.0-nagiosplug.ssh.0.1 this is a comment' | nc ${nc_flags} |");
-+   sleep 1;
-+   $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003 -r nagiosplug.ssh.0.1" );
-+   cmp_ok( $res->return_code, '==', 0, "Got SSH protocol version control string, and parsed comment appropriately");
-+   like( $res->output, '/^SSH OK - nagiosplug.ssh.0.1 \(protocol 2.0\)/', "Output OK");
-+   close NC;
-+
-+   open(NC, "echo 'SSH-' | nc ${nc_flags}|");
-+   sleep 1;
-+   $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-+   cmp_ok( $res->return_code, '==', 2, "Got invalid SSH protocol version control string");
-+   like( $res->output, '/^SSH CRITICAL/', "Output OK");
-+   close NC;
-+
-+   open(NC, "echo '' | nc ${nc_flags}|");
-+   sleep 1;
-+   $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-+   cmp_ok( $res->return_code, '==', 2, "No version control string received");
-+   like( $res->output, '/^SSH CRITICAL - No version control string received/', "Output OK");
-+   close NC;
-+
-+   open(NC, "echo 'Not a version control string' | nc ${nc_flags}|");
-+   sleep 1;
-+   $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-+   cmp_ok( $res->return_code, '==', 2, "No version control string received");
-+   like( $res->output, '/^SSH CRITICAL - No version control string received/', "Output OK");
-+   close NC;
-+
-+   #RFC 4253 permits servers to send any number of data lines prior to sending the protocol version control string
-+   open(NC, "{ echo 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'; sleep 1;
-+       echo 'BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB'; sleep 1;
-+       echo 'CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC'; sleep 1;
-+       echo 'DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD'; sleep 1;
-+       printf 'EEEEEEEEEEEEEEEEEE'; sleep 1;
-+       printf 'EEEEEEEEEEEEEEEEEE\n'; sleep 1;
-+       echo 'Some\nPrepended\nData\nLines\n'; sleep 1;
-+       echo 'SSH-2.0-nagiosplug.ssh.0.2';} | nc ${nc_flags}|");
-+   sleep 1;
-+   $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-+   cmp_ok( $res->return_code, '==', 0, "Got delayed SSH protocol version control string");
-+   like( $res->output, '/^SSH OK - nagiosplug.ssh.0.2 \(protocol 2.0\)/', "Output OK");
-+   close NC;
- 

monitoring-plugins-2.3.5-check_swap_wrong_percent.patch

@@ -1,44 +0,0 @@
-From f3e6c9663369d011b241c6fb2c8fd5312f98cacf Mon Sep 17 00:00:00 2001
-From: Jan ONDREJ <ondrejj@salstar.sk>
-Date: Thu, 7 Oct 2010 17:28:48 +0400
-Subject: [PATCH 6/6] Prevent check_swap from returning OK, if no swap activated
-
-My swap was not activated on boot for unknown reason and nagios does not
-report this as a problem. Here is an example:
-
-[root@kecom ~]# rpm -q nagios-plugins
-nagios-plugins-1.4.13-11.fc10.i386
-[root@kecom ~]# /usr/lib/nagios/plugins/check_swap -w 80% -c 40% -c 1 -w 2
-SWAP CRITICAL - 100% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0
-
-If there is no swap and users is trying to test percentage of free swap,
-consider 0 MB free swap space as problem, or of free/total raises division
-by zero, then set percentage to 0%, not to 100%.
-
-Steps to Reproduce:
-1. make sure, your swap is empty or it's usage is not large
-2. swapoff -a
-3. /usr/lib/nagios/plugins/check_swap -w 80% -c 40%
-
-Actual results:
-SWAP OK - 100% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0
-
-Expected results:
-SWAP CRITICAL - 0% free (0 MB out of 0 MB) |swap=0MB;0;0;0;0
-
-Additional info:
-https://bugzilla.redhat.com/512559
-
-Index: monitoring-plugins-2.3.3/plugins/check_swap.c
-===================================================================
---- monitoring-plugins-2.3.3.orig/plugins/check_swap.c
-+++ monitoring-plugins-2.3.3/plugins/check_swap.c
-@@ -134,7 +134,7 @@ main (int argc, char **argv)
- 			free_swap_mb += dskfree_mb;
- 			if (allswaps) {
- 				if (dsktotal_mb == 0)
--					percent=100.0;
-+					percent = 0.0;
- 				else
- 					percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
- 				result = max_state (result, check_swap (dskfree_mb, dsktotal_mb));

monitoring-plugins-2.3.5-plugins-root-Makefile_-_no_chown.patch

@@ -1,20 +0,0 @@
---- monitoring-plugins-2.3.5/plugins-root/Makefile.in.orig	2023-11-28 17:23:06.400019507 -0600
-+++ monitoring-plugins-2.3.5/plugins-root/Makefile.in	2023-11-28 17:49:03.832492223 -0600
-@@ -1960,8 +1960,6 @@
- 	p=$$f; \
- 	echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p"; \
- 	$(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$p; \
--	echo " chown root $(DESTDIR)$(libexecdir)/$$p"; \
--	chown root $(DESTDIR)$(libexecdir)/$$p; \
- 	echo " chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p"; \
- 	chmod $(setuid_root_mode) $(DESTDIR)$(libexecdir)/$$p; \
- 	done
-@@ -2484,7 +2482,7 @@
- 	@TMPFILE=$(DESTDIR)$(libexecdir)/.setuid-$$$$; \
- 	rm -f $$TMPFILE; \
- 	echo > $$TMPFILE; \
--	can_create_suid_root_executable=no; \
-+	can_create_suid_root_executable=yes; \
- 	chown root $$TMPFILE > /dev/null 2>&1 \
- 	  && chmod $(setuid_root_mode) $$TMPFILE > /dev/null 2>&1 \
- 	  && can_create_suid_root_executable=yes; \

monitoring-plugins-2.3.5.tar.gz.sha1

@@ -1 +0,0 @@
-fcbe2068cb55aeaca3ebe67b619cb345a6705184 *monitoring-plugins-2.3.5.tar.gz