Date: Wed, 20 Nov 2013 15:15:52 +0100 (CET)
From: Geoffroy Desvernay <dgeo@centrale-marseille.fr>
To: FreeBSD-gnats-submit@freebsd.org
Cc: demon@FreeBSD.org, dgeo@centrale-marseille.fr
Subject: ports/184118: [PATCH] net-mgmt/nagios-plugins: enable check_{dns, dig} for FreeBSD 10
Message-ID: <20131120141552.521401CCD9@dgeo.sysadm.ec-m.fr>
Resent-Message-ID: <201311201420.rAKEK0fO056014@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184118
>Category: ports
>Synopsis: [PATCH] net-mgmt/nagios-plugins: enable check_{dns,dig} for FreeBSD 10
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 20 14:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Geoffroy Desvernay
>Release: FreeBSD 10.0-BETA3 amd64
>Organization:
Ecole Centrale de Marseille
>Environment:
System: FreeBSD dgeo.sysadm.ec-m.fr 10.0-BETA3 FreeBSD 10.0-BETA3 #0: Thu Nov 14 11:50:51 CET 2013
>Description:
dig is missing from base in FreeBSD 10, add a DNS option to make nagios-plugins depend on
dns/bind-tools if no dig is found
Port maintainer (demon@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
Upgrade to freebsd 10 and look how check_dns disappears silently...
>Fix:
Patch attached
Feature-safe: yes
--- nagios-plugins-1.4.16_3,1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 334414)
+++ Makefile (working copy)
@@ -18,8 +18,8 @@
ACLOCAL_ARGS= -I m4 -I gl/m4
AUTOMAKE_ARGS= --add-missing
-OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS
-OPTIONS_DEFAULT=IPV6
+OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DNS
+OPTIONS_DEFAULT=IPV6 DNS
QSTAT_DESC= Game server query support (check_game)
FPING_DESC= Support for non-flooding fast ping (check_fping)
@@ -28,6 +28,7 @@
MYSQL_DESC= MySQL support (check_mysql)
PGSQL_DESC= PostgreSQL support (check_pgsql)
LDAP_DESC= OpenLDAP support (check_ldap)
+DNS_DESC= DNS support via dig (check_dns, check_dig)
JAIL_DESC= Compilation within jail(8) (see Makefile)
GNU_CONFIGURE= yes
@@ -70,6 +71,14 @@
PLIST_SUB+= SUB_QSTAT="@comment "
.endif
+.if ${PORT_OPTIONS:MDNS}
+BUILD_DEPENDS+= dig:${PORTSDIR}/dns/bind-tools
+RUN_DEPENDS+= dig:${PORTSDIR}/dns/bind-tools
+PLIST_SUB+= SUB_DNS=""
+.else
+PLIST_SUB+= SUB_DNS="@comment "
+.endif
+
.if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --with-ipv6
.else
Index: pkg-plist
===================================================================
--- pkg-plist (revision 334414)
+++ pkg-plist (working copy)
@@ -4,10 +4,10 @@
libexec/nagios/check_clamd
libexec/nagios/check_cluster
libexec/nagios/check_dhcp
-libexec/nagios/check_dig
+%%SUB_DNS%%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
--- nagios-plugins-1.4.16_3,1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131120141552.521401CCD9>