aboutsummaryrefslogtreecommitdiff
path: root/dns/bind9-devel
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2019-04-01 08:36:08 +0000
committerMathieu Arnold <mat@FreeBSD.org>2019-04-01 08:36:08 +0000
commit3afbf9d4719179d5b1f8ca54f91509754fa8599c (patch)
tree985dd8ec47385cc73f6c0e9734a49e52a8fe2851 /dns/bind9-devel
parente23cfe677948c5e21dba04defa63e9edcc7f902b (diff)
downloadports-3afbf9d4719179d5b1f8ca54f91509754fa8599c.tar.gz
ports-3afbf9d4719179d5b1f8ca54f91509754fa8599c.zip
Update to latest commit.
Notes
Notes: svn path=/head/; revision=497467
Diffstat (limited to 'dns/bind9-devel')
-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-ttl12
3 files changed, 11 insertions, 11 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index e4769dad92fe..d5dff3ba120a 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -38,13 +38,13 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2
# XXX: remove tar:bz2
USES= compiler:c11 cpe libedit ssl tar:bz2
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.15.0a0.2019.03.22
+ISCVERSION= 9.15.0a0.2019.03.29
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
-GL_COMMIT= d089387d7f98b26eff89e75200e0d2cb4b7eec6b
+GL_COMMIT= 7e069cb16a0a6b8d3551ecb793e1cea682815942
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index cf0bd715e873..f5e1b585b9a8 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553504621
-SHA256 (isc-projects-bind9-d089387d7f98b26eff89e75200e0d2cb4b7eec6b_GL0.tar.gz) = 4388e1035c0794491affabd1275286e55e5c697261a5d7352a48236ebae95076
-SIZE (isc-projects-bind9-d089387d7f98b26eff89e75200e0d2cb4b7eec6b_GL0.tar.gz) = 6337543
+TIMESTAMP = 1554105090
+SHA256 (isc-projects-bind9-7e069cb16a0a6b8d3551ecb793e1cea682815942_GL0.tar.gz) = c08bd0de7d39bdd1c015b1680eb4e0cc2ee4b0bfaa2bdf310f93924cb58f6b51
+SIZE (isc-projects-bind9-7e069cb16a0a6b8d3551ecb793e1cea682815942_GL0.tar.gz) = 6337730
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 04da72edb4e0..9c13ed1f9cf9 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 2019-03-22 10:58:02 UTC
+--- bin/named/config.c.orig 2019-03-29 15:22:57 UTC
+++ bin/named/config.c
@@ -176,6 +176,7 @@ options {\n\
notify-source *;\n\
@@ -8,7 +8,7 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2019-03-22 10:58:02 UTC
+--- bin/named/server.c.orig 2019-03-29 15:22:57 UTC
+++ bin/named/server.c
@@ -4231,6 +4231,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
@@ -22,7 +22,7 @@
result = named_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 2019-03-22 10:58:02 UTC
+--- lib/dns/include/dns/view.h.orig 2019-03-29 15:22:57 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid;
@@ -32,9 +32,9 @@
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2019-03-22 10:58:02 UTC
+--- lib/dns/resolver.c.orig 2019-03-29 15:22:57 UTC
+++ lib/dns/resolver.c
-@@ -6008,6 +6008,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6011,6 +6011,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
/*
@@ -47,7 +47,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2019-03-22 10:58:02 UTC
+--- lib/isccfg/namedconf.c.orig 2019-03-29 15:22:57 UTC
+++ lib/isccfg/namedconf.c
@@ -1899,6 +1899,7 @@ view_clauses[] = {
#endif