diff options
Diffstat (limited to 'dns/bind918')
| -rw-r--r-- | dns/bind918/Makefile | 86 | ||||
| -rw-r--r-- | dns/bind918/distinfo | 6 | ||||
| -rw-r--r-- | dns/bind918/files/extrapatch-bind-min-override-ttl | 14 | ||||
| -rw-r--r-- | dns/bind918/pkg-plist | 14 |
4 files changed, 64 insertions, 56 deletions
diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index 37ca61ae5d41..cc2f895c4b52 100644 --- a/dns/bind918/Makefile +++ b/dns/bind918/Makefile @@ -1,15 +1,15 @@ # pkg-help formatted with fmt 59 63 PORTNAME= bind -DISTVERSION= 9.18.36 +DISTVERSION= 9.18.38 PORTREVISION= 0 CATEGORIES= dns net MASTER_SITES= ISC/bind9/${DISTVERSION} PKGNAMESUFFIX= 918 MAINTAINER= mat@FreeBSD.org -WWW= https://www.isc.org/bind/ COMMENT= BIND DNS suite with updated DNSSEC and DNS64 +WWW= https://www.isc.org/bind/ # Uncomment when bind920 comes of age. +3 years if ESV, +1year otherwise, see # https://kb.isc.org/docs/aa-00896 @@ -19,14 +19,13 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64 LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libuv.so:devel/libuv \ - libnghttp2.so:www/libnghttp2 +LIB_DEPENDS= libnghttp2.so:www/libnghttp2 \ + libuv.so:devel/libuv RUN_DEPENDS= bind-tools>0:dns/bind-tools USES= autoreconf compiler:c11 cpe gnome libedit libtool pkgconfig ssl \ tar:xz -USE_GNOME= libxml2 CPE_VENDOR= isc CPE_VERSION= ${DISTVERSION:C/-.*//} @@ -34,33 +33,36 @@ CPE_VERSION= ${DISTVERSION:C/-.*//} CPE_UPDATE= ${DISTVERSION:C/.*-//:tl} .endif +USE_RC_SUBR= named + GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= --disable-linux-caps \ + --enable-dnsrps \ --localstatedir=/var \ --sysconfdir=${ETCDIR} \ --with-dlopen=yes \ - --with-libxml2 \ --with-openssl=${OPENSSLBASE} \ - --enable-dnsrps \ --with-readline=libedit CONFIGURE_ENV= READLINE_CFLAGS="-L${LOCALBASE}/lib" + +MAKE_JOBS_UNSAFE= yes + +CONFLICTS= bind9-devel bind920 + ETCDIR= ${PREFIX}/etc/namedb -USE_RC_SUBR= named -SUB_FILES= named.conf pkg-message +SUB_FILES= named.conf pkg-message PORTDOCS= * -CONFLICTS= bind920 bind9-devel - -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 @@ -78,51 +80,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 @@ -133,6 +134,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> @@ -146,7 +154,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> diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo index a668a626a870..99584ea6783a 100644 --- a/dns/bind918/distinfo +++ b/dns/bind918/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744829385 -SHA256 (bind-9.18.36.tar.xz) = cd9a667bd33637dd9af331e4a203837cb3d53de5747eb2973c816dfaa68708f1 -SIZE (bind-9.18.36.tar.xz) = 5357976 +TIMESTAMP = 1752729485 +SHA256 (bind-9.18.38.tar.xz) = b11fce934773ec25dd6d7253caeaf9c5bbf073fd327acc29daffeca3987e31a1 +SIZE (bind-9.18.38.tar.xz) = 5362772 diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl index 48b3f75c10f9..5fab4d9d5ef5 100644 --- a/dns/bind918/files/extrapatch-bind-min-override-ttl +++ b/dns/bind918/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:37:24 UTC +--- bin/named/config.c.orig 2025-07-04 09:46:41 UTC +++ bin/named/config.c @@ -186,6 +186,7 @@ options {\n\ notify-source *;\n\ @@ -10,7 +10,7 @@ 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:37:24 UTC +--- bin/named/server.c.orig 2025-07-04 09:46:41 UTC +++ bin/named/server.c @@ -4755,6 +4755,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } @@ -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:37:24 UTC +--- doc/arm/reference.rst.orig 2025-07-04 09:46:42 UTC +++ doc/arm/reference.rst -@@ -4388,6 +4388,10 @@ Tuning +@@ -4391,6 +4391,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:37:24 UTC +--- lib/dns/include/dns/view.h.orig 2025-07-04 09:46:42 UTC +++ lib/dns/include/dns/view.h @@ -157,6 +157,7 @@ struct dns_view { bool requestnsid; @@ -47,7 +47,7 @@ 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:37:24 UTC +--- lib/dns/resolver.c.orig 2025-07-04 09:46:42 UTC +++ lib/dns/resolver.c @@ -6425,6 +6425,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:37:25 UTC +--- lib/isccfg/namedconf.c.orig 2025-07-04 09:46:42 UTC +++ lib/isccfg/namedconf.c @@ -2105,6 +2105,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist index 28210402e054..d5899878e4fc 100644 --- a/dns/bind918/pkg-plist +++ b/dns/bind918/pkg-plist @@ -240,19 +240,19 @@ include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so lib/libbind9.so -lib/libbind9-9.18.36.so +lib/libbind9-9.18.38.so lib/libdns.so -lib/libdns-9.18.36.so +lib/libdns-9.18.38.so lib/libirs.so -lib/libirs-9.18.36.so +lib/libirs-9.18.38.so lib/libisc.so -lib/libisc-9.18.36.so +lib/libisc-9.18.38.so lib/libisccc.so -lib/libisccc-9.18.36.so +lib/libisccc-9.18.38.so lib/libisccfg.so -lib/libisccfg-9.18.36.so +lib/libisccfg-9.18.38.so lib/libns.so -lib/libns-9.18.36.so +lib/libns-9.18.38.so @comment share/man/man1/arpaname.1.gz @comment share/man/man1/delv.1.gz @comment share/man/man1/dig.1.gz |