ISC BIND 9.2.2rc1 imported

[Jakob Schlyter <jakob_(_at_)_openbsd_(_dot_)_org>]

I've just imported ISC BIND 9.2.2rc1 as src/usr.sbin/bind. It is not
default yet, but will be soon - people who want to test before activation
could apply the patch below.

Local changes are documented in README.OpenBSD.


	jakob


Index: usr.sbin/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/Makefile,v
retrieving revision 1.92
diff -u -r1.92 Makefile
--- usr.sbin/Makefile	31 Dec 2002 16:22:26 -0000	1.92
+++ usr.sbin/Makefile	20 Jan 2003 22:54:13 -0000
@@ -5,11 +5,11 @@
 .include <bsd.own.mk>

 SUBDIR=	ac accton adduser amd arp authpf \
-	bootpd bootpgw bootpef bootptest \
+	bind bootpd bootpgw bootpef bootptest \
 	chroot config cron dev_mkdb dhcp \
 	edquota httpd inetd iostat \
 	kgmon kvm_mkdb lpr \
-	mailwrapper mopd mtree named \
+	mailwrapper mopd mtree \
 	netgroup_mkdb openssl pkg pkg_install popa3d portmap ppp pppd pppoe \
 	pstat pwd_mkdb quot quotaon rarpd rbootd rdconfig rdate repquota rmt \
 	rpc.bootparamd rpc.lockd rpc.pcnfsd rwhod \
Index: etc/Makefile
===================================================================
RCS file: /cvs/src/etc/Makefile,v
retrieving revision 1.174
diff -u -r1.174 Makefile
--- etc/Makefile	31 Dec 2002 16:22:25 -0000	1.174
+++ etc/Makefile	20 Jan 2003 22:54:13 -0000
@@ -31,7 +31,6 @@
 # -rw-rw-r--
 BIN2=	motd

-NAMEDB=	localhost.rev localhost.v6.rev localhost.zone root.cache
 PCS=	pcs750.bin
 WCS1=	wcs fppwcs poc poc1 poc2 fppoc
 WCS2=	fpevent fppwcs fppwcs_dual hdcwcs load_diags start_fpp wcs wcs_dual
@@ -167,11 +166,21 @@
 		    ${DESTDIR}/etc/systrace; \
 		${INSTALL} -c -o root -g wheel -m 600 usr_sbin_named \
 		    ${DESTDIR}/etc/systrace;
-	cd namedb; \
-	    ${INSTALL} -c -o root -g ${BINGRP} -m 644 named.boot \
-		${DESTDIR}/var/named; \
-	    ${INSTALL} -c -o named -g ${BINGRP} -m 644 ${NAMEDB} \
-		${DESTDIR}/var/named/namedb
+	cd bind; \
+		${INSTALL} -c -o root -g named -m 640 named-simple.conf \
+		    ${DESTDIR}/var/named/etc/named.conf; \
+		${INSTALL} -c -o root -g named -m 640 named-*.conf \
+		    ${DESTDIR}/var/named/etc; \
+		${INSTALL} -c -o root -g wheel -m 644 db.localhost \
+		    ${DESTDIR}/var/named/standard/localhost; \
+		${INSTALL} -c -o root -g wheel -m 644 db.loopback \
+		    ${DESTDIR}/var/named/standard/loopback; \
+		${INSTALL} -c -o root -g wheel -m 644 db.loopback6.arpa \
+		    ${DESTDIR}/var/named/standard/loopback6.arpa; \
+		${INSTALL} -c -o root -g wheel -m 644 db.loopback6.int \
+		    ${DESTDIR}/var/named/standard/loopback6.int; \
+		${INSTALL} -c -o root -g wheel -m 644 root.hint \
+		    ${DESTDIR}/var/named/standard; \
 	/bin/rm -f ${DESTDIR}/etc/localtime
 	ln -s ${TZDIR}/${LOCALTIME} ${DESTDIR}/etc/localtime
 	/bin/rm -f ${DESTDIR}/etc/rmt
Index: etc/mtree/4.4BSD.dist
===================================================================
RCS file: /cvs/src/etc/mtree/4.4BSD.dist,v
retrieving revision 1.141
diff -u -r1.141 4.4BSD.dist
--- etc/mtree/4.4BSD.dist	20 Jan 2003 20:50:22 -0000	1.141
+++ etc/mtree/4.4BSD.dist	20 Jan 2003 22:54:13 -0000
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.141 2003/01/20 20:50:22 millert Exp $
+#	$OpenBSD: 4.4BSD.dist.diff,v 1.1 2003/01/20 19:19:42 jakob Exp $

 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -527,6 +527,12 @@
 # ./usr/share/doc/html/lynx_help
 ..

+# ./usr/share/doc/html/bind
+bind
+
+# ./usr/share/doc/html/bind
+..
+
 # ./usr/share/doc/html/curses
 curses

@@ -1906,13 +1912,23 @@
 ..

 # ./var/named/etc
-etc
+etc		uname=root gname=named mode=0750
 # ./var/named/etc
 ..

-# ./var/named/namedb
-namedb		uname=named gname=bin mode=0755
-# ./var/named/namedb
+# ./var/named/master
+master
+# ./var/named/master
+..
+
+# ./var/named/slave
+slave		uname=root gname=named mode=0775
+# ./var/named/slave
+..
+
+# ./var/named/standard
+standard
+# ./var/named/standard
 ..

 # ./var/named