Attachment #189434 for bug #224926

View | Details | Raw Unified | Return to bug 224926
Collapse All | Expand All

Lines 3-9 Link Here

(-)nagios-plugins/Makefile (-1 / +1 lines)
3		3
4	PORTNAME= nagios-plugins	4	PORTNAME= nagios-plugins
5	PORTVERSION= 2.2.1	5	PORTVERSION= 2.2.1
6	PORTREVISION= 5	6	PORTREVISION= 6
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= net-mgmt	8	CATEGORIES= net-mgmt
9	MASTER_SITES= https://www.nagios-plugins.org/download/ \	9	MASTER_SITES= https://www.nagios-plugins.org/download/ \

Line 0 Link Here

(-)nagios-plugins/files/patch-NEWS (+10 lines)
	1	--- NEWS.orig 2018-01-04 09:16:46.608359000 -0800
	2	+++ NEWS 2018-01-04 09:17:21.365900000 -0800
	3	@@ -12,6 +12,7 @@
	4	fix some gcc5 warnings (Mario Trangoni)
	5	check_cluster.c: Update wording in comments (Troy Lea)
	6	check_nagios.c: could not locate a running nagios process
	7	+ check_ntp_time: Periodically returns "Socket timeout" when one of several ntp server doesn't respond
	8	check_swap.c: does not accept threshold of zero
	9	check_swap.c: uses inconsistent checks on negative thresholds
	10	check_snmp.c: --offset does not appear to do anything (Troy Lea)

Line 0 Link Here

(-)nagios-plugins/files/patch-THANKS (+10 lines)
	1	--- THANKS.orig 2016-08-01 09:28:39.000000000 -0700
	2	+++ THANKS 2018-01-04 09:15:34.922605000 -0800
	3	@@ -331,6 +331,7 @@
	4	Jon Vandegrift
	5	Gianluca Varisco
	6	Laurent Vaslin
	7	+Leonid Vasiliev
	8	Matej Vela
	9	Carole Verdon
	10	Ludse Verhoeven




--- 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) {

Return to bug 224926

Line 0 Link Here

(-)nagios-plugins/files/patch-plugins-check_ntp_time.c (+12 lines)
	1	--- plugins/check_ntp_time.c.orig 2018-01-04 12:59:01.422087000 -0800
	2	+++ plugins/check_ntp_time.c 2018-01-04 13:05:56.317152000 -0800
	3	@@ -415,6 +415,9 @@
	4	}
	5	}
	6	/* lather, rinse, repeat. */
	7	+ /* break if we have one response but other ntp servers doesn't response */
	8	+ /* greater than timeout_interval/2 */
	9	+ if (servers_completed && now_time-start_ts > timeout_interval/2) break;
	10	}
	11
	12	if (one_read == 0) {