Date: Mon, 25 May 2020 16:50:39 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536481 - in head/dns/bind9-devel: . files Message-ID: <202005251650.04PGodnA089947@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon May 25 16:50:39 2020 New Revision: 536481 URL: https://svnweb.freebsd.org/changeset/ports/536481 Log: Update to latest commit. While here, fix the bind-min-override-ttl patch. [1] Submitted by: Andre Albsmeier [1] Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind9-devel/distinfo (contents, props changed) head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind9-devel/pkg-plist (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Mon May 25 16:50:36 2020 (r536480) +++ head/dns/bind9-devel/Makefile Mon May 25 16:50:39 2020 (r536481) @@ -48,13 +48,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools # XXX: remove tar:bz2 USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.17.0a0.2020.05.10 +ISCVERSION= 9.17.0a0.2020.05.25 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 7b4d07c31dab70e9c168dd134a61b121b2587718 +GL_COMMIT= 8422b23c921176329c07e57aa26dfa32ed63cd4f CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: head/dns/bind9-devel/distinfo ============================================================================== --- head/dns/bind9-devel/distinfo Mon May 25 16:50:36 2020 (r536480) +++ head/dns/bind9-devel/distinfo Mon May 25 16:50:39 2020 (r536481) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589189924 -SHA256 (isc-projects-bind9-7b4d07c31dab70e9c168dd134a61b121b2587718_GL0.tar.gz) = 71218dbb3e33916a138e92562ee2f36471fc79aae8ebdbf10e976633e5730290 -SIZE (isc-projects-bind9-7b4d07c31dab70e9c168dd134a61b121b2587718_GL0.tar.gz) = 4462883 +TIMESTAMP = 1590418666 +SHA256 (isc-projects-bind9-8422b23c921176329c07e57aa26dfa32ed63cd4f_GL0.tar.gz) = 179f61e59e119993196f52c262f57fa792dbe9d788811c713cbfb4d1108429fe +SIZE (isc-projects-bind9-8422b23c921176329c07e57aa26dfa32ed63cd4f_GL0.tar.gz) = 4473365 Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon May 25 16:50:36 2020 (r536480) +++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon May 25 16:50:39 2020 (r536481) @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2020-05-10 23:44:14 UTC +--- bin/named/config.c.orig 2020-05-25 12:38:28 UTC +++ bin/named/config.c @@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ @@ -10,7 +10,7 @@ Add the override-cache-ttl feature. provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2020-05-10 23:44:14 UTC +--- bin/named/server.c.orig 2020-05-25 12:38:28 UTC +++ bin/named/server.c @@ -4331,6 +4331,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } @@ -18,13 +18,13 @@ Add the override-cache-ttl feature. obj = NULL; + result = named_config_get(maps, "override-cache-ttl", &obj); + INSIST(result == ISC_R_SUCCESS); -+ view->overridecachettl = cfg_obj_asuint32(obj); ++ view->overridecachettl = cfg_obj_asduration(obj); + + obj = NULL; 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 2020-05-10 23:44:14 UTC +--- lib/dns/include/dns/view.h.orig 2020-05-25 12:38:28 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,7 @@ struct dns_view { bool requestnsid; @@ -34,9 +34,9 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2020-05-10 23:44:14 UTC +--- lib/dns/resolver.c.orig 2020-05-25 12:38:28 UTC +++ lib/dns/resolver.c -@@ -6233,6 +6233,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -6236,6 +6236,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -49,7 +49,7 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2020-05-10 23:44:14 UTC +--- lib/isccfg/namedconf.c.orig 2020-05-25 12:38:28 UTC +++ lib/isccfg/namedconf.c @@ -1992,6 +1992,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ Modified: head/dns/bind9-devel/pkg-plist ============================================================================== --- head/dns/bind9-devel/pkg-plist Mon May 25 16:50:36 2020 (r536480) +++ head/dns/bind9-devel/pkg-plist Mon May 25 16:50:39 2020 (r536481) @@ -212,6 +212,7 @@ include/isc/time.h include/isc/timer.h include/isc/tm.h include/isc/types.h +include/isc/utf8.h include/isc/util.h include/isccc/alist.h include/isccc/base64.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005251650.04PGodnA089947>