aboutsummaryrefslogtreecommitdiff
path: root/dns/bind911
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2020-05-19 09:25:48 +0000
committerMathieu Arnold <mat@FreeBSD.org>2020-05-19 09:25:48 +0000
commitd20913ee739f4d911470d929635fa224197f6f81 (patch)
treecb39e12895c70d81296a171153ea329d6a8eb648 /dns/bind911
parente28bcc682e1152420290e111e532eff2fc18bf6a (diff)
downloadports-d20913ee739f4d911470d929635fa224197f6f81.tar.gz
ports-d20913ee739f4d911470d929635fa224197f6f81.zip
Update to 9.11.19.
MFH: 2020Q2 Security: CVE-2020-8616, CVE-2020-8617
Notes
Notes: svn path=/head/; revision=535847
Diffstat (limited to 'dns/bind911')
-rw-r--r--dns/bind911/Makefile2
-rw-r--r--dns/bind911/distinfo6
-rw-r--r--dns/bind911/files/extrapatch-bind-min-override-ttl12
3 files changed, 10 insertions, 10 deletions
diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index 65c284b42051..2754408acd09 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -23,7 +23,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.18
+ISCVERSION= 9.11.19
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo
index 33fed12a661b..865fd4ae60c9 100644
--- a/dns/bind911/distinfo
+++ b/dns/bind911/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586982298
-SHA256 (bind-9.11.18.tar.gz) = 59af1a8aaa85d2f2f035ca5dc2682889ff96a47b59424824bcb3a6b1fe079a6f
-SIZE (bind-9.11.18.tar.gz) = 8221186
+TIMESTAMP = 1589559723
+SHA256 (bind-9.11.19.tar.gz) = 0dee554a4caa368948b32da9a0c97b516c19103bc13ff5b3762c5d8552f52329
+SIZE (bind-9.11.19.tar.gz) = 8230483
diff --git a/dns/bind911/files/extrapatch-bind-min-override-ttl b/dns/bind911/files/extrapatch-bind-min-override-ttl
index 2c91391d09b6..426c1c462368 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-01-16 14:46:40 UTC
+--- bin/named/config.c.orig 2020-05-06 12:50:24 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-01-16 14:46:40 UTC
+--- bin/named/server.c.orig 2020-05-06 12:50:24 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-01-16 14:46:40 UTC
+--- lib/dns/include/dns/view.h.orig 2020-05-06 12:50:24 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-01-16 14:46:40 UTC
+--- lib/dns/resolver.c.orig 2020-05-06 12:50:24 UTC
+++ lib/dns/resolver.c
-@@ -5534,6 +5534,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -5553,6 +5553,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
/*
@@ -63,7 +63,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2020-01-16 14:46:40 UTC
+--- lib/isccfg/namedconf.c.orig 2020-05-06 12:50:24 UTC
+++ lib/isccfg/namedconf.c
@@ -1773,6 +1773,8 @@ view_clauses[] = {
#endif