svn commit: r336542 - in head/net-mgmt/nagios-plugins: . files
Dmitry Sivachenko
demon at FreeBSD.org
Sun Dec 15 15:13:14 UTC 2013
Author: demon
Date: Sun Dec 15 15:13:13 2013
New Revision: 336542
URL: http://svnweb.freebsd.org/changeset/ports/336542
Log:
Use drill(1) instead of dig(1) on fresh FreeBSD-10.
Disable check_dns for now because there is no nslookup in base.
Several people pointed out drill can be use instead of dig
(mat@, Alexander Wittig <alexander at wittig.name>, et al).
Added:
head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff (contents, props changed)
Modified:
head/net-mgmt/nagios-plugins/Makefile
head/net-mgmt/nagios-plugins/pkg-plist
Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile Sun Dec 15 15:02:30 2013 (r336541)
+++ head/net-mgmt/nagios-plugins/Makefile Sun Dec 15 15:13:13 2013 (r336542)
@@ -148,6 +148,14 @@ CONFIGURE_ARGS+= --without-dbi
PLIST_SUB+= SUB_DBI="@comment "
.endif
+.if ${OSVERSION} > 1000055
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff
+CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill
+PLIST_SUB+= SUB_DNS="@comment "
+.else
+PLIST_SUB+= SUB_DNS=""
+.endif
+
post-patch:
.for file in check_by_ssh.c check_disk.c check_http.c check_mrtgtraf.c \
check_nagios.c check_ntp.c check_ntp_peer.c check_ntp_time.c \
Added: head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff Sun Dec 15 15:13:13 2013 (r336542)
@@ -0,0 +1,11 @@
+--- plugins/check_dig.c.orig 2013-10-02 19:22:21.000000000 +0400
++++ plugins/check_dig.c 2013-12-15 16:55:26.000000000 +0400
+@@ -88,7 +88,7 @@ main (int argc, char **argv)
+ usage_va(_("Could not parse arguments"));
+
+ /* get the command to run */
+- xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s",
++ xasprintf (&command_line, "%s @%s -p %d %s %s %s %s",
+ PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport);
+
+ alarm (timeout_interval);
Modified: head/net-mgmt/nagios-plugins/pkg-plist
==============================================================================
--- head/net-mgmt/nagios-plugins/pkg-plist Sun Dec 15 15:02:30 2013 (r336541)
+++ head/net-mgmt/nagios-plugins/pkg-plist Sun Dec 15 15:13:13 2013 (r336542)
@@ -8,7 +8,7 @@ libexec/nagios/check_dhcp
libexec/nagios/check_dig
libexec/nagios/check_disk
libexec/nagios/check_disk_smb
-libexec/nagios/check_dns
+%%SUB_DNS%%libexec/nagios/check_dns
libexec/nagios/check_dummy
libexec/nagios/check_file_age
libexec/nagios/check_flexlm
More information about the svn-ports-all
mailing list