aboutsummaryrefslogtreecommitdiff
path: root/dns/bind911
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2020-12-16 21:36:27 +0000
committerMathieu Arnold <mat@FreeBSD.org>2020-12-16 21:36:27 +0000
commit892754392f23fc41ea93a3c25ce9a24f9a11c929 (patch)
treec42a21906f90a1c89dc0eb81a1905fb19a33868b /dns/bind911
parent3d4d96194d43fce85956e34c3933e4bf76cf15d9 (diff)
downloadports-892754392f23fc41ea93a3c25ce9a24f9a11c929.tar.gz
ports-892754392f23fc41ea93a3c25ce9a24f9a11c929.zip
Update to 9.11.26.
Notes
Notes: svn path=/head/; revision=558241
Diffstat (limited to 'dns/bind911')
-rw-r--r--dns/bind911/Makefile6
-rw-r--r--dns/bind911/distinfo8
-rw-r--r--dns/bind911/files/extrapatch-bind-min-override-ttl12
3 files changed, 11 insertions, 15 deletions
diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index 6d14fd839b46..258e3c46668b 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -3,13 +3,11 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= dns net
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX= 911
DISTNAME= ${PORTNAME}-${ISCVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- ${DISTNAME}-fixed-man-pages${EXTRACT_SUFX}
MAINTAINER= mat@FreeBSD.org
COMMENT= BIND DNS suite with updated DNSSEC and DNS64
@@ -26,7 +24,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
USES= cpe libedit pkgconfig
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.11.25
+ISCVERSION= 9.11.26
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo
index c205b3269601..a1130d1ce391 100644
--- a/dns/bind911/distinfo
+++ b/dns/bind911/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1606573875
-SHA256 (bind-9.11.25.tar.gz) = 8491c24e5a3da68f421d0fcb946602c8d0ff963012fdd176b8026c8890f3a117
-SIZE (bind-9.11.25.tar.gz) = 8284943
-SHA256 (bind-9.11.25-fixed-man-pages.tar.gz) = 4da5592ffef2a0241f232d26927f46d94621e7649520260acbf91a541867a282
-SIZE (bind-9.11.25-fixed-man-pages.tar.gz) = 84725
+TIMESTAMP = 1608153444
+SHA256 (bind-9.11.26.tar.gz) = c93a7be0ff76027ab799f030aafe8b4eede8bd2fa2c40a83858c2c43c5bee8b3
+SIZE (bind-9.11.26.tar.gz) = 8286586
diff --git a/dns/bind911/files/extrapatch-bind-min-override-ttl b/dns/bind911/files/extrapatch-bind-min-override-ttl
index 815ee5d1f108..2b11ce61b331 100644
--- a/dns/bind911/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind911/files/extrapatch-bind-min-override-ttl
@@ -1,7 +1,7 @@
- Add the min-cache-ttl config knob.
- Add the override-cache-ttl config knob.
---- bin/named/config.c.orig 2020-10-13 11:00:08 UTC
+--- bin/named/config.c.orig 2020-12-08 08:36:42 UTC
+++ bin/named/config.c
@@ -182,6 +182,8 @@ options {\n\
" max-acache-size 16M;\n\
@@ -12,7 +12,7 @@
max-clients-per-query 100;\n\
max-ncache-ttl 10800; /* 3 hours */\n\
max-recursion-depth 7;\n\
---- bin/named/server.c.orig 2020-10-13 11:00:08 UTC
+--- bin/named/server.c.orig 2020-12-08 08:36:42 UTC
+++ bin/named/server.c
@@ -3720,6 +3720,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
@@ -31,7 +31,7 @@
result = ns_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asuint32(obj);
---- lib/dns/include/dns/view.h.orig 2020-10-13 11:00:08 UTC
+--- lib/dns/include/dns/view.h.orig 2020-12-08 08:36:42 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,8 @@ struct dns_view {
bool requestnsid;
@@ -42,9 +42,9 @@
dns_ttl_t maxncachettl;
uint32_t nta_lifetime;
uint32_t nta_recheck;
---- lib/dns/resolver.c.orig 2020-10-13 11:00:08 UTC
+--- lib/dns/resolver.c.orig 2020-12-08 08:36:42 UTC
+++ lib/dns/resolver.c
-@@ -5572,6 +5572,18 @@ cache_name(fetchctx_t *fctx, dns_message_t *rmessage,
+@@ -5579,6 +5579,18 @@ cache_name(fetchctx_t *fctx, dns_message_t *rmessage,
}
/*
@@ -63,7 +63,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2020-10-13 11:00:08 UTC
+--- lib/isccfg/namedconf.c.orig 2020-12-08 08:36:42 UTC
+++ lib/isccfg/namedconf.c
@@ -1773,6 +1773,8 @@ view_clauses[] = {
#endif