dns/bind9-devel: update to 9.19.18

Switch from gitlab to official BIND9 development releases.    	 	  	 	   	 	   	 		       	                  

8 files changed, 77 insertions, 105 deletions

diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel
index 66f73650ac47..09454495d4b7 100644
--- a/dns/bind-tools/pkg-plist-devel
+++ b/dns/bind-tools/pkg-plist-devel
@@ -16,20 +16,16 @@ bin/named-rrchecker
 bin/nsec3hash
 bin/nslookup
 bin/nsupdate
-lib/bind-tools/libbind9.so
-lib/bind-tools/libbind9-9.19.3-dev.so
+lib/bind-tools/libdns-9.19.18.so
 lib/bind-tools/libdns.so
-lib/bind-tools/libdns-9.19.3-dev.so
-lib/bind-tools/libirs.so
-lib/bind-tools/libirs-9.19.3-dev.so
+lib/bind-tools/libisc-9.19.18.so
 lib/bind-tools/libisc.so
-lib/bind-tools/libisc-9.19.3-dev.so
+lib/bind-tools/libisccc-9.19.18.so
 lib/bind-tools/libisccc.so
-lib/bind-tools/libisccc-9.19.3-dev.so
+lib/bind-tools/libisccfg-9.19.18.so
 lib/bind-tools/libisccfg.so
-lib/bind-tools/libisccfg-9.19.3-dev.so
+lib/bind-tools/libns-9.19.18.so
 lib/bind-tools/libns.so
-lib/bind-tools/libns-9.19.3-dev.so
 share/man/man1/arpaname.1.gz
 share/man/man1/delv.1.gz
 share/man/man1/dig.1.gz
@@ -42,14 +38,12 @@ share/man/man1/dnssec-revoke.1.gz
 share/man/man1/dnssec-settime.1.gz
 share/man/man1/dnssec-signzone.1.gz
 share/man/man1/dnssec-verify.1.gz
-@comment share/man/man1/dnstap-read.1.gz
 share/man/man1/host.1.gz
 share/man/man1/mdig.1.gz
 @comment share/man/man1/named-checkconf.1.gz
 @comment share/man/man1/named-checkzone.1.gz
 @comment share/man/man1/named-compilezone.1.gz
 @comment share/man/man1/named-journalprint.1.gz
-@comment share/man/man1/named-nzd2nzf.1.gz
 share/man/man1/named-rrchecker.1.gz
 share/man/man1/nsec3hash.1.gz
 share/man/man1/nslookup.1.gz
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 15de05084a85..f80eea1d6a1e 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -1,27 +1,23 @@
 # pkg-help formatted with fmt 59 63
 
 PORTNAME=	bind
-PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
+DISTVERSION=	9.19.18
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
-PORTREVISION=	2
+PORTREVISION=	0
 .else
 # XXX: correct version
 # dns/bind9xx here
-PORTREVISION=	2
+PORTREVISION=	0
 .endif
 CATEGORIES=	dns net
-# XXX: put the ISC master_site
-#MASTER_SITES=	ISC/bind9/${ISCVERSION}
-MASTER_SITES=	LOCAL/mat/bind
+MASTER_SITES=	ISC/bind9/${DISTVERSION}
 .if defined(BIND_TOOLS_SLAVE)
 PKGNAMESUFFIX=	-tools
 .else
 # XXX: correct SUFFIX.
 PKGNAMESUFFIX=	9-devel
 .endif
-# XXX: correct DISTNAME.
-#DISTNAME=	${PORTNAME}-${ISCVERSION}
 
 MAINTAINER=	mat@FreeBSD.org
 WWW=		https://www.isc.org/bind/
@@ -41,33 +37,24 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 LIB_DEPENDS=	libuv.so:devel/libuv \
 		libnghttp2.so:www/libnghttp2 \
+		liburcu.so:sysutils/liburcu \
 		libxml2.so:textproc/libxml2
 
 .if !defined(BIND_TOOLS_SLAVE)
 RUN_DEPENDS=	bind-tools>0:dns/bind-tools
 .endif
 
