Pullup ticket #2645 - requested by mlelstv

bind9: security update

Revisions pulled up:
- net/bind9/Makefile				1.103-1.104
- net/bind9/PLIST				1.23
- net/bind9/distinfo				1.39-1.40
- net/bind9/patches/patch-ai			1.10
- net/bind9/patches/patch-ap			delete
---
Module Name:	pkgsrc
Committed By:	adrianp
Date:		Sun Jan	 4 00:16:03 UTC 2009

Modified Files:
	pkgsrc/net/bind9: Makefile PLIST distinfo
	pkgsrc/net/bind9/patches: patch-ai
Removed Files:
	pkgsrc/net/bind9/patches: patch-ap

Log Message:
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
---
Module Name:	pkgsrc
Committed By:	adrianp
Date:		Thu Jan	 8 09:02:19 UTC 2009

Modified Files:
	pkgsrc/net/bind9: Makefile distinfo

Log Message:
Changes since 9.4.3:

2522.	[security]	Handle -1 from DSA_do_verify().

2498.	[bug]		Removed a bogus function argument used with
			ISC_SOCKET_USE_POLLWATCH: it could cause compiler
			warning or crash named with the debug 1 level
			of logging. [RT #18917]


To generate a diff of this commit:
cvs rdiff -r1.103 -r1.104 pkgsrc/net/bind9/Makefile
cvs rdiff -r1.39 -r1.40 pkgsrc/net/bind9/distinfo

5 files changed, 37 insertions, 51 deletions

diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 3673a80f3e1..5c55a1e6e5e 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.102 2008/08/03 18:41:45 adrianp Exp $
+# $NetBSD: Makefile,v 1.102.6.1 2009/01/19 11:44:15 tron Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
-PKGNAME=	${DISTNAME:S/-P2/pl2/}
+PKGNAME=	${DISTNAME:S/-P1/pl1/}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
@@ -9,9 +9,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.isc.org/sw/bind/
 COMMENT=	Version 9 of the Berkeley Internet Name Daemon, implementation of DNS
 
+CONFLICTS+=	bind<9.4.0
+CONFLICTS+=	bind>=9.5.0
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BIND_VERSION=	9.4.2-P2
+BIND_VERSION=	9.4.3-P1
 
 # IPv6 ready, automatically detected
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/bind9/PLIST b/net/bind9/PLIST
index 22d83b710ff..43b22898b52 100644
--- a/net/bind9/PLIST
+++ b/net/bind9/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2008/07/10 21:05:30 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.22.10.1 2009/01/19 11:44:15 tron Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -192,6 +192,7 @@ lib/liblwres.la
 man/man1/dig.1
 man/man1/host.1
 man/man1/nslookup.1
+man/man1/nsupdate.1
 man/man3/lwres.3
 man/man3/lwres_addr_parse.3
 man/man3/lwres_buffer.3
@@ -286,7 +287,6 @@ man/man8/named-checkconf.8
 man/man8/named-checkzone.8
 man/man8/named-compilezone.8
 man/man8/named.8
-man/man8/nsupdate.8
 man/man8/rndc-confgen.8
 man/man8/rndc.8
 sbin/dnssec-keygen
diff --git a/net/bind9/distinfo b/net/bind9/distinfo
index 3c45c1d97b3..84d96ca151b 100644
--- a/net/bind9/distinfo
+++ b/net/bind9/distinfo
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.38 2008/08/03 18:41:45 adrianp Exp $
+$NetBSD: distinfo,v 1.38.6.1 2009/01/19 11:44:16 tron Exp $
 
-SHA1 (bind-9.4.2-P2.tar.gz) = e6aebf6e73dfd4d8ccae397bc5cafaa17fbc5ce4
-RMD160 (bind-9.4.2-P2.tar.gz) = c0934436914cbc0963298cec326fe14a73130873
-Size (bind-9.4.2-P2.tar.gz) = 6456550 bytes
+SHA1 (bind-9.4.3-P1.tar.gz) = 3aff02f8c7c0c79dc589b9ce9af28bae386d44cf
+RMD160 (bind-9.4.3-P1.tar.gz) = f7bc80a50c03f241d37c3bc4cfe52d936675f8c3
+Size (bind-9.4.3-P1.tar.gz) = 6544583 bytes
 SHA1 (patch-ab) = dd12c457791a75a8b43d9dfd0c0b236dcdbe31a5
 SHA1 (patch-ac) = 4df1ece91d59b2b36fc7a4316604f1c112cf70ba
 SHA1 (patch-ad) = 0851864c896c2f0eb63cb58da39e12cfa89f1b7c
 SHA1 (patch-af) = b21bb5195cdb4deec00e5abd39f5bf2137549c3f
 SHA1 (patch-ag) = 9d61e0f527a76977bf8457355997d201fa37dd4e
-SHA1 (patch-ai) = 00b4e2206b161d0cdf67b8569b7d36d9b898b18f
+SHA1 (patch-ai) = 4375ae44c83050fd576c0ccb5b267fbc23761a63
 SHA1 (patch-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
 SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
 SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
 SHA1 (patch-an) = 6ec6ede602292ef2eaf5f0891e97576218bd8c3e
 SHA1 (patch-ao) = 9a1ed7b37befdd8e29d233fe55cd62362df3c50e
-SHA1 (patch-ap) = 800486318acbaae22d04ac6e2b7ccddd150fde90
diff --git a/net/bind9/patches/patch-ai b/net/bind9/patches/patch-ai
index 2ecc5db97e6..bdb17832cd2 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.9.10.1 2009/01/19 11:44:16 tron 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;
- 	}