summaryrefslogtreecommitdiff
path: root/dns/bind9-devel
diff options
context:
space:
mode:
Diffstat (limited to 'dns/bind9-devel')
-rw-r--r--dns/bind9-devel/Makefile104
-rw-r--r--dns/bind9-devel/distinfo6
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl22
-rw-r--r--dns/bind9-devel/pkg-plist11
4 files changed, 78 insertions, 65 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 33117e7339a8..3d15cab52ec7 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -1,7 +1,7 @@
# pkg-help formatted with fmt 59 63
PORTNAME= bind
-DISTVERSION= 9.21.7
+DISTVERSION= 9.21.9
.if defined(BIND_TOOLS_SLAVE)
# dns/bind-tools here
PORTREVISION= 0
@@ -20,12 +20,12 @@ PKGNAMESUFFIX= 9-devel
.endif
MAINTAINER= mat@FreeBSD.org
-WWW= https://www.isc.org/bind/
.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
+WWW= https://www.isc.org/bind/
# Uncomment when bind9xx comes of age. +3 years if ESV, +1year otherwise, see
# https://kb.isc.org/docs/aa-00896
@@ -35,29 +35,40 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64
LICENSE= MPL20
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-LIB_DEPENDS= libuv.so:devel/libuv \
- libnghttp2.so:www/libnghttp2 \
- liburcu.so:sysutils/liburcu
+LIB_DEPENDS= libnghttp2.so:www/libnghttp2 \
+ liburcu.so:sysutils/liburcu \
+ libuv.so:devel/libuv
.if !defined(BIND_TOOLS_SLAVE)
RUN_DEPENDS= bind-tools>0:dns/bind-tools
.endif
-USES= autoreconf compiler:c11 cpe gnome libedit libtool pkgconfig ssl tar:xz
+USES= autoreconf compiler:c11 cpe gnome libedit libtool pkgconfig ssl \
+ tar:xz
CPE_VENDOR= isc
CPE_VERSION= ${DISTVERSION:C/-.*//}
.if ${DISTVERSION:M*-*}
CPE_UPDATE= ${DISTVERSION:C/.*-//:tl}
.endif
-USE_GNOME= libxml2
+
+.if !defined(BIND_TOOLS_SLAVE)
+USE_RC_SUBR= named
+.endif # !BIND_TOOLS_SLAVE
GNU_CONFIGURE= yes
GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share
CONFIGURE_ARGS= --localstatedir=/var \
--sysconfdir=${ETCDIR} \
- --with-libxml2 \
--with-openssl=${OPENSSLBASE}
+
+MAKE_JOBS_UNSAFE= yes
+
+.if !defined(BIND_TOOLS_SLAVE)
+# XXX: Add -devel
+CONFLICTS= bind9[0-9][0-9]
+.endif # !BIND_TOOLS_SLAVE
+
ETCDIR= ${PREFIX}/etc/namedb
# FIXME: figure out why build fails if enabled
@@ -67,33 +78,28 @@ CONFIGURE_ARGS+= --disable-tracing
EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/bind-tools
.else
-USE_RC_SUBR= named
# XXX: remove the big warning about it being a development version from pkg-message
SUB_FILES= named.conf pkg-message
EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools
PORTDOCS= *
+.endif # BIND_TOOLS_SLAVE
-# XXX: Add -devel
-CONFLICTS= bind9[0-9][0-9]
-.endif # BIND_TOOLS_SLAVE
-
-MAKE_JOBS_UNSAFE= yes
+OPTIONS_DEFINE= DNSTAP DOCS GEOIP IDN LARGE_FILE LMDB OVERRIDECACHE \
+ QUERYTRACE START_LATE TCP_FASTOPEN
+OPTIONS_DEFAULT= DNSTAP GSSAPI_NONE IDN LMDB STATS_JSON STATS_XML \
+ TCP_FASTOPEN
-OPTIONS_DEFAULT= GSSAPI_NONE IDN JSON LMDB \
- TCP_FASTOPEN DNSTAP
-OPTIONS_DEFINE= DNSTAP DOCS GEOIP IDN JSON LARGE_FILE LMDB \
- OVERRIDECACHE QUERYTRACE \
- START_LATE TCP_FASTOPEN
+OPTIONS_GROUP= STATS
+OPTIONS_GROUP_STATS= STATS_JSON STATS_XML
OPTIONS_SINGLE= GSSAPI
OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
.if defined(BIND_TOOLS_SLAVE)
-OPTIONS_EXCLUDE= DOCS GEOIP LMDB \
- OVERRIDECACHE QUERYTRACE START_LATE \
- TCP_FASTOPEN
-.endif # BIND_TOOLS_SLAVE
+OPTIONS_EXCLUDE= DOCS GEOIP LMDB OVERRIDECACHE QUERYTRACE START_LATE \
+ STATS_JSON STATS_XML TCP_FASTOPEN
+.endif # BIND_TOOLS_SLAVE
OPTIONS_SUB= yes
@@ -107,49 +113,48 @@ LMDB_DESC= Use LMDB for zone management
OVERRIDECACHE_DESC= Use the override-cache patch
QUERYTRACE_DESC= Enable the very verbose query tracelogging
START_LATE_DESC= Start BIND late in the boot process (see help)
+STATS_DESC= Statistics channels
+STATS_JSON_DESC= Enable JSON statistics channel
+STATS_XML_DESC= Enable XML statistics channel
TCP_FASTOPEN_DESC= RFC 7413 support
-DOCS_ALL_TARGET= all html
-DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \
- ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
-DOCS_USES= gmake python:env
-
-DNSTAP_CONFIGURE_ENABLE= dnstap
DNSTAP_LIB_DEPENDS= libfstrm.so:devel/fstrm \
libprotobuf-c.so:devel/protobuf-c
+DNSTAP_CONFIGURE_ENABLE= dnstap
+
+DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \
+ sphinx-build:textproc/py-sphinx
+DOCS_USES= gmake python:env
+DOCS_ALL_TARGET= all html
+GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
GEOIP_CONFIGURE_ENABLE= geoip
GEOIP_CONFIGURE_WITH= maxminddb
-GEOIP_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb
-GSSAPI_BASE_CONFIGURE_ON= --with-gssapi="${KRB5CONFIG}" \
- ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_BASE_USES= gssapi
+GSSAPI_BASE_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
+ --with-gssapi="${KRB5CONFIG}"
-GSSAPI_HEIMDAL_CONFIGURE_ON= --with-gssapi="${KRB5CONFIG}" \
- ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_HEIMDAL_USES= gssapi:heimdal
+GSSAPI_HEIMDAL_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
+ --with-gssapi="${KRB5CONFIG}"
-GSSAPI_MIT_CONFIGURE_ON= --with-gssapi="${KRB5CONFIG}" \
- ${GSSAPI_CONFIGURE_ARGS}
GSSAPI_MIT_USES= gssapi:mit
+GSSAPI_MIT_CONFIGURE_ON= ${GSSAPI_CONFIGURE_ARGS} \
+ --with-gssapi="${KRB5CONFIG}"
GSSAPI_NONE_CONFIGURE_ON= --without-gssapi
-IDN_CONFIGURE_OFF= --without-libidn2
-IDN_CONFIGURE_ON= ${ICONV_CONFIGURE_BASE} \
- --with-libidn2=${LOCALBASE}
IDN_LIB_DEPENDS= libidn2.so:dns/libidn2
IDN_USES= iconv
-
-JSON_CONFIGURE_WITH= json-c
-JSON_LIB_DEPENDS= libjson-c.so:devel/json-c
-JSON_LDFLAGS= -L${LOCALBASE}/lib -ljson-c
+IDN_CONFIGURE_ON= ${ICONV_CONFIGURE_BASE} \
+ --with-libidn2=${LOCALBASE}
+IDN_CONFIGURE_OFF= --without-libidn2
LARGE_FILE_CONFIGURE_ENABLE= largefile
-LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE}
LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb
+LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE}
OVERRIDECACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl
@@ -160,6 +165,13 @@ START_LATE_SUB_LIST= NAMED_BEFORE="LOGIN" \
START_LATE_SUB_LIST_OFF= NAMED_BEFORE="SERVERS" \
NAMED_REQUIRE="NETWORKING ldconfig syslogd"
+STATS_JSON_LIB_DEPENDS= libjson-c.so:devel/json-c
+STATS_JSON_CONFIGURE_WITH= json-c
+STATS_JSON_LDFLAGS= -L${LOCALBASE}/lib -ljson-c
+
+STATS_XML_USE= GNOME=libxml2
+STATS_XML_CONFIGURE_WITH= libxml2
+
TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen
.include <bsd.port.options.mk>
@@ -172,7 +184,7 @@ BUILD_DEPENDS+= cmocka>0:sysutils/cmocka
.endif
.if !${PORT_OPTIONS:MDOCS}
-CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD=
+CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD=
.endif
.include <bsd.port.pre.mk>
@@ -219,6 +231,6 @@ do-install:
done
@${RM} -r ${STAGEDIR}${PREFIX}/include
-.endif # BIND_TOOLS_SLAVE
+.endif # BIND_TOOLS_SLAVE
.include <bsd.port.post.mk>
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 2c33a3e26b6b..a0c73ca647d4 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744829551
-SHA256 (bind-9.21.7.tar.xz) = f9cd6c8e9cc7fd0ae6438a26072063b2d0aa11594493ecf4655f29abdc704b89
-SIZE (bind-9.21.7.tar.xz) = 5558888
+TIMESTAMP = 1750354542
+SHA256 (bind-9.21.9.tar.xz) = 1218c0f78a6fab3a7bd42844c839ef79159c6dfc13cf60f0571405f3f78aeb03
+SIZE (bind-9.21.9.tar.xz) = 5583264
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 40fe995a0760..19b831342b94 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 2025-04-09 14:26:29 UTC
+--- bin/named/config.c.orig 2025-06-06 09:09:52 UTC
+++ bin/named/config.c
-@@ -183,6 +183,7 @@ options {\n\
+@@ -184,6 +184,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 2025-04-09 14:26:29 UTC
+--- bin/named/server.c.orig 2025-06-06 09:09:52 UTC
+++ bin/named/server.c
-@@ -4204,6 +4204,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4183,6 +4183,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);
---- doc/arm/reference.rst.orig 2025-04-09 14:26:29 UTC
+--- doc/arm/reference.rst.orig 2025-06-06 09:09:53 UTC
+++ doc/arm/reference.rst
-@@ -4163,6 +4163,10 @@ Tuning
+@@ -4184,6 +4184,10 @@ Tuning
cannot exceed 7 days and is silently truncated to 7 days if set to a
greater value.
@@ -37,7 +37,7 @@ Add the override-cache-ttl feature.
.. namedconf:statement:: max-cache-ttl
:tags: server
:short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers.
---- lib/dns/include/dns/view.h.orig 2025-04-09 14:26:29 UTC
+--- lib/dns/include/dns/view.h.orig 2025-06-06 09:09:53 UTC
+++ lib/dns/include/dns/view.h
@@ -148,6 +148,7 @@ struct dns_view {
bool requestzoneversion;
@@ -47,9 +47,9 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2025-04-09 14:26:29 UTC
+--- lib/dns/resolver.c.orig 2025-06-06 09:09:53 UTC
+++ lib/dns/resolver.c
-@@ -5937,6 +5937,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
+@@ -5918,6 +5918,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
}
/*
@@ -62,9 +62,9 @@ Add the override-cache-ttl feature.
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2025-04-09 14:26:29 UTC
+--- lib/isccfg/namedconf.c.orig 2025-06-06 09:09:53 UTC
+++ lib/isccfg/namedconf.c
-@@ -2068,6 +2068,7 @@ static cfg_clausedef_t view_clauses[] = {
+@@ -2084,6 +2084,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/pkg-plist b/dns/bind9-devel/pkg-plist
index 2099b7727cb4..57d15551dd46 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -98,6 +98,7 @@ include/dns/transport.h
include/dns/tsig.h
include/dns/ttl.h
include/dns/types.h
+include/dns/unreachcache.h
include/dns/update.h
include/dns/validator.h
include/dns/view.h
@@ -234,15 +235,15 @@ include/ns/update.h
include/ns/xfrout.h
lib/bind/filter-a.so
lib/bind/filter-aaaa.so
-lib/libdns-9.21.7.so
+lib/libdns-9.21.9.so
lib/libdns.so
-lib/libisc-9.21.7.so
+lib/libisc-9.21.9.so
lib/libisc.so
-lib/libisccc-9.21.7.so
+lib/libisccc-9.21.9.so
lib/libisccc.so
-lib/libisccfg-9.21.7.so
+lib/libisccfg-9.21.9.so
lib/libisccfg.so
-lib/libns-9.21.7.so
+lib/libns-9.21.9.so
lib/libns.so
@comment share/man/man1/arpaname.1.gz
@comment share/man/man1/delv.1.gz
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-25 03:53:36 +0000