-# 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.3.2022.06.16
-# XXX: Remove gitlab
-USE_GITLAB=	yes
-GL_SITE=	https://gitlab.isc.org
-GL_ACCOUNT=	isc-projects
-GL_PROJECT=	bind9
-GL_TAGNAME=	84854b3f22b885ba4cfbf34697de4fbed1cad0a2
+USES=		autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:xz
 
 CPE_VENDOR=	isc
-CPE_VERSION=	${ISCVERSION:C/-.*//}
-.if ${ISCVERSION:M*-*}
-CPE_UPDATE=	${ISCVERSION:C/.*-//:tl}
+CPE_VERSION=	${DISTVERSION:C/-.*//}
+.if ${DISTVERSION:M*-*}
+CPE_UPDATE=	${DISTVERSION:C/.*-//:tl}
 .endif
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
-CONFIGURE_ARGS=	--disable-linux-caps \
-		--localstatedir=/var \
+CONFIGURE_ARGS=	--localstatedir=/var \
 		--sysconfdir=${ETCDIR} \
 		--with-dlopen=yes \
 		--with-libxml2 \
@@ -189,6 +176,10 @@ USE_PERL5=		build
 BUILD_DEPENDS+=		cmocka>0:sysutils/cmocka
 .endif
 
+.if !${PORT_OPTIONS:MDOCS}
+CONFIGURE_ENV+=		ac_cv_path_SPHINX_BUILD=
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT} == base
@@ -197,10 +188,7 @@ SUB_LIST+=	ENGINES=/usr/lib/engines
 SUB_LIST+=	ENGINES=${LOCALBASE}/lib/engines
 .endif
 
-# XXX: Remove first REINPLACE_CMD
 post-patch:
-	@${REINPLACE_CMD} -e '/^m4_define(\[bind_SRCID/s/\[m4.*\]/${GL_TAGNAME}/' \
-		${WRKSRC}/configure.ac
 .for FILE in check/named-checkconf.rst named/named.rst nsupdate/nsupdate.rst \
 	rndc/rndc.rst
 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
@@ -223,10 +211,6 @@ post-install:
 	${INSTALL_DATA} ${FILESDIR}/localhost-reverse.db ${STAGEDIR}${ETCDIR}/primary
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.dist.sample
 	${INSTALL_DATA} ${FILESDIR}/BIND.chroot.local.dist ${STAGEDIR}${PREFIX}/etc/mtree/BIND.chroot.local.dist.sample
-	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
-		${STAGEDIR}${ETCDIR}/rndc.conf.sample
-# FIXME: this is strange.
-	@${RM} -rf ${STAGEDIR}/wrkdirs
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 44b8c8e1fc90..8d4cb59f2198 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655710077
-SHA256 (isc-projects-bind9-84854b3f22b885ba4cfbf34697de4fbed1cad0a2_GL0.tar.gz) = 2675272288171b0c5240f533b13f9169754dc363df6b9fcea5ac56c93a53dda4
-SIZE (isc-projects-bind9-84854b3f22b885ba4cfbf34697de4fbed1cad0a2_GL0.tar.gz) = 6452017
+TIMESTAMP = 1701518000
+SHA256 (bind-9.19.18.tar.xz) = 42a2bed5e3727f83b23cc116c1330229e53e34b57833a37cbd0fe189315824f8
+SIZE (bind-9.19.18.tar.xz) = 5656312
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 5ee5822278c9..3305062720c8 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	2022-06-10 05:54:30 UTC
+--- bin/named/config.c.orig	2023-11-09 12:05:47 UTC
 +++ bin/named/config.c
-@@ -181,6 +181,7 @@ options {\n\
+@@ -177,6 +177,7 @@ options {\n\
  	notify-source *;\n\
  	notify-source-v6 *;\n\
  	nsec3-test-zone no;\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-06-10 05:54:30 UTC
+--- bin/named/server.c.orig	2023-11-09 12:05:47 UTC
 +++ bin/named/server.c
-@@ -4521,6 +4521,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4473,6 +4473,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	2022-06-10 05:54:30 UTC
+--- lib/dns/include/dns/view.h.orig	2023-11-09 12:05:47 UTC
 +++ lib/dns/include/dns/view.h
 @@ -149,6 +149,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	2022-06-10 05:54:30 UTC
+--- lib/dns/resolver.c.orig	2023-11-09 12:05:47 UTC
 +++ lib/dns/resolver.c
-@@ -6126,6 +6126,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -5933,6 +5933,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
  		}
  
  		/*
@@ -49,9 +49,9 @@ Add the override-cache-ttl feature.
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2022-06-10 05:54:30 UTC
+--- lib/isccfg/namedconf.c.orig	2023-11-09 12:05:47 UTC
 +++ lib/isccfg/namedconf.c
-@@ -2093,6 +2093,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -2088,6 +2088,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
  	{ "max-acache-size", NULL, CFG_CLAUSEFLAG_ANCIENT },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
diff --git a/dns/bind9-devel/files/extrapatch-bind-tools b/dns/bind9-devel/files/extrapatch-bind-tools
index 886edecf59fb..0416f8b80b37 100644
--- a/dns/bind9-devel/files/extrapatch-bind-tools
+++ b/dns/bind9-devel/files/extrapatch-bind-tools
@@ -1,22 +1,21 @@
 Only select the "tools" part of bind for building.
 
---- Makefile.am.orig	2022-06-10 05:54:30 UTC
+--- Makefile.am.orig	2023-12-02 10:13:03 UTC
 +++ Makefile.am
-@@ -12,8 +12,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
--
+@@ -17,7 +17,6 @@ bind.keys.h: bind.keys Makefile
  .PHONY: doc
  
  EXTRA_DIST =			\
---- bin/Makefile.am.orig	2022-06-10 05:54:30 UTC
+-	bind.keys		\
+ 	util/bindkeys.pl	\
+ 	util/dtrace.sh		\
+ 	contrib			\
+--- bin/Makefile.am.orig	2023-12-01 14:21:34 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	2022-06-10 05:54:30 UTC
+--- bin/tools/Makefile.am.orig	2023-12-01 14:21:34 UTC
 +++ bin/tools/Makefile.am
 @@ -11,7 +11,6 @@ LDADD +=			\
  bin_PROGRAMS =			\
diff --git a/dns/bind9-devel/files/named.root b/dns/bind9-devel/files/named.root
index 6f15474277e1..77cf1e35c5bb 100644
--- a/dns/bind9-devel/files/named.root
+++ b/dns/bind9-devel/files/named.root
@@ -8,9 +8,9 @@
 ;           file                /domain/named.cache 
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
-; 
-;       last update:     November 16, 2017 
-;       related version of root zone:     2017111601
+;
+;       last update:     January 24, 2024
+;       related version of root zone:     2024012401
 ; 
 ; FORMERLY NS.INTERNIC.NET 
 ;
@@ -21,8 +21,8 @@ A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
 ; FORMERLY NS1.ISI.EDU 
 ;
 .                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     199.9.14.201
-B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:200::b
+B.ROOT-SERVERS.NET.      3600000      A     170.247.170.2
+B.ROOT-SERVERS.NET.      3600000      AAAA  2801:1b8:10::b
 ; 
 ; FORMERLY C.PSI.NET 
 ;
diff --git a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h
index 6b9d61afe30c..e0b4c90941ad 100644
--- a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h
+++ b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h
@@ -1,8 +1,8 @@
 We reference the pid file as being run/named/pid everywere else.
 
---- bin/named/include/named/globals.h.orig	2021-09-17 07:10:48 UTC
+--- bin/named/include/named/globals.h.orig	2023-12-01 14:21:34 UTC
 +++ bin/named/include/named/globals.h
-@@ -133,7 +133,7 @@ EXTERN bool named_g_forcelock		   INIT(false);
+@@ -121,7 +121,7 @@ EXTERN const char *named_g_defaultsessionkeyfile INIT(
  
  #if NAMED_RUN_PID_DIR
  EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/"
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 1497d3df4270..f39cec7e0da2 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -6,15 +6,11 @@ bin/named-journalprint
 %%LMDB%%bin/named-nzd2nzf
 @sample etc/mtree/BIND.chroot.dist.sample
 @sample etc/mtree/BIND.chroot.local.dist.sample
-%%ETCDIR%%/bind.keys
+@sample %%ETCDIR%%/named.conf.sample
+%%ETCDIR%%/named.root
 %%ETCDIR%%/primary/empty.db
 %%ETCDIR%%/primary/localhost-forward.db
 %%ETCDIR%%/primary/localhost-reverse.db
-@sample %%ETCDIR%%/named.conf.sample
-%%ETCDIR%%/named.root
-%%ETCDIR%%/rndc.conf.sample
-include/bind9/check.h
-include/bind9/getaddresses.h
 include/dns/acl.h
 include/dns/adb.h
 include/dns/badcache.h
@@ -44,7 +40,6 @@ include/dns/ecs.h
 include/dns/edns.h
 include/dns/enumclass.h
 include/dns/enumtype.h
-include/dns/events.h
 include/dns/fixedname.h
 include/dns/forward.h
 include/dns/geoip.h
@@ -63,6 +58,7 @@ include/dns/master.h
 include/dns/masterdump.h
 include/dns/message.h
 include/dns/name.h
+include/dns/nametree.h
 include/dns/ncache.h
 include/dns/nsec.h
 include/dns/nsec3.h
@@ -71,6 +67,7 @@ include/dns/opcode.h
 include/dns/order.h
 include/dns/peer.h
 include/dns/private.h
+include/dns/qp.h
 include/dns/rbt.h
 include/dns/rcode.h
 include/dns/rdata.h
@@ -81,6 +78,7 @@ include/dns/rdatasetiter.h
 include/dns/rdataslab.h
 include/dns/rdatastruct.h
 include/dns/rdatatype.h
+include/dns/remote.h
 include/dns/request.h
 include/dns/resolver.h
 include/dns/result.h
@@ -88,7 +86,6 @@ include/dns/rootns.h
 include/dns/rpz.h
 include/dns/rriterator.h
 include/dns/rrl.h
-include/dns/sdb.h
 include/dns/sdlz.h
 include/dns/secalg.h
 include/dns/secproto.h
@@ -97,8 +94,8 @@ include/dns/ssu.h
 include/dns/stats.h
 include/dns/time.h
 include/dns/tkey.h
+include/dns/trace.h
 include/dns/transport.h
-include/dns/tsec.h
 include/dns/tsig.h
 include/dns/ttl.h
 include/dns/types.h
@@ -115,46 +112,47 @@ include/dst/gssapi.h
 include/irs/resconf.h
 include/isc/aes.h
 include/isc/align.h
-include/isc/app.h
+include/isc/ascii.h
 include/isc/assertions.h
-include/isc/astack.h
+include/isc/async.h
 include/isc/atomic.h
 include/isc/attributes.h
 include/isc/backtrace.h
 include/isc/barrier.h
 include/isc/base32.h
 include/isc/base64.h
-include/isc/bind9.h
 include/isc/buffer.h
-include/isc/cmocka.h
 include/isc/commandline.h
 include/isc/condition.h
 include/isc/counter.h
 include/isc/crc64.h
-include/isc/deprecated.h
 include/isc/dir.h
+include/isc/dnsstream.h
 include/isc/endian.h
+include/isc/entropy.h
 include/isc/errno.h
 include/isc/error.h
-include/isc/event.h
-include/isc/eventclass.h
 include/isc/file.h
+include/isc/fips.h
 include/isc/formatcheck.h
-include/isc/fsaccess.h
 include/isc/fuzz.h
-include/isc/glob.h
+include/isc/getaddresses.h
 include/isc/hash.h
+include/isc/hashmap.h
 include/isc/heap.h
 include/isc/hex.h
+include/isc/histo.h
 include/isc/hmac.h
 include/isc/ht.h
 include/isc/httpd.h
 include/isc/interfaceiter.h
 include/isc/iterated_hash.h
+include/isc/job.h
 include/isc/lang.h
 include/isc/lex.h
 include/isc/list.h
 include/isc/log.h
+include/isc/loop.h
 include/isc/magic.h
 include/isc/managers.h
 include/isc/md.h
@@ -164,16 +162,15 @@ include/isc/mutex.h
 include/isc/mutexblock.h
 include/isc/net.h
 include/isc/netaddr.h
-include/isc/netdb.h
 include/isc/netmgr.h
 include/isc/netscope.h
 include/isc/nonce.h
-include/isc/offset.h
 include/isc/once.h
 include/isc/os.h
+include/isc/overflow.h
 include/isc/parseint.h
+include/isc/pause.h
 include/isc/portset.h
-include/isc/print.h
 include/isc/quota.h
 include/isc/radix.h
 include/isc/random.h
@@ -181,38 +178,39 @@ include/isc/ratelimiter.h
 include/isc/refcount.h
 include/isc/regex.h
 include/isc/region.h
-include/isc/resource.h
 include/isc/result.h
 include/isc/rwlock.h
 include/isc/safe.h
 include/isc/serial.h
+include/isc/signal.h
 include/isc/siphash.h
 include/isc/sockaddr.h
-include/isc/stat.h
+include/isc/spinlock.h
 include/isc/stats.h
-include/isc/stdatomic.h
 include/isc/stdio.h
 include/isc/stdtime.h
 include/isc/strerr.h
 include/isc/string.h
 include/isc/symtab.h
 include/isc/syslog.h
-include/isc/task.h
 include/isc/thread.h
+include/isc/tid.h
 include/isc/time.h
 include/isc/timer.h
 include/isc/tls.h
 include/isc/tm.h
 include/isc/types.h
+include/isc/urcu.h
 include/isc/url.h
 include/isc/utf8.h
 include/isc/util.h
 include/isc/uv.h
+include/isc/work.h
+include/isc/xml.h
 include/isccc/alist.h
 include/isccc/base64.h
 include/isccc/cc.h
 include/isccc/ccmsg.h
-include/isccc/events.h
 include/isccc/sexpr.h
 include/isccc/symtab.h
 include/isccc/symtype.h
@@ -220,12 +218,13 @@ include/isccc/types.h
 include/isccc/util.h
 include/isccfg/aclconf.h
 include/isccfg/cfg.h
+include/isccfg/check.h
+include/isccfg/duration.h
 include/isccfg/grammar.h
 include/isccfg/kaspconf.h
 include/isccfg/log.h
 include/isccfg/namedconf.h
 include/ns/client.h
-include/ns/events.h
 include/ns/hooks.h
 include/ns/interfacemgr.h
 include/ns/listenlist.h
@@ -240,20 +239,16 @@ include/ns/update.h
 include/ns/xfrout.h
 lib/bind/filter-a.so
 lib/bind/filter-aaaa.so
-lib/libbind9.so
-lib/libbind9-9.19.3-dev.so
+lib/libdns-9.19.18.so
 lib/libdns.so
-lib/libdns-9.19.3-dev.so
-lib/libirs.so
-lib/libirs-9.19.3-dev.so
+lib/libisc-9.19.18.so
 lib/libisc.so
-lib/libisc-9.19.3-dev.so
+lib/libisccc-9.19.18.so
 lib/libisccc.so
-lib/libisccc-9.19.3-dev.so
+lib/libisccfg-9.19.18.so
 lib/libisccfg.so
-lib/libisccfg-9.19.3-dev.so
+lib/libns-9.19.18.so
 lib/libns.so
-lib/libns-9.19.3-dev.so
 @comment share/man/man1/arpaname.1.gz
 @comment share/man/man1/delv.1.gz
 @comment share/man/man1/dig.1.gz