Update bind99 to 9.9.3pl1 (BIND 9.9.3-P1).

Please refer CHANGES file for complete changes and here is quote from
release announce.

Introduction

   BIND 9.9.3-P1 is the latest production release of BIND 9.9-ESV.


Security Fixes

   Prevents exploitation of a runtime_check which can crash named
   when satisfying a recursive query for particular malformed zones.
   (CVE-2013-3919) [RT #33690]

   Now supports NAPTR regular expression validation on all platforms,
   and avoids memory exhaustion compiling pathological regular
   expressions. (CVE-2013-2266)  [RT #32688]

   Prevents named from aborting with a require assertion failure
   on servers with DNS64 enabled.  These crashes might occur as a
   result of specific queries that are received.  (CVE-2012-5688)
   [RT #30792 / #30996]

   Prevents an assertion failure in named when RPZ and DNS64 are
   used together. (CVE-2012-5689) [RT #32141]

New Features

   Adds a new configuration option, "check-spf"; valid values are
   "warn" (default) and "ignore".  When set to "warn", checks SPF
   and TXT records in spf format, warning if either resource record
   type occurs without a corresponding record of the other resource
   record type.  [RT #33355]

   Adds the command-line tool "dnssec-coverage" that checks to make
   sure that there is no scheduled lapse in key coverage. Requires
   python. [RT #28098]

   Adds support for the EUI48 and EUI64 RR types. [RT #33082]

   Adds support for the RFC 6742 ILNP record types (NID, LP, L32,
   and L64). [RT #31836]

9 files changed, 23 insertions, 177 deletions

diff --git a/net/bind99/Makefile b/net/bind99/Makefile
index 512273adfd0..cf347c1f918 100644
--- a/net/bind99/Makefile
+++ b/net/bind99/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2013/05/31 12:41:32 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/06/06 02:55:03 taca Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
 		http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
@@ -15,7 +14,7 @@ CONFLICTS+=	host-[0-9]*
 
 MAKE_JOBS_SAFE=	no
 
-BIND_VERSION=	9.9.2-P2
+BIND_VERSION=	9.9.3-P1
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -53,7 +52,7 @@ PKG_USERS=		${BIND_USER}:${BIND_GROUP}
 PKG_GECOS.${BIND_USER}=	Named pseudo-user
 PKG_HOME.${BIND_USER}=	${BIND_DIR}
 
-DOCS=			CHANGES FAQ README REDIRECT-NOTES
+DOCS=			CHANGES FAQ README
 
 FILES_SUBST+=		BIND_GROUP=${BIND_GROUP:Q} \
 			BIND_USER=${BIND_USER:Q} PAX=${PAX:Q}
diff --git a/net/bind99/PLIST b/net/bind99/PLIST
index 30062e8de7b..8b7c4a50d77 100644
--- a/net/bind99/PLIST
+++ b/net/bind99/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/10/10 03:07:12 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/06/06 02:55:03 taca Exp $
 bin/dig
 bin/host
 bin/isc-config.sh
@@ -139,6 +139,7 @@ include/isc/radix.h
 include/isc/random.h
 include/isc/ratelimiter.h
 include/isc/refcount.h
+include/isc/regex.h
 include/isc/region.h
 include/isc/resource.h
 include/isc/result.h
@@ -337,7 +338,6 @@ sbin/rndc-confgen
 share/doc/bind9/CHANGES
 share/doc/bind9/FAQ
 share/doc/bind9/README
-share/doc/bind9/REDIRECT-NOTES
 share/doc/bind9/arm/Bv9ARM.ch01.html
 share/doc/bind9/arm/Bv9ARM.ch02.html
 share/doc/bind9/arm/Bv9ARM.ch03.html
diff --git a/net/bind99/distinfo b/net/bind99/distinfo
index 534ee150fd9..7bf48e25bf7 100644
--- a/net/bind99/distinfo
+++ b/net/bind99/distinfo
@@ -1,23 +1,22 @@
-$NetBSD: distinfo,v 1.15 2013/04/08 15:55:45 pettai Exp $
+$NetBSD: distinfo,v 1.16 2013/06/06 02:55:03 taca Exp $
 
-SHA1 (bind-9.9.2-P2.tar.gz) = 3aadeaf64164a31a1cf22737ff2eea706792b68d
-RMD160 (bind-9.9.2-P2.tar.gz) = 3fd39bc8a572ac2c888ce6fc71454a8034cd9b68
-Size (bind-9.9.2-P2.tar.gz) = 7277958 bytes
-SHA1 (rl-9.9.2-P2.patch) = 4ea620a491e9d8427f9d1c484a2d240d56c61eec
-RMD160 (rl-9.9.2-P2.patch) = fdfc7ad77d86efc0f12da21a760b16b8ca99fc34
-Size (rl-9.9.2-P2.patch) = 100699 bytes
+SHA1 (bind-9.9.3-P1.tar.gz) = 9e1a9e5e45685befce6b93d4fcfd63e50eaeb2cf
+RMD160 (bind-9.9.3-P1.tar.gz) = 1c0e244781fa653872794991091e7403f4b6f020
+Size (bind-9.9.3-P1.tar.gz) = 7459819 bytes
+SHA1 (rl-9.9.3-P1.patch) = f4538d33c6d958e579752f90c9cee7db5dd1a6fa
+RMD160 (rl-9.9.3-P1.patch) = df1b825f2faa314680246be58cc74cb93a730105
+Size (rl-9.9.3-P1.patch) = 103910 bytes
 SHA1 (patch-bin_dig_Makefile.in) = d2c2a0b137be7e31fdc15438d107116fc38a38b9
 SHA1 (patch-bin_dig_dighost.c) = 186cdc70605242afb0211dc8802ec75677a65614
 SHA1 (patch-bin_nsupdate_Makefile.in) = 42b39d60468ffa8ed13f77259755b217966de664
 SHA1 (patch-bin_tests_system_Makefile.in) = 1f268808c55223ac11d1794039503424a51ee71b
 SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2
-SHA1 (patch-configure) = 96135505a9c554c95dade6872b42f360ad5bfeec
-SHA1 (patch-configure.in) = f07381d79ef45a7356d0657c220fcec3ffc6741d
+SHA1 (patch-configure) = cd7f1b06f3849016c971b5947578128594a04b9a
+SHA1 (patch-configure.in) = cc6fcdd0ad9fdc9546dc15d51c267bd4ac1453a6
 SHA1 (patch-contrib_dlz_config.dlz.in) = f18bec63fbfce7cb2cd72929058ce3770fce458f
 SHA1 (patch-lib_bind9_Makefile.in) = 89e21d21fa512f11a2fdb8d7455abd5d95f20ba5
 SHA1 (patch-lib_dns_Makefile.in) = 1770a8bd86901c618b11d255f3af54748d04b759
 SHA1 (patch-lib_dns_rbt.c) = df4b029369d9fa3b250d8505b5f7590e2cd86654
-SHA1 (patch-lib_dns_zone.c) = e01378ee95bf7c5b903a2c3a90acf83a3a4cae52
 SHA1 (patch-lib_isc_Makefile.in) = 5e0739d19957b1f26bcc24a6c76bcab6248cbff5
 SHA1 (patch-lib_isccc_Makefile.in) = a31831872b7724cb84f663ed70a82335d812f95f
 SHA1 (patch-lib_isccfg_Makefile.in) = 5ce4a85c1a13eca255804850b18b421418a2a01b
diff --git a/net/bind99/options.mk b/net/bind99/options.mk
index 94a92bda960..8bb5fdf028e 100644
--- a/net/bind99/options.mk
+++ b/net/bind99/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2013/03/27 12:08:24 pettai Exp $
+# $NetBSD: options.mk,v 1.7 2013/06/06 02:55:03 taca Exp $
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.bind99
 PKG_SUPPORTED_OPTIONS=  bind-dig-sigchase bind-xml-statistics-server
@@ -55,7 +55,7 @@ CONFIGURE_ARGS+=	--with-dlz-filesystem
 .endif
 
 .if !empty(PKG_OPTIONS:Mrrl)
-PATCHFILES=rl-9.9.2-P2.patch
+PATCHFILES=rl-9.9.3-P1.patch
 PATCH_SITES=http://ss.vix.su/~vjs/
 .endif
 
diff --git a/net/bind99/patches/patch-bin_dig_Makefile.in b/net/bind99/patches/patch-bin_dig_Makefile.in
deleted file mode 100644
index a0978836be4..00000000000
--- a/net/bind99/patches/patch-bin_dig_Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bin_dig_Makefile.in,v 1.1 2012/07/10 10:23:03 sbd Exp $
-
-Use @LIBREADLINE@.
-
---- bin/dig/Makefile.in.orig	2012-06-01 15:29:52.000000000 +0000
-+++ bin/dig/Makefile.in
-@@ -70,7 +70,7 @@ MANOBJS =	${MANPAGES} ${HTMLPAGES}
- @BIND9_MAKE_RULES@
- 
- dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
--	export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS}"; \
-+	export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS} @LIBREADLINE@"; \
- 	${FINALBUILDCMD}
- 
- host@EXEEXT@: host.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
diff --git a/net/bind99/patches/patch-bin_nsupdate_Makefile.in b/net/bind99/patches/patch-bin_nsupdate_Makefile.in
deleted file mode 100644
index 1383c5534e1..00000000000
--- a/net/bind99/patches/patch-bin_nsupdate_Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bin_nsupdate_Makefile.in,v 1.1 2012/07/10 10:23:03 sbd Exp $
-
-Use @LIBREADLINE@.
-
---- bin/nsupdate/Makefile.in.orig	2012-06-01 15:29:52.000000000 +0000
-+++ bin/nsupdate/Makefile.in
-@@ -44,9 +44,9 @@ ISCCFGDEPLIBS =	../../lib/isccfg/libiscc
- 
- DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS}
- 
--LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
-+LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ @LIBREADLINE@
- 
--NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
-+NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@ @LIBREADLINE@
- 
- SUBDIRS =
- 
diff --git a/net/bind99/patches/patch-configure b/net/bind99/patches/patch-configure
index c1181547427..7d251fc4a19 100644
--- a/net/bind99/patches/patch-configure
+++ b/net/bind99/patches/patch-configure
@@ -1,21 +1,12 @@
-$NetBSD: patch-configure,v 1.4 2013/03/26 22:12:14 taca Exp $
+$NetBSD: patch-configure,v 1.5 2013/06/06 02:55:03 taca Exp $
 
 * Add DragonFly support.
 * Link proper postgresql library.
-* Use separate @LIBREADLINE@ AC_SUBST.
 * Avoid using "==" for argument of test(1).
 
---- configure.orig	2013-03-06 16:56:08.000000000 +0000
+--- configure.orig	2013-06-04 18:30:02.000000000 +0000
 +++ configure
-@@ -1369,6 +1369,7 @@ LWRES_PLATFORM_NEEDVSNPRINTF
- ISC_PLATFORM_NEEDVSNPRINTF
- LWRES_PLATFORM_NEEDSPRINTF
- ISC_PLATFORM_NEEDSPRINTF
-+LIBREADLINE
- ISC_PLATFORM_NEEDSTRLCAT
- ISC_PLATFORM_NEEDSTRLCPY
- GENRANDOMLIB
-@@ -19784,7 +19785,7 @@ done
+@@ -12177,7 +12177,7 @@ done
  
  			;;
  		esac
@@ -24,7 +15,7 @@ $NetBSD: patch-configure,v 1.4 2013/03/26 22:12:14 taca Exp $
  		then
  			case "$use_python" in
  			unspec)
-@@ -22420,6 +22421,8 @@ case $host in
+@@ -14870,6 +14870,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=true ;;
@@ -33,70 +24,7 @@ $NetBSD: patch-configure,v 1.4 2013/03/26 22:12:14 taca Exp $
  *-bsdi[234]*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -25054,23 +25057,47 @@ no)	;;
- 	then
- 		readline=-lreadline
- 	fi
--	saved_LIBS="$LIBS"
--	LIBS="$LIBS $readline"
--	for ac_func in readline
--do :
--  ac_fn_c_check_func "$LINENO" "readline" "ac_cv_func_readline"
--if test "x$ac_cv_func_readline" = xyes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_READLINE 1
--_ACEOF
-+	as_ac_Lib=`$as_echo "ac_cv_lib_$readline''_readline" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in $readline" >&5
-+$as_echo_n "checking for readline in $readline... " >&6; }
-+if eval \${$as_ac_Lib+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="$readline  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char readline ();
-+int
-+main ()
-+{
-+return readline ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "$as_ac_Lib=yes"
-+else
-+  eval "$as_ac_Lib=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+eval ac_res=\$$as_ac_Lib
-+              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-+  LIBREADLINE=-lreadline
- fi
--done
--
--	if test "$ac_cv_func_readline" = "no"
--	then
--		LIBS="$saved_LIBS"
--	fi
-         ;;
- esac
- 
-@@ -27402,7 +27429,7 @@ $as_echo "no" >&6; }
+@@ -19876,7 +19878,7 @@ $as_echo "no" >&6; }
  	fi
  	if test -n "-L$use_dlz_postgres_lib -lpq"
  	then
diff --git a/net/bind99/patches/patch-configure.in b/net/bind99/patches/patch-configure.in
index 275092c56bb..9a17118b511 100644
--- a/net/bind99/patches/patch-configure.in
+++ b/net/bind99/patches/patch-configure.in
@@ -1,9 +1,8 @@
-$NetBSD: patch-configure.in,v 1.2 2012/10/10 03:07:12 taca Exp $
+$NetBSD: patch-configure.in,v 1.3 2013/06/06 02:55:03 taca Exp $
 
-* Use separate @LIBREADLINE@ AC_SUBST.
 * Avoid using "==" for argument of test(1).
 
---- configure.in.orig	2012-09-27 00:35:19.000000000 +0000
+--- configure.in.orig	2013-06-04 18:30:02.000000000 +0000
 +++ configure.in
 @@ -157,7 +157,7 @@ case "$use_python" in
  			AC_PATH_PROGS(PYTHON, $use_python)
@@ -14,31 +13,3 @@ $NetBSD: patch-configure.in,v 1.2 2012/10/10 03:07:12 taca Exp $
  		then
  			case "$use_python" in
  			unspec)
-@@ -2322,23 +2322,18 @@ AC_SUBST(ISC_PLATFORM_NEEDSTRLCAT)
- 
- AC_ARG_WITH(readline,
-         [  --with-readline[=LIBSPEC]    specify readline library [default -lreadline]],
--        readline="$withval", readline="-lreadline")
-+        readline="$withval", readline="readline")
- case "$readline" in
- no)	;;
- *)
- 	if test "x$readline" = "xyes"
- 	then
--		readline=-lreadline
--	fi
--	saved_LIBS="$LIBS"
--	LIBS="$LIBS $readline"
--	AC_CHECK_FUNCS(readline)
--	if test "$ac_cv_func_readline" = "no" 
--	then
--		LIBS="$saved_LIBS"
-+		readline=readline
- 	fi
-+	AC_CHECK_LIB($readline, [readline], LIBREADLINE=-lreadline)
-         ;;
- esac
-+AC_SUBST(LIBREADLINE)
- 
- 
- ISC_PRINT_OBJS=
diff --git a/net/bind99/patches/patch-lib_dns_zone.c b/net/bind99/patches/patch-lib_dns_zone.c
deleted file mode 100644
index 29d99c20fef..00000000000
--- a/net/bind99/patches/patch-lib_dns_zone.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-lib_dns_zone.c,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
-
-* Avoid to use bool as variable name.
-
---- lib/dns/zone.c.orig	2012-02-23 07:09:02.000000000 +0000
-+++ lib/dns/zone.c
-@@ -15780,9 +15780,9 @@ dns_zone_setrefreshkeyinterval(dns_zone_
- }
- 
- void
--dns_zone_setrequestixfr(dns_zone_t *zone, isc_boolean_t bool) {
-+dns_zone_setrequestixfr(dns_zone_t *zone, isc_boolean_t isc_bool) {
- 	REQUIRE(DNS_ZONE_VALID(zone));
--	zone->requestixfr = bool;
-+	zone->requestixfr = isc_bool;
- }
- 
- isc_boolean_t