diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index d78c6916f289..0161cd42cfa8 100644 --- a/dns/bind-tools/pkg-plist-devel +++ b/dns/bind-tools/pkg-plist-devel @@ -18,15 +18,15 @@ bin/named-rrchecker bin/nsec3hash bin/nslookup bin/nsupdate -lib/bind-tools/libdns-9.21.0.so +lib/bind-tools/libdns-9.21.1.so lib/bind-tools/libdns.so -lib/bind-tools/libisc-9.21.0.so +lib/bind-tools/libisc-9.21.1.so lib/bind-tools/libisc.so -lib/bind-tools/libisccc-9.21.0.so +lib/bind-tools/libisccc-9.21.1.so lib/bind-tools/libisccc.so -lib/bind-tools/libisccfg-9.21.0.so +lib/bind-tools/libisccfg-9.21.1.so lib/bind-tools/libisccfg.so -lib/bind-tools/libns-9.21.0.so +lib/bind-tools/libns-9.21.1.so lib/bind-tools/libns.so share/man/man1/arpaname.1.gz share/man/man1/delv.1.gz diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index bb38b56dd3b9..5e46075d88ed 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.0 +DISTVERSION= 9.21.1 .if defined(BIND_TOOLS_SLAVE) # dns/bind-tools here PORTREVISION= 0 diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 1f1eb134cb89..b5b1ac20e103 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724255554 -SHA256 (bind-9.21.0.tar.xz) = b4c91c0e6767b62139e818e29b3bb4b9704bc14a868b25bf8491deea0254df96 -SIZE (bind-9.21.0.tar.xz) = 5777380 +TIMESTAMP = 1726753891 +SHA256 (bind-9.21.1.tar.xz) = d17b641c7e64991ec1842f3e40609ef43c336abc2b42749865e2be7db260c19b +SIZE (bind-9.21.1.tar.xz) = 5834220 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 9586075aff6b..90f4edeb993e 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 2024-08-13 14:33:00 UTC +--- bin/named/config.c.orig 2024-09-09 13:09:11 UTC +++ bin/named/config.c -@@ -181,6 +181,7 @@ options {\n\ +@@ -180,6 +180,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 2024-08-13 14:33:00 UTC +--- bin/named/server.c.orig 2024-09-09 13:09:11 UTC +++ bin/named/server.c -@@ -4609,6 +4609,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4599,6 +4599,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 2024-08-13 14:33:01 UTC +--- doc/arm/reference.rst.orig 2024-09-09 13:09:11 UTC +++ doc/arm/reference.rst -@@ -4342,6 +4342,10 @@ Tuning +@@ -4296,6 +4296,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 2024-08-13 14:33:01 UTC +--- lib/dns/include/dns/view.h.orig 2024-09-09 13:09:11 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 2024-08-13 14:33:01 UTC +--- lib/dns/resolver.c.orig 2024-09-09 13:09:11 UTC +++ lib/dns/resolver.c -@@ -5906,6 +5906,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -5907,6 +5907,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 2024-08-13 14:33:01 UTC +--- lib/isccfg/namedconf.c.orig 2024-09-09 13:09:11 UTC +++ lib/isccfg/namedconf.c -@@ -2148,6 +2148,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2208,6 +2208,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/files/patch-bin_named_include_named_globals.h b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h index e0b4c90941ad..9a5b3d64dd73 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,8 +1,8 @@ We reference the pid file as being run/named/pid everywere else. ---- bin/named/include/named/globals.h.orig 2023-12-01 14:21:34 UTC +--- bin/named/include/named/globals.h.orig 2024-09-09 13:09:11 UTC +++ bin/named/include/named/globals.h -@@ -121,7 +121,7 @@ EXTERN const char *named_g_defaultsessionkeyfile INIT( +@@ -119,7 +119,7 @@ EXTERN const char *named_g_defaultsessionkeyfile INIT( #if NAMED_RUN_PID_DIR EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/" diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 45e8b41ef555..8fd5dd0c86a9 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -53,7 +53,6 @@ include/dns/keystore.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 @@ -89,6 +88,7 @@ include/dns/rrl.h include/dns/sdlz.h include/dns/secalg.h include/dns/secproto.h +include/dns/skr.h include/dns/soa.h include/dns/ssu.h include/dns/stats.h @@ -221,13 +221,11 @@ 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/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 @@ -238,15 +236,15 @@ include/ns/update.h include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so -lib/libdns-9.21.0.so +lib/libdns-9.21.1.so lib/libdns.so -lib/libisc-9.21.0.so +lib/libisc-9.21.1.so lib/libisc.so -lib/libisccc-9.21.0.so +lib/libisccc-9.21.1.so lib/libisccc.so -lib/libisccfg-9.21.0.so +lib/libisccfg-9.21.1.so lib/libisccfg.so -lib/libns-9.21.0.so +lib/libns-9.21.1.so lib/libns.so @comment share/man/man1/arpaname.1.gz @comment share/man/man1/delv.1.gz