dns/bind9-devel: Update to latest commit

5 files changed, 25 insertions, 26 deletions

diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index c99548656e3d..8ea57b8981d4 100644
--- a/dns/bind-tools/pkg-plist-devel
+++ b/dns/bind-tools/pkg-plist-devel
@@ -17,19 +17,19 @@ bin/nsec3hash
 bin/nslookup
 bin/nsupdate
 lib/bind-tools/libbind9.so
-lib/bind-tools/libbind9-9.17.13.so
+lib/bind-tools/libbind9-9.17.14.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libdns-9.17.13.so
+lib/bind-tools/libdns-9.17.14.so
 lib/bind-tools/libirs.so
-lib/bind-tools/libirs-9.17.13.so
+lib/bind-tools/libirs-9.17.14.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisc-9.17.13.so
+lib/bind-tools/libisc-9.17.14.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccc-9.17.13.so
+lib/bind-tools/libisccc-9.17.14.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libisccfg-9.17.13.so
+lib/bind-tools/libisccfg-9.17.14.so
 lib/bind-tools/libns.so
-lib/bind-tools/libns-9.17.13.so
+lib/bind-tools/libns-9.17.14.so
 man/man1/arpaname.1.gz
 man/man1/delv.1.gz
 man/man1/dig.1.gz
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index ac12afd08280..e7b7a46dc6f8 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -49,13 +49,13 @@ RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 # XXX: remove tar:bz2
 USES=		autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.17.13a0.2021.06.15
+ISCVERSION=	9.17.14a0.2021.06.18
 # XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	f035a22c42b4db6f43833a56b22aa9da32835eab
+GL_COMMIT=	fb335e4b47a6286da98c9cfaac211db0157c1c0d
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 7314d3cdfe30..fd1c9b10fdc9 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623743455
-SHA256 (isc-projects-bind9-f035a22c42b4db6f43833a56b22aa9da32835eab_GL0.tar.gz) = df2324dc7e3581c4d2e8c2ce70e32da504567f0ca6ae299be61f6ff0b1139a35
-SIZE (isc-projects-bind9-f035a22c42b4db6f43833a56b22aa9da32835eab_GL0.tar.gz) = 6217258
+TIMESTAMP = 1624257524
+SHA256 (isc-projects-bind9-fb335e4b47a6286da98c9cfaac211db0157c1c0d_GL0.tar.gz) = 7ff54de9f1e8dba8035c7bca33e9963cf750ebbe621e8f95ed2b6fcf8c5b1323
+SIZE (isc-projects-bind9-fb335e4b47a6286da98c9cfaac211db0157c1c0d_GL0.tar.gz) = 6216335
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 61636a10725a..fd5269fa1cdf 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,8 +1,8 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2021-05-25 05:27:59 UTC
+--- bin/named/config.c.orig	2021-06-18 07:21:27 UTC
 +++ bin/named/config.c
-@@ -185,6 +185,7 @@ options {\n\
+@@ -179,6 +179,7 @@ options {\n\
  	notify-source *;\n\
  	notify-source-v6 *;\n\
  	nsec3-test-zone no;\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	2021-05-25 05:27:59 UTC
+--- bin/named/server.c.orig	2021-06-18 07:21:27 UTC
 +++ bin/named/server.c
 @@ -4456,6 +4456,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	2021-05-25 05:27:59 UTC
+--- lib/dns/include/dns/view.h.orig	2021-06-18 07:21:27 UTC
 +++ lib/dns/include/dns/view.h
 @@ -154,6 +154,7 @@ struct dns_view {
  	bool		      requestnsid;
@@ -34,7 +34,7 @@ Add the override-cache-ttl feature.
  	dns_ttl_t	      maxncachettl;
  	dns_ttl_t	      mincachettl;
  	dns_ttl_t	      minncachettl;
---- lib/dns/resolver.c.orig	2021-05-25 05:27:59 UTC
+--- lib/dns/resolver.c.orig	2021-06-18 07:21:27 UTC
 +++ lib/dns/resolver.c
 @@ -6387,6 +6387,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
@@ -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	2021-05-25 05:27:59 UTC
+--- lib/isccfg/namedconf.c.orig	2021-06-18 07:21:27 UTC
 +++ lib/isccfg/namedconf.c
 @@ -2028,6 +2028,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 0c7ffcb571bb..f7ed1b892cdc 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -173,7 +173,6 @@ include/isc/md.h
 include/isc/mem.h
 include/isc/meminfo.h
 include/isc/mutex.h
-include/isc/mutexatomic.h
 include/isc/mutexblock.h
 include/isc/net.h
 include/isc/netaddr.h
@@ -267,19 +266,19 @@ include/pkcs11/pkcs11.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
 lib/libbind9.so
-lib/libbind9-9.17.13.so
+lib/libbind9-9.17.14.so
 lib/libdns.so
-lib/libdns-9.17.13.so
+lib/libdns-9.17.14.so
 lib/libirs.so
-lib/libirs-9.17.13.so
+lib/libirs-9.17.14.so
 lib/libisc.so
-lib/libisc-9.17.13.so
+lib/libisc-9.17.14.so
 lib/libisccc.so
-lib/libisccc-9.17.13.so
+lib/libisccc-9.17.14.so
 lib/libisccfg.so
-lib/libisccfg-9.17.13.so
+lib/libisccfg-9.17.14.so
 lib/libns.so
-lib/libns-9.17.13.so
+lib/libns-9.17.14.so
 @comment man/man1/arpaname.1.gz
 @comment man/man1/delv.1.gz
 @comment man/man1/dig.1.gz