From owner-svn-ports-head@FreeBSD.ORG Mon Jan 5 23:54:34 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A09332E; Mon, 5 Jan 2015 23:54:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7375664831; Mon, 5 Jan 2015 23:54:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t05NsYgQ024466; Mon, 5 Jan 2015 23:54:34 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t05NsXux024463; Mon, 5 Jan 2015 23:54:33 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201501052354.t05NsXux024463@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 5 Jan 2015 23:54:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376375 - in head/dns/bind99: . files X-SVN-Group: ports-head 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.18-1 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, 05 Jan 2015 23:54:34 -0000 Author: mat Date: Mon Jan 5 23:54:32 2015 New Revision: 376375 URL: https://svnweb.freebsd.org/changeset/ports/376375 QAT: https://qat.redports.org/buildarchive/r376375/ Log: Really remove BIND_DESTETC. Noticed by: wblock, Matt Mullins Sponsored by: Absolight Modified: head/dns/bind99/Makefile head/dns/bind99/files/named.conf.in head/dns/bind99/files/named.in Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Mon Jan 5 23:21:43 2015 (r376374) +++ head/dns/bind99/Makefile Mon Jan 5 23:54:32 2015 (r376375) @@ -2,7 +2,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 Modified: head/dns/bind99/files/named.conf.in ============================================================================== --- head/dns/bind99/files/named.conf.in Mon Jan 5 23:21:43 2015 (r376374) +++ head/dns/bind99/files/named.conf.in Mon Jan 5 23:54:32 2015 (r376375) @@ -11,7 +11,7 @@ options { // All file and path names are relative to the chroot directory, // if any, and should be fully qualified. - directory "%%BIND_DESTETC%%/working"; + directory "%%ETCDIR%%/working"; pid-file "/var/run/named/pid"; dump-file "/var/dump/named_dump.db"; statistics-file "/var/stats/named.stats"; @@ -52,7 +52,7 @@ options { // the entries in /etc/resolv.conf, uncomment the following line and // set named_auto_forward=yes in /etc/rc.conf. You can also enable // named_auto_forward_only (the effect of which is described above). -// include "%%BIND_DESTETC%%/auto_forward.conf"; +// include "%%ETCDIR%%/auto_forward.conf"; /* Modern versions of BIND use a random UDP port for each outgoing @@ -75,7 +75,7 @@ options { // Also, make sure to enable it in /etc/rc.conf. // The traditional root hints mechanism. Use this, OR the slave zones below. -zone "." { type hint; file "%%BIND_DESTETC%%/named.root"; }; +zone "." { type hint; file "%%ETCDIR%%/named.root"; }; /* Slaving the following zones from the root name servers has some significant advantages: @@ -100,7 +100,7 @@ zone "." { type hint; file "%%BIND_DESTE /* zone "." { type slave; - file "%%BIND_DESTETC%%/slave/root.slave"; + file "%%ETCDIR%%/slave/root.slave"; masters { 192.5.5.241; // F.ROOT-SERVERS.NET. }; @@ -108,7 +108,7 @@ zone "." { }; zone "arpa" { type slave; - file "%%BIND_DESTETC%%/slave/arpa.slave"; + file "%%ETCDIR%%/slave/arpa.slave"; masters { 192.5.5.241; // F.ROOT-SERVERS.NET. }; @@ -123,198 +123,198 @@ zone "arpa" { 2. No spurious traffic will be sent from your network to the roots */ // RFCs 1912, 5735 and 6303 (and BCP 32 for localhost) -zone "localhost" { type master; file "%%BIND_DESTETC%%/master/localhost-forward.db"; }; -zone "127.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/localhost-reverse.db"; }; -zone "255.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "localhost" { type master; file "%%ETCDIR%%/master/localhost-forward.db"; }; +zone "127.in-addr.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; +zone "255.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // RFC 1912-style zone for IPv6 localhost address (RFC 6303) -zone "0.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/localhost-reverse.db"; }; +zone "0.ip6.arpa" { type master; file "%%ETCDIR%%/master/localhost-reverse.db"; }; // "This" Network (RFCs 1912, 5735 and 6303) -zone "0.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "0.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Private Use Networks (RFCs 1918, 5735 and 6303) -zone "10.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "16.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "17.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "18.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "19.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "20.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "21.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "22.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "23.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "24.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "25.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "26.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "27.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "28.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "29.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "30.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "31.172.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "168.192.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "10.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "16.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "17.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "18.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "19.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "20.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "21.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "22.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "23.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "24.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "25.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "26.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "27.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "28.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "29.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "30.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "31.172.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "168.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Shared Address Space (RFC 6598) -zone "64.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "65.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "66.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "67.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "68.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "69.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "70.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "71.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "72.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "73.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "74.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "75.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "76.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "77.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "78.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "79.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "80.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "81.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "82.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "83.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "84.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "85.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "86.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "87.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "88.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "89.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "90.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "91.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "92.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "93.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "94.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "95.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "96.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "97.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "98.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "99.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "100.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "101.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "102.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "103.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "104.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "105.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "106.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "107.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "108.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "109.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "110.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "111.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "112.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "113.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "114.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "115.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "116.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "117.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "118.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "119.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "120.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "121.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "122.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "123.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "124.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "125.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "126.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "127.100.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "64.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "65.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "66.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "67.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "68.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "69.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "70.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "71.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "72.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "73.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "74.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "75.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "76.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "77.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "78.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "79.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "80.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "81.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "82.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "83.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "84.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "85.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "86.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "87.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "88.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "89.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "90.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "91.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "92.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "93.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "94.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "95.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "96.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "97.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "98.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "99.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "100.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "101.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "102.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "103.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "104.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "105.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "106.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "107.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "108.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "109.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "110.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "111.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "112.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "113.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "114.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "115.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "116.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "117.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "118.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "119.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "120.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "121.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "122.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "123.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "124.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "125.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "126.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "127.100.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Link-local/APIPA (RFCs 3927, 5735 and 6303) -zone "254.169.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "254.169.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IETF protocol assignments (RFCs 5735 and 5736) -zone "0.0.192.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "0.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303) -zone "2.0.192.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "100.51.198.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "113.0.203.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "2.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "100.51.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "113.0.203.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Example Range for Documentation (RFCs 3849 and 6303) -zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Domain Names for Documentation and Testing (BCP 32) -zone "test" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "example" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "invalid" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "example.com" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "example.net" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "example.org" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "test" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "example" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "invalid" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "example.com" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "example.net" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "example.org" { type master; file "%%ETCDIR%%/master/empty.db"; }; // Router Benchmark Testing (RFCs 2544 and 5735) -zone "18.198.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "19.198.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "18.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "19.198.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IANA Reserved - Old Class E Space (RFC 5735) -zone "240.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "241.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "242.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "243.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "244.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "245.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "246.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "247.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "248.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "249.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "250.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "251.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "252.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "253.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "254.in-addr.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "240.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "241.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "242.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "243.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "244.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "245.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "246.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "247.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "248.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "249.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "250.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "251.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "252.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "253.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "254.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Unassigned Addresses (RFC 4291) -zone "1.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "3.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "4.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "5.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "6.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "7.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "8.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "9.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "a.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "b.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "c.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "d.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "e.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "0.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "1.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "2.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "3.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "4.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "5.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "6.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "7.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "8.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "9.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "a.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "b.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "0.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "1.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "2.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "3.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "4.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "5.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "6.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "7.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "1.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "3.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "4.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "5.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "6.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "7.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "8.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "9.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "a.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "b.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "c.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "d.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "e.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "0.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "1.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "2.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "3.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "4.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "5.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "6.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "7.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "8.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "9.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "a.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "b.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "0.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "1.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "2.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "3.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "4.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "5.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "6.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "7.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 ULA (RFCs 4193 and 6303) -zone "c.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "d.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "c.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "d.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Link Local (RFCs 4291 and 6303) -zone "8.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "9.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "a.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "b.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "8.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "9.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "a.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "b.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303) -zone "c.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "d.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "e.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; -zone "f.e.f.ip6.arpa" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "c.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "d.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "e.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; +zone "f.e.f.ip6.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; }; // IP6.INT is Deprecated (RFC 4159) -zone "ip6.int" { type master; file "%%BIND_DESTETC%%/master/empty.db"; }; +zone "ip6.int" { type master; file "%%ETCDIR%%/master/empty.db"; }; // NB: Do not use the IP addresses below, they are faked, and only // serve demonstration/documentation purposes! @@ -345,14 +345,14 @@ zone "example.org" { allow-update { key "exampleorgkey"; }; - file "%%BIND_DESTETC%%/dynamic/example.org"; + file "%%ETCDIR%%/dynamic/example.org"; }; */ /* Example of a slave reverse zone zone "1.168.192.in-addr.arpa" { type slave; - file "%%BIND_DESTETC%%/slave/1.168.192.in-addr.arpa"; + file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa"; masters { 192.168.1.1; }; Modified: head/dns/bind99/files/named.in ============================================================================== --- head/dns/bind99/files/named.in Mon Jan 5 23:21:43 2015 (r376374) +++ head/dns/bind99/files/named.in Mon Jan 5 23:54:32 2015 (r376375) @@ -24,7 +24,7 @@ stop_cmd=named_stop named_enable=${named_enable:-"NO"} # Run named, the DNS server (or NO). named_program=${named_program:-"%%PREFIX%%/sbin/named"} # Path to named, if you want a different one. -named_conf=${named_conf:-"%%BIND_DESTETC%%/named.conf"} # Path to the configuration file +named_conf=${named_conf:-"%%ETCDIR%%/named.conf"} # Path to the configuration file named_flags=${named_flags:-""} # Use this for flags OTHER than -u and -c named_uid=${named_uid:-"bind"} # User to run named as named_wait=${named_wait:-"NO"} # Wait for working name service before exiting