git: a61f9745ccf4 - main - dns/bind916: update to 9.16.28

From: Mathieu Arnold <mat_at_FreeBSD.org>
Date: Fri, 22 Apr 2022 15:56:03 UTC
The branch main has been updated by mat:

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

commit a61f9745ccf4134228fc8aee97dfd35d07f98fda
Author:     Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2022-04-22 14:43:14 +0000
Commit:     Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2022-04-22 15:55:42 +0000

    dns/bind916: update to 9.16.28
    
    BIND9 9.16 is now the new ESV release, replacing BIND9 9.11.
    
    Changes:        https://downloads.isc.org/isc/bind9/9.16.28/doc/arm/html/notes.html#notes-for-bind-9-16-28
---
 dns/bind916/Makefile                               | 57 +++-------------------
 dns/bind916/distinfo                               |  6 +--
 dns/bind916/files/extrapatch-bind-min-override-ttl | 18 +++----
 dns/bind916/files/extrapatch-bind-tools            | 34 -------------
 dns/bind916/files/patch-configure                  |  8 +--
 ...xtrapatch-no-bind-tools => patch-no-bind-tools} |  0
 dns/bind916/pkg-plist                              |  1 -
 7 files changed, 22 insertions(+), 102 deletions(-)

diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
index 72f715858bcc..e8ad17b299eb 100644
--- a/dns/bind916/Makefile
+++ b/dns/bind916/Makefile
@@ -2,45 +2,29 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-.if defined(BIND_TOOLS_SLAVE)
-# dns/bind-tools here
-PORTREVISION=	1
-.else
-# dns/bind916 here
-PORTREVISION=	1
-.endif
+PORTREVISION=	0
 CATEGORIES=	dns net
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
-.if defined(BIND_TOOLS_SLAVE)
-PKGNAMESUFFIX=	-tools
-.else
 PKGNAMESUFFIX=	916
-.endif
 DISTNAME=	${PORTNAME}-${ISCVERSION}
 
 MAINTAINER=	mat@FreeBSD.org
-.if defined(BIND_TOOLS_SLAVE)
-COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
-.else
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
-.endif
 
 # Uncomment when bind920 comes of age.
 # DEPRECATED=	End of life, please migrate to a newer version of BIND9
 # EXPIRATION_DATE=	2023-12-31
 
 LICENSE=	MPL20
-LICENSE_FILE=	${WRKSRC}/COPYRIGHT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libuv.so:devel/libuv \
 		libxml2.so:textproc/libxml2
-.if !defined(BIND_TOOLS_SLAVE)
 RUN_DEPENDS=	bind-tools>0:dns/bind-tools
-.endif
 
 USES=		compiler:c11 cpe libedit pkgconfig ssl tar:xz
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.16.27
+ISCVERSION=	9.16.28
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
@@ -53,30 +37,25 @@ CONFIGURE_ARGS=	--disable-linux-caps \
 		--localstatedir=/var \
 		--sysconfdir=${ETCDIR} \
 		--with-dlopen=yes \
+		--without-python \
 		--with-libxml2 \
 		--with-openssl=${OPENSSLBASE} \
 		--with-readline="-L${LOCALBASE}/lib -ledit"
 ETCDIR=		${PREFIX}/etc/namedb
 
-.if defined(BIND_TOOLS_SLAVE)
-CONFIGURE_ARGS+=	--disable-shared
-EXTRA_PATCHES=		${PATCHDIR}/extrapatch-bind-tools
-.else
 USE_RC_SUBR=		named
 SUB_FILES=		named.conf pkg-message
-EXTRA_PATCHES=		${PATCHDIR}/extrapatch-no-bind-tools
 
 PORTDOCS=	*
 
 CONFLICTS=	bind9[0-9][0-9] bind9-devel
-.endif	# BIND_TOOLS_SLAVE
 
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFAULT=	DLZ_FILESYSTEM GSSAPI_NONE IDN JSON LMDB PYTHON \
+OPTIONS_DEFAULT=	DLZ_FILESYSTEM GSSAPI_NONE IDN JSON LMDB \
 			TCP_FASTOPEN MANPAGES DNSTAP
 OPTIONS_DEFINE=		DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
