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 @@ -1,65 +1,59 @@ bin/arpaname bin/delv bin/dig bin/dnssec-cds bin/dnssec-dsfromkey bin/dnssec-importkey bin/dnssec-keyfromlabel bin/dnssec-keygen bin/dnssec-revoke bin/dnssec-settime bin/dnssec-signzone bin/dnssec-verify bin/host bin/mdig 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 share/man/man1/dnssec-cds.1.gz share/man/man1/dnssec-dsfromkey.1.gz share/man/man1/dnssec-importkey.1.gz share/man/man1/dnssec-keyfromlabel.1.gz share/man/man1/dnssec-keygen.1.gz 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 share/man/man1/nsupdate.1.gz @comment share/man/man5/named.conf.5.gz @comment share/man/man5/rndc.conf.5.gz @comment share/man/man8/ddns-confgen.8.gz @comment share/man/man8/filter-a.8.gz @comment share/man/man8/filter-aaaa.8.gz @comment share/man/man8/named.8.gz @comment share/man/man8/rndc-confgen.8.gz @comment share/man/man8/rndc.8.gz @comment share/man/man8/tsig-keygen.8.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,246 +1,230 @@ # 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/ .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 bind9xx comes of age. +3 years if ESV, +1year otherwise, see # https://kb.isc.org/docs/aa-00896 # DEPRECATED= End of life, please migrate to a newer version of BIND9 # EXPIRATION_DATE= XXX-12-31 LICENSE= MPL20 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 \ --with-openssl=${OPENSSLBASE} \ --enable-dnsrps \ --with-readline=libedit CONFIGURE_ENV= READLINE_CFLAGS="-L${LOCALBASE}/lib" ETCDIR= ${PREFIX}/etc/namedb .if defined(BIND_TOOLS_SLAVE) 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= * # XXX: Add -devel CONFLICTS= bind9[0-9][0-9] .endif # BIND_TOOLS_SLAVE MAKE_JOBS_UNSAFE= yes 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_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE .if defined(BIND_TOOLS_SLAVE) OPTIONS_EXCLUDE= DNSTAP DOCS GEOIP LMDB \ OVERRIDECACHE QUERYTRACE START_LATE \ TCP_FASTOPEN .endif # BIND_TOOLS_SLAVE OPTIONS_SUB= yes DNSTAP_DESC= Provides fast passive logging of DNS messages FIXED_RRSET_DESC= Enable fixed rrset ordering GSSAPI_BASE_DESC= Using Heimdal in base (nsupdate is broken) GSSAPI_HEIMDAL_DESC= Using security/heimdal (nsupdate is broken) GSSAPI_MIT_DESC= Using security/krb5 GSSAPI_NONE_DESC= Disable LARGE_FILE_DESC= 64-bit file support 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) 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 FIXED_RRSET_CONFIGURE_ENABLE= fixed-rrset 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_HEIMDAL_CONFIGURE_ON= --with-gssapi="${KRB5CONFIG}" \ ${GSSAPI_CONFIGURE_ARGS} GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_CONFIGURE_ON= --with-gssapi="${KRB5CONFIG}" \ ${GSSAPI_CONFIGURE_ARGS} GSSAPI_MIT_USES= gssapi:mit 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 LARGE_FILE_CONFIGURE_ENABLE= largefile LMDB_CONFIGURE_WITH= lmdb=${LOCALBASE} LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb OVERRIDECACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl QUERYTRACE_CONFIGURE_ENABLE= querytrace START_LATE_SUB_LIST= NAMED_BEFORE="LOGIN" \ NAMED_REQUIRE="SERVERS cleanvar" START_LATE_SUB_LIST_OFF= NAMED_BEFORE="SERVERS" \ NAMED_REQUIRE="NETWORKING ldconfig syslogd" TCP_FASTOPEN_CONFIGURE_ENABLE= tcp-fastopen .include .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-developer \ --enable-symtable USES+= perl5 USE_PERL5= build BUILD_DEPENDS+= cmocka>0:sysutils/cmocka .endif +.if !${PORT_OPTIONS:MDOCS} +CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD= +.endif + .include .if ${SSL_DEFAULT} == base SUB_LIST+= ENGINES=/usr/lib/engines .else 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' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ ${WRKSRC}/bin/${FILE} .endfor .if !defined(BIND_TOOLS_SLAVE) post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/mtree ${MKDIR} ${STAGEDIR}${ETCDIR} . for i in dynamic primary secondary working @${MKDIR} ${STAGEDIR}${ETCDIR}/$i . endfor ${INSTALL_DATA} ${WRKDIR}/named.conf ${STAGEDIR}${ETCDIR}/named.conf.sample ${INSTALL_DATA} ${FILESDIR}/named.root ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/empty.db ${STAGEDIR}${ETCDIR}/primary ${INSTALL_DATA} ${FILESDIR}/localhost-forward.db ${STAGEDIR}${ETCDIR}/primary ${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 ${INSTALL_DATA} ${WRKSRC}/CHANGES* \ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc/arm/_build/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/arm .else do-install: for dir in bin lib doc/man; do \ (cd ${INSTALL_WRKSRC}/$$dir && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ; \ done @${RM} -r ${STAGEDIR}${PREFIX}/include .endif # BIND_TOOLS_SLAVE .include 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,61 +1,61 @@ 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\ + override-cache-ttl 0; /* do not override */\n\ 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; + result = named_config_get(maps, "override-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); + view->overridecachettl = cfg_obj_asduration(obj); + + obj = NULL; 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; bool sendcookie; dns_ttl_t maxcachettl; + dns_ttl_t overridecachettl; 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 } /* + * Enforce the configure cache TTL override. + */ + if (res->view->overridecachettl) + rdataset->ttl = res->view->overridecachettl; + + /* * 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 }, + { "override-cache-ttl", &cfg_type_duration, 0 }, { "max-cache-ttl", &cfg_type_duration, 0 }, { "max-clients-per-query", &cfg_type_uint32, 0 }, { "max-ncache-ttl", &cfg_type_duration, 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,28 +1,27 @@ 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 = \ arpaname \ mdig \ - named-journalprint \ named-rrchecker \ nsec3hash 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 @@ -1,92 +1,92 @@ ; This file holds the information on root name servers needed to ; initialize cache of Internet domain name servers ; (e.g. reference this file in the "cache . " ; configuration file of BIND domain name servers). ; ; This file is made available by InterNIC ; under anonymous FTP as ; 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 ; . 3600000 NS A.ROOT-SERVERS.NET. A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4 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 ; . 3600000 NS C.ROOT-SERVERS.NET. C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12 C.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2::c ; ; FORMERLY TERP.UMD.EDU ; . 3600000 NS D.ROOT-SERVERS.NET. D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13 D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2d::d ; ; FORMERLY NS.NASA.GOV ; . 3600000 NS E.ROOT-SERVERS.NET. E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10 E.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:a8::e ; ; FORMERLY NS.ISC.ORG ; . 3600000 NS F.ROOT-SERVERS.NET. F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241 F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f ; ; FORMERLY NS.NIC.DDN.MIL ; . 3600000 NS G.ROOT-SERVERS.NET. G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4 G.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:12::d0d ; ; FORMERLY AOS.ARL.ARMY.MIL ; . 3600000 NS H.ROOT-SERVERS.NET. H.ROOT-SERVERS.NET. 3600000 A 198.97.190.53 H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::53 ; ; FORMERLY NIC.NORDU.NET ; . 3600000 NS I.ROOT-SERVERS.NET. I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17 I.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fe::53 ; ; OPERATED BY VERISIGN, INC. ; . 3600000 NS J.ROOT-SERVERS.NET. J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30 J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:c27::2:30 ; ; OPERATED BY RIPE NCC ; . 3600000 NS K.ROOT-SERVERS.NET. K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129 K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1 ; ; OPERATED BY ICANN ; . 3600000 NS L.ROOT-SERVERS.NET. L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42 L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:9f::42 ; ; OPERATED BY WIDE ; . 3600000 NS M.ROOT-SERVERS.NET. M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33 M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35 ; End of file 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,13 +1,13 @@ 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/" - "named.pid"); + "pid"); #else /* if NAMED_RUN_PID_DIR */ EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/" "named.pid"); 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 @@ -1,297 +1,292 @@ %%DNSTAP%%bin/dnstap-read bin/named-checkconf bin/named-checkzone bin/named-compilezone 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 include/dns/bit.h include/dns/byaddr.h include/dns/cache.h include/dns/callbacks.h include/dns/catz.h include/dns/cert.h include/dns/client.h include/dns/clientinfo.h include/dns/compress.h include/dns/db.h include/dns/dbiterator.h include/dns/diff.h include/dns/dispatch.h include/dns/dlz.h include/dns/dlz_dlopen.h include/dns/dns64.h include/dns/dnsrps.h include/dns/dnssec.h include/dns/dnstap.h include/dns/ds.h include/dns/dsdigest.h include/dns/dyndb.h 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 include/dns/ipkeylist.h include/dns/iptable.h include/dns/journal.h include/dns/kasp.h include/dns/keydata.h include/dns/keyflags.h include/dns/keymgr.h include/dns/keytable.h include/dns/keyvalues.h include/dns/librpz.h include/dns/log.h 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 include/dns/nta.h 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 include/dns/rdataclass.h include/dns/rdatalist.h include/dns/rdataset.h 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 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 include/dns/soa.h 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 include/dns/update.h include/dns/validator.h include/dns/view.h include/dns/xfrin.h include/dns/zone.h include/dns/zonekey.h include/dns/zoneverify.h include/dns/zt.h include/dst/dst.h 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 include/isc/mem.h include/isc/meminfo.h 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 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 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 include/ns/log.h include/ns/notify.h include/ns/query.h include/ns/server.h include/ns/sortlist.h include/ns/stats.h include/ns/types.h 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 @comment share/man/man1/dnssec-cds.1.gz @comment share/man/man1/dnssec-dsfromkey.1.gz @comment share/man/man1/dnssec-importkey.1.gz @comment share/man/man1/dnssec-keyfromlabel.1.gz @comment share/man/man1/dnssec-keygen.1.gz @comment share/man/man1/dnssec-revoke.1.gz @comment share/man/man1/dnssec-settime.1.gz @comment share/man/man1/dnssec-signzone.1.gz @comment share/man/man1/dnssec-verify.1.gz %%DNSTAP%%share/man/man1/dnstap-read.1.gz @comment share/man/man1/host.1.gz @comment share/man/man1/mdig.1.gz share/man/man1/named-checkconf.1.gz share/man/man1/named-checkzone.1.gz share/man/man1/named-compilezone.1.gz share/man/man1/named-journalprint.1.gz %%LMDB%%share/man/man1/named-nzd2nzf.1.gz @comment share/man/man1/named-rrchecker.1.gz @comment share/man/man1/nsec3hash.1.gz @comment share/man/man1/nslookup.1.gz @comment share/man/man1/nsupdate.1.gz share/man/man5/named.conf.5.gz share/man/man5/rndc.conf.5.gz share/man/man8/ddns-confgen.8.gz share/man/man8/filter-a.8.gz share/man/man8/filter-aaaa.8.gz share/man/man8/named.8.gz share/man/man8/rndc-confgen.8.gz share/man/man8/rndc.8.gz share/man/man8/tsig-keygen.8.gz sbin/ddns-confgen sbin/named sbin/rndc sbin/rndc-confgen sbin/tsig-keygen @dir(bind,bind,) %%ETCDIR%%/dynamic @dir(bind,bind,) %%ETCDIR%%/secondary @dir(bind,bind,) %%ETCDIR%%/working