Attachment 189434 Details for Bug 224926 – PATCH

[patch] PATCH

nagios-plugins-2.2.1_6.diff (text/plain), 2.40 KB, created by admins on 2018-01-05 09:24:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: admins

Created: 2018-01-05 09:24:59 UTC

Size: 2.40 KB

patch

obsolete

>diff -ruN nagios-plugins.orig/Makefile nagios-plugins/Makefile
>--- nagios-plugins.orig/Makefile	2017-09-14 04:58:58.000000000 -0700
>+++ nagios-plugins/Makefile	2018-01-04 09:18:38.696999406 -0800
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	nagios-plugins
> PORTVERSION=	2.2.1
>-PORTREVISION=	5
>+PORTREVISION=	6
> PORTEPOCH=	1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	https://www.nagios-plugins.org/download/ \
>diff -ruN nagios-plugins.orig/files/patch-NEWS nagios-plugins/files/patch-NEWS
>--- nagios-plugins.orig/files/patch-NEWS	1969-12-31 16:00:00.000000000 -0800
>+++ nagios-plugins/files/patch-NEWS	2018-01-04 09:17:59.793648523 -0800
>@@ -0,0 +1,10 @@
>+--- NEWS.orig	2018-01-04 09:16:46.608359000 -0800
>++++ NEWS	2018-01-04 09:17:21.365900000 -0800
>+@@ -12,6 +12,7 @@
>+ 	fix some gcc5 warnings (Mario Trangoni)
>+ 	check_cluster.c: Update wording in comments (Troy Lea)
>+ 	check_nagios.c: could not locate a running nagios process
>++        check_ntp_time: Periodically returns "Socket timeout" when one of several ntp server doesn't respond
>+ 	check_swap.c: does not accept threshold of zero
>+ 	check_swap.c: uses inconsistent checks on negative thresholds
>+ 	check_snmp.c: --offset does not appear to do anything (Troy Lea)
>diff -ruN nagios-plugins.orig/files/patch-THANKS nagios-plugins/files/patch-THANKS
>--- nagios-plugins.orig/files/patch-THANKS	1969-12-31 16:00:00.000000000 -0800
>+++ nagios-plugins/files/patch-THANKS	2018-01-04 09:16:11.844734704 -0800
>@@ -0,0 +1,10 @@
>+--- THANKS.orig	2016-08-01 09:28:39.000000000 -0700
>++++ THANKS	2018-01-04 09:15:34.922605000 -0800
>+@@ -331,6 +331,7 @@
>+ Jon Vandegrift
>+ Gianluca Varisco
>+ Laurent Vaslin
>++Leonid Vasiliev
>+ Matej Vela
>+ Carole Verdon
>+ Ludse Verhoeven
>diff -ruN nagios-plugins.orig/files/patch-plugins-check_ntp_time.c nagios-plugins/files/patch-plugins-check_ntp_time.c
>--- nagios-plugins.orig/files/patch-plugins-check_ntp_time.c	1969-12-31 16:00:00.000000000 -0800
>+++ nagios-plugins/files/patch-plugins-check_ntp_time.c	2018-01-04 13:07:16.356776437 -0800
>@@ -0,0 +1,12 @@
>+--- plugins/check_ntp_time.c.orig	2018-01-04 12:59:01.422087000 -0800
>++++ plugins/check_ntp_time.c	2018-01-04 13:05:56.317152000 -0800
>+@@ -415,6 +415,9 @@
>+ 			}
>+ 		}
>+ 		/* lather, rinse, repeat. */
>++		/* break if we have one response but other ntp servers doesn't response */
>++		/* greater than timeout_interval/2 */
>++		if (servers_completed && now_time-start_ts > timeout_interval/2) break;
>+ 	}
>+
>+ 	if (one_read == 0) {

Actions: View | Diff

Attachments on bug 224926: 189433 | 189434 | 189435