5 files changed, 15 insertions, 252 deletions

diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
index c6ce78336252..4ec9e0ec12ba 100644
--- a/dns/bind916/Makefile
+++ b/dns/bind916/Makefile
@@ -8,7 +8,7 @@ PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 PORTREVISION=	0
 .else
 # dns/bind916 here
-PORTREVISION=	1
+PORTREVISION=	0
 .endif
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
@@ -41,7 +41,7 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 
 USES=		compiler:c11 cpe libedit pkgconfig ssl tar:xz
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.16.5
+ISCVERSION=	9.16.6
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
@@ -180,7 +180,6 @@ LARGE_FILE_CONFIGURE_ENABLE=	largefile
 
 LMDB_CONFIGURE_WITH=	lmdb=${LOCALBASE}
 LMDB_LIB_DEPENDS=	liblmdb.so:databases/lmdb
-LMDB_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-lmdb-lock
 
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 
diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo
index 8ee7d886ef39..2a5b225abec4 100644
--- a/dns/bind916/distinfo
+++ b/dns/bind916/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594913262
-SHA256 (bind-9.16.5.tar.xz) = 6378b3e51fef11a8be4794dc48e8111ba92d211c0dfd129a0c296ed06a3dc075
-SIZE (bind-9.16.5.tar.xz) = 3474044
+TIMESTAMP = 1597735379
+SHA256 (bind-9.16.6.tar.xz) = b567b0f3b47dd03b345a4848af7f2acdd3f5cea2bd804edd85d9ef50743571cb
+SIZE (bind-9.16.6.tar.xz) = 3228368
diff --git a/dns/bind916/files/extrapatch-bind-lmdb-lock b/dns/bind916/files/extrapatch-bind-lmdb-lock
deleted file mode 100644
index b01eea2feae3..000000000000
--- a/dns/bind916/files/extrapatch-bind-lmdb-lock
+++ /dev/null
@@ -1,236 +0,0 @@
---- bin/named/server.c.orig	2020-06-10 21:01:43 UTC
-+++ bin/named/server.c
-@@ -7578,6 +7578,8 @@ count_newzones(dns_view_t *view, ns_cfgctx_t *nzcfg, i
- 		      "for view '%s'",
- 		      view->new_zone_db, view->name);
- 
-+	LOCK(&view->new_zone_lock);
-+
- 	CHECK(nzd_count(view, &n));
- 
- 	*num_zonesp = n;
-@@ -7592,6 +7594,8 @@ cleanup:
- 		*num_zonesp = 0;
- 	}
- 
-+	UNLOCK(&view->new_zone_lock);
-+
- 	return (ISC_R_SUCCESS);
- }
- 
-@@ -7920,6 +7924,8 @@ typedef isc_result_t (*newzone_cfg_cb_t)(const cfg_obj
-  * Immediately interrupt processing if an error is encountered while
-  * transforming NZD data into a zone configuration object or if "callback"
-  * returns an error.
-+ *
-+ * Caller must hold 'view->new_zone_lock'.
-  */
- static isc_result_t
- for_all_newzone_cfgs(newzone_cfg_cb_t callback, cfg_obj_t *config,
-@@ -8028,8 +8034,11 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config
- 		return (ISC_R_SUCCESS);
- 	}
- 
-+	LOCK(&view->new_zone_lock);
-+
- 	result = nzd_open(view, MDB_RDONLY, &txn, &dbi);
- 	if (result != ISC_R_SUCCESS) {
-+		UNLOCK(&view->new_zone_lock);
- 		return (ISC_R_SUCCESS);
- 	}
- 
-@@ -8055,6 +8064,9 @@ configure_newzones(dns_view_t *view, cfg_obj_t *config
- 	}
- 
- 	(void)nzd_close(&txn, false);
-+
-+	UNLOCK(&view->new_zone_lock);
-+
- 	return (result);
- }
- 
-@@ -8075,6 +8087,8 @@ get_newzone_config(dns_view_t *view, const char *zonen
- 
- 	INSIST(zoneconfig != NULL && *zoneconfig == NULL);
- 
-+	LOCK(&view->new_zone_lock);
-+
- 	CHECK(nzd_open(view, MDB_RDONLY, &txn, &dbi));
- 
- 	isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-@@ -8108,6 +8122,8 @@ get_newzone_config(dns_view_t *view, const char *zonen
- cleanup:
- 	(void)nzd_close(&txn, false);
- 
-+	UNLOCK(&view->new_zone_lock);
-+
- 	if (zoneconf != NULL) {
- 		cfg_obj_destroy(named_g_addparser, &zoneconf);
- 	}
-@@ -12566,8 +12582,6 @@ nzd_save(MDB_txn **txnp, MDB_dbi dbi, dns_zone_t *zone
- 
- 	nzd_setkey(&key, dns_zone_getorigin(zone), namebuf, sizeof(namebuf));
- 
--	LOCK(&view->new_zone_lock);
--
- 	if (zconfig == NULL) {
- 		/* We're deleting the zone from the database */
- 		status = mdb_del(*txnp, dbi, &key, NULL);
-@@ -12647,8 +12661,6 @@ cleanup:
- 	}
- 	*txnp = NULL;
- 
--	UNLOCK(&view->new_zone_lock);
--
- 	if (text != NULL) {
- 		isc_buffer_free(&text);
- 	}
-@@ -12656,6 +12668,11 @@ cleanup:
- 	return (result);
- }
- 
-+/*
-+ * Check whether the new zone database for 'view' can be opened for writing.
-+ *
-+ * Caller must hold 'view->new_zone_lock'.
-+ */
- static isc_result_t
- nzd_writable(dns_view_t *view) {
- 	isc_result_t result = ISC_R_SUCCESS;
-@@ -12685,6 +12702,11 @@ nzd_writable(dns_view_t *view) {
- 	return (result);
- }
- 
-+/*
-+ * Open the new zone database for 'view' and start a transaction for it.
-+ *
-+ * Caller must hold 'view->new_zone_lock'.
-+ */
- static isc_result_t
- nzd_open(dns_view_t *view, unsigned int flags, MDB_txn **txnp, MDB_dbi *dbi) {
- 	int status;
-@@ -12812,6 +12834,13 @@ cleanup:
- 	return (result);
- }
- 
-+/*
-+ * If 'commit' is true, commit the new zone database transaction pointed to by
-+ * 'txnp'; otherwise, abort that transaction.
-+ *
-+ * Caller must hold 'view->new_zone_lock' for the view that the transaction
-+ * pointed to by 'txnp' was started for.
-+ */
- static isc_result_t
- nzd_close(MDB_txn **txnp, bool commit) {
- 	isc_result_t result = ISC_R_SUCCESS;
-@@ -12834,6 +12863,12 @@ nzd_close(MDB_txn **txnp, bool commit) {
- 	return (result);
- }
- 
-+/*
-+ * Count the zones configured in the new zone database for 'view' and store the
-+ * result in 'countp'.
-+ *
-+ * Caller must hold 'view->new_zone_lock'.
-+ */
- static isc_result_t
- nzd_count(dns_view_t *view, int *countp) {
- 	isc_result_t result;
-@@ -12881,6 +12916,8 @@ migrate_nzf(dns_view_t *view) {
- 	MDB_val key, data;
- 	ns_dzarg_t dzarg;
- 
-+	LOCK(&view->new_zone_lock);
-+
- 	/*
- 	 * If NZF file doesn't exist, or NZD DB exists and already
- 	 * has data, return without attempting migration.
-@@ -13016,6 +13053,8 @@ cleanup:
- 		result = nzd_close(&txn, commit);
- 	}
- 
-+	UNLOCK(&view->new_zone_lock);
-+
- 	if (text != NULL) {
- 		isc_buffer_free(&text);
- 	}
-@@ -13225,6 +13264,7 @@ do_addzone(named_server_t *server, ns_cfgctx_t *cfg, d
- 	MDB_dbi dbi;
- 
- 	UNUSED(zoneconf);
-+	LOCK(&view->new_zone_lock);
- #endif /* HAVE_LMDB */
- 
- 	/* Zone shouldn't already exist */
-@@ -13378,6 +13418,7 @@ cleanup:
- 	if (txn != NULL) {
- 		(void)nzd_close(&txn, false);
- 	}
-+	UNLOCK(&view->new_zone_lock);
- #endif /* HAVE_LMDB */
- 
- 	if (zone != NULL) {
-@@ -13401,6 +13442,7 @@ do_modzone(named_server_t *server, ns_cfgctx_t *cfg, d
- #else  /* HAVE_LMDB */
- 	MDB_txn *txn = NULL;
- 	MDB_dbi dbi;
-+	LOCK(&view->new_zone_lock);
- #endif /* HAVE_LMDB */
- 
- 	/* Zone must already exist */
-@@ -13598,6 +13640,7 @@ cleanup:
- 	if (txn != NULL) {
- 		(void)nzd_close(&txn, false);
- 	}
-+	UNLOCK(&view->new_zone_lock);
- #endif /* HAVE_LMDB */
- 
- 	if (zone != NULL) {
-@@ -13761,6 +13804,7 @@ rmzone(isc_task_t *task, isc_event_t *event) {
- 	if (added && cfg != NULL) {
- #ifdef HAVE_LMDB
- 		/* Make sure we can open the NZD database */
-+		LOCK(&view->new_zone_lock);
- 		result = nzd_open(view, 0, &txn, &dbi);
- 		if (result != ISC_R_SUCCESS) {
- 			isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
-@@ -13778,6 +13822,11 @@ rmzone(isc_task_t *task, isc_event_t *event) {
- 				      "delete zone configuration: %s",
- 				      isc_result_totext(result));
- 		}
-+
-+		if (txn != NULL) {
-+			(void)nzd_close(&txn, false);
-+		}
-+		UNLOCK(&view->new_zone_lock);
- #else  /* ifdef HAVE_LMDB */
- 		result = delete_zoneconf(view, cfg->add_parser, cfg->nzf_config,
- 					 dns_zone_getorigin(zone),
-@@ -13867,11 +13916,6 @@ rmzone(isc_task_t *task, isc_event_t *event) {
- 		}
- 	}
- 
--#ifdef HAVE_LMDB
--	if (txn != NULL) {
--		(void)nzd_close(&txn, false);
--	}
--#endif /* ifdef HAVE_LMDB */
- 	if (raw != NULL) {
- 		dns_zone_detach(&raw);
- 	}
---- lib/dns/include/dns/lmdb.h.orig	2020-06-10 21:01:43 UTC
-+++ lib/dns/include/dns/lmdb.h
-@@ -10,12 +10,7 @@
-  */
- 
- #include <lmdb.h>
--/*
-- * MDB_NOTLS is used to prevent problems after configuration is reloaded, due
-- * to the way LMDB's use of thread-local storage (TLS) interacts with the BIND9
-- * thread model.
-- */
--#define DNS_LMDB_COMMON_FLAGS (MDB_CREATE | MDB_NOSUBDIR | MDB_NOTLS)
-+#define DNS_LMDB_COMMON_FLAGS (MDB_CREATE | MDB_NOSUBDIR | MDB_NOLOCK)
- #ifndef __OpenBSD__
- #define DNS_LMDB_FLAGS (DNS_LMDB_COMMON_FLAGS)
- #else /* __OpenBSD__ */
diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl
index 0eebb6d5eb7b..0d5be6d5fe1f 100644
--- a/dns/bind916/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind916/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2020-07-03 10:44:14 UTC
+--- bin/named/config.c.orig	2020-08-10 09:31:13 UTC
 +++ bin/named/config.c
 @@ -179,6 +179,7 @@ options {\n\
  	notify-source *;\n\
@@ -10,7 +10,7 @@ Add the override-cache-ttl feature.
  	provide-ixfr true;\n\
  	qname-minimization relaxed;\n\
  	query-source address *;\n\
---- bin/named/server.c.orig	2020-07-03 10:44:14 UTC
+--- bin/named/server.c.orig	2020-08-10 09:31:13 UTC
 +++ bin/named/server.c
 @@ -4330,6 +4330,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
@@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
  	result = named_config_get(maps, "max-cache-ttl", &obj);
  	INSIST(result == ISC_R_SUCCESS);
  	view->maxcachettl = cfg_obj_asduration(obj);
---- lib/dns/include/dns/view.h.orig	2020-07-03 10:44:14 UTC
+--- lib/dns/include/dns/view.h.orig	2020-08-10 09:31:13 UTC
 +++ lib/dns/include/dns/view.h
 @@ -152,6 +152,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -34,9 +34,9 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2020-07-03 10:44:14 UTC
+--- lib/dns/resolver.c.orig	2020-08-10 09:31:13 UTC
 +++ lib/dns/resolver.c
-@@ -6256,6 +6256,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6268,6 +6268,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
  		}
  
  		/*
@@ -49,7 +49,7 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2020-07-03 10:44:14 UTC
+--- lib/isccfg/namedconf.c.orig	2020-08-10 09:31:13 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1990,6 +1990,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind916/files/patch-configure b/dns/bind916/files/patch-configure
index f4c473335473..530869b3f50e 100644
--- a/dns/bind916/files/patch-configure
+++ b/dns/bind916/files/patch-configure
@@ -1,8 +1,8 @@
 Fixup gssapi and db detection.
 
---- configure.orig	2020-07-03 10:44:14 UTC
+--- configure.orig	2020-08-10 09:31:13 UTC
 +++ configure
-@@ -17604,27 +17604,9 @@ done
+@@ -17574,27 +17574,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -32,7 +32,7 @@ Fixup gssapi and db detection.
  		    { $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
-@@ -17667,47 +17649,7 @@ $as_echo "no" >&6; } ;;
+@@ -17637,47 +17619,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -81,7 +81,7 @@ Fixup gssapi and db detection.
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23213,7 +23155,7 @@ $as_echo "" >&6; }
+@@ -23183,7 +23125,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).