Pullup ticket #3605 - requested by spz

net/bind98 security update

Revisions pulled up:
- net/bind98/Makefile                                           1.6
- net/bind98/distinfo                                           1.6-1.7
- net/bind98/patches/patch-bin_dig_dighost.c                    1.1

---
   Module Name:	pkgsrc
   Committed By:	spz
   Date:		Wed Nov 16 21:34:44 UTC 2011

   Modified Files:
   	pkgsrc/net/bind98: Makefile distinfo

   Log Message:
   BIND 9.8.1-P1 is security patch for BIND 9.8.1.

   * BIND 9 nameservers performing recursive queries could cache an invalid
     record and subsequent queries for that record could crash the resolvers
     with an assertion failure. [RT #26590]

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Thu Nov 17 00:48:09 UTC 2011

   Modified Files:
   	pkgsrc/net/bind98: distinfo
   Added Files:
   	pkgsrc/net/bind98/patches: patch-bin_dig_dighost.c

   Log Message:
   Fix build problem on NetBSD current, maybe caused by newer gcc.

   * Avoid to use true as variable name.

3 files changed, 135 insertions, 6 deletions

diff --git a/net/bind98/Makefile b/net/bind98/Makefile
index 3be15e1e6d7..0bbb33dc5f3 100644
--- a/net/bind98/Makefile
+++ b/net/bind98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/09/01 03:44:35 taca Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2011/11/17 01:26:00 sbd 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.8.1
+BIND_VERSION=	9.8.1-P1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/bind98/distinfo b/net/bind98/distinfo
index 6ac995871d6..5c8e9e8a413 100644
--- a/net/bind98/distinfo
+++ b/net/bind98/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2011/09/01 03:44:35 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2011/11/17 01:26:00 sbd Exp $
 
-SHA1 (bind-9.8.1.tar.gz) = 7e6ed6ebc896b1de33a9f440233066c60539de4c
-RMD160 (bind-9.8.1.tar.gz) = a1a49ce0b1b6a5c6dd339fe160920cd4f39e2372
-Size (bind-9.8.1.tar.gz) = 8450567 bytes
+SHA1 (bind-9.8.1-P1.tar.gz) = 1cff6594aa185d84942edd2f3cc06dff9cebb04b
+RMD160 (bind-9.8.1-P1.tar.gz) = 3183167d73a5da81e7e286a6eb123fc8684f4421
+Size (bind-9.8.1-P1.tar.gz) = 8451969 bytes
+SHA1 (patch-bin_dig_dighost.c) = 3f37033cc64e1153268ab437fab533d2920bb18c
 SHA1 (patch-config.threads.in) = 3d8ee03230fdb6aca545a67759ba7aacda52bb61
 SHA1 (patch-configure) = 81a83d750f5c6d21abb30a743a4aa09e7d91711e
 SHA1 (patch-contrib_dlz_drivers_sdlz__helper.c) = d6e9a7145449874ad00a0b28b1582df5a2516965
diff --git a/net/bind98/patches/patch-bin_dig_dighost.c b/net/bind98/patches/patch-bin_dig_dighost.c
new file mode 100644
index 00000000000..a525362e2d7
--- /dev/null
+++ b/net/bind98/patches/patch-bin_dig_dighost.c
@@ -0,0 +1,128 @@
+$NetBSD: patch-bin_dig_dighost.c,v 1.1.2.2 2011/11/17 01:26:00 sbd Exp $
+
+Avoid to use true as variable name.
+
+--- bin/dig/dighost.c.orig	2011-03-11 06:46:58.000000000 +0000
++++ bin/dig/dighost.c
+@@ -4345,7 +4345,7 @@ prepare_lookup(dns_name_t *name)
+ 		isc_result_t result;
+ 		isc_region_t r;
+ 		dns_rdataset_t *rdataset = NULL;
+-		isc_boolean_t true = ISC_TRUE;
++		isc_boolean_t isc_true = ISC_TRUE;
+ #endif
+ 
+ 		memset(namestr, 0, DNS_NAME_FORMATSIZE);
+@@ -4359,7 +4359,7 @@ prepare_lookup(dns_name_t *name)
+ 
+ 		result = advanced_rrsearch(&rdataset, &ns.name,
+ 					   dns_rdatatype_aaaa,
+-					   dns_rdatatype_any, &true);
++					   dns_rdatatype_any, &isc_true);
+ 		if (result == ISC_R_SUCCESS) {
+ 			for (result = dns_rdataset_first(rdataset);
+ 			     result == ISC_R_SUCCESS;
+@@ -4388,7 +4388,7 @@ prepare_lookup(dns_name_t *name)
+ 
+ 		rdataset = NULL;
+ 		result = advanced_rrsearch(&rdataset, &ns.name, dns_rdatatype_a,
+-					   dns_rdatatype_any, &true);
++					   dns_rdatatype_any, &isc_true);
+ 		if (result == ISC_R_SUCCESS) {
+ 			for (result = dns_rdataset_first(rdataset);
+ 			     result == ISC_R_SUCCESS;
+@@ -4507,11 +4507,11 @@ isc_result_t
+ initialization(dns_name_t *name)
+ {
+ 	isc_result_t   result;
+-	isc_boolean_t  true = ISC_TRUE;
++	isc_boolean_t  isc_true = ISC_TRUE;
+ 
+ 	chase_nsrdataset = NULL;
+ 	result = advanced_rrsearch(&chase_nsrdataset, name, dns_rdatatype_ns,
+-				   dns_rdatatype_any, &true);
++				   dns_rdatatype_any, &isc_true);
+ 	if (result != ISC_R_SUCCESS) {
+ 		printf("\n;; NS RRset is missing to continue validation:"
+ 		       " FAILED\n\n");
+@@ -4864,7 +4864,7 @@ sigchase_td(dns_message_t *msg)
+ 	isc_result_t result;
+ 	dns_name_t *name = NULL;
+ 	isc_boolean_t have_answer = ISC_FALSE;
+-	isc_boolean_t true = ISC_TRUE;
++	isc_boolean_t isc_true = ISC_TRUE;
+ 
+ 	if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER))
+ 	    == ISC_R_SUCCESS) {
+@@ -4873,7 +4873,7 @@ sigchase_td(dns_message_t *msg)
+ 			initialization(name);
+ 			return;
+ 		}
+-		have_answer = true;
++		have_answer = isc_true;
+ 	} else {
+ 		if (!current_lookup->trace_root_sigchase) {
+ 			result = dns_message_firstname(msg,
+@@ -4991,7 +4991,7 @@ sigchase_td(dns_message_t *msg)
+ 						   dns_rdatatype_rrsig,
+ 						   current_lookup
+ 						   ->rdtype_sigchase,
+-						   &true);
++						   &isc_true);
+ 			if (result == ISC_R_FAILURE) {
+ 				printf("\n;; RRset is missing to continue"
+ 				       " validation SHOULD NOT APPEND:"
+@@ -5004,7 +5004,7 @@ sigchase_td(dns_message_t *msg)
+ 						   &chase_authority_name,
+ 						   dns_rdatatype_rrsig,
+ 						   dns_rdatatype_any,
+-						   &true);
++						   &isc_true);
+ 			if (result == ISC_R_FAILURE) {
+ 				printf("\n;; RRSIG is missing  to continue"
+ 				       " validation SHOULD NOT APPEND:"
+@@ -5080,7 +5080,7 @@ sigchase_td(dns_message_t *msg)
+ 					   &chase_authority_name,
+ 					   dns_rdatatype_rrsig,
+ 					   dns_rdatatype_ds,
+-					   &true);
++					   &isc_true);
+ 		if (result != ISC_R_SUCCESS) {
+ 			printf("\n;; DSset is missing to continue validation:"
+ 			       " FAILED\n\n");
+@@ -5168,7 +5168,7 @@ sigchase_td(dns_message_t *msg)
+ 		result = advanced_rrsearch(&chase_rdataset, &chase_name,
+ 					   current_lookup->rdtype_sigchase,
+ 					   dns_rdatatype_any ,
+-					   &true);
++					   &isc_true);
+ 	if (result == ISC_R_FAILURE) {
+ 		printf("\n;; RRsig of RRset is missing to continue validation"
+ 		       " SHOULD NOT APPEND: FAILED\n\n");
+@@ -5211,7 +5211,7 @@ getneededrr(dns_message_t *msg)
+ 	dns_name_t *name = NULL;
+ 	dns_rdata_t sigrdata = DNS_RDATA_INIT;
+ 	dns_rdata_sig_t siginfo;
+-	isc_boolean_t   true = ISC_TRUE;
++	isc_boolean_t   isc_true = ISC_TRUE;
+ 
+ 	if ((result = dns_message_firstname(msg, DNS_SECTION_ANSWER))
+ 	    != ISC_R_SUCCESS) {
+@@ -5227,7 +5227,7 @@ getneededrr(dns_message_t *msg)
+ 	if (chase_rdataset == NULL) {
+ 		result = advanced_rrsearch(&chase_rdataset, name,
+ 					   dns_rdatatype_any,
+-					   dns_rdatatype_any, &true);
++					   dns_rdatatype_any, &isc_true);
+ 		if (result != ISC_R_SUCCESS) {
+ 			printf("\n;; No Answers: Validation FAILED\n\n");
+ 			return (ISC_R_NOTFOUND);
+@@ -5347,7 +5347,7 @@ getneededrr(dns_message_t *msg)
+ 		result = advanced_rrsearch(&chase_sigdsrdataset,
+ 					   &chase_signame,
+ 					   dns_rdatatype_rrsig,
+-					   dns_rdatatype_ds, &true);
++					   dns_rdatatype_ds, &isc_true);
+ 		if (result == ISC_R_FAILURE) {
+ 			printf(";; WARNING : NO RRSIG DS : RRSIG DS"
+ 			       " should come with DS\n");