Update bind97 package to 9.7.3.

* also sync rc scrpt with base system.

Bug Fixes

9.7.3

     * BIND now builds with threads disabled in versions of NetBSD earlier
       than 5.0 and with pthreads enabled by default in NetBSD versions
       5.0 and higher. Also removes support for unproven-pthreads,
       mit-pthreads and ptl2. [RT #19203]
     * Added a regression test for fix 2896/RT #21045 ("rndc sign" failed
       to properly update the zone when adding a DNSKEY for publication
       only). [RT #21324]
     * "nsupdate -l" now gives error message if "session.key" file is not
       found. [RT #21670]
     * HPUX now correctly defaults to using /dev/poll, which should
       increase performance. [RT #21919]
     * If named is running as a threaded application, after an "rndc stop"
       command has been issued, other inbound TCP requests can cause named
       to hang and never complete shutdown. [RT #22108]
     * After an "rndc reconfig", the refresh timer for managed-keys is
       ignored, resulting in managed-keys not being refreshed until named
       is restarted. [RT #22296]
     * An NSEC3PARAM record placed inside a zone which is not properly
       signed with NSEC3 could cause named to crash, if changed via
       dynamic update. [RT #22363]
     * "rndc -h" now includes "loadkeys" option. [RT #22493]
     * When performing a GSS-TSIG signed dynamic zone update, memory could
       be leaked. This causes an unclean shutdown and may affect
       long-running servers. [RT #22573]
     * A bug in NetBSD and FreeBSD kernels with SO_ACCEPTFILTER enabled
       allows for a TCP DoS attack. Until there is a kernel fix, ISC is
       disabling SO_ACCEPTFILTER support in BIND. [RT #22589]
     * When signing records, named didn't filter out any TTL changes to
       DNSKEY records. This resulted in an incomplete key set. TTL changes
       are now dealt with before signing. [RT #22590]
     * Corrected a defect where a combination of dynamic updates and zone
       transfers incorrectly locked the in-memory zone database, causing
       named to freeze. [RT #22614]
     * Don't run MX checks (check-mx) when the MX record points to ".".
       [RT #22645]
     * DST key reference counts can now be incremented via dst_key_attach.
       [RT #22672]
     * The IN6_IS_ADDR_LINKLOCAL and IN6_IS_ADDR_SITELOCAL macros in win32
       were updated/corrected per current Windows OS. [RT #22724]
     * "dnssec-settime -S" no longer tests prepublication interval
       validity when the interval is set to 0. [RT #22761]
     * isc_mutex_init_errcheck() in phtreads/mutex.c failed to destroy
       attr. [RT #22766]
     * The Kerberos realm was being truncated when being pulled from the
       the host prinicipal, make krb5-self updates fail. [RT #22770]
     * named failed to preserve the case of domain names in RDATA which is
       not compressible when writing master files. [RT #22863]
     * The man page for dnssec-keyfromlabel incorrectly had "-U" rather
       than the correct option "-I". [RT #22887]
     * The "rndc" command usage statement was missing the "-b" option. [RT
       #22937]
     * There was a bug in how the clients-per-query code worked with some
       query patterns. This could result, in rare circumstances, in having
       all the client query slots filled with queries for the same DNS
       label, essentially ignoring the max-clients-per-query setting. [RT
       #22972]
     * The secure zone update feature in named is based on the zone being
       signed and configured for dynamic updates. A bug in the ACL
       processing for "allow-update { none; };" resulted in a zone that is
       supposed to be static being treated as a dynamic zone. Thus, name
       would try to sign/re-sign that zone erroneously. [RT #23120]

6 files changed, 21 insertions, 98 deletions

diff --git a/net/bind97/Makefile b/net/bind97/Makefile
index 655f2aca729..fc740ddb4aa 100644
--- a/net/bind97/Makefile
+++ b/net/bind97/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/02 00:31:33 taca Exp $
+# $NetBSD: Makefile,v 1.6 2011/02/16 17:43:22 taca Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
@@ -16,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=	no
 
-BIND_VERSION=	9.7.2-P3
+BIND_VERSION=	9.7.3
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/bind97/PLIST b/net/bind97/PLIST
index 691e2ded5e1..fb6322d6214 100644
--- a/net/bind97/PLIST
+++ b/net/bind97/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2010/09/29 15:08:47 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2011/02/16 17:43:22 taca Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -364,10 +364,10 @@ share/doc/bind9/arm/man.rndc.conf.html
 share/doc/bind9/arm/man.rndc.html
 share/doc/bind9/draft/draft-ietf-6man-text-addr-representation-07.txt
 share/doc/bind9/draft/draft-ietf-behave-address-format-07.txt
-share/doc/bind9/draft/draft-ietf-behave-dns64-10.txt
+share/doc/bind9/draft/draft-ietf-behave-dns64-11.txt
 share/doc/bind9/draft/draft-ietf-dnsext-axfr-clarify-14.txt
 share/doc/bind9/draft/draft-ietf-dnsext-dns-tcp-requirements-03.txt
-share/doc/bind9/draft/draft-ietf-dnsext-dnssec-bis-updates-10.txt
+share/doc/bind9/draft/draft-ietf-dnsext-dnssec-bis-updates-12.txt
 share/doc/bind9/draft/draft-ietf-dnsext-dnssec-registry-fixes-06.txt
 share/doc/bind9/draft/draft-ietf-dnsext-ecc-key-07.txt
 share/doc/bind9/draft/draft-ietf-dnsext-interop3597-02.txt
diff --git a/net/bind97/distinfo b/net/bind97/distinfo
index a74d7a2a61e..fdb186003ff 100644
--- a/net/bind97/distinfo
+++ b/net/bind97/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2010/12/02 00:31:34 taca Exp $
+$NetBSD: distinfo,v 1.6 2011/02/16 17:43:22 taca Exp $
 
-SHA1 (bind-9.7.2-P3.tar.gz) = ca621a23e79298b4da14a3884690edbccda410d4
-RMD160 (bind-9.7.2-P3.tar.gz) = 304f362cef1c3e48bece850802a08159ecfd5428
-Size (bind-9.7.2-P3.tar.gz) = 7643996 bytes
+SHA1 (bind-9.7.3.tar.gz) = 78e14b3d3e653a8c21b098361b645dee5ed66238
+RMD160 (bind-9.7.3.tar.gz) = 9e53c9cefa2e8261bc52b5d6d7ed550891d9dce5
+Size (bind-9.7.3.tar.gz) = 7653584 bytes
 SHA1 (patch-aa) = 6cec876c8caa7082f97365863f3f88c4f168da48
 SHA1 (patch-ab) = 9585a26a376d32f80ac8266eb7967c00b433f14d
-SHA1 (patch-ac) = ce61643531948feb7db32c04594adc7ed041f4c6
+SHA1 (patch-ac) = 8c994d3c775cea8ef55c38ba63a1112cd02ea1e3
 SHA1 (patch-ad) = 29fb5c24ff3558f1621e93ea16419e32dbc695b7
-SHA1 (patch-ae) = 790408852e6b0f3a1b6dfb2725e2a43ad7240935
+SHA1 (patch-ae) = 0e11a5d4a3379b74124708dc2c1fe142ce369a0c
diff --git a/net/bind97/files/named9.sh b/net/bind97/files/named9.sh
index 8e73ed2539f..4f88bab9162 100644
--- a/net/bind97/files/named9.sh
+++ b/net/bind97/files/named9.sh
@@ -1,10 +1,10 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: named9.sh,v 1.1.1.1 2010/05/26 16:11:47 taca Exp $
+# $NetBSD: named9.sh,v 1.2 2011/02/16 17:43:22 taca Exp $
 #
 
 # PROVIDE: named
-# REQUIRE: SERVERS
+# REQUIRE: NETWORKING mountcritremote syslogd
 # BEFORE:  DAEMON
 # KEYWORD: chrootdir
 
diff --git a/net/bind97/patches/patch-ac b/net/bind97/patches/patch-ac
index 570433fa01f..d2d64656d2f 100644
--- a/net/bind97/patches/patch-ac
+++ b/net/bind97/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2010/07/05 03:17:45 taca Exp $
+$NetBSD: patch-ac,v 1.3 2011/02/16 17:43:22 taca Exp $
 
---- configure.orig	2010-05-26 23:47:44.000000000 +0000
+--- configure.orig	2010-12-21 04:33:28.000000000 +0000
 +++ configure
-@@ -24293,6 +24293,8 @@ case $host in
+@@ -21314,6 +21314,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
@@ -11,46 +11,7 @@ $NetBSD: patch-ac,v 1.2 2010/07/05 03:17:45 taca Exp $
  *-bsdi234*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -24381,7 +24383,7 @@ $as_echo "$as_me: WARNING: linking with 
- $as_echo "native" >&6; }
- 				LIBS="-lpthread $LIBS"
- 			else
--				if test ! -d $LOCALBASE/pthreads
-+				if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h
- 				then
- 					{ $as_echo "$as_me:$LINENO: result: none" >&5
- $as_echo "none" >&6; }
-@@ -24394,12 +24396,23 @@ $as_echo "$as_me: error: \"could not fin
- 				then
- 					{ $as_echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
- $as_echo "mit-pthreads/unproven-pthreads" >&6; }
--					pkg="$LOCALBASE/pthreads"
--					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
--					lib2="-lpthread -lm -lgcc -lpthread"
--					LIBS="$lib1 $lib2 $LIBS"
--					CPPFLAGS="$CPPFLAGS -I$pkg/include"
--					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+					if test -f /usr/include/pthread.h
-+					then
-+						{ $as_echo "$as_me:$LINENO: result: native pthreads" >&5
-+$as_echo "native pthreads" >&6; }
-+						LIBS="-lpthread $LIBS"
-+						CPPFLAGS="$CPPFLAGS -I/usr/include"
-+						STD_CINDLUES="$STD_CINDLUES -I/usr/include"
-+					else
-+						{ $as_echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
-+$as_echo "mit-pthreads/unproven-pthreads" >&6; }
-+						pkg="$LOCALBASE/pthreads"
-+						lib1="-L$pkg/lib -Wl,-R$pkg/lib"
-+						lib2="-lpthread -lm -lgcc -lpthread"
-+						LIBS="$lib1 $lib2 $LIBS"
-+						CPPFLAGS="$CPPFLAGS -I$pkg/include"
-+						STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+					fi
- 				fi
- 			fi
- 		fi
-@@ -26918,9 +26931,9 @@ case $use_libtool in
+@@ -22630,9 +22632,9 @@ case $use_libtool in
  		O=lo
  		A=la
  		LIBTOOL_MKDEP_SED='s;\.o;\.lo;'
@@ -62,7 +23,7 @@ $NetBSD: patch-ac,v 1.2 2010/07/05 03:17:45 taca Exp $
  		case "$host" in
  		*) LIBTOOL_ALLOW_UNDEFINED= ;;
  		esac
-@@ -33936,7 +33949,7 @@ $as_echo "no" >&6; }
+@@ -26000,7 +26002,7 @@ $as_echo "no" >&6; }
  	fi
  	if test -n "-L$use_dlz_postgres_lib -lpq"
  	then
diff --git a/net/bind97/patches/patch-ae b/net/bind97/patches/patch-ae
index 0b4b51ac850..0daa7c1d4c4 100644
--- a/net/bind97/patches/patch-ae
+++ b/net/bind97/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 2010/05/26 16:11:47 taca Exp $
+$NetBSD: patch-ae,v 1.2 2011/02/16 17:43:22 taca Exp $
 
---- config.threads.in.orig	2006-07-20 05:39:07.000000000 +0000
+--- config.threads.in.orig	2010-12-21 04:30:15.000000000 +0000
 +++ config.threads.in
-@@ -48,6 +48,8 @@ case $host in
+@@ -44,6 +44,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
@@ -11,41 +11,3 @@ $NetBSD: patch-ae,v 1.1.1.1 2010/05/26 16:11:47 taca Exp $
  *-bsdi[234]*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -121,7 +123,7 @@ then
- 				AC_MSG_RESULT(native)
- 				LIBS="-lpthread $LIBS"
- 			else
--				if test ! -d $LOCALBASE/pthreads
-+				if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h
- 				then
- 					AC_MSG_RESULT(none)
- 					AC_MSG_ERROR("could not find thread libraries")
-@@ -129,13 +131,21 @@ then
- 
- 				if $use_threads
- 				then
--					AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
--					pkg="$LOCALBASE/pthreads"
--					lib1="-L$pkg/lib -Wl,-R$pkg/lib"
--					lib2="-lpthread -lm -lgcc -lpthread"
--					LIBS="$lib1 $lib2 $LIBS"
--					CPPFLAGS="$CPPFLAGS -I$pkg/include"
--					STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+					if test -f /usr/include/pthread.h
-+					then
-+						AC_MSG_RESULT(native pthreads)
-+						LIBS="-lpthread $LIBS"
-+						CPPFLAGS="$CPPFLAGS -I/usr/inclue"
-+						STD_CINDLUES="$STD_CINDLUES -I/usr/include"
-+					else
-+						AC_MSG_RESULT(mit-pthreads/unproven-pthreads)
-+						pkg="$LOCALBASE/pthreads"
-+						lib1="-L$pkg/lib -Wl,-R$pkg/lib"
-+						lib2="-lpthread -lm -lgcc -lpthread"
-+						LIBS="$lib1 $lib2 $LIBS"
-+						CPPFLAGS="$CPPFLAGS -I$pkg/include"
-+						STD_CINCLUDES="$STD_CINCLUDES -I$pkg/include"
-+					fi
- 				fi
- 			fi
- 		fi