svn commit: r377447 - in head/net-mgmt: monitoring-plugins monitoring-plugins/files nagios-plugins nagios-plugins/files

[Mathieu Arnold]

Author: mat
Date: Mon Jan 19 17:52:56 2015
New Revision: 377447
URL: https://svnweb.freebsd.org/changeset/ports/377447
QAT: https://qat.redports.org/buildarchive/r377447/

Log:
  Fix check_dig on > 10 with IPv6
  
  PR:		196725
  Submitted by:	brd
  Sponsored by:	Absolight

Modified:
  head/net-mgmt/monitoring-plugins/Makefile
  head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff
  head/net-mgmt/nagios-plugins/Makefile
  head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff

Modified: head/net-mgmt/monitoring-plugins/Makefile
==============================================================================
--- head/net-mgmt/monitoring-plugins/Makefile	Mon Jan 19 17:48:41 2015	(r377446)
+++ head/net-mgmt/monitoring-plugins/Makefile	Mon Jan 19 17:52:56 2015	(r377447)
@@ -3,7 +3,7 @@
 
 PORTNAME=	monitoring-plugins
 PORTVERSION=	2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME}
 

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	Mon Jan 19 17:48:41 2015	(r377446)
+++ head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff	Mon Jan 19 17:52:56 2015	(r377447)
@@ -1,13 +1,13 @@
 --- plugins/check_dig.c.orig	2014-06-23 16:01:00 UTC
 +++ plugins/check_dig.c
-@@ -94,8 +94,8 @@
+@@ -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 -z -p %d %s %s %s",
-+            PATH_TO_DIG, dig_args, dns_server, server_port, query_address, record_type, query_transport);
++            PATH_TO_DIG, dig_args, dns_server, server_port, query_transport, query_address, record_type);
  
    alarm (timeout_interval);
    gettimeofday (&tv, NULL);

Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile	Mon Jan 19 17:48:41 2015	(r377446)
+++ head/net-mgmt/nagios-plugins/Makefile	Mon Jan 19 17:52:56 2015	(r377447)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nagios-plugins
 PORTVERSION=	2.0.3
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://www.nagios-plugins.org/download/ \

Modified: head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff
==============================================================================
--- head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff	Mon Jan 19 17:48:41 2015	(r377446)
+++ head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff	Mon Jan 19 17:52:56 2015	(r377447)
@@ -1,13 +1,13 @@
 --- plugins/check_dig.c.orig	2014-03-04 21:41:57 UTC
 +++ plugins/check_dig.c
-@@ -94,8 +94,8 @@
+@@ -94,8 +94,8 @@ main (int argc, char **argv)
    timeout_interval_dig = ceil((double) timeout_interval / (double) 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 -z -p %d %s %s %s",
-+            PATH_TO_DIG, dig_args, dns_server, server_port, query_address, record_type, query_transport);
++            PATH_TO_DIG, dig_args, dns_server, server_port, query_transport, query_address, record_type);
  
    alarm (timeout_interval);
    gettimeofday (&tv, NULL);