diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2020-08-31 12:39:58 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2020-08-31 12:39:58 +0000 |
| commit | 5012daeff60fce4bd4253b7580a38d160ef42a2c (patch) | |
| tree | 8d39e218f6f77e7aceee6fc6836e700c374a6342 /net-mgmt/nagios-plugins | |
| parent | 7354fc1b89b4ab7829dce422fcf9dcf2933d8f4e (diff) | |
| download | ports-5012daeff60fce4bd4253b7580a38d160ef42a2c.tar.gz ports-5012daeff60fce4bd4253b7580a38d160ef42a2c.zip | |
Notes
Diffstat (limited to 'net-mgmt/nagios-plugins')
| -rw-r--r-- | net-mgmt/nagios-plugins/Makefile | 15 | ||||
| -rw-r--r-- | net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff | 4 | ||||
| -rw-r--r-- | net-mgmt/nagios-plugins/pkg-plist | 2 |
3 files changed, 8 insertions, 13 deletions
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile index a182a827b1e6..a526f5561640 100644 --- a/net-mgmt/nagios-plugins/Makefile +++ b/net-mgmt/nagios-plugins/Makefile @@ -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 (instead of base) 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 \ @@ -131,15 +135,6 @@ _PING6_CMD= /sbin/ping6 -n -X %d -c %d %s _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) PLIST_SUB+= SSH="@comment " .else diff --git a/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff b/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff index 3f568a49445f..5d6bf02d7fa9 100644 --- a/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff +++ b/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff @@ -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); diff --git a/net-mgmt/nagios-plugins/pkg-plist b/net-mgmt/nagios-plugins/pkg-plist index c9831a8b9a66..397443790a14 100644 --- a/net-mgmt/nagios-plugins/pkg-plist +++ b/net-mgmt/nagios-plugins/pkg-plist @@ -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 |