git: 92436afa3d96 - main - dns/bind9-devel: update to latest commit

From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Tue, 14 Jun 2022 12:12:47 UTC
The branch main has been updated by mat:

URL: https://cgit.FreeBSD.org/ports/commit/?id=92436afa3d96783cc37c8fbb2904d08fb7f26f7a

commit 92436afa3d96783cc37c8fbb2904d08fb7f26f7a
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2022-06-14 07:49:52 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2022-06-14 12:12:28 +0000

    dns/bind9-devel: update to latest commit
---
 dns/bind-tools/pkg-plist-devel                         | 14 +++++++-------
 dns/bind9-devel/Makefile                               |  4 ++--
 dns/bind9-devel/distinfo                               |  6 +++---
 dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 16 ++++++++--------
 dns/bind9-devel/files/extrapatch-bind-tools            | 10 +++++-----
 dns/bind9-devel/pkg-plist                              | 16 ++++++++--------
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index 6e7dd58b62f0..8a85c1cc1848 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.19.1-dev.so
+lib/bind-tools/libbind9-9.19.3-dev.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libdns-9.19.1-dev.so
+lib/bind-tools/libdns-9.19.3-dev.so
 lib/bind-tools/libirs.so
-lib/bind-tools/libirs-9.19.1-dev.so
+lib/bind-tools/libirs-9.19.3-dev.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisc-9.19.1-dev.so
+lib/bind-tools/libisc-9.19.3-dev.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccc-9.19.1-dev.so
+lib/bind-tools/libisccc-9.19.3-dev.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libisccfg-9.19.1-dev.so
+lib/bind-tools/libisccfg-9.19.3-dev.so
 lib/bind-tools/libns.so
-lib/bind-tools/libns-9.19.1-dev.so
+lib/bind-tools/libns-9.19.3-dev.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 082cf342abf8..85eebb0d2cbe 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.19.1.2022.04.22
+ISCVERSION=	9.19.1.2022.06.10
 # XXX: Remove gitlab
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.isc.org
 GL_ACCOUNT=	isc-projects
 GL_PROJECT=	bind9
