upgrade to 9.2.0.

list of changes between 9.1.3 to 9.2.0 is available at:
http://www.isc.org/products/BIND/bind9.html

7 files changed, 165 insertions, 94 deletions

diff --git a/net/bind9/DESCR b/net/bind9/DESCR
index c7a4c2deb27..c311081809b 100644
--- a/net/bind9/DESCR
+++ b/net/bind9/DESCR
@@ -12,6 +12,3 @@ necessitated by the expected demands of:
   The 9.0.0 release, and this release candidate, is aimed at
 early adopters and those who wish to make use of new 9.0
 features, such as IPv6 and DNSSEC secure resolution support.
-
-** Set "named9=yes" and "named=no" in /etc/rc.conf to use the
-** startup script!
diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 66a9fba342f..8e7bc3197df 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2001/07/04 00:21:34 itojun Exp $
+# $NetBSD: Makefile,v 1.37 2001/11/27 03:38:40 itojun Exp $
 #
 
 DISTNAME=	bind-${BIND_VERSION}
-PKGNAME=	bind-9.1.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
@@ -15,14 +14,14 @@ COMMENT=	Version 9 of the Berkeley Internet Name Daemon, implementation of DNS
 BUILD_DEFS+=	USE_INET6
 
 # No need to set USE_INET6, will auto-detect.
