From owner-svn-ports-head@freebsd.org Mon Aug 31 12:40:01 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 07ABC3C04FB; Mon, 31 Aug 2020 12:40:01 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bg8t83Ngrz4Swc; Mon, 31 Aug 2020 12:40:00 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D32F227E52; Mon, 31 Aug 2020 12:39:59 +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 07VCdx61004289; Mon, 31 Aug 2020 12:39:59 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07VCdwRd004283; Mon, 31 Aug 2020 12:39:58 GMT (envelope-from mat@FreeBSD.org) Message-Id: <202008311239.07VCdwRd004283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 31 Aug 2020 12:39:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547174 - in head/net-mgmt: monitoring-plugins monitoring-plugins/files nagios-plugins nagios-plugins/files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/net-mgmt: monitoring-plugins monitoring-plugins/files nagios-plugins nagios-plugins/files X-SVN-Commit-Revision: 547174 X-SVN-Commit-Repository: ports 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.33 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: Mon, 31 Aug 2020 12:40:03 -0000 Author: mat Date: Mon Aug 31 12:39:58 2020 New Revision: 547174 URL: https://svnweb.freebsd.org/changeset/ports/547174 Log: Fix check_dig when it uses drill and when changing the port. PR: 249027 Reported by: Joakim Lindblom Deleted: head/net-mgmt/monitoring-plugins/pkg-help Modified: head/net-mgmt/monitoring-plugins/Makefile (contents, props changed) head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff (contents, props changed) head/net-mgmt/monitoring-plugins/pkg-plist (contents, props changed) head/net-mgmt/nagios-plugins/Makefile (contents, props changed) head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff (contents, props changed) head/net-mgmt/nagios-plugins/pkg-plist (contents, props changed) Modified: head/net-mgmt/monitoring-plugins/Makefile ============================================================================== --- head/net-mgmt/monitoring-plugins/Makefile Mon Aug 31 12:39:54 2020 (r547173) +++ head/net-mgmt/monitoring-plugins/Makefile Mon Aug 31 12:39:58 2020 (r547174) @@ -3,7 +3,7 @@ PORTNAME= monitoring-plugins PORTVERSION= 2.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME} @@ -37,7 +37,7 @@ SSH_PORTABLE_DESC= Build check_ssh with ports openssh DNS_DESC= Configuration of check_dig and check_dns (see help) -DNS_BASE_DESC= >= 10 means drill for check_dig and no check_dns +DNS_BASE_DESC= Use drill for check_dig and no check_dns DNS_BINDTOOLS_DESC= Use dig and nslookup from dns/bind-tools EXTRAOPTS_CONFIGURE_ENABLE= extra-opts @@ -109,6 +109,11 @@ NLS_CONFIGURE_ENABLE= nls DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_WITH= dbi + +DNS_BASE_CONFIGURE_ON= --with-dig-command=/usr/bin/drill \ + ac_cv_path_PATH_TO_NSLOOKUP= +DNS_BASE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-dig-to-drill.diff + DNS_BINDTOOLS_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind-tools DNS_BINDTOOLS_RUN_DEPENDS= ${DNS_BINDTOOLS_BUILD_DEPENDS} DNS_BINDTOOLS_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ @@ -124,15 +129,6 @@ SSH_PORTABLE_CONFIGURE_ON= --with-ssh-command=${LOCALB _PING6_CMD= /sbin/ping6 -n -X %d -c %d %s .else _PING6_CMD= /sbin/ping6 -n -t %d -c %d %s -.endif - -.if ${PORT_OPTIONS:MDNS_BASE} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff -CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill \ - ac_cv_path_PATH_TO_NSLOOKUP= -PLIST_SUB+= CHECK_DNS="@comment " -.else -PLIST_SUB+= CHECK_DNS="" .endif .if !exists(/usr/bin/ssh) && empty(PORT_OPTIONS:MSSH_PORTABLE) 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 Aug 31 12:39:54 2020 (r547173) +++ head/net-mgmt/monitoring-plugins/files/extra-patch-dig-to-drill.diff Mon Aug 31 12:39:58 2020 (r547174) @@ -6,8 +6,8 @@ /* get the command to run */ - 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); ++ xasprintf (&command_line, "%s %s %s -p %d @%s %s %s", ++ PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type); alarm (timeout_interval); gettimeofday (&tv, NULL); Modified: head/net-mgmt/monitoring-plugins/pkg-plist ============================================================================== --- head/net-mgmt/monitoring-plugins/pkg-plist Mon Aug 31 12:39:54 2020 (r547173) +++ head/net-mgmt/monitoring-plugins/pkg-plist Mon Aug 31 12:39:58 2020 (r547174) @@ -8,7 +8,7 @@ libexec/nagios/check_cluster libexec/nagios/check_dig libexec/nagios/check_disk libexec/nagios/check_disk_smb -%%CHECK_DNS%%libexec/nagios/check_dns +%%DNS_BINDTOOLS%%libexec/nagios/check_dns libexec/nagios/check_dummy libexec/nagios/check_file_age libexec/nagios/check_flexlm Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Mon Aug 31 12:39:54 2020 (r547173) +++ head/net-mgmt/nagios-plugins/Makefile Mon Aug 31 12:39:58 2020 (r547174) @@ -3,7 +3,7 @@ PORTNAME= nagios-plugins DISTVERSION= 2.3.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= https://www.nagios-plugins.org/download/ \ @@ -70,6 +70,10 @@ SSH_PORTABLE_DESC= Build check_ssh with ports openssh DBI_LIB_DEPENDS= libdbi.so:databases/libdbi DBI_CONFIGURE_WITH= dbi +DNS_BASE_CONFIGURE_ON= --with-dig-command=/usr/bin/drill \ + ac_cv_path_PATH_TO_NSLOOKUP= +DNS_BASE_EXTRA_PATCHES= ${FILESDIR}/extra-patch-dig-to-drill.diff + DNS_BINDTOOLS_BUILD_DEPENDS= ${LOCALBASE}/bin/dig:dns/bind-tools DNS_BINDTOOLS_RUN_DEPENDS= ${DNS_BINDTOOLS_BUILD_DEPENDS} DNS_BINDTOOLS_CONFIGURE_ON= --with-dig-command=${LOCALBASE}/bin/dig \ @@ -129,15 +133,6 @@ NAGIOSCGIURL?= ${NAGIOSHTMURL}/cgi-bin _PING6_CMD= /sbin/ping6 -n -X %d -c %d %s .else _PING6_CMD= /sbin/ping6 -n -t %d -c %d %s -.endif - -.if ${PORT_OPTIONS:MDNS_BASE} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff -CONFIGURE_ARGS+= --with-dig-command=/usr/bin/drill \ - ac_cv_path_PATH_TO_NSLOOKUP= -PLIST_SUB+= CHECK_DNS="@comment " -.else -PLIST_SUB+= CHECK_DNS="" .endif .if !exists(/usr/bin/ssh) && empty(PORT_OPTIONS:MSSH_PORTABLE) 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 Aug 31 12:39:54 2020 (r547173) +++ head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff Mon Aug 31 12:39:58 2020 (r547174) @@ -6,8 +6,8 @@ /* get the command to run */ - 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); ++ xasprintf (&command_line, "%s %s %s -p %d @%s %s %s", ++ PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type); alarm (timeout_interval); gettimeofday (&tv, NULL); Modified: head/net-mgmt/nagios-plugins/pkg-plist ============================================================================== --- head/net-mgmt/nagios-plugins/pkg-plist Mon Aug 31 12:39:54 2020 (r547173) +++ head/net-mgmt/nagios-plugins/pkg-plist Mon Aug 31 12:39:58 2020 (r547174) @@ -8,7 +8,7 @@ libexec/nagios/check_cluster libexec/nagios/check_dig libexec/nagios/check_disk libexec/nagios/check_disk_smb -%%CHECK_DNS%%libexec/nagios/check_dns +%%DNS_BINDTOOLS%%libexec/nagios/check_dns libexec/nagios/check_dummy libexec/nagios/check_file_age libexec/nagios/check_flexlm