Update to 9.11.6.

4 files changed, 15 insertions, 15 deletions

diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index c44f08dc1c0c..38485be7a674 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libxml2.so:textproc/libxml2
 USES=	cpe libedit
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.11.5-P4
+ISCVERSION=	9.11.6
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo
index bcd5423d4fed..28198d6b7257 100644
--- a/dns/bind911/distinfo
+++ b/dns/bind911/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1550649103
-SHA256 (bind-9.11.5-P4.tar.gz) = 7e8c08192bcbaeb6e9f2391a70e67583b027b90e8c4bc1605da6eb126edde434
-SIZE (bind-9.11.5-P4.tar.gz) = 8819038
+TIMESTAMP = 1551432618
+SHA256 (bind-9.11.6.tar.gz) = 4499007f3a6b8bba84fc757053caeabf36466d6f7d278baccef9fd109beac6d4
+SIZE (bind-9.11.6.tar.gz) = 8125093
diff --git a/dns/bind911/files/extrapatch-bind-min-override-ttl b/dns/bind911/files/extrapatch-bind-min-override-ttl
index 43c308c63d7f..f279b2db8fff 100644
--- a/dns/bind911/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind911/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig	2019-02-05 00:06:43 UTC
+--- bin/named/config.c.orig	2019-02-27 23:28:15 UTC
 +++ bin/named/config.c
 @@ -177,6 +177,8 @@ options {\n\
  "	max-acache-size 16M;\n\
@@ -9,9 +9,9 @@
  	max-clients-per-query 100;\n\
  	max-ncache-ttl 10800; /* 3 hours */\n\
  	max-recursion-depth 7;\n\
---- bin/named/server.c.orig	2019-02-05 00:06:43 UTC
+--- bin/named/server.c.orig	2019-02-27 23:28:15 UTC
 +++ bin/named/server.c
-@@ -3695,6 +3695,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -3718,6 +3718,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	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	2019-02-05 00:06:43 UTC
+--- lib/dns/include/dns/view.h.orig	2019-02-27 23:28:15 UTC
 +++ lib/dns/include/dns/view.h
 @@ -152,6 +152,8 @@ struct dns_view {
  	bool			requestnsid;
@@ -39,9 +39,9 @@
  	dns_ttl_t			maxncachettl;
  	uint32_t			nta_lifetime;
  	uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2019-02-05 00:06:43 UTC
+--- lib/dns/resolver.c.orig	2019-02-27 23:28:15 UTC
 +++ lib/dns/resolver.c
-@@ -5474,6 +5474,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -5514,6 +5514,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
  		}
  
  		/*
@@ -60,7 +60,7 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2019-02-05 00:06:43 UTC
+--- lib/isccfg/namedconf.c.orig	2019-02-27 23:28:15 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1773,6 +1773,8 @@ view_clauses[] = {
  #endif
diff --git a/dns/bind911/files/patch-configure b/dns/bind911/files/patch-configure
index 3d88a1052f83..a05765e38e3f 100644
--- a/dns/bind911/files/patch-configure
+++ b/dns/bind911/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2018-10-06 01:36:17 UTC
+--- configure.orig	2019-02-27 23:28:15 UTC
 +++ configure
-@@ -15106,27 +15106,9 @@ done
+@@ -15157,27 +15157,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
-@@ -15169,47 +15151,7 @@ $as_echo "no" >&6; } ;;
+@@ -15220,47 +15202,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
-@@ -23938,7 +23880,7 @@ $as_echo "" >&6; }
+@@ -24267,7 +24209,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).