Update to 9.4.2-P1

Please see CHANGES for all the details but the driving factor of this update
is:
2375.   [security]      Fully randomize UDP query ports to improve
                        forgery resilience. [RT #17949]

4 files changed, 25 insertions, 27 deletions

diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 1f0f6aa754e..6c0071cda23 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.100 2008/06/21 22:13:22 adrianp Exp $
+# $NetBSD: Makefile,v 1.101 2008/07/10 21:05:30 adrianp Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P1/pl1/}
-PKGREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
@@ -12,7 +11,7 @@ COMMENT=	Version 9 of the Berkeley Internet Name Daemon, implementation of DNS
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BIND_VERSION=	9.4.1-P1
+BIND_VERSION=	9.4.2-P1
 
 # IPv6 ready, automatically detected
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/bind9/PLIST b/net/bind9/PLIST
index 4375b0a9ea6..22d83b710ff 100644
--- a/net/bind9/PLIST
+++ b/net/bind9/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.21 2008/04/12 22:43:08 jlam Exp $
+@comment $NetBSD: PLIST,v 1.22 2008/07/10 21:05:30 adrianp Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -77,6 +77,7 @@ include/dst/lib.h
 include/dst/result.h
 include/isc/app.h
 include/isc/assertions.h
+include/isc/atomic.h
 include/isc/base64.h
 include/isc/bitstring.h
 include/isc/boolean.h
diff --git a/net/bind9/distinfo b/net/bind9/distinfo
index 6ce3b43287c..fa0b7daffbe 100644
--- a/net/bind9/distinfo
+++ b/net/bind9/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.36 2008/06/21 22:13:22 adrianp Exp $
+$NetBSD: distinfo,v 1.37 2008/07/10 21:05:30 adrianp Exp $
 
-SHA1 (bind-9.4.1-P1.tar.gz) = c65bfd3d6ff1dd78b678fe350e323bfb6d47fe1b
-RMD160 (bind-9.4.1-P1.tar.gz) = ced75a96098d78a7fdd8cc1d1e3daf2ad142ee9f
-Size (bind-9.4.1-P1.tar.gz) = 6341409 bytes
+SHA1 (bind-9.4.2-P1.tar.gz) = 71421abc311fbbd6cc9fa7d4400dff4d82a0a6a8
+RMD160 (bind-9.4.2-P1.tar.gz) = 9771d109aaa7c340bc1af280a8ab713892604ba1
+Size (bind-9.4.2-P1.tar.gz) = 6451654 bytes
 SHA1 (patch-ab) = dd12c457791a75a8b43d9dfd0c0b236dcdbe31a5
 SHA1 (patch-ac) = 4df1ece91d59b2b36fc7a4316604f1c112cf70ba
-SHA1 (patch-ad) = 0d743fd89184105225ff442e1c8e622b0f8d16fa
+SHA1 (patch-ad) = 0851864c896c2f0eb63cb58da39e12cfa89f1b7c
 SHA1 (patch-af) = b21bb5195cdb4deec00e5abd39f5bf2137549c3f
 SHA1 (patch-ag) = 9d61e0f527a76977bf8457355997d201fa37dd4e
 SHA1 (patch-ai) = 00b4e2206b161d0cdf67b8569b7d36d9b898b18f
diff --git a/net/bind9/patches/patch-ad b/net/bind9/patches/patch-ad
index 55059d508ab..81897f7ff3e 100644
--- a/net/bind9/patches/patch-ad
+++ b/net/bind9/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2008/06/21 22:13:22 adrianp Exp $
+$NetBSD: patch-ad,v 1.8 2008/07/10 21:05:30 adrianp Exp $
 
---- configure.orig	2005-10-21 08:57:38.000000000 +0900
+--- configure.orig	2007-09-14 05:27:29.000000000 +0100
 +++ configure
-@@ -5546,6 +5546,8 @@ case $host in
+@@ -6165,6 +6165,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=false ;;
@@ -11,27 +11,19 @@ $NetBSD: patch-ad,v 1.7 2008/06/21 22:13:22 adrianp Exp $
  *-bsdi234*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -5634,7 +5636,7 @@ echo "$as_me: WARNING: linking with PTL2
- echo "${ECHO_T}native" >&6
+@@ -6253,7 +6255,7 @@ 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
  				then
- 					echo "$as_me:$LINENO: result: none" >&5
- echo "${ECHO_T}none" >&6
-@@ -5645,14 +5647,23 @@ echo "$as_me: error: \"could not find th
+ 					{ echo "$as_me:$LINENO: result: none" >&5
+ echo "${ECHO_T}none" >&6; }
+@@ -6264,14 +6266,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"
 +					if test -f /usr/include/pthread.h
 +					then
 +						{ echo "$as_me:$LINENO: result: native pthreads" >&5
@@ -40,8 +32,14 @@ $NetBSD: patch-ad,v 1.7 2008/06/21 22:13:22 adrianp Exp $
 +						CPPFLAGS="$CPPFLAGS -I/usr/include"
 +						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 "$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"
 +						pkg="$LOCALBASE/pthreads"
 +						lib1="-L$pkg/lib -Wl,-R$pkg/lib"
 +						lib2="-lpthread -lm -lgcc -lpthread"