-			OVERRIDECACHE PORTREVISION PYTHON QUERYTRACE \
+			OVERRIDECACHE PORTREVISION QUERYTRACE \
 			START_LATE TCP_FASTOPEN MANPAGES
 
 OPTIONS_RADIO=		CRYPTO
@@ -89,14 +68,6 @@ OPTIONS_GROUP_DLZ=	DLZ_BDB DLZ_FILESYSTEM DLZ_LDAP DLZ_MYSQL \
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
-.if defined(BIND_TOOLS_SLAVE)
-OPTIONS_EXCLUDE=	${OPTIONS_GROUP_DLZ} DNSTAP DOCS GEOIP LMDB \
-			OVERRIDECACHE PORTREVISION QUERYTRACE START_LATE \
-			TCP_FASTOPEN
-.else
-OPTIONS_EXCLUDE=	PYTHON
-.endif	# BIND_TOOLS_SLAVE
-
 OPTIONS_SUB=	yes
 
 CRYPTO_DESC=		Choose which crypto engine to use
@@ -118,7 +89,6 @@ LMDB_DESC=		Use LMDB for zone management
 OVERRIDECACHE_DESC=	Use the override-cache patch
 NATIVE_PKCS11_DESC=	Use PKCS\#11 native API (**READ HELP**)
 PORTREVISION_DESC=	Show PORTREVISION in the version string
-PYTHON_DESC=		Build with Python utilities
 QUERYTRACE_DESC=	Enable the very verbose query tracelogging
 START_LATE_DESC=	Start BIND late in the boot process (see help)
 TCP_FASTOPEN_DESC=	RFC 7413 support
@@ -188,11 +158,6 @@ OVERRIDECACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
 
 NATIVE_PKCS11_CONFIGURE_ENABLE=	native-pkcs11
 
-PYTHON_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
-PYTHON_CONFIGURE_WITH=	python=${PYTHON_CMD}
-PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
-PYTHON_USES=		python
-
 QUERYTRACE_CONFIGURE_ENABLE=	querytrace
 
 START_LATE_SUB_LIST=		NAMED_BEFORE="LOGIN" \
@@ -231,7 +196,6 @@ post-patch:
 		${WRKSRC}/doc/man/${FILE}in
 .endfor
 
