Update to latest commit.

While there, transition from master/slave to primary/secondary in the
default configuration files.

PR:		253799

6 files changed, 202 insertions, 192 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index b6a8fadf744a..0e408ed3e5b4 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -50,13 +50,13 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 # XXX: remove tar:bz2
 USES=		autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.17.10a0.2021.03.08
+ISCVERSION=	9.17.10a0.2021.03.15
 # XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	77ac8db0c68c38cc776cfe9e7104aefedb532bc2
+GL_COMMIT=	a9339fe7fc68198a2b74b9623defca784308214c
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
@@ -250,14 +250,14 @@ post-patch-PORTREVISION-on:
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree
 	${MKDIR} ${STAGEDIR}${ETCDIR}
-.  for i in dynamic master slave working
+.  for i in dynamic primary secondary working
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/$i
 .  endfor
 	${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/master
-	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/master
-	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/master
+	${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/primary
+	${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/primary
+	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample
 	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 97c32991f4b3..c70113637626 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615205363
-SHA256 (isc-projects-bind9-77ac8db0c68c38cc776cfe9e7104aefedb532bc2_GL0.tar.gz) = f5f67460483fc446e51b5b4b583b85715a6e242a4369f63b7a71460a7171e19a
-SIZE (isc-projects-bind9-77ac8db0c68c38cc776cfe9e7104aefedb532bc2_GL0.tar.gz) = 6414529
+TIMESTAMP = 1615811533
+SHA256 (isc-projects-bind9-a9339fe7fc68198a2b74b9623defca784308214c_GL0.tar.gz) = c5da134ab58524378310101a4e127797ea082ed35c2c6bcac2522cbb294312f0
+SIZE (isc-projects-bind9-a9339fe7fc68198a2b74b9623defca784308214c_GL0.tar.gz) = 6418081
diff --git a/dns/bind9-devel/files/BIND.chroot.local.dist b/dns/bind9-devel/files/BIND.chroot.local.dist
index 53b36a87c082..6c6ffa7b0be4 100644
--- a/dns/bind9-devel/files/BIND.chroot.local.dist
+++ b/dns/bind9-devel/files/BIND.chroot.local.dist
@@ -10,9 +10,9 @@
         namedb          type=dir uname=root
             dynamic         type=dir
             ..
-            master          type=dir uname=root
+            primary         type=dir uname=root
             ..
-            slave           type=dir
+            secondary       type=dir
             ..
             working         type=dir
             ..
diff --git a/dns/bind9-devel/files/named.conf.in b/dns/bind9-devel/files/named.conf.in
index 2d23a6592fae..0e2730b35755 100644
--- a/dns/bind9-devel/files/named.conf.in
+++ b/dns/bind9-devel/files/named.conf.in
@@ -74,7 +74,7 @@ options {
 // first in your /etc/resolv.conf so this server will be queried.
 // Also, make sure to enable it in /etc/rc.conf.
 
-// The traditional root hints mechanism. Use this, OR the slave zones below.
+// The traditional root hints mechanism. Use this, OR the secondary zones below.
 zone "." { type hint; file "%%ETCDIR%%/named.root"; };
 
 /*	Slaving the following zones from the root name servers has some
@@ -99,9 +99,9 @@ zone "." { type hint; file "%%ETCDIR%%/named.root"; };
 */
 /*
 zone "." {
-	type slave;
-	file "%%ETCDIR%%/slave/root.slave";
-	masters {
+	type secondary;
+	file "%%ETCDIR%%/secondary/root.secondary";
+	primaries {
 		192.0.32.132;           // lax.xfr.dns.icann.org
 		2620:0:2d0:202::132;    // lax.xfr.dns.icann.org
 		192.0.47.132;           // iad.xfr.dns.icann.org
@@ -110,9 +110,9 @@ zone "." {
 	notify no;
 };
 zone "arpa" {
-	type slave;
-	file "%%ETCDIR%%/slave/arpa.slave";
-	masters {
+	type secondary;
+	file "%%ETCDIR%%/secondary/arpa.secondary";
+	primaries {
 		192.0.32.132;           // lax.xfr.dns.icann.org
 		2620:0:2d0:202::132;    // lax.xfr.dns.icann.org
 		192.0.47.132;           // iad.xfr.dns.icann.org
@@ -121,9 +121,9 @@ zone "arpa" {
 	notify no;
 };
 zone "in-addr.arpa" {
-	type slave;
-	file "%%ETCDIR%%/slave/in-addr.arpa.slave";
-	masters {
+	type secondary;
+	file "%%ETCDIR%%/secondary/in-addr.arpa.secondary";
+	primaries {
 		192.0.32.132;           // lax.xfr.dns.icann.org
 		2620:0:2d0:202::132;    // lax.xfr.dns.icann.org
 		192.0.47.132;           // iad.xfr.dns.icann.org
@@ -132,9 +132,9 @@ zone "in-addr.arpa" {
 	notify no;
 };
 zone "ip6.arpa" {
-	type slave;
-	file "%%ETCDIR%%/slave/ip6.arpa.slave";
-	masters {
+	type secondary;
+	file "%%ETCDIR%%/secondary/ip6.arpa.secondary";
+	primaries {
 		192.0.32.132;           // lax.xfr.dns.icann.org
 		2620:0:2d0:202::132;    // lax.xfr.dns.icann.org
 		192.0.47.132;           // iad.xfr.dns.icann.org
@@ -151,206 +151,206 @@ zone "ip6.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 "%%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"; };
+zone "localhost"	{ type primary; file "%%ETCDIR%%/primary/localhost-forward.db"; };
+zone "127.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/localhost-reverse.db"; };
+zone "255.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // RFC 1912-style zone for IPv6 localhost address (RFC 6303)
-zone "0.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/localhost-reverse.db"; };
+zone "0.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/localhost-reverse.db"; };
 
 // "This" Network (RFCs 1912, 5735 and 6303)
-zone "0.in-addr.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "0.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // Private Use Networks (RFCs 1918, 5735 and 6303)
-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"; };
+zone "10.in-addr.arpa"	   { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "16.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "17.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "18.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "19.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "20.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "21.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "22.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "23.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "24.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "25.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "26.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "27.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "28.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "29.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "30.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "31.172.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "168.192.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // Shared Address Space (RFC 6598)
-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"; };
+zone "64.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "65.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "66.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "67.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "68.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "69.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "70.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "71.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "72.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "73.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "74.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "75.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "76.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "77.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "78.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "79.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "80.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "81.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "82.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "83.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "84.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "85.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "86.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "87.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "88.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "89.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "90.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "91.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "92.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "93.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "94.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "95.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "96.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "97.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "98.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "99.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "100.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "101.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "102.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "103.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "104.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "105.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "106.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "107.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "108.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "109.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "110.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "111.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "112.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "113.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "114.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "115.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "116.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "117.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "118.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "119.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "120.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "121.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "122.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "123.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "124.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "125.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "126.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "127.100.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // Link-local/APIPA (RFCs 3927, 5735 and 6303)
-zone "254.169.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "254.169.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // IETF protocol assignments (RFCs 5735 and 5736)
-zone "0.0.192.in-addr.arpa" { type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "0.0.192.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303)
-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"; };
+zone "2.0.192.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "100.51.198.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "113.0.203.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/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 "%%ETCDIR%%/master/empty.db"; };
+zone "8.b.d.0.1.0.0.2.ip6.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // Router Benchmark Testing (RFCs 2544 and 5735)
-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"; };
+zone "18.198.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "19.198.in-addr.arpa" { type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // IANA Reserved - Old Class E Space (RFC 5735)
-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"; };
+zone "240.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "241.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "242.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "243.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "244.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "245.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "246.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "247.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "248.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "249.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "250.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "251.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "252.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "253.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "254.in-addr.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // IPv6 Unassigned Addresses (RFC 4291)
-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"; };
+zone "1.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "3.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "4.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "5.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "6.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "7.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "8.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "9.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "a.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "b.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "c.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "d.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "e.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "0.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "1.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "2.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "3.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "4.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "5.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "6.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "7.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "8.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "9.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "a.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "b.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "0.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "1.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "2.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "3.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "4.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "5.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "6.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "7.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // IPv6 ULA (RFCs 4193 and 6303)
-zone "c.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
-zone "d.f.ip6.arpa"	{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "c.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "d.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // IPv6 Link Local (RFCs 4291 and 6303)
-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"; };
+zone "8.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "9.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "a.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "b.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303)
-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"; };
+zone "c.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "d.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "e.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
+zone "f.e.f.ip6.arpa"	{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // IP6.INT is Deprecated (RFC 4159)
-zone "ip6.int"		{ type master; file "%%ETCDIR%%/master/empty.db"; };
+zone "ip6.int"		{ type primary; file "%%ETCDIR%%/primary/empty.db"; };
 
 // NB: Do not use the IP addresses below, they are faked, and only
 // serve demonstration/documentation purposes!
 //
-// Example slave zone config entries.  It can be convenient to become
-// a slave at least for the zone your own domain is in.  Ask
+// Example secondary zone config entries.  It can be convenient to become
+// a secondary at least for the zone your own domain is in.  Ask
 // your network administrator for the IP address of the responsible
-// master name server.
+// primary name server.
 //
 // Do not forget to include the reverse lookup zone!
 // This is named after the first bytes of the IP address, in reverse
 // order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6.
 //
-// Before starting to set up a master zone, make sure you fully
+// Before starting to set up a primary zone, make sure you fully
 // understand how DNS and BIND work.  There are sometimes
-// non-obvious pitfalls.  Setting up a slave zone is usually simpler.
+// non-obvious pitfalls.  Setting up a secondary zone is usually simpler.
 //
 // NB: Don't blindly enable the examples below. :-)  Use actual names
 // and addresses instead.
@@ -361,7 +361,7 @@ key "exampleorgkey" {
 	secret "sf87HJqjkqh8ac87a02lla==";
 };
 zone "example.org" {
-	type master;
+	type primary;
 	allow-update {
 		key "exampleorgkey";
 	};
@@ -369,11 +369,11 @@ zone "example.org" {
 };
 */
 
-/* Example of a slave reverse zone
+/* Example of a secondary reverse zone
 zone "1.168.192.in-addr.arpa" {
-	type slave;
-	file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa";
-	masters {
+	type secondary;
+	file "%%ETCDIR%%/secondary/1.168.192.in-addr.arpa";
+	primaries {
 		192.168.1.1;
 	};
 };
diff --git a/dns/bind9-devel/files/pkg-message.in b/dns/bind9-devel/files/pkg-message.in
index bb1834c03d3c..2c90ff28953d 100644
--- a/dns/bind9-devel/files/pkg-message.in
+++ b/dns/bind9-devel/files/pkg-message.in
@@ -20,6 +20,16 @@ EOT
   type: install
 }
 {
+  type: upgrade
+  maximum_version: "9.17.10.a0.2021.03.15"
+  message: <<EOT
+The BIND9 port was changed to respect upstream's change
+concerning master and slave that were replaced by primary and
+secondary, all the references in the sample files were updated
+to reflect that.
+EOT
+}
+{
   message: <<EOT
 +------------------------------------------------------------+
 |THIS IS A DEVELOPMENT VERSION OF BIND, IT WILL EAT YOUR DATA|
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index fbe7807f5d2d..00eddeeacc80 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -11,9 +11,9 @@ bin/named-journalprint
 @sample etc/mtree/BIND.chroot.dist.sample
 @sample etc/mtree/BIND.chroot.local.dist.sample
 %%ETCDIR%%/bind.keys
-%%ETCDIR%%/master/empty.db
-%%ETCDIR%%/master/localhost-forward.db
-%%ETCDIR%%/master/localhost-reverse.db
+%%ETCDIR%%/primary/empty.db
+%%ETCDIR%%/primary/localhost-forward.db
+%%ETCDIR%%/primary/localhost-reverse.db
 @sample %%ETCDIR%%/named.conf.sample
 %%ETCDIR%%/named.root
 %%ETCDIR%%/rndc.conf.sample
@@ -320,5 +320,5 @@ sbin/rndc
 sbin/rndc-confgen
 sbin/tsig-keygen
 @dir(bind,bind,) %%ETCDIR%%/dynamic
-@dir(bind,bind,) %%ETCDIR%%/slave
+@dir(bind,bind,) %%ETCDIR%%/secondary
 @dir(bind,bind,) %%ETCDIR%%/working