Update to latest commits.

Man pages are back.

4 files changed, 23 insertions, 15 deletions

diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index c09004624a9a..4ef36c65ea90 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-04-30 06:25:30 UTC
+--- bin/named/config.c.orig	2020-05-10 23:44:14 UTC
 +++ bin/named/config.c
 @@ -180,6 +180,7 @@ options {\n\
  	notify-source *;\n\
@@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
  	provide-ixfr true;\n\
  	qname-minimization relaxed;\n\
  	query-source address *;\n\
---- bin/named/server.c.orig	2020-04-30 06:25:30 UTC
+--- bin/named/server.c.orig	2020-05-10 23:44:14 UTC
 +++ bin/named/server.c
-@@ -4327,6 +4327,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4331,6 +4331,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -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-04-30 06:25:30 UTC
+--- lib/dns/include/dns/view.h.orig	2020-05-10 23:44:14 UTC
 +++ lib/dns/include/dns/view.h
 @@ -152,6 +152,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	2020-04-30 06:25:30 UTC
+--- lib/dns/resolver.c.orig	2020-05-10 23:44:14 UTC
 +++ lib/dns/resolver.c
 @@ -6233,6 +6233,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-04-30 06:25:30 UTC
+--- lib/isccfg/namedconf.c.orig	2020-05-10 23:44:14 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 df3af04d814f..8223daf4f5ef 100644
--- a/dns/bind9-devel/files/extrapatch-bind-tools
+++ b/dns/bind9-devel/files/extrapatch-bind-tools
@@ -1,14 +1,23 @@
 Only select the "tools" part of bind for building.
 
---- Makefile.am.orig	2020-04-30 06:25:30 UTC
+--- Makefile.am.orig	2020-05-10 23:44:14 UTC
 +++ Makefile.am
-@@ -7,5 +7,3 @@ CLEANFILES = bind.keys.h
+@@ -1,13 +1,9 @@
+ include $(top_srcdir)/Makefile.top
+ 
+-SUBDIRS = . libltdl lib doc bin
++SUBDIRS = . libltdl lib bin
+ 
+ BUILT_SOURCES = bind.keys.h
+ 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
---- bin/Makefile.am.orig	2020-04-30 06:25:30 UTC
+-
+-.PHONY: doc
+--- bin/Makefile.am.orig	2020-05-10 23:44:14 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 ce2d6b61d379..ba486b2e2e9b 100644
--- a/dns/bind9-devel/files/extrapatch-no-bind-tools
+++ b/dns/bind9-devel/files/extrapatch-no-bind-tools
@@ -1,6 +1,6 @@
 Exclude the "tools" from building and installing.
 
---- bin/Makefile.am.orig	2020-04-30 07:10:53 UTC
+--- bin/Makefile.am.orig	2020-05-10 23:44:14 UTC
 +++ bin/Makefile.am
 @@ -1,4 +1,4 @@
 -SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
@@ -8,9 +8,9 @@ Exclude the "tools" from building and installing.
  
  if HAVE_PKCS11
  SUBDIRS += pkcs11
---- bin/tools/Makefile.am.orig	2020-04-30 07:08:39 UTC
+--- bin/tools/Makefile.am.orig	2020-05-10 23:44:14 UTC
 +++ bin/tools/Makefile.am
-@@ -8,15 +8,10 @@ LDADD =				\
+@@ -8,14 +8,9 @@ LDADD =				\
  	$(LIBISC_LIBS)		\
  	$(LIBDNS_LIBS)
  
@@ -27,4 +27,3 @@ Exclude the "tools" from building and installing.
  
  mdig_CPPFLAGS =			\
  	$(AM_CPPFLAGS)		\
- 	$(LIBBIND9_CFLAGS)
diff --git a/dns/bind9-devel/files/patch-configure.ac b/dns/bind9-devel/files/patch-configure.ac
index 027333ac9b66..b99ac3b789fd 100644
--- a/dns/bind9-devel/files/patch-configure.ac
+++ b/dns/bind9-devel/files/patch-configure.ac
@@ -1,6 +1,6 @@
 automake has warnings, it is ok here.
 
---- configure.ac.orig	2020-04-30 08:56:31 UTC
+--- configure.ac.orig	2020-05-10 23:44:14 UTC
 +++ configure.ac
 @@ -56,7 +56,7 @@ AC_DEFINE_UNQUOTED([PACKAGE_CONFIGARGS], ["$bind_CONFI
  AC_DEFINE([PACKAGE_BUILDER], ["make"], [make or Visual Studio])
@@ -9,5 +9,5 @@ automake has warnings, it is ok here.
 -AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz -Wall -Werror])
 +AM_INIT_AUTOMAKE([foreign subdir-objects dist-xz -Wall])
  AM_SILENT_RULES([yes])
- AM_EXTRA_RECURSIVE_TARGETS([test unit])
+ AM_EXTRA_RECURSIVE_TARGETS([test unit doc])