Skip to content

Commit

Permalink
dns/bind9-devel: update to 9.19.19
Browse files Browse the repository at this point in the history
  • Loading branch information
mat813 committed May 17, 2024
1 parent 0663764 commit 0663765
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 24 deletions.
10 changes: 5 additions & 5 deletions dns/bind-tools/pkg-plist-devel
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ bin/named-rrchecker
bin/nsec3hash
bin/nslookup
bin/nsupdate
lib/bind-tools/libdns-9.19.18.so
lib/bind-tools/libdns-9.19.19.so
lib/bind-tools/libdns.so
lib/bind-tools/libisc-9.19.18.so
lib/bind-tools/libisc-9.19.19.so
lib/bind-tools/libisc.so
lib/bind-tools/libisccc-9.19.18.so
lib/bind-tools/libisccc-9.19.19.so
lib/bind-tools/libisccc.so
lib/bind-tools/libisccfg-9.19.18.so
lib/bind-tools/libisccfg-9.19.19.so
lib/bind-tools/libisccfg.so
lib/bind-tools/libns-9.19.18.so
lib/bind-tools/libns-9.19.19.so
lib/bind-tools/libns.so
share/man/man1/arpaname.1.gz
share/man/man1/delv.1.gz
Expand Down
2 changes: 1 addition & 1 deletion dns/bind9-devel/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# pkg-help formatted with fmt 59 63

PORTNAME= bind
DISTVERSION= 9.19.18
DISTVERSION= 9.19.19
.if defined(BIND_TOOLS_SLAVE)
# dns/bind-tools here
PORTREVISION= 0
Expand Down
6 changes: 3 additions & 3 deletions dns/bind9-devel/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
TIMESTAMP = 1701518000
SHA256 (bind-9.19.18.tar.xz) = 42a2bed5e3727f83b23cc116c1330229e53e34b57833a37cbd0fe189315824f8
SIZE (bind-9.19.18.tar.xz) = 5656312
TIMESTAMP = 1715889897
SHA256 (bind-9.19.19.tar.xz) = f14a9259d05ce63904ac6e6b378e0523adc12f8d3feaa4fa024b3ecf478e3322
SIZE (bind-9.19.19.tar.xz) = 5691368
31 changes: 22 additions & 9 deletions dns/bind9-devel/files/extrapatch-bind-min-override-ttl
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Add the override-cache-ttl feature.

--- bin/named/config.c.orig 2023-11-09 12:05:47 UTC
--- bin/named/config.c.orig 2023-12-08 11:46:50 UTC
+++ bin/named/config.c
@@ -177,6 +177,7 @@ options {\n\
@@ -179,6 +179,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 2023-11-09 12:05:47 UTC
--- bin/named/server.c.orig 2023-12-08 11:46:50 UTC
+++ bin/named/server.c
@@ -4473,6 +4473,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
@@ -4472,6 +4472,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}

obj = NULL;
Expand All @@ -24,17 +24,30 @@ 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);
--- lib/dns/include/dns/view.h.orig 2023-11-09 12:05:47 UTC
--- doc/arm/reference.rst.orig 2023-12-08 11:46:50 UTC
+++ doc/arm/reference.rst
@@ -4198,6 +4198,10 @@ Tuning
cannot exceed 7 days and is silently truncated to 7 days if set to a
greater value.

+.. namedconf:statement:: override-cache-ttl
+
+ Enforce the configure cache TTL override.
+
.. 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 2023-12-08 11:46:50 UTC
+++ lib/dns/include/dns/view.h
@@ -149,6 +149,7 @@ struct dns_view {
@@ -151,6 +151,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 2023-11-09 12:05:47 UTC
--- lib/dns/resolver.c.orig 2023-12-08 11:46:50 UTC
+++ lib/dns/resolver.c
@@ -5933,6 +5933,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
}
Expand All @@ -49,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 2023-11-09 12:05:47 UTC
--- lib/isccfg/namedconf.c.orig 2023-12-08 11:46:50 UTC
+++ lib/isccfg/namedconf.c
@@ -2088,6 +2088,7 @@ static cfg_clausedef_t view_clauses[] = {
@@ -2096,6 +2096,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 },
Expand Down
12 changes: 6 additions & 6 deletions dns/bind9-devel/pkg-plist
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ 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/ascii.h
include/isc/assertions.h
Expand Down Expand Up @@ -171,6 +170,7 @@ include/isc/overflow.h
include/isc/parseint.h
include/isc/pause.h
include/isc/portset.h
include/isc/proxy2.h
include/isc/quota.h
include/isc/radix.h
include/isc/random.h
Expand Down Expand Up @@ -239,15 +239,15 @@ include/ns/update.h
include/ns/xfrout.h
lib/bind/filter-a.so
lib/bind/filter-aaaa.so
lib/libdns-9.19.18.so
lib/libdns-9.19.19.so
lib/libdns.so
lib/libisc-9.19.18.so
lib/libisc-9.19.19.so
lib/libisc.so
lib/libisccc-9.19.18.so
lib/libisccc-9.19.19.so
lib/libisccc.so
lib/libisccfg-9.19.18.so
lib/libisccfg-9.19.19.so
lib/libisccfg.so
lib/libns-9.19.18.so
lib/libns-9.19.19.so
lib/libns.so
@comment share/man/man1/arpaname.1.gz
@comment share/man/man1/delv.1.gz
Expand Down

0 comments on commit 0663765

Please sign in to comment.