diff options
Diffstat (limited to 'dns/bind920')
| -rw-r--r-- | dns/bind920/Makefile | 102 | ||||
| -rw-r--r-- | dns/bind920/distinfo | 6 | ||||
| -rw-r--r-- | dns/bind920/files/extrapatch-bind-min-override-ttl | 18 | ||||
| -rw-r--r-- | dns/bind920/pkg-plist | 11 |
4 files changed, 74 insertions, 63 deletions
diff --git a/dns/bind920/Makefile b/dns/bind920/Makefile index ff62d67f7810..d3ff68396546 100644 --- a/dns/bind920/Makefile +++ b/dns/bind920/Makefile @@ -1,7 +1,7 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -DISTVERSION= 9.20.8 +DISTVERSION= 9.20.12 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 @@ -19,12 +19,12 @@ PKGNAMESUFFIX= 920 .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 bind922 comes of age. +3 years if ESV, +1year otherwise, see # https://kb.isc.org/docs/aa-00896 @@ -34,10 +34,9 @@ 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 \ +LIB_DEPENDS= libnghttp2.so:www/libnghttp2 \ liburcu.so:sysutils/liburcu \ - libxml2.so:textproc/libxml2 + libuv.so:devel/libuv .if !defined(BIND_TOOLS_SLAVE) RUN_DEPENDS= bind-tools>0:dns/bind-tools @@ -51,16 +50,25 @@ 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 \ +CONFIGURE_ARGS= --enable-dnsrps \ + --localstatedir=/var \ --sysconfdir=${ETCDIR} \ - --with-libxml2 \ --with-openssl=${OPENSSLBASE} \ - --enable-dnsrps \ --with-readline=libedit + +MAKE_JOBS_UNSAFE= yes + +.if !defined(BIND_TOOLS_SLAVE) +CONFLICTS= bind9-devel bind918 +.endif # !BIND_TOOLS_SLAVE + ETCDIR= ${PREFIX}/etc/namedb # FIXME: figure out why build fails if enabled @@ -70,31 +78,27 @@ CONFIGURE_ARGS+= --disable-tracing EXTRA_PATCHES= ${PATCHDIR}/extrapatch-bind-tools CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/bind-tools .else -USE_RC_SUBR= named SUB_FILES= named.conf pkg-message EXTRA_PATCHES= ${PATCHDIR}/extrapatch-no-bind-tools PORTDOCS= * +.endif # BIND_TOOLS_SLAVE -CONFLICTS= bind918 bind9-devel -.endif # BIND_TOOLS_SLAVE - -MAKE_JOBS_UNSAFE= yes +OPTIONS_DEFINE= DNSTAP DOCS FIXED_RRSET 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 FIXED_RRSET 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 @@ -109,51 +113,50 @@ 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 FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset +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 @@ -164,6 +167,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> @@ -176,7 +186,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> @@ -223,6 +233,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/bind920/distinfo b/dns/bind920/distinfo index a7af60325a38..ec97ab3ce744 100644 --- a/dns/bind920/distinfo +++ b/dns/bind920/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744829456 -SHA256 (bind-9.20.8.tar.xz) = 3004d99c476beab49a986c2d49f902e2cd7766c9ab18b261e8b353cabf3a04b5 -SIZE (bind-9.20.8.tar.xz) = 5661928 +TIMESTAMP = 1756270416 +SHA256 (bind-9.20.12.tar.xz) = dd32d6eb67504e8a430aaf70b4ef894f3d0226b44c7e02370c9b0d377f1c7999 +SIZE (bind-9.20.12.tar.xz) = 5700944 diff --git a/dns/bind920/files/extrapatch-bind-min-override-ttl b/dns/bind920/files/extrapatch-bind-min-override-ttl index 61428e25229f..085a03ec7098 100644 --- a/dns/bind920/files/extrapatch-bind-min-override-ttl +++ b/dns/bind920/files/extrapatch-bind-min-override-ttl @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2025-04-09 14:34:29 UTC +--- bin/named/config.c.orig 2025-08-13 17:20:02 UTC +++ bin/named/config.c @@ -186,6 +186,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 2025-04-09 14:34:29 UTC +--- bin/named/server.c.orig 2025-08-13 17:20:02 UTC +++ bin/named/server.c -@@ -4643,6 +4643,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4640,6 +4640,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:34:29 UTC +--- doc/arm/reference.rst.orig 2025-08-13 17:20:02 UTC +++ doc/arm/reference.rst -@@ -4394,6 +4394,10 @@ Tuning +@@ -4397,6 +4397,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:34:29 UTC +--- lib/dns/include/dns/view.h.orig 2025-08-13 17:20:02 UTC +++ lib/dns/include/dns/view.h @@ -151,6 +151,7 @@ struct dns_view { bool requestnsid; @@ -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:34:29 UTC +--- lib/dns/resolver.c.orig 2025-08-13 17:20:02 UTC +++ lib/dns/resolver.c -@@ -5967,6 +5967,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -5985,6 +5985,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } /* @@ -62,7 +62,7 @@ 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:34:29 UTC +--- lib/isccfg/namedconf.c.orig 2025-08-13 17:20:02 UTC +++ lib/isccfg/namedconf.c @@ -2220,6 +2220,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ diff --git a/dns/bind920/pkg-plist b/dns/bind920/pkg-plist index beef2af65409..35f6975b47f9 100644 --- a/dns/bind920/pkg-plist +++ b/dns/bind920/pkg-plist @@ -34,6 +34,7 @@ include/dns/dnssec.h include/dns/dnstap.h include/dns/ds.h include/dns/dsdigest.h +include/dns/dsync.h include/dns/dyndb.h include/dns/ecs.h include/dns/ede.h @@ -242,15 +243,15 @@ include/ns/update.h include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so -lib/libdns-9.20.8.so +lib/libdns-9.20.12.so lib/libdns.so -lib/libisc-9.20.8.so +lib/libisc-9.20.12.so lib/libisc.so -lib/libisccc-9.20.8.so +lib/libisccc-9.20.12.so lib/libisccc.so -lib/libisccfg-9.20.8.so +lib/libisccfg-9.20.12.so lib/libisccfg.so -lib/libns-9.20.8.so +lib/libns-9.20.12.so lib/libns.so @comment share/man/man1/arpaname.1.gz @comment share/man/man1/delv.1.gz |