-.if !defined(BIND_TOOLS_SLAVE)
 .  if ${PORTREVISION:N0}
 post-patch-PORTREVISION-on:
 	@${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \
@@ -262,14 +226,5 @@ post-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \
 		${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc/arm/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm
-.else
-
-post-install-MANPAGES-on:
-	@(cd ${WRKSRC}/doc/man && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
-
-# Can't use USE_PYTHON=autoplist
-post-install-PYTHON-on:
-	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST}
-.endif	# BIND_TOOLS_SLAVE
 
 .include <bsd.port.post.mk>
diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo
index 061c963585d6..94a9ef8a3d36 100644
--- a/dns/bind916/distinfo
+++ b/dns/bind916/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648017873
-SHA256 (bind-9.16.27.tar.xz) = 90902aaf104c81019d75d6f8b2f7ec40fcd249406f894b44e4a9c6b5e08bf566
-SIZE (bind-9.16.27.tar.xz) = 5084340
+TIMESTAMP = 1650638039
+SHA256 (bind-9.16.28.tar.xz) = 332e34dcbd723a2569efbaf4e79b62e6d56c9abd5bb8411df01533f984d1a370
+SIZE (bind-9.16.28.tar.xz) = 5084504
diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl
index 80b48f982da0..7ccf9d5444e7 100644
--- a/dns/bind916/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind916/files/extrapatch-bind-min-override-ttl
@@ -1,8 +1,8 @@
 Add the override-cache-ttl feature.
 
---- bin/named/config.c.orig	2022-02-04 12:05:58 UTC
+--- bin/named/config.c.orig	2022-04-11 15:28:12 UTC
 +++ bin/named/config.c
-@@ -167,6 +167,7 @@ options {\n\
+@@ -176,6 +176,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-02-04 12:05:58 UTC
+--- bin/named/server.c.orig	2022-04-11 15:28:12 UTC
 +++ bin/named/server.c
-@@ -4435,6 +4435,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4424,6 +4424,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-02-04 12:05:58 UTC
+--- lib/dns/include/dns/view.h.orig	2022-04-11 15:28:12 UTC
 +++ lib/dns/include/dns/view.h
 @@ -154,6 +154,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-02-04 12:05:58 UTC
+--- lib/dns/resolver.c.orig	2022-04-11 15:28:12 UTC
 +++ lib/dns/resolver.c
-@@ -6478,6 +6478,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -6486,6 +6486,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-02-04 12:05:58 UTC
+--- lib/isccfg/namedconf.c.orig	2022-04-11 15:28:12 UTC
 +++ lib/isccfg/namedconf.c
-@@ -2050,6 +2050,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -2051,6 +2051,7 @@ static cfg_clausedef_t view_clauses[] = {
  #endif /* ifdef HAVE_LMDB */
  	{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
  	{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
diff --git a/dns/bind916/files/extrapatch-bind-tools b/dns/bind916/files/extrapatch-bind-tools
deleted file mode 100644
index 9db9e178cdea..000000000000
--- a/dns/bind916/files/extrapatch-bind-tools
+++ /dev/null
@@ -1,34 +0,0 @@
-Only select the "tools" part of bind for building.
-
---- Makefile.in.orig	2022-01-12 13:50:10 UTC
-+++ Makefile.in
-@@ -19,7 +19,7 @@ W3M = @W3M@
- 
- VERSION=@BIND9_VERSION@
- 
--SUBDIRS =	make lib fuzz bin doc
-+SUBDIRS =	lib bin
- TARGETS =
- PREREQS =	bind.keys.h
- 
-@@ -53,7 +53,6 @@ installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sysconfdir}
- 
- install:: installdirs
--	${INSTALL_DATA} ${top_srcdir}/bind.keys ${DESTDIR}${sysconfdir}
- 
- uninstall::
- 	rm -f ${DESTDIR}${sysconfdir}/bind.keys
---- bin/Makefile.in.orig	2022-01-12 13:50:10 UTC
-+++ bin/Makefile.in
-@@ -13,8 +13,8 @@ srcdir =	@srcdir@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig delv dnssec tools nsupdate check confgen \
--		@NZD_TOOLS@ @PYTHON_TOOLS@ @PKCS11_TOOLS@ plugins tests
-+SUBDIRS =	dig delv dnssec tools nsupdate \
-+		@NZD_TOOLS@ @PYTHON_TOOLS@
- TARGETS =
- 
- @BIND9_MAKE_RULES@
diff --git a/dns/bind916/files/patch-configure b/dns/bind916/files/patch-configure
index b1b9610f94ac..614422ab8845 100644
--- a/dns/bind916/files/patch-configure
+++ b/dns/bind916/files/patch-configure
@@ -1,8 +1,8 @@
 Fixup gssapi and db detection.
 
---- configure.orig	2022-02-04 12:05:58 UTC
+--- configure.orig	2022-04-11 15:28:12 UTC
 +++ configure
-@@ -17876,27 +17876,9 @@ done
+@@ -17821,27 +17821,9 @@ done
  		# problems start to show up.
  		saved_libs="$LIBS"
  		for TRY_LIBS in \
@@ -32,7 +32,7 @@ Fixup gssapi and db detection.
  		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
  $as_echo_n "checking linking as $TRY_LIBS... " >&6; }
  		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -17939,47 +17921,7 @@ $as_echo "no" >&6; } ;;
+@@ -17884,47 +17866,7 @@ $as_echo "no" >&6; } ;;
  		no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
  		esac
  
@@ -81,7 +81,7 @@ Fixup gssapi and db detection.
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23429,7 +23371,7 @@ $as_echo "" >&6; }
+@@ -23374,7 +23316,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  
diff --git a/dns/bind916/files/extrapatch-no-bind-tools b/dns/bind916/files/patch-no-bind-tools
similarity index 100%
rename from dns/bind916/files/extrapatch-no-bind-tools
rename to dns/bind916/files/patch-no-bind-tools
diff --git a/dns/bind916/pkg-plist b/dns/bind916/pkg-plist
index d95b32c06e4f..69ae0c729db6 100644
--- a/dns/bind916/pkg-plist
+++ b/dns/bind916/pkg-plist
@@ -175,7 +175,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