From owner-svn-ports-all@FreeBSD.ORG Wed Mar 11 15:47:56 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F92E703; Wed, 11 Mar 2015 15:47:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 49E5F9E; Wed, 11 Mar 2015 15:47:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2BFlumK074329; Wed, 11 Mar 2015 15:47:56 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2BFlsCv074316; Wed, 11 Mar 2015 15:47:54 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201503111547.t2BFlsCv074316@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 11 Mar 2015 15:47:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r381012 - in head/net-mgmt/monitoring-plugins: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2015 15:47:56 -0000 Author: mat Date: Wed Mar 11 15:47:53 2015 New Revision: 381012 URL: https://svnweb.freebsd.org/changeset/ports/381012 QAT: https://qat.redports.org/buildarchive/r381012/ Log: Update to 2.1.1. Sponsored by: Absolight Modified: head/net-mgmt/monitoring-plugins/Makefile head/net-mgmt/monitoring-plugins/distinfo head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff head/net-mgmt/monitoring-plugins/files/patch-configure head/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c Modified: head/net-mgmt/monitoring-plugins/Makefile ============================================================================== --- head/net-mgmt/monitoring-plugins/Makefile Wed Mar 11 15:37:24 2015 (r381011) +++ head/net-mgmt/monitoring-plugins/Makefile Wed Mar 11 15:47:53 2015 (r381012) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= monitoring-plugins -PORTVERSION= 2.0 -PORTREVISION= 8 +PORTVERSION= 2.1.1 +PORTREVISION= 0 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME} Modified: head/net-mgmt/monitoring-plugins/distinfo ============================================================================== --- head/net-mgmt/monitoring-plugins/distinfo Wed Mar 11 15:37:24 2015 (r381011) +++ head/net-mgmt/monitoring-plugins/distinfo Wed Mar 11 15:47:53 2015 (r381012) @@ -1,2 +1,2 @@ -SHA256 (monitoring-plugins-2.0.tar.gz) = a91b0f68ff00661e0d69f28e3cf577541af98e0f6d09dd014328f132bde6c3fc -SIZE (monitoring-plugins-2.0.tar.gz) = 2610000 +SHA256 (monitoring-plugins-2.1.1.tar.gz) = 44dbace8033eafb716cc501bfef26ca9071ae3d0329b2c118bd0230fd98dd1d3 +SIZE (monitoring-plugins-2.1.1.tar.gz) = 2612331 Modified: head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff ============================================================================== --- head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff Wed Mar 11 15:37:24 2015 (r381011) +++ head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff Wed Mar 11 15:47:53 2015 (r381012) @@ -1,11 +1,11 @@ ---- plugins/check_dig.c.orig 2014-06-23 16:01:00 UTC +--- plugins/check_dig.c.orig 2014-11-30 10:36:26 UTC +++ plugins/check_dig.c @@ -94,8 +94,8 @@ main (int argc, char **argv) timeout_interval_dig = timeout_interval / number_tries + number_tries; /* get the command to run */ -- xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s +tries=%d +time=%d", -- PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport, number_tries, timeout_interval_dig); +- xasprintf (&command_line, "%s %s %s -p %d @%s %s %s +tries=%d +time=%d", +- PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type, number_tries, timeout_interval_dig); + xasprintf (&command_line, "%s %s @%s -z -p %d %s %s %s", + PATH_TO_DIG, dig_args, dns_server, server_port, query_transport, query_address, record_type); Modified: head/net-mgmt/monitoring-plugins/files/patch-configure ============================================================================== --- head/net-mgmt/monitoring-plugins/files/patch-configure Wed Mar 11 15:37:24 2015 (r381011) +++ head/net-mgmt/monitoring-plugins/files/patch-configure Wed Mar 11 15:47:53 2015 (r381012) @@ -1,6 +1,6 @@ ---- configure.orig 2014-06-26 16:17:37 UTC +--- configure.orig 2014-12-01 23:45:00 UTC +++ configure -@@ -21787,7 +21787,7 @@ then +@@ -16651,7 +16651,7 @@ then $as_echo "$ac_cv_ps_command" >&6; } elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \ Modified: head/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c ============================================================================== --- head/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c Wed Mar 11 15:37:24 2015 (r381011) +++ head/net-mgmt/monitoring-plugins/files/patch-plugins-root_check__dhcp.c Wed Mar 11 15:47:53 2015 (r381012) @@ -1,4 +1,4 @@ ---- plugins-root/check_dhcp.c.orig 2014-07-06 17:55:03 UTC +--- plugins-root/check_dhcp.c.orig 2014-11-30 10:36:26 UTC +++ plugins-root/check_dhcp.c @@ -323,7 +323,8 @@ int get_hardware_address(int sock,char * #elif defined(__bsd__) Modified: head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl ============================================================================== --- head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl Wed Mar 11 15:37:24 2015 (r381011) +++ head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts__check_ircd.pl Wed Mar 11 15:47:53 2015 (r381012) @@ -1,6 +1,6 @@ ---- plugins-scripts/check_ircd.pl.orig 2014-07-06 17:55:03 UTC +--- plugins-scripts/check_ircd.pl.orig 2014-11-30 10:36:26 UTC +++ plugins-scripts/check_ircd.pl -@@ -66,6 +66,7 @@ +@@ -66,6 +66,7 @@ sub bindRemote ($$); $ENV{'PATH'}='@TRUSTED_PATH@'; $ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; @@ -8,7 +8,7 @@ # -----------------------------------------------------------------[ Global ]-- -@@ -153,7 +154,7 @@ +@@ -153,7 +154,7 @@ sub bindRemote ($$) print "IRCD UNKNOWN: Could not start socket ($!)\n"; exit $ERRORS{"UNKNOWN"}; } Modified: head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c ============================================================================== --- head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c Wed Mar 11 15:37:24 2015 (r381011) +++ head/net-mgmt/monitoring-plugins/files/patch-plugins__check_ssh.c Wed Mar 11 15:47:53 2015 (r381012) @@ -1,6 +1,6 @@ ---- plugins/check_ssh.c.orig 2014-07-06 10:26:39 UTC +--- plugins/check_ssh.c.orig 2014-11-30 22:28:21 UTC +++ plugins/check_ssh.c -@@ -255,6 +255,7 @@ +@@ -255,6 +255,7 @@ ssh_connect (char *haddr, int hport, cha printf (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"), ssh_server, ssh_proto, remote_version); @@ -8,7 +8,7 @@ close(sd); exit (STATE_WARNING); } -@@ -273,6 +274,7 @@ +@@ -273,6 +274,7 @@ ssh_connect (char *haddr, int hport, cha (_("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));