From owner-svn-ports-head@freebsd.org Sun Mar 26 22:24:36 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7F0F7D1E0B5; Sun, 26 Mar 2017 22:24:36 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 31A881FD8; Sun, 26 Mar 2017 22:24:36 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2QMOZiT019409; Sun, 26 Mar 2017 22:24:35 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2QMOZoH019407; Sun, 26 Mar 2017 22:24:35 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201703262224.v2QMOZoH019407@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Sun, 26 Mar 2017 22:24:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r437010 - in head/net-mgmt: monitoring-plugins nagios-plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2017 22:24:36 -0000 Author: mat Date: Sun Mar 26 22:24:34 2017 New Revision: 437010 URL: https://svnweb.freebsd.org/changeset/ports/437010 Log: Add timeout to check_ping{,6} commands. It helps nagios/icinga when packet loss occur. PR: 218148 Reported by: Josef Karthauser Sponsored by: Absolight Modified: head/net-mgmt/monitoring-plugins/Makefile (contents, props changed) head/net-mgmt/nagios-plugins/Makefile (contents, props changed) Modified: head/net-mgmt/monitoring-plugins/Makefile ============================================================================== --- head/net-mgmt/monitoring-plugins/Makefile Sun Mar 26 22:05:06 2017 (r437009) +++ head/net-mgmt/monitoring-plugins/Makefile Sun Mar 26 22:24:34 2017 (r437010) @@ -3,6 +3,7 @@ PORTNAME= monitoring-plugins PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME} @@ -66,8 +67,8 @@ CONFIGURE_ARGS+=--with-cgiurl=${NAGIOSCG CONFIGURE_ARGS+=ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \ ac_cv_path_PATH_TO_PING=/sbin/ping \ ac_cv_path_PATH_TO_PING6=/sbin/ping6 \ - --with-ping-command="/sbin/ping -n -c %d %s" \ - --with-ping6-command="/sbin/ping6 -n -c %d %s" \ + --with-ping-command="/sbin/ping -n -t %d -c %d %s" \ + --with-ping6-command="/sbin/ping6 -n -X %d -c %d %s" \ ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient CPPFLAGS+= -I${LOCALBASE}/include Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Sun Mar 26 22:05:06 2017 (r437009) +++ head/net-mgmt/nagios-plugins/Makefile Sun Mar 26 22:24:34 2017 (r437010) @@ -3,7 +3,7 @@ PORTNAME= nagios-plugins PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.nagios-plugins.org/download/ \ @@ -73,8 +73,8 @@ CONFIGURE_ARGS+=--with-nagios-user=${NAG CONFIGURE_ARGS+=ac_cv_path_PATH_TO_QMAIL_QSTAT=/var/qmail/bin/qmail-qstat \ ac_cv_path_PATH_TO_PING=/sbin/ping \ ac_cv_path_PATH_TO_PING6=/sbin/ping6 \ - --with-ping-command="/sbin/ping -n -c %d %s" \ - --with-ping6-command="/sbin/ping6 -n -c %d %s" \ + --with-ping-command="/sbin/ping -n -t %d -c %d %s" \ + --with-ping6-command="/sbin/ping6 -n -X %d -c %d %s" \ ac_cv_path_PATH_TO_SUDO=${LOCALBASE}/bin/sudo \ ac_cv_path_PATH_TO_SMBCLIENT=${LOCALBASE}/bin/smbclient