-BIND_VERSION=	9.1.3
+BIND_VERSION=	9.2.0
 DIST_SUBDIR=	bind/${BIND_VERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-threads	# Until we have real threads
 CONFIGURE_ARGS+=--with-libtool=yes \
 		--sysconfdir=/etc \
 		--localstatedir=/var
-LDFLAGS+=	-Wl,-R${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
+#LDFLAGS+=	-Wl,-R${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib
 # use external OpenSSL.  comment the following two lines out to use
 # OpenSSL shipped with BIND9.
 USE_SSL=	yes
@@ -49,10 +48,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/draft/* ${PREFIX}/share/doc/bind9/draft
 	${INSTALL_DATA} ${WRKSRC}/doc/misc/* ${PREFIX}/share/doc/bind9/misc
 	${INSTALL_DATA} ${WRKSRC}/doc/rfc/* ${PREFIX}/share/doc/bind9/rfc
-	${INSTALL_MAN} ${WRKSRC}/doc/man/bin/*.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/man/bin/*.5 ${PREFIX}/man/man5
-	${INSTALL_MAN} ${WRKSRC}/doc/man/bin/*.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/dnssec/*.8 ${PREFIX}/man/man8
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	(cd ${PREFIX}; ${FIND} share/doc/bind9 -type f -print ) >> ${PLIST_SRC}
 	(cd ${PREFIX}; ${FIND} share/doc/bind9 -type d -print ) | \
diff --git a/net/bind9/PLIST b/net/bind9/PLIST
index 60b9a61505a..23cee1a213d 100644
--- a/net/bind9/PLIST
+++ b/net/bind9/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:54:54 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/11/27 03:38:40 itojun Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
 bin/nslookup
 bin/nsupdate
-etc/rc.d/named9
 etc/rc.d/lwresd
+etc/rc.d/named9
 include/dns/a6.h
 include/dns/acl.h
 include/dns/adb.h
@@ -14,21 +14,6 @@ include/dns/cache.h
 include/dns/callbacks.h
 include/dns/cert.h
 include/dns/compress.h
-include/dns/confacl.h
-include/dns/confcache.h
-include/dns/confcommon.h
-include/dns/confctl.h
-include/dns/confctx.h
-include/dns/confip.h
-include/dns/confkeys.h
-include/dns/conflog.h
-include/dns/conflsn.h
-include/dns/conflwres.h
-include/dns/confparser.h
-include/dns/confresolv.h
-include/dns/confrrset.h
-include/dns/confview.h
-include/dns/confzone.h
 include/dns/db.h
 include/dns/dbiterator.h
 include/dns/dbtable.h
@@ -49,7 +34,6 @@ include/dns/master.h
 include/dns/masterdump.h
 include/dns/message.h
 include/dns/name.h
-include/dns/namedconf.h
 include/dns/ncache.h
 include/dns/nxt.h
 include/dns/peer.h
@@ -70,6 +54,7 @@ include/dns/rootns.h
 include/dns/sdb.h
 include/dns/secalg.h
 include/dns/secproto.h
+include/dns/soa.h
 include/dns/ssu.h
 include/dns/tcpmsg.h
 include/dns/time.h
@@ -81,6 +66,7 @@ include/dns/validator.h
 include/dns/view.h
 include/dns/xfrin.h
 include/dns/zone.h
+include/dns/zonekey.h
 include/dns/zt.h
 include/dst/dst.h
 include/dst/lib.h
@@ -146,6 +132,7 @@ include/isc/stdio.h
 include/isc/stdtime.h
 include/isc/string.h
 include/isc/symtab.h
+include/isc/syslog.h
 include/isc/task.h
 include/isc/taskpool.h
 include/isc/thread.h
@@ -153,6 +140,21 @@ include/isc/time.h
 include/isc/timer.h
 include/isc/types.h
 include/isc/util.h
+include/isccc/alist.h
+include/isccc/base64.h
+include/isccc/cc.h
+include/isccc/ccmsg.h
+include/isccc/events.h
+include/isccc/lib.h
+include/isccc/result.h
+include/isccc/sexpr.h
+include/isccc/symtab.h
+include/isccc/symtype.h
+include/isccc/types.h    
+include/isccc/util.h     
+include/isccfg/cfg.h
+include/isccfg/check.h
+include/isccfg/log.h
 include/lwres/context.h
 include/lwres/int.h
 include/lwres/ipv6.h
@@ -165,45 +167,31 @@ include/lwres/net.h
 include/lwres/netdb.h
 include/lwres/platform.h
 include/lwres/result.h
-include/omapi/compatibility.h
-include/omapi/lib.h
-include/omapi/omapi.h
-include/omapi/private.h
-include/omapi/result.h
-include/omapi/types.h
 lib/libdns.a
 lib/libdns.la
 lib/libdns.so
-lib/libdns.so.4
-lib/libdns.so.4.0
+lib/libdns.so.5
+lib/libdns.so.5.0
 lib/libisc.a
 lib/libisc.la
 lib/libisc.so
-lib/libisc.so.3
-lib/libisc.so.3.0
+lib/libisc.so.4
+lib/libisc.so.4.0
+lib/libisccc.a
+lib/libisccc.la
+lib/libisccc.so
+lib/libisccc.so.0
+lib/libisccc.so.0.0
+lib/libisccfg.a
+lib/libisccfg.la
+lib/libisccfg.so
+lib/libisccfg.so.0
+lib/libisccfg.so.0.0
 lib/liblwres.a
 lib/liblwres.la
 lib/liblwres.so
 lib/liblwres.so.2
 lib/liblwres.so.2.0
-lib/libomapi.a
-lib/libomapi.la
-lib/libomapi.so
-lib/libomapi.so.3
-lib/libomapi.so.3.0
-man/man1/dig.1
-man/man1/host.1
-man/man1/named-checkconf.1
-man/man1/named-checkzone.1
-man/man5/rndc.conf.5
-man/man8/dnssec-keygen.8
-man/man8/dnssec-makekeyset.8
-man/man8/dnssec-signkey.8
-man/man8/dnssec-signzone.8
-man/man8/lwresd.8
-man/man8/named.8
-man/man8/nsupdate.8
-man/man8/rndc.8
 sbin/dnssec-keygen
 sbin/dnssec-makekeyset
 sbin/dnssec-signkey
@@ -213,8 +201,109 @@ sbin/named
 sbin/named-checkconf
 sbin/named-checkzone
 sbin/rndc
-@dirrm include/omapi
+sbin/rndc-confgen
 @dirrm include/lwres
+@dirrm include/isccc
+@dirrm include/isccfg
 @dirrm include/isc
 @dirrm include/dst
 @dirrm include/dns
+man/man1/dig.1
+man/man1/host.1
+man/man3/lwres.3
+man/man3/lwres_addr_parse.3
+man/man3/lwres_buffer.3
+man/man3/lwres_buffer_add.3
+man/man3/lwres_buffer_back.3
+man/man3/lwres_buffer_clear.3
+man/man3/lwres_buffer_first.3
+man/man3/lwres_buffer_forward.3
+man/man3/lwres_buffer_getmem.3
+man/man3/lwres_buffer_getuint16.3
+man/man3/lwres_buffer_getuint32.3
+man/man3/lwres_buffer_getuint8.3
+man/man3/lwres_buffer_init.3
+man/man3/lwres_buffer_invalidate.3
+man/man3/lwres_buffer_putmem.3
+man/man3/lwres_buffer_putuint16.3
+man/man3/lwres_buffer_putuint32.3
+man/man3/lwres_buffer_putuint8.3
+man/man3/lwres_buffer_subtract.3
+man/man3/lwres_conf_clear.3
+man/man3/lwres_conf_get.3
+man/man3/lwres_conf_init.3
+man/man3/lwres_conf_parse.3
+man/man3/lwres_conf_print.3
+man/man3/lwres_config.3
+man/man3/lwres_context.3
+man/man3/lwres_context_allocmem.3
+man/man3/lwres_context_create.3
+man/man3/lwres_context_destroy.3
+man/man3/lwres_context_freemem.3
+man/man3/lwres_context_initserial.3
+man/man3/lwres_context_nextserial.3
+man/man3/lwres_context_sendrecv.3
+man/man3/lwres_endhostent.3
+man/man3/lwres_endhostent_r.3
+man/man3/lwres_freeaddrinfo.3
+man/man3/lwres_freehostent.3
+man/man3/lwres_gabn.3
+man/man3/lwres_gabnrequest_free.3
+man/man3/lwres_gabnrequest_parse.3
+man/man3/lwres_gabnrequest_render.3
+man/man3/lwres_gabnresponse_free.3
+man/man3/lwres_gabnresponse_parse.3
+man/man3/lwres_gabnresponse_render.3
+man/man3/lwres_gai_strerror.3
+man/man3/lwres_getaddrinfo.3
+man/man3/lwres_getaddrsbyname.3
+man/man3/lwres_gethostbyaddr.3
+man/man3/lwres_gethostbyaddr_r.3
+man/man3/lwres_gethostbyname.3
+man/man3/lwres_gethostbyname2.3
+man/man3/lwres_gethostbyname_r.3
+man/man3/lwres_gethostent.3
+man/man3/lwres_gethostent_r.3
+man/man3/lwres_getipnode.3
+man/man3/lwres_getipnodebyaddr.3
+man/man3/lwres_getipnodebyname.3
+man/man3/lwres_getnamebyaddr.3
+man/man3/lwres_getnameinfo.3
+man/man3/lwres_getrrsetbyname.3
+man/man3/lwres_gnba.3
+man/man3/lwres_gnbarequest_free.3
+man/man3/lwres_gnbarequest_parse.3
+man/man3/lwres_gnbarequest_render.3
+man/man3/lwres_gnbaresponse_free.3
+man/man3/lwres_gnbaresponse_parse.3
+man/man3/lwres_gnbaresponse_render.3
+man/man3/lwres_herror.3
+man/man3/lwres_hstrerror.3
+man/man3/lwres_inetntop.3
+man/man3/lwres_lwpacket_parseheader.3
+man/man3/lwres_lwpacket_renderheader.3
+man/man3/lwres_net_ntop.3
+man/man3/lwres_noop.3
+man/man3/lwres_nooprequest_free.3
+man/man3/lwres_nooprequest_parse.3
+man/man3/lwres_nooprequest_render.3
+man/man3/lwres_noopresponse_free.3
+man/man3/lwres_noopresponse_parse.3
+man/man3/lwres_noopresponse_render.3
+man/man3/lwres_packet.3
+man/man3/lwres_resutil.3
+man/man3/lwres_sethostent.3
+man/man3/lwres_sethostent_r.3
+man/man3/lwres_string_parse.3
+man/man5/rndc.conf.5
+man/man8/dnssec-keygen.8
+man/man8/dnssec-makekeyset.8
+man/man8/dnssec-signkey.8
+man/man8/dnssec-signzone.8
+man/man8/lwresd.8
+man/man8/named-checkconf.8
+man/man8/named-checkzone.8
+man/man8/named.8
+man/man8/nsupdate.8
+man/man8/rndc.8
+man/man8/rndc-confgen.8
diff --git a/net/bind9/distinfo b/net/bind9/distinfo
index af66e558ba4..e370633a7db 100644
--- a/net/bind9/distinfo
+++ b/net/bind9/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/07/04 00:21:34 itojun Exp $
+$NetBSD: distinfo,v 1.5 2001/11/27 03:38:40 itojun Exp $
 
-SHA1 (bind/9.1.3/bind-9.1.3.tar.gz) = b5b96875d279cb093c63bd03c2edcd2c44509b12
-Size (bind/9.1.3/bind-9.1.3.tar.gz) = 3314185 bytes
-SHA1 (patch-aa) = 70102411c64adaba2d63f58d2a50b5ef725831ed
-SHA1 (patch-ab) = 77bb2703e7de1d503e85a932c503facdcdb95de3
-SHA1 (patch-ac) = ca57e92cb3e6da548e9fcc5521bc216cd6a5ca96
+SHA1 (bind/9.2.0/bind-9.2.0.tar.gz) = 5f6aaa25c4fb0326569203a11870c235d7ebf315
+Size (bind/9.2.0/bind-9.2.0.tar.gz) = 4814337 bytes
+SHA1 (patch-ab) = 1d3d82e3e01ac38e8a1b1d98e018849e8fe071bf
+SHA1 (patch-ac) = 1696adfab7392e0f150d34931b808e51ad017938
diff --git a/net/bind9/patches/patch-aa b/net/bind9/patches/patch-aa
deleted file mode 100644
index a08bbf68b52..00000000000
--- a/net/bind9/patches/patch-aa
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/01/18 13:12:06 itojun Exp $
-
---- Makefile.in.orig	Wed Dec  6 05:19:14 2000
-+++ Makefile.in	Sat Dec 16 03:17:07 2000
-@@ -37,3 +37,3 @@
- install:: isc-config.sh installdirs
--	${INSTALL_PROGRAM} isc-config.sh ${DESTDIR}${bindir}
-+	${BSD_INSTALL_SCRIPT} isc-config.sh ${DESTDIR}${bindir}
- 
diff --git a/net/bind9/patches/patch-ab b/net/bind9/patches/patch-ab
index eb1efaeae50..9b26c64ee4f 100644
--- a/net/bind9/patches/patch-ab
+++ b/net/bind9/patches/patch-ab
@@ -1,19 +1,19 @@
-$NetBSD: patch-ab,v 1.6 2001/01/28 07:15:29 itojun Exp $
-support for kame scopeid extension (assumes that link scope = interface)
+$NetBSD: patch-ab,v 1.7 2001/11/27 03:38:42 itojun Exp $
 
---- lib/lwres/getnameinfo.c-	Sun Jan 28 15:34:19 2001
-+++ lib/lwres/getnameinfo.c	Sun Jan 28 16:13:15 2001
-@@ -63,6 +63,9 @@
- #include <sys/socket.h>
+--- lib/lwres/getnameinfo.c.orig	Sat Jul 14 08:34:02 2001
++++ lib/lwres/getnameinfo.c	Tue Jul 17 10:14:33 2001
+@@ -66,6 +66,10 @@
+ #include <lwres/net.h>
+ #include <lwres/netdb.h>
  
- #include <netinet/in.h>
 +#ifdef __KAME__
 +#include <net/if.h>
 +#endif
++
+ #include "assert_p.h"
  
- #include <stdio.h>
- #include <string.h>
-@@ -219,13 +222,11 @@
+ #define SUCCESS 0
+@@ -214,13 +218,11 @@
  		    ((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
  			char *p = numaddr + strlen(numaddr);
  			const char *stringscope = NULL;
diff --git a/net/bind9/patches/patch-ac b/net/bind9/patches/patch-ac
index 4e6aa4efed3..7b864fbbb16 100644
--- a/net/bind9/patches/patch-ac
+++ b/net/bind9/patches/patch-ac
@@ -1,19 +1,19 @@
-$NetBSD: patch-ac,v 1.3 2001/01/28 06:50:22 itojun Exp $
-support for kame scopeid extension (assumes that link scope = interface)
+$NetBSD: patch-ac,v 1.4 2001/11/27 03:38:42 itojun Exp $
 
---- lib/lwres/getaddrinfo.c-	Sun Jan 28 15:34:17 2001
-+++ lib/lwres/getaddrinfo.c	Sun Jan 28 15:38:37 2001
-@@ -28,6 +28,9 @@
- #include <sys/un.h>
+--- lib/lwres/getaddrinfo.c.orig	Sat Jul 14 08:34:01 2001
++++ lib/lwres/getaddrinfo.c	Tue Jul 17 10:15:03 2001
+@@ -31,6 +31,10 @@
+ #include <lwres/net.h>
+ #include <lwres/netdb.h>
  
- #include <netinet/in.h>
 +#ifdef __KAME__
 +#include <net/if.h>
 +#endif
- 
- #include <arpa/nameser.h>
- #include <arpa/inet.h>
-@@ -262,14 +265,18 @@
++
+ #define SA(addr)	((struct sockaddr *)(addr))
+ #define SIN(addr)	((struct sockaddr_in *)(addr))
+ #define SIN6(addr)	((struct sockaddr_in6 *)(addr))
+@@ -253,14 +257,18 @@
  			p = strchr(ntmp, '%');
  			ep = NULL;