Update to latest commit.

Sponsored by:	Absolight

6 files changed, 21 insertions, 22 deletions

diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 25cef9ec82e6..64e67eea868a 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -16,8 +16,8 @@ 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.11.0.a20160620
-HASH=		c1bf332
+ISCVERSION=	9.11.0.a20160627
+HASH=		33d0a77
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index bc7ecd023eaa..a56ff38f09dd 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466424812
-SHA256 (bind9-c1bf332.tar.gz) = cec536899ea4ae93d6355d138a11bff6859768f7e0efc76d3aeb4b2fa9b12dc5
-SIZE (bind9-c1bf332.tar.gz) = 11812192
+TIMESTAMP = 1467029021
+SHA256 (bind9-33d0a77.tar.gz) = 87a43c83b074357d4af9dbd131ba268c35b2dfd9497c5c56cf5bac2815375a2c
+SIZE (bind9-33d0a77.tar.gz) = 11759207
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index a59603ab5fc1..95193c984881 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
---- bin/named/config.c.orig	2016-06-04 07:08:48 UTC
+--- bin/named/config.c.orig	2016-06-27 05:29:38 UTC
 +++ bin/named/config.c
-@@ -160,6 +160,8 @@ options {\n\
+@@ -151,6 +151,8 @@ options {\n\
  	lame-ttl 600;\n\
  	servfail-ttl 1;\n\
  	max-ncache-ttl 10800; /* 3 hours */\n\
@@ -9,9 +9,9 @@
  	max-cache-ttl 604800; /* 1 week */\n\
  	transfer-format many-answers;\n\
  	max-cache-size 90%;\n\
---- bin/named/server.c.orig	2016-06-04 07:08:48 UTC
+--- bin/named/server.c.orig	2016-06-27 05:29:38 UTC
 +++ bin/named/server.c
-@@ -3491,6 +3491,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3521,6 +3521,16 @@ configure_view(dns_view_t *view, dns_vie
  	}
  
  	obj = NULL;
@@ -28,9 +28,9 @@
  	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-06-04 07:08:48 UTC
+--- lib/dns/include/dns/view.h.orig	2016-06-27 05:29:38 UTC
 +++ lib/dns/include/dns/view.h
-@@ -154,6 +154,8 @@ struct dns_view {
+@@ -145,6 +145,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
  	isc_boolean_t			sendcookie;
  	dns_ttl_t			maxcachettl;
@@ -39,9 +39,9 @@
  	dns_ttl_t			maxncachettl;
  	isc_uint32_t			nta_lifetime;
  	isc_uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2016-06-04 07:08:48 UTC
+--- lib/dns/resolver.c.orig	2016-06-27 05:29:38 UTC
 +++ lib/dns/resolver.c
-@@ -5440,6 +5440,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
+@@ -5431,6 +5431,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-06-04 07:08:48 UTC
+--- lib/isccfg/namedconf.c.orig	2016-06-27 05:29:38 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1716,6 +1716,8 @@ view_clauses[] = {
+@@ -1707,6 +1707,8 @@ view_clauses[] = {
  	{ "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },
  	{ "max-acache-size", &cfg_type_sizenodefault, 0 },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
diff --git a/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in b/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in
index a63be7ce0466..7c4bf00c2b2a 100644
--- a/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in
+++ b/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in
@@ -1,6 +1,6 @@
---- bin/tests/system/dlzexternal/Makefile.in.orig	2015-09-09 02:23:40 UTC
+--- bin/tests/system/dlzexternal/Makefile.in.orig	2016-06-27 05:29:38 UTC
 +++ bin/tests/system/dlzexternal/Makefile.in
-@@ -43,7 +43,7 @@ OBJS =          ${DLOPENOBJS}
+@@ -35,7 +35,7 @@ OBJS =          ${DLOPENOBJS}
  @BIND9_MAKE_RULES@
  
  CFLAGS =	@CFLAGS@ @SO_CFLAGS@
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 0da3ddf49431..55acdbe127d1 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2016-06-04 07:08:48 UTC
+--- configure.orig	2016-06-27 05:29:38 UTC
 +++ configure
-@@ -14204,27 +14204,9 @@ done
+@@ -14205,27 +14205,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
-@@ -14267,47 +14249,7 @@ $as_echo "no" >&6; } ;;
+@@ -14268,47 +14250,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
-@@ -22143,7 +22085,7 @@ $as_echo "" >&6; }
+@@ -22147,7 +22089,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 822367ccb6da..03d26fc1dacb 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -32,7 +32,6 @@ include/dns/dlz_dlopen.h
 include/dns/dns64.h
 include/dns/dnssec.h
 include/dns/dnstap.h
-include/dns/dnstap.pb-c.h
 include/dns/ds.h
 include/dns/dsdigest.h
 include/dns/dyndb.h