Update to 9.4.3

Resolver could try unreachable servers multiple times.
Adb's handling of lame addresses was different for IPv4 and IPv6.
Remove NULL pointer dereference in dns_journal_print().
libbind: Out of bounds reference in dns_ho.c:addrsort.
Set initial timeout to 800ms.
TSIG context leak

For all the details see:
 http://oldwww.isc.org/sw/bind/view/?release=9.4.3#RELEASE

2 files changed, 24 insertions, 40 deletions

diff --git a/net/bind9/patches/patch-ai b/net/bind9/patches/patch-ai
index 2ecc5db97e6..e0b7c7cf4dd 100644
--- a/net/bind9/patches/patch-ai
+++ b/net/bind9/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.9 2008/06/21 22:13:22 adrianp Exp $
+$NetBSD: patch-ai,v 1.10 2009/01/04 00:16:03 adrianp Exp $
 
---- lib/bind/configure.orig	2005-10-14 10:44:50.000000000 +0900
+--- lib/bind/configure.orig	2008-08-26 15:49:33.000000000 +0100
 +++ lib/bind/configure
-@@ -1960,12 +1960,7 @@ done
+@@ -2600,12 +2600,7 @@ done
  #
  case "$includedir" in
  	'${prefix}/include')
@@ -16,7 +16,7 @@ $NetBSD: patch-ai,v 1.9 2008/06/21 22:13:22 adrianp Exp $
  		;;
  esac
  
-@@ -4547,6 +4542,8 @@ case $host in
+@@ -5379,6 +5374,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
@@ -25,27 +25,21 @@ $NetBSD: patch-ai,v 1.9 2008/06/21 22:13:22 adrianp Exp $
  *-bsdi234*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -4635,7 +4632,7 @@ echo "$as_me: WARNING: linking with PTL2
- echo "${ECHO_T}native" >&6
+@@ -5467,7 +5464,8 @@ echo "$as_me: WARNING: linking with PTL2
+ echo "${ECHO_T}native" >&6; }
  				LIBS="-lpthread $LIBS"
  			else
 -				if test ! -d $LOCALBASE/pthreads
-+				if test ! -d $LOCALBASE/pthreads -a ! -f /usr/include/pthread.h
++				if test ! -d $LOCALBASE/pthreads -a ! -f /usr/in
++clude/pthread.h
  				then
- 					echo "$as_me:$LINENO: result: none" >&5
- echo "${ECHO_T}none" >&6
-@@ -4646,14 +4643,23 @@ echo "$as_me: error: \"could not find th
+ 					{ echo "$as_me:$LINENO: result: none" >&5
+ echo "${ECHO_T}none" >&6; }
+@@ -5478,14 +5476,23 @@ echo "$as_me: error: \"could not find th
  
  				if $use_threads
  				then
--					echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
--echo "${ECHO_T}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"
+-					{ echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
 +					if test -f /usr/include/pthread.h
 +					then
 +						{ echo "$as_me:$LINENO: result: native pthreads" >&5
@@ -55,7 +49,13 @@ $NetBSD: patch-ai,v 1.9 2008/06/21 22:13:22 adrianp Exp $
 +						STD_CINDLUES="$STD_CINDLUES -I/usr/include"
 +					else
 +						{ echo "$as_me:$LINENO: result: mit-pthreads/unproven-pthreads" >&5
-+echo "${ECHO_T}mit-pthreads/unproven-pthreads" >&6; }
+ echo "${ECHO_T}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"
 +						pkg="$LOCALBASE/pthreads"
 +						lib1="-L$pkg/lib -Wl,-R$pkg/lib"
 +						lib2="-lpthread -lm -lgcc -lpthread"
@@ -66,7 +66,7 @@ $NetBSD: patch-ai,v 1.9 2008/06/21 22:13:22 adrianp Exp $
  				fi
  			fi
  		fi
-@@ -5714,6 +5720,10 @@ fi
+@@ -6220,6 +6227,10 @@ then
  			CCOPT="$CCOPT -pthread"
  			STD_CDEFINES="$STD_CDEFINES -D_THREAD_SAFE"
  			;;
@@ -77,19 +77,19 @@ $NetBSD: patch-ai,v 1.9 2008/06/21 22:13:22 adrianp Exp $
  		*-openbsd*)
  			CC="$CC -pthread"
  			CCOPT="$CCOPT -pthread"
-@@ -23291,6 +23301,7 @@ case "$host" in
+@@ -24730,6 +24741,7 @@ case "$host" in
  	*-bsdi2345*)	have_minimum_ifreq=yes;;
  	*-darwin*)	have_minimum_ifreq=yes;;
  	*-freebsd*)	have_minimum_ifreq=yes;;
-+	*-dragonfly*)	have_minimum_ifreq=yes;;
++	*-dragonfly*)   have_minimum_ifreq=yes;;
  	*-lynxos*)	have_minimum_ifreq=yes;;
  	*-netbsd*)	have_minimum_ifreq=yes;;
  	*-next*)	have_minimum_ifreq=yes;;
-@@ -23330,6 +23341,7 @@ case "$host" in
+@@ -24769,6 +24781,7 @@ case "$host" in
  	*-darwin*)	PORT_DIR="port/darwin";;
  	*-osf*)		PORT_DIR="port/decunix";;
  	*-freebsd*)	PORT_DIR="port/freebsd";;
-+	*-dragonfly*)	PORT_DIR="port/freebsd";;
++	*-dragonfly*)   PORT_DIR="port/freebsd";;
  	*-hpux9*)	PORT_DIR="port/hpux9";;
  	*-hpux10*)	PORT_DIR="port/hpux10";;
  	*-hpux11*)	PORT_DIR="port/hpux";;
diff --git a/net/bind9/patches/patch-ap b/net/bind9/patches/patch-ap
deleted file mode 100644
index 8e4642918d5..00000000000
--- a/net/bind9/patches/patch-ap
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ap,v 1.3 2008/05/11 00:00:59 tonnerre Exp $
-
---- lib/bind/inet/inet_network.c.orig	2005-04-27 07:00:54.000000000 +0200
-+++ lib/bind/inet/inet_network.c
-@@ -84,9 +84,9 @@ again:
- 	}
- 	if (!digit)
- 		return (INADDR_NONE);
-+	if (pp >= parts + 4 || val > 0xffU)
-+		return (INADDR_NONE);
- 	if (*cp == '.') {
--		if (pp >= parts + 4 || val > 0xffU)
--			return (INADDR_NONE);
- 		*pp++ = val, cp++;
- 		goto again;
- 	}