svn commit: r458415 - in head/net-mgmt/nagios-plugins: . files

[Mathieu Arnold]

Author: mat
Date: Mon Jan  8 13:38:55 2018
New Revision: 458415
URL: https://svnweb.freebsd.org/changeset/ports/458415

Log:
  Fix check_ntp_time.
  
  It periodically returns "Socket timeout" when one of several ntp server
  doesn't response.
  
  PR:		224926
  Submitted by:	admins perceptyx com
  Sponsored by:	Absolight

Added:
  head/net-mgmt/nagios-plugins/files/patch-plugins-check_ntp_time.c   (contents, props changed)
Modified:
  head/net-mgmt/nagios-plugins/Makefile   (contents, props changed)

Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile	Mon Jan  8 13:38:51 2018	(r458414)
+++ head/net-mgmt/nagios-plugins/Makefile	Mon Jan  8 13:38:55 2018	(r458415)
@@ -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/ \

Added: head/net-mgmt/nagios-plugins/files/patch-plugins-check_ntp_time.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins-check_ntp_time.c	Mon Jan  8 13:38:55 2018	(r458415)
@@ -0,0 +1,15 @@
+Obtained from:
+https://github.com/nagios-plugins/nagios-plugins/commit/df485c74f582708d6ce37cdf99880fe75215498a
+
+--- 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) {