Pullup ticket 2010 - requested by adrianp

security update for bind9

- pkgsrc/net/bind9/Makefile				1.85-1.86
- pkgsrc/net/bind9/distinfo				1.30
- pkgsrc/net/bind9/patches/patch-ao			1.2
- pkgsrc/net/bind9/patches/patch-ap			removed
- pkgsrc/net/bind9/patches/patch-aq			removed

   Module Name:	pkgsrc
   Committed By:	adrianp
   Date:		Sun Jan 28 01:31:52 UTC 2007

   Modified Files:
	   pkgsrc/net/bind9: Makefile distinfo
	   pkgsrc/net/bind9/patches: patch-ao
   Removed Files:
	   pkgsrc/net/bind9/patches: patch-ap patch-aq

   Log Message:
   Update to 9.3.4
   Lots of changes, see http://www.isc.org/sw/bind/view/?release=9.3.4#RELEASE
   for all the details:

   In brief:
   2126.	[security]	Serialise validation of type ANY responses.

   2124.	[security]	It was possible to dereference a freed fetch
   context.

   2089.	[security]	Raise the minimum safe OpenSSL versions to
   OpenSSL 0.9.7l and OpenSSL 0.9.8d.  Versions
   prior to these have known security flaws which
   are (potentially) exploitable in named.

   2088.	[security]	Change the default RSA exponent from 3 to 65537.

   2066.   [security]      Handle SIG queries gracefully.

   1941.   [bug]           ncache_adderesult() should set eresult even if no
   rdataset is passed to it.
---
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Tue Jan 30 15:04:34 UTC 2007

   Modified Files:
	   pkgsrc/net/bind9: Makefile

   Log Message:
   Fix permission problems:
   - "share/doc/bind9" shouldn't be group-writable.
   - "share/doc/bind9/arm/Bv9ARM.pdf" shouldn't be executable.

   Bump package revision because of these fixes.

3 files changed, 17 insertions, 16 deletions

diff --git a/net/bind9/Makefile b/net/bind9/Makefile
index 0267ef14da6..bfdd6610f4b 100644
--- a/net/bind9/Makefile
+++ b/net/bind9/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2006/11/23 22:19:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.84.2.1 2007/02/01 09:28:52 ghen Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
-PKGREVISION=	4
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
@@ -9,7 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.isc.org/sw/bind/
 COMMENT=	Version 9 of the Berkeley Internet Name Daemon, implementation of DNS
 
-BIND_VERSION=	9.3.2
+BIND_VERSION=	9.3.4
 
 # IPv6 ready, automatically detected
 .include "../../mk/bsd.prefs.mk"
@@ -60,6 +60,8 @@ post-install:
 	set -e; cd ${WRKSRC}/doc && ${PAX} -rwppm			\
 	  -s ',.*xsl.*,,' -s ',Makefile.*,,' -s ',.*\.pl,,'		\
 	  . ${PREFIX}/share/doc/bind9
+	${CHMOD} -R g-w ${PREFIX}/share/doc/bind9
+	${CHMOD} -x ${PREFIX}/share/doc/bind9/arm/Bv9ARM.pdf
 	${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/distinfo b/net/bind9/distinfo
index 5374dccd0a5..78cfeb46904 100644
--- a/net/bind9/distinfo
+++ b/net/bind9/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.29 2006/09/05 20:45:32 adrianp Exp $
+$NetBSD: distinfo,v 1.29.4.1 2007/02/01 09:28:53 ghen Exp $
 
-SHA1 (bind-9.3.2.tar.gz) = 13efeaf496ed110980088fb5cbe22460f04a0fac
-RMD160 (bind-9.3.2.tar.gz) = c825b6308eb374e9bcf9b6ccc48f65d8753c0a6d
-Size (bind-9.3.2.tar.gz) = 5302112 bytes
+SHA1 (bind-9.3.4.tar.gz) = f53c7e24157ae1fd881834351804bfee3c2782ee
+RMD160 (bind-9.3.4.tar.gz) = 8b5fda9542f6afbe7ffb857d72f7e545237d7826
+Size (bind-9.3.4.tar.gz) = 5405022 bytes
 SHA1 (patch-ab) = dd12c457791a75a8b43d9dfd0c0b236dcdbe31a5
 SHA1 (patch-ac) = 4df1ece91d59b2b36fc7a4316604f1c112cf70ba
 SHA1 (patch-ad) = 0e28ae0bb42e633f1ff1111478c97ced5c222186
@@ -13,6 +13,4 @@ SHA1 (patch-aj) = c3bbf84a8a735298552f918ac38331e06a1b68a1
 SHA1 (patch-al) = eb6a52d3f865639447ec6f9019c0ea1d2122b772
 SHA1 (patch-am) = bb267f13dbd30d492f4dfcf9c278b941efa97bed
 SHA1 (patch-an) = b3e5cd93890aa9a9cec7c14abf1b62ddbf854b14
-SHA1 (patch-ao) = 8a3f8f1b5871af263fc99bc8e552b3ab615bc815
-SHA1 (patch-ap) = 817c39121f1b62f8033822a42d7d9f8a5b5372ea
-SHA1 (patch-aq) = 20cde9869c69dff2aca4784ec9b8b032639776fe
+SHA1 (patch-ao) = 9a1ed7b37befdd8e29d233fe55cd62362df3c50e
diff --git a/net/bind9/patches/patch-ao b/net/bind9/patches/patch-ao
index 58fc04b6328..b9dfd2f8037 100644
--- a/net/bind9/patches/patch-ao
+++ b/net/bind9/patches/patch-ao
@@ -1,21 +1,22 @@
-$NetBSD: patch-ao,v 1.1 2006/08/28 16:00:45 seb Exp $
+$NetBSD: patch-ao,v 1.1.6.1 2007/02/01 09:28:53 ghen Exp $
 
---- lib/bind/irs/getaddrinfo.c.orig	2005-07-28 07:43:19.000000000 +0000
+--- lib/bind/irs/getaddrinfo.c.orig	2006-11-13 05:04:49.000000000 +0000
 +++ lib/bind/irs/getaddrinfo.c
-@@ -332,7 +332,7 @@ getaddrinfo(hostname, servname, hints, r
+@@ -332,7 +332,8 @@ getaddrinfo(hostname, servname, hints, r
  	pai->ai_family = PF_UNSPEC;
  	pai->ai_socktype = ANY;
  	pai->ai_protocol = ANY;
--#ifdef __sparcv9
+-#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
 +#if (defined(sun) && defined(_SOCKLEN_T) && defined(__sparc9)) || (defined(__NetBSD__) && (((defined(__sparc__) || defined(__i386__)) && defined(_LP64)) || defined(__alpha__)))
++
  	/*
  	 * clear _ai_pad to preserve binary
  	 * compatibility with previously compiled 64-bit
-@@ -365,7 +365,7 @@ getaddrinfo(hostname, servname, hints, r
+@@ -365,7 +366,7 @@ getaddrinfo(hostname, servname, hints, r
  		}
  		memcpy(pai, hints, sizeof(*pai));
  
--#ifdef __sparcv9
+-#if defined(sun) && defined(_SOCKLEN_T) && defined(__sparcv9)
 +#if (defined(sun) && defined(_SOCKLEN_T) && defined(__sparc9)) || (defined(__NetBSD__) && (((defined(__sparc__) || defined(__i386__)) && defined(_LP64)) || defined(__alpha__)))
  		/*
  		 * We need to clear _ai_pad to preserve binary