-GL_COMMIT=	4d216e68ab6829a249e84247a65d298d32adc034
+GL_COMMIT=	189417c76b30fa89e3d7f1111d492f79dcd44a47
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 57da13265334..5cf665fa8e7b 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1650639943
-SHA256 (isc-projects-bind9-4d216e68ab6829a249e84247a65d298d32adc034_GL0.tar.gz) = c9861670dddd5ab35aeaaf3c4e29a42ca972a1dbc1a9e3f0701f3ed3c994d1b5
-SIZE (isc-projects-bind9-4d216e68ab6829a249e84247a65d298d32adc034_GL0.tar.gz) = 6187253
+TIMESTAMP = 1655137874
+SHA256 (isc-projects-bind9-189417c76b30fa89e3d7f1111d492f79dcd44a47_GL0.tar.gz) = 582c3beea10332d5714c976f37318585ff8342729f218bbe776d346dc1beed3c
+SIZE (isc-projects-bind9-189417c76b30fa89e3d7f1111d492f79dcd44a47_GL0.tar.gz) = 6453669
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index d36105468e9f..5ee5822278c9 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	2022-04-22 13:42:53 UTC
+--- bin/named/config.c.orig	2022-06-10 05:54:30 UTC
 +++ bin/named/config.c
 @@ -181,6 +181,7 @@ options {\n\
  	notify-source *;\n\
@@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
  	parental-source *;\n\
  	parental-source-v6 *;\n\
  	provide-ixfr true;\n\
---- bin/named/server.c.orig	2022-04-22 13:42:53 UTC
+--- bin/named/server.c.orig	2022-06-10 05:54:30 UTC
 +++ bin/named/server.c
-@@ -4505,6 +4505,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4521,6 +4521,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -24,9 +24,9 @@ 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	2022-04-22 13:42:53 UTC
+--- lib/dns/include/dns/view.h.orig	2022-06-10 05:54:30 UTC
 +++ lib/dns/include/dns/view.h
-@@ -155,6 +155,7 @@ struct dns_view {
+@@ -149,6 +149,7 @@ struct dns_view {
  	bool		      requestnsid;
  	bool		      sendcookie;
  	dns_ttl_t	      maxcachettl;
@@ -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	2022-04-22 13:42:53 UTC
+--- lib/dns/resolver.c.orig	2022-06-10 05:54:30 UTC
 +++ lib/dns/resolver.c
-@@ -6113,6 +6113,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6126,6 +6126,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	2022-04-22 13:42:53 UTC
+--- lib/isccfg/namedconf.c.orig	2022-06-10 05:54:30 UTC
 +++ lib/isccfg/namedconf.c
 @@ -2093,6 +2093,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 a38b3bd1fa14..886edecf59fb 100644
--- a/dns/bind9-devel/files/extrapatch-bind-tools
+++ b/dns/bind9-devel/files/extrapatch-bind-tools
@@ -1,8 +1,8 @@
 Only select the "tools" part of bind for building.
 
---- Makefile.am.orig	2021-09-24 03:34:18 UTC
+--- Makefile.am.orig	2022-06-10 05:54:30 UTC
 +++ Makefile.am
-@@ -8,8 +8,6 @@ CLEANFILES = bind.keys.h
+@@ -12,8 +12,6 @@ CLEANFILES = bind.keys.h
  bind.keys.h: bind.keys Makefile
  	${PERL} ${top_srcdir}/util/bindkeys.pl ${top_srcdir}/bind.keys > $@
  
@@ -10,13 +10,13 @@ Only select the "tools" part of bind for building.
 -
  .PHONY: doc
  
- EXTRA_DIST = 			\
---- bin/Makefile.am.orig	2021-09-24 03:34:18 UTC
+ EXTRA_DIST =			\
+--- bin/Makefile.am.orig	2022-06-10 05:54:30 UTC
 +++ bin/Makefile.am
 @@ -1 +1 @@
 -SUBDIRS = named rndc dig delv dnssec tools nsupdate check confgen tests plugins
 +SUBDIRS = dig delv dnssec tools nsupdate
---- bin/tools/Makefile.am.orig	2021-09-24 03:34:18 UTC
+--- bin/tools/Makefile.am.orig	2022-06-10 05:54:30 UTC
 +++ bin/tools/Makefile.am
 @@ -11,7 +11,6 @@ LDADD +=			\
  bin_PROGRAMS =			\
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index e8233a72e2ff..9d922a5da5e5 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -59,7 +59,6 @@ include/dns/keytable.h
 include/dns/keyvalues.h
 include/dns/librpz.h
 include/dns/log.h
-include/dns/lookup.h
 include/dns/master.h
 include/dns/masterdump.h
 include/dns/message.h
@@ -208,6 +207,7 @@ include/isc/types.h
 include/isc/url.h
 include/isc/utf8.h
 include/isc/util.h
+include/isc/uv.h
 include/isccc/alist.h
 include/isccc/base64.h
 include/isccc/cc.h
@@ -241,19 +241,19 @@ include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
 lib/libbind9.so
-lib/libbind9-9.19.1-dev.so
+lib/libbind9-9.19.3-dev.so
 lib/libdns.so
-lib/libdns-9.19.1-dev.so
+lib/libdns-9.19.3-dev.so
 lib/libirs.so
-lib/libirs-9.19.1-dev.so
+lib/libirs-9.19.3-dev.so
 lib/libisc.so
-lib/libisc-9.19.1-dev.so
+lib/libisc-9.19.3-dev.so
 lib/libisccc.so
-lib/libisccc-9.19.1-dev.so
+lib/libisccc-9.19.3-dev.so
 lib/libisccfg.so
-lib/libisccfg-9.19.1-dev.so
+lib/libisccfg-9.19.3-dev.so
 lib/libns.so
-lib/libns-9.19.1-dev.so
+lib/libns-9.19.3-dev.so
 @comment man/man1/arpaname.1.gz
 @comment man/man1/delv.1.gz
 @comment man/man1/dig.1.gz