Update to latest commit.

8 files changed, 72 insertions, 74 deletions

diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index 8219220a603a..0ae644283809 100644
--- a/dns/bind-tools/pkg-plist-devel
+++ b/dns/bind-tools/pkg-plist-devel
@@ -1,49 +1,49 @@
 bin/arpaname
 bin/delv
 bin/dig
+bin/dnssec-cds
+bin/dnssec-dsfromkey
+bin/dnssec-importkey
+bin/dnssec-keyfromlabel
+bin/dnssec-keygen
+bin/dnssec-revoke
+bin/dnssec-settime
+bin/dnssec-signzone
+bin/dnssec-verify
 bin/host
 bin/mdig
+bin/named-journalprint
 bin/named-rrchecker
+bin/nsec3hash
 bin/nslookup
 bin/nsupdate
 man/man1/arpaname.1.gz
 man/man1/delv.1.gz
 man/man1/dig.1.gz
-@comment man/man1/dnstap-read.1.gz
+man/man1/dnssec-cds.1.gz
+man/man1/dnssec-dsfromkey.1.gz
+man/man1/dnssec-importkey.1.gz
+man/man1/dnssec-keyfromlabel.1.gz
+man/man1/dnssec-keygen.1.gz
+man/man1/dnssec-revoke.1.gz
+man/man1/dnssec-settime.1.gz
+man/man1/dnssec-signzone.1.gz
+man/man1/dnssec-verify.1.gz
+man/man1/dnstap-read.1.gz
 man/man1/host.1.gz
 man/man1/mdig.1.gz
+@comment man/man1/named-checkconf.1.gz
+@comment man/man1/named-checkzone.1.gz
+@comment man/man1/named-journalprint.1.gz
+@comment man/man1/named-nzd2nzf.1.gz
 man/man1/named-rrchecker.1.gz
+man/man1/nsec3hash.1.gz
 man/man1/nslookup.1.gz
 man/man1/nsupdate.1.gz
 @comment man/man5/named.conf.5.gz
 @comment man/man5/rndc.conf.5.gz
 @comment man/man8/ddns-confgen.8.gz
-man/man8/dnssec-cds.8.gz
-man/man8/dnssec-dsfromkey.8.gz
-man/man8/dnssec-importkey.8.gz
-man/man8/dnssec-keyfromlabel.8.gz
-man/man8/dnssec-keygen.8.gz
-man/man8/dnssec-revoke.8.gz
-man/man8/dnssec-settime.8.gz
-man/man8/dnssec-signzone.8.gz
-man/man8/dnssec-verify.8.gz
 @comment man/man8/filter-aaaa.8.gz
-@comment man/man8/named-checkconf.8.gz
-@comment man/man8/named-checkzone.8.gz
-man/man8/named-journalprint.8.gz
-@comment man/man8/named-nzd2nzf.8.gz
 @comment man/man8/named.8.gz
-man/man8/nsec3hash.8.gz
 @comment man/man8/rndc-confgen.8.gz
 @comment man/man8/rndc.8.gz
-sbin/dnssec-cds
-sbin/dnssec-dsfromkey
-sbin/dnssec-importkey
-sbin/dnssec-keyfromlabel
-sbin/dnssec-keygen
-sbin/dnssec-revoke
-sbin/dnssec-settime
-sbin/dnssec-signzone
-sbin/dnssec-verify
-sbin/named-journalprint
-sbin/nsec3hash
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index e893753e02eb..9a73379596dc 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -48,13 +48,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.0a0.2020.06.01
+ISCVERSION=	9.17.0a0.2020.06.06
 # XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	31fa72ec2e724ecf1489983849eb05b7aeb3481a
+GL_COMMIT=	d95951729025a8775a8a85d61a76fb5389a71adc
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 2ffc884f00f1..17598947d85e 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591098249
-SHA256 (isc-projects-bind9-31fa72ec2e724ecf1489983849eb05b7aeb3481a_GL0.tar.gz) = 269e65c65ff1ee57d7deb927649f86ff79458f8dad9d9686b6c2b00821d6eac1
-SIZE (isc-projects-bind9-31fa72ec2e724ecf1489983849eb05b7aeb3481a_GL0.tar.gz) = 4472173
+TIMESTAMP = 1591625667
+SHA256 (isc-projects-bind9-d95951729025a8775a8a85d61a76fb5389a71adc_GL0.tar.gz) = 5f9eada8f63c7561702b75ca19e7807d025f4fe48e736a0021cd523db836adca
+SIZE (isc-projects-bind9-d95951729025a8775a8a85d61a76fb5389a71adc_GL0.tar.gz) = 4484049
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 6ef48704f746..eae34a9f5d6f 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 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2020-05-25 12:38:28 UTC
+--- bin/named/config.c.orig	2020-06-06 05:02:12 UTC
 +++ bin/named/config.c
 @@ -180,6 +180,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-05-25 12:38:28 UTC
+--- bin/named/server.c.orig	2020-06-06 05:02:12 UTC
 +++ bin/named/server.c
 @@ -4331,6 +4331,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-05-25 12:38:28 UTC
+--- lib/dns/include/dns/view.h.orig	2020-06-06 05:02:12 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-05-25 12:38:28 UTC
+--- lib/dns/resolver.c.orig	2020-06-06 05:02:12 UTC
 +++ lib/dns/resolver.c
-@@ -6236,6 +6236,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6235,6 +6235,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-05-25 12:38:28 UTC
+--- lib/isccfg/namedconf.c.orig	2020-06-06 05:02:12 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1992,6 +1992,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind9-devel/files/extrapatch-bind-tools b/dns/bind9-devel/files/extrapatch-bind-tools
index 95dae0b30866..1db418320f74 100644
--- a/dns/bind9-devel/files/extrapatch-bind-tools
+++ b/dns/bind9-devel/files/extrapatch-bind-tools
@@ -1,15 +1,17 @@
 Only select the "tools" part of bind for building.
 
---- Makefile.am.orig	2020-06-01 11:40:58 UTC
+--- Makefile.am.orig	2020-06-06 05:02:12 UTC
 +++ Makefile.am
-@@ -8,6 +8,4 @@ CLEANFILES = bind.keys.h
+@@ -8,8 +8,6 @@ CLEANFILES = bind.keys.h
  bind.keys.h: bind.keys Makefile
  	${PERL} ${top_srcdir}/util/bindkeys.pl ${top_srcdir}/bind.keys > $@
  
 -dist_sysconf_DATA = bind.keys
 -
  .PHONY: doc
---- bin/Makefile.am.orig	2020-06-01 11:40:58 UTC
+ 
+ EXTRA_DIST = 			\
+--- bin/Makefile.am.orig	2020-06-06 05:02:12 UTC
 +++ bin/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
diff --git a/dns/bind9-devel/files/extrapatch-no-bind-tools b/dns/bind9-devel/files/extrapatch-no-bind-tools
index 88dee1e53f7d..cc7ad2158093 100644
--- a/dns/bind9-devel/files/extrapatch-no-bind-tools
+++ b/dns/bind9-devel/files/extrapatch-no-bind-tools
@@ -10,20 +10,18 @@ Exclude the "tools" from building and installing.
  SUBDIRS += pkcs11
 --- bin/tools/Makefile.am.orig	2020-06-01 11:40:58 UTC
 +++ bin/tools/Makefile.am
-@@ -8,14 +8,9 @@ LDADD =				\
+@@ -8,13 +8,8 @@
  	$(LIBISC_LIBS)		\
  	$(LIBDNS_LIBS)
  
 -bin_PROGRAMS =			\
 -	arpaname		\
--	named-rrchecker		\
--	mdig
-+bin_PROGRAMS =
- 
--sbin_PROGRAMS =			\
+-	mdig			\
 -	named-journalprint	\
+-	named-rrchecker		\
 -	nsec3hash
-+sbin_PROGRAMS =
++bin_PROGRAMS =
  
  arpaname_LDADD =		\
  	$(LIBISC_LIBS)
+ 
diff --git a/dns/bind9-devel/files/patch-configure.ac b/dns/bind9-devel/files/patch-configure.ac
index b99ac3b789fd..894a000dcad4 100644
--- a/dns/bind9-devel/files/patch-configure.ac
+++ b/dns/bind9-devel/files/patch-configure.ac
@@ -6,8 +6,8 @@ automake has warnings, it is ok here.
  AC_DEFINE([PACKAGE_BUILDER], ["make"], [make or Visual Studio])
  
  AC_CONFIG_SRCDIR([bin/named/main.c])
--AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz -Wall -Werror])
-+AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz -Wall])
+-AM_INIT_AUTOMAKE([1.9 tar-pax foreign subdir-objects dist-xz -Wall -Werror])
++AM_INIT_AUTOMAKE([1.9 tar-pax foreign subdir-objects dist-xz -Wall])
  AM_SILENT_RULES([yes])
  AM_EXTRA_RECURSIVE_TARGETS([test unit doc])
  
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index d690d9a45e6a..01341381c678 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -1,4 +1,8 @@
 %%DNSTAP%%bin/dnstap-read
+bin/named-checkconf
+bin/named-checkzone
+bin/named-compilezone
+%%LMDB%%bin/named-nzd2nzf
 %%NATIVE_PKCS11%%bin/pkcs11-destroy
 %%NATIVE_PKCS11%%bin/pkcs11-keygen
 %%NATIVE_PKCS11%%bin/pkcs11-list
@@ -139,6 +143,7 @@ include/isc/deprecated.h
 include/isc/dir.h
 include/isc/endian.h
 include/isc/errno.h
+include/isc/errno2result.h
 include/isc/error.h
 include/isc/event.h
 include/isc/eventclass.h
@@ -264,49 +269,42 @@ lib/libisccc.a
 lib/libisccfg.a
 lib/libns.a
 @comment lib/named/filter-aaaa.so
-@comment %%DNSTAP%%man/man1/dnstap-read.1.gz
 @comment man/man1/arpaname.1.gz
 @comment man/man1/delv.1.gz
 @comment man/man1/dig.1.gz
+@comment man/man1/dnssec-cds.1.gz
+@comment man/man1/dnssec-dsfromkey.1.gz
+@comment man/man1/dnssec-importkey.1.gz
+@comment man/man1/dnssec-keyfromlabel.1.gz
+@comment man/man1/dnssec-keygen.1.gz
+@comment man/man1/dnssec-revoke.1.gz
+@comment man/man1/dnssec-settime.1.gz
+@comment man/man1/dnssec-signzone.1.gz
+@comment man/man1/dnssec-verify.1.gz
 @comment man/man1/dnstap-read.1.gz
 @comment man/man1/host.1.gz
 @comment man/man1/mdig.1.gz
+%%MANPAGES%%man/man1/named-checkconf.1.gz
+%%MANPAGES%%man/man1/named-checkzone.1.gz
+%%MANPAGES%%man/man1/named-journalprint.1.gz
+%%MANPAGES%%%%LMDB%%man/man1/named-nzd2nzf.1.gz
 @comment man/man1/named-rrchecker.1.gz
+@comment man/man1/nsec3hash.1.gz
 @comment man/man1/nslookup.1.gz
 @comment man/man1/nsupdate.1.gz
+%%MANPAGES%%%%NATIVE_PKCS11%%man/man1/pkcs11-destroy.1.gz
+%%MANPAGES%%%%NATIVE_PKCS11%%man/man1/pkcs11-keygen.1.gz
+%%MANPAGES%%%%NATIVE_PKCS11%%man/man1/pkcs11-list.1.gz
+%%MANPAGES%%%%NATIVE_PKCS11%%man/man1/pkcs11-tokens.1.gz
 %%MANPAGES%%man/man5/named.conf.5.gz
 %%MANPAGES%%man/man5/rndc.conf.5.gz
 %%MANPAGES%%man/man8/ddns-confgen.8.gz
-@comment man/man8/dnssec-cds.8.gz
-@comment man/man8/dnssec-dsfromkey.8.gz
-@comment man/man8/dnssec-importkey.8.gz
-@comment man/man8/dnssec-keyfromlabel.8.gz
-@comment man/man8/dnssec-keygen.8.gz
-@comment man/man8/dnssec-revoke.8.gz
-@comment man/man8/dnssec-settime.8.gz
-@comment man/man8/dnssec-signzone.8.gz
-@comment man/man8/dnssec-verify.8.gz
 %%MANPAGES%%man/man8/filter-aaaa.8.gz
-%%MANPAGES%%man/man8/named-checkconf.8.gz
-%%MANPAGES%%man/man8/named-checkzone.8.gz
-@comment man/man8/named-compilezone.8.gz
-@comment man/man8/named-journalprint.8.gz
-%%MANPAGES%%%%LMDB%%man/man8/named-nzd2nzf.8.gz
 %%MANPAGES%%man/man8/named.8.gz
-@comment man/man8/nsec3hash.8.gz
-%%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-destroy.8.gz
-%%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-keygen.8.gz
-%%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-list.8.gz
-%%MANPAGES%%%%NATIVE_PKCS11%%man/man8/pkcs11-tokens.8.gz
 %%MANPAGES%%man/man8/rndc-confgen.8.gz
 %%MANPAGES%%man/man8/rndc.8.gz
-@comment man/man8/tsig-keygen.8.gz
 sbin/ddns-confgen
 sbin/named
-sbin/named-checkconf
-sbin/named-checkzone
-sbin/named-compilezone
-%%LMDB%%sbin/named-nzd2nzf
 sbin/rndc
 sbin/rndc-confgen
 sbin/tsig-confgen