Date: Wed, 21 Dec 2016 11:12:50 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429066 - in head/net-mgmt/monitoring-plugins: . files Message-ID: <201612211112.uBLBCoK7011884@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Dec 21 11:12:50 2016 New Revision: 429066 URL: https://svnweb.freebsd.org/changeset/ports/429066 Log: Update to 2.2. Reported by: portscout Sponsored by: Absolight Modified: head/net-mgmt/monitoring-plugins/Makefile (contents, props changed) head/net-mgmt/monitoring-plugins/distinfo (contents, props changed) head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff (contents, props changed) head/net-mgmt/monitoring-plugins/files/patch-configure (contents, props changed) head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl (contents, props changed) head/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c (contents, props changed) Modified: head/net-mgmt/monitoring-plugins/Makefile ============================================================================== --- head/net-mgmt/monitoring-plugins/Makefile Wed Dec 21 11:12:30 2016 (r429065) +++ head/net-mgmt/monitoring-plugins/Makefile Wed Dec 21 11:12:50 2016 (r429066) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= monitoring-plugins -PORTVERSION= 2.1.2 -PORTREVISION= 1 +PORTVERSION= 2.2 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 Dec 21 11:12:30 2016 (r429065) +++ head/net-mgmt/monitoring-plugins/distinfo Wed Dec 21 11:12:50 2016 (r429066) @@ -1,2 +1,3 @@ -SHA256 (monitoring-plugins-2.1.2.tar.gz) = 76c6b58f0867ab7b6c8c86c7e94fcce7183618f6daab63488990d0355f5600aa -SIZE (monitoring-plugins-2.1.2.tar.gz) = 2613060 +TIMESTAMP = 1482313684 +SHA256 (monitoring-plugins-2.2.tar.gz) = 296a538f00a9cbef7f528ff2d43af357a44b384dc98a32389a675b62a6dd3665 +SIZE (monitoring-plugins-2.2.tar.gz) = 2461548 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 Dec 21 11:12:30 2016 (r429065) +++ head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff Wed Dec 21 11:12:50 2016 (r429066) @@ -1,10 +1,10 @@ ---- plugins/check_dig.c.orig 2014-11-30 10:36:26 UTC +--- plugins/check_dig.c.orig 2016-11-29 08:45:08 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 %s -p %d @%s %s %s +tries=%d +time=%d", +- xasprintf (&command_line, "%s %s %s -p %d @%s %s %s +retry=%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 Dec 21 11:12:30 2016 (r429065) +++ head/net-mgmt/monitoring-plugins/files/patch-configure Wed Dec 21 11:12:50 2016 (r429066) @@ -1,6 +1,6 @@ ---- configure.orig 2014-12-01 23:45:00 UTC +--- configure.orig 2016-11-29 08:48:11 UTC +++ configure -@@ -16651,7 +16651,7 @@ then +@@ -16748,7 +16748,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-scripts_check__ircd.pl ============================================================================== --- head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl Wed Dec 21 11:12:30 2016 (r429065) +++ head/net-mgmt/monitoring-plugins/files/patch-plugins-scripts_check__ircd.pl Wed Dec 21 11:12:50 2016 (r429066) @@ -1,6 +1,6 @@ ---- plugins-scripts/check_ircd.pl.orig 2014-11-30 10:36:26 UTC +--- plugins-scripts/check_ircd.pl.orig 2016-11-29 08:45:08 UTC +++ plugins-scripts/check_ircd.pl -@@ -66,6 +66,7 @@ sub bindRemote ($$); +@@ -65,6 +65,7 @@ sub bindRemote ($$); $ENV{'PATH'}='@TRUSTED_PATH@'; $ENV{'BASH_ENV'}=''; $ENV{'ENV'}=''; @@ -8,7 +8,7 @@ # -----------------------------------------------------------------[ Global ]-- -@@ -153,7 +154,7 @@ sub bindRemote ($$) +@@ -152,7 +153,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 Dec 21 11:12:30 2016 (r429065) +++ head/net-mgmt/monitoring-plugins/files/patch-plugins_check__ssh.c Wed Dec 21 11:12:50 2016 (r429066) @@ -1,12 +1,12 @@ ---- plugins/check_ssh.c.orig 2014-11-30 22:28:21 UTC +--- plugins/check_ssh.c.orig 2016-11-29 08:45:08 UTC +++ plugins/check_ssh.c @@ -255,6 +255,7 @@ ssh_connect (char *haddr, int hport, cha printf - (_("SSH WARNING - %s (protocol %s) version mismatch, expected '%s'\n"), + (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"), ssh_server, ssh_proto, remote_version); + recv (sd, output, BUFF_SZ, 0); close(sd); - exit (STATE_WARNING); + exit (STATE_CRITICAL); } @@ -273,6 +274,7 @@ ssh_connect (char *haddr, int hport, cha (_("SSH OK - %s (protocol %s) | %s\n"),
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612211112.uBLBCoK7011884>