MFH: r446860

Update BIND9 ports to 9.{9.11,10.6,11.2}.

Fixes related to LMDB usage:
https://kb.isc.org/article/AA-01497/0/Operational-Notification%3A-LMDB-integration-problems-with-BIND-9.11.0-and-9.11.1.html

Sponsored by:	Absolight

10 files changed, 37 insertions, 37 deletions

diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index 8389c89..377c9bd 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -16,7 +16,7 @@ LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.10.5-P3
+ISCVERSION=	9.10.6
 
 USES=	cpe libedit
 
@@ -228,8 +228,8 @@ post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \
-		${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ* \
+		${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}
 
 # Can't use USE_PYTHON=autoplist
 post-install-PYTHON-on:
diff --git a/dns/bind910/distinfo b/dns/bind910/distinfo
index 090d869..e9ee8cb 100644
--- a/dns/bind910/distinfo
+++ b/dns/bind910/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499711579
-SHA256 (bind-9.10.5-P3.tar.gz) = 8d7e96b5b0bbac7b900d4c4bbb82e0956b4e509433c5fa392bb72a929b96606a
-SIZE (bind-9.10.5-P3.tar.gz) = 9413321
+TIMESTAMP = 1501282039
+SHA256 (bind-9.10.6.tar.gz) = 17bbcd2bd7b1d32f5ba4b30d5dbe8a39bce200079048073d1e0d050fdf47e69d
+SIZE (bind-9.10.6.tar.gz) = 9449394
diff --git a/dns/bind910/files/patch-configure b/dns/bind910/files/patch-configure
index a79e236..d2220aa 100644
--- a/dns/bind910/files/patch-configure
+++ b/dns/bind910/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-04-14 03:54:11 UTC
+--- configure.orig	2017-07-24 05:31:21 UTC
 +++ configure
-@@ -14347,27 +14347,9 @@ done
+@@ -14348,27 +14348,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
-@@ -14410,47 +14392,7 @@ $as_echo "no" >&6; } ;;
+@@ -14411,47 +14393,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
-@@ -21960,7 +21902,7 @@ $as_echo "" >&6; }
+@@ -22036,7 +21978,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index 3ac5c54..21b2dc5 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -30,7 +30,7 @@ LICENSE=	MPL
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.11.1-P3
+ISCVERSION=	9.11.2
 
 USES=	cpe libedit
 
@@ -271,8 +271,8 @@ post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \
-		${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES \
+		${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}
 .endif	# BIND_TOOLS_SLAVE
 
 # Can't use USE_PYTHON=autoplist
diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo
index 24bc466..71da50d 100644
--- a/dns/bind911/distinfo
+++ b/dns/bind911/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499711607
-SHA256 (bind-9.11.1-P3.tar.gz) = 52426e75432e46996dc90f24fca027805a341c38fbbb022b60dc9acd2677ccf4
-SIZE (bind-9.11.1-P3.tar.gz) = 9749095
+TIMESTAMP = 1501282074
+SHA256 (bind-9.11.2.tar.gz) = 7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a
+SIZE (bind-9.11.2.tar.gz) = 9782180
diff --git a/dns/bind911/files/extrapatch-bind-min-override-ttl b/dns/bind911/files/extrapatch-bind-min-override-ttl
index 2f8224d..d34d9d3 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	2017-04-14 03:58:25 UTC
+--- bin/named/config.c.orig	2017-07-24 05:36:50 UTC
 +++ bin/named/config.c
 @@ -154,6 +154,8 @@ options {\n\
  	lame-ttl 600;\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	2017-04-14 03:58:25 UTC
+--- bin/named/server.c.orig	2017-07-24 05:36:50 UTC
 +++ bin/named/server.c
-@@ -3693,6 +3693,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3713,6 +3713,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	2017-04-14 03:58:25 UTC
+--- lib/dns/include/dns/view.h.orig	2017-07-24 05:36:50 UTC
 +++ lib/dns/include/dns/view.h
 @@ -146,6 +146,8 @@ struct dns_view {
  	isc_boolean_t			requestnsid;
@@ -39,7 +39,7 @@
  	dns_ttl_t			maxncachettl;
  	isc_uint32_t			nta_lifetime;
  	isc_uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2017-04-14 03:58:25 UTC
+--- lib/dns/resolver.c.orig	2017-07-24 05:36:50 UTC
 +++ lib/dns/resolver.c
 @@ -5439,6 +5439,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	2017-04-14 03:58:25 UTC
+--- lib/isccfg/namedconf.c.orig	2017-07-24 05:36:50 UTC
 +++ lib/isccfg/namedconf.c
-@@ -1759,6 +1759,8 @@ view_clauses[] = {
+@@ -1765,6 +1765,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/bind911/files/patch-configure b/dns/bind911/files/patch-configure
index 93c6090..2783ccd 100644
--- a/dns/bind911/files/patch-configure
+++ b/dns/bind911/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-04-14 03:58:25 UTC
+--- configure.orig	2017-07-24 05:36:50 UTC
 +++ configure
-@@ -14401,27 +14401,9 @@ done
+@@ -14402,27 +14402,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
-@@ -14464,47 +14446,7 @@ $as_echo "no" >&6; } ;;
+@@ -14465,47 +14447,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
-@@ -22666,7 +22608,7 @@ $as_echo "" >&6; }
+@@ -22825,7 +22767,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index d704163..5cb2719 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -16,7 +16,7 @@ LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.9.10-P3
+ISCVERSION=	9.9.11
 
 USES=	cpe libedit
 
@@ -211,8 +211,8 @@ post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \
-		${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ* \
+		${WRKSRC}/HISTORY* ${WRKSRC}/README* ${STAGEDIR}${DOCSDIR}
 
 # Can't use USE_PYTHON=autoplist
 post-install-PYTHON-on:
diff --git a/dns/bind99/distinfo b/dns/bind99/distinfo
index e2e0337..b3bdf76 100644
--- a/dns/bind99/distinfo
+++ b/dns/bind99/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499711508
-SHA256 (bind-9.9.10-P3.tar.gz) = a116a32bd4f558912418444127949a0ab0861ce98a29ee26f00767a84b0bd003
-SIZE (bind-9.9.10-P3.tar.gz) = 8841873
+TIMESTAMP = 1501282004
+SHA256 (bind-9.9.11.tar.gz) = 995395d540b6dd8eb77d737824f47dc10917c864ba4ab450a703b8c6179dc8ba
+SIZE (bind-9.9.11.tar.gz) = 8867109
diff --git a/dns/bind99/files/patch-configure b/dns/bind99/files/patch-configure
index af3e818..74ca2d6 100644
--- a/dns/bind99/files/patch-configure
+++ b/dns/bind99/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2017-04-14 03:50:56 UTC
+--- configure.orig	2017-07-24 05:26:01 UTC
 +++ configure
-@@ -14508,27 +14508,9 @@ done
+@@ -14509,27 +14509,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
-@@ -14571,47 +14553,7 @@ $as_echo "no" >&6; } ;;
+@@ -14572,47 +14554,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
-@@ -20735,7 +20677,7 @@ $as_echo "" >&6; }
+@@ -20809,7 +20751,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).