aboutsummaryrefslogtreecommitdiffstats
path: root/dns
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2017-06-15 19:46:29 +0800
committermat <mat@FreeBSD.org>2017-06-15 19:46:29 +0800
commit1178df6e9d538eab7cbc28c2f4a4b65450938e83 (patch)
treed2c99923dfd7f11d5300333d71aa07d83d81ae1a /dns
parent283c6801d9796cf47a845b87b1d91ebe36a0c89d (diff)
downloadfreebsd-ports-gnome-1178df6e9d538eab7cbc28c2f4a4b65450938e83.tar.gz
freebsd-ports-gnome-1178df6e9d538eab7cbc28c2f4a4b65450938e83.tar.zst
freebsd-ports-gnome-1178df6e9d538eab7cbc28c2f4a4b65450938e83.zip
Update to latest commit.
MFH: 2017Q2 Security: CVE-2017-3140 Security: CVE-2017-3141 Sponsored by: Absolight
Diffstat (limited to 'dns')
-rw-r--r--dns/bind9-devel/Makefile4
-rw-r--r--dns/bind9-devel/distinfo6
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl14
3 files changed, 12 insertions, 12 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index cd16e9666e89..4c688ffee0d7 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -31,8 +31,8 @@ LICENSE= MPL
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.12.0a.2017.05.30
-HASH= aa3a897
+ISCVERSION= 9.12.0a.2017.06.14
+HASH= d6b626e
USES= cpe libedit
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index bc483e6051ef..c78595a72212 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496736164
-SHA256 (bind9-aa3a897.tar.gz) = 2845f6b02275bc9edcbf73f39771d25853a31e5c5574d9e9932439f6832391dd
-SIZE (bind9-aa3a897.tar.gz) = 11871283
+TIMESTAMP = 1497526827
+SHA256 (bind9-d6b626e.tar.gz) = 4c665fb50d3360510754fe27de6117827d04bf075300518943012a995b1cf52a
+SIZE (bind9-d6b626e.tar.gz) = 11875169
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 81ae1729f609..a28843d6b60c 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig 2017-04-24 07:26:47 UTC
+--- bin/named/config.c.orig 2017-06-14 01:08:21 UTC
+++ bin/named/config.c
@@ -155,6 +155,8 @@ options {\n\
lame-ttl 600;\n\
@@ -9,9 +9,9 @@
max-cache-ttl 604800; /* 1 week */\n\
transfer-format many-answers;\n\
max-cache-size 90%;\n\
---- bin/named/server.c.orig 2017-04-24 07:26:47 UTC
+--- bin/named/server.c.orig 2017-06-14 01:08:21 UTC
+++ bin/named/server.c
-@@ -3702,6 +3702,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3713,6 +3713,16 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
@@ -28,7 +28,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 2017-04-24 07:26:47 UTC
+--- lib/dns/include/dns/view.h.orig 2017-06-14 01:08:21 UTC
+++ lib/dns/include/dns/view.h
@@ -143,6 +143,8 @@ struct dns_view {
isc_boolean_t requestnsid;
@@ -39,7 +39,7 @@
dns_ttl_t maxncachettl;
isc_uint32_t nta_lifetime;
isc_uint32_t nta_recheck;
---- lib/dns/resolver.c.orig 2017-04-24 07:26:47 UTC
+--- lib/dns/resolver.c.orig 2017-06-14 01:08:21 UTC
+++ lib/dns/resolver.c
@@ -5468,6 +5468,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
@@ -60,9 +60,9 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig 2017-04-24 07:26:47 UTC
+--- lib/isccfg/namedconf.c.orig 2017-06-14 01:08:21 UTC
+++ lib/isccfg/namedconf.c
-@@ -1887,6 +1887,8 @@ view_clauses[] = {
+@@ -1893,6 +1893,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,
CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },