6 files changed, 20 insertions, 20 deletions

diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index d5c3a6f9138e..06bfdbb866f4 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -2,7 +2,7 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
-PORTVERSION=	${ISCVERSION:S/-P/P/}
+PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/}
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
 PORTREVISION=	0
@@ -29,7 +29,7 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	ISCL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.10.3-P4
+ISCVERSION=	9.10.4
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/dns/bind910/distinfo b/dns/bind910/distinfo
index f39e2ea516ce..7e92e3f2727a 100644
--- a/dns/bind910/distinfo
+++ b/dns/bind910/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bind-9.10.3-P4.tar.gz) = 2ac044b5fbdf45fb45107af0df961b3b7cb5262a3bf1948ed3fe7a170dd13e3e
-SIZE (bind-9.10.3-P4.tar.gz) = 8529535
+SHA256 (bind-9.10.4.tar.gz) = f8d412b38d5ac390275b943bde69f4608f67862a45487ec854b30e4448fcb056
+SIZE (bind-9.10.4.tar.gz) = 9318151
diff --git a/dns/bind910/files/extrapatch-bind-min-override-ttl b/dns/bind910/files/extrapatch-bind-min-override-ttl
index d847787779f0..1ec3ec75ec7c 100644
--- a/dns/bind910/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind910/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig	2016-02-29 00:29:06 UTC
+--- bin/named/config.c.orig	2016-04-20 20:11:20 UTC
 +++ bin/named/config.c
 @@ -151,6 +151,8 @@ options {\n\
  	min-roots 2;\n\
@@ -9,9 +9,9 @@
  	max-cache-ttl 604800; /* 1 week */\n\
  	transfer-format many-answers;\n\
  	max-cache-size 0;\n\
---- bin/named/server.c.orig	2016-02-29 00:29:06 UTC
+--- bin/named/server.c.orig	2016-04-20 20:11:20 UTC
 +++ bin/named/server.c
-@@ -2797,6 +2797,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -2802,6 +2802,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
  
  	obj = NULL;
@@ -28,7 +28,7 @@
  	result = ns_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig	2016-02-29 00:29:06 UTC
+--- lib/dns/include/dns/view.h.orig	2016-04-20 20:11:20 UTC
 +++ lib/dns/include/dns/view.h
 @@ -150,6 +150,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
@@ -39,9 +39,9 @@
  	dns_ttl_t			maxncachettl;
  	dns_ttl_t			prefetch_trigger;
  	dns_ttl_t			prefetch_eligible;
---- lib/dns/resolver.c.orig	2016-02-29 00:29:06 UTC
+--- lib/dns/resolver.c.orig	2016-04-20 20:11:20 UTC
 +++ lib/dns/resolver.c
-@@ -5345,6 +5345,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
+@@ -5371,6 +5371,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
  		}
  
  		/*
@@ -60,9 +60,9 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig	2016-02-29 00:29:06 UTC
+--- lib/isccfg/namedconf.c.orig	2016-04-20 20:11:20 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1561,6 +1561,8 @@ view_clauses[] = {
+@@ -1572,6 +1572,8 @@ view_clauses[] = {
  #endif
  	{ "max-acache-size", &cfg_type_sizenodefault, 0 },
  	{ "max-cache-size", &cfg_type_sizenodefault, 0 },
diff --git a/dns/bind910/files/named.root b/dns/bind910/files/named.root
index 159213fc33e6..21ec7ca71f9b 100644
--- a/dns/bind910/files/named.root
+++ b/dns/bind910/files/named.root
@@ -13,8 +13,8 @@
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:    December 01, 2015
-;       related version of root zone:   2015120100
+;       last update:    March 23, 2016
+;       related version of root zone:   2016032301
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -84,7 +84,7 @@ K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
 ;
 .                        3600000      NS    L.ROOT-SERVERS.NET.
 L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
-L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
+L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:9f::42
 ;
 ; OPERATED BY WIDE
 ;
diff --git a/dns/bind910/files/patch-bin__tests__system__dlzexternal__Makefile.in b/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in
index a63be7ce0466..aecb9e38a9b4 100644
--- a/dns/bind910/files/patch-bin__tests__system__dlzexternal__Makefile.in
+++ b/dns/bind910/files/patch-bin_tests_system_dlzexternal_Makefile.in
@@ -1,4 +1,4 @@
---- bin/tests/system/dlzexternal/Makefile.in.orig	2015-09-09 02:23:40 UTC
+--- bin/tests/system/dlzexternal/Makefile.in.orig	2016-04-20 20:11:20 UTC
 +++ bin/tests/system/dlzexternal/Makefile.in
 @@ -43,7 +43,7 @@ OBJS =          ${DLOPENOBJS}
  @BIND9_MAKE_RULES@
diff --git a/dns/bind910/files/patch-configure b/dns/bind910/files/patch-configure
index 8b68876f1e24..f17aeeefae16 100644
--- a/dns/bind910/files/patch-configure
+++ b/dns/bind910/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2015-12-06 12:37:44 UTC
+--- configure.orig	2016-04-20 20:11:20 UTC
 +++ configure
-@@ -14100,27 +14100,9 @@ done
+@@ -14142,27 +14142,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -30,7 +30,7 @@
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -14163,47 +14145,7 @@ $as_echo "no" >&6; } ;;
+@@ -14205,47 +14187,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -79,7 +79,7 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -21456,7 +21398,7 @@ $as_echo "" >&6; }
+@@ -21602,7 +21544,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).