Update to latest commit.

This commit is contained in:
Mathieu Arnold 2019-10-07 15:42:10 +00:00
parent 9836d99037
commit 9669546782
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=513966
4 changed files with 11 additions and 12 deletions

View file

@ -41,13 +41,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
# XXX: remove tar:bz2 # XXX: remove tar:bz2
USES= compiler:c11 cpe libedit pkgconfig ssl tar:bz2 USES= compiler:c11 cpe libedit pkgconfig ssl tar:bz2
# ISC releases things like 9.8.0-P1, which our versioning doesn't like # ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.15.3a0.2019.09.30 ISCVERSION= 9.15.4a0.2019.10.06
# XXX: Remove gitlab # XXX: Remove gitlab
USE_GITLAB= yes USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects GL_ACCOUNT= isc-projects
GL_PROJECT= bind9 GL_PROJECT= bind9
GL_COMMIT= 98886bab43fd27d50cca373566c048db4aa373b6 GL_COMMIT= 38270b790099e0c997da15016cf572e14fe5f9b1
CPE_VENDOR= isc CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//} CPE_VERSION= ${ISCVERSION:C/-.*//}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1569848062 TIMESTAMP = 1570446298
SHA256 (isc-projects-bind9-98886bab43fd27d50cca373566c048db4aa373b6_GL0.tar.gz) = cf4b67a8af3ef79d7c2001c1d528f073114c5098dcbfde990556f69209fdc4e1 SHA256 (isc-projects-bind9-38270b790099e0c997da15016cf572e14fe5f9b1_GL0.tar.gz) = af6bb3333f6e708fca5fe7ea550a291a6afa0a5ee335f27da61aebab5665c2a5
SIZE (isc-projects-bind9-98886bab43fd27d50cca373566c048db4aa373b6_GL0.tar.gz) = 6340999 SIZE (isc-projects-bind9-38270b790099e0c997da15016cf572e14fe5f9b1_GL0.tar.gz) = 6335854

View file

@ -1,6 +1,6 @@
Add the override-cache-ttl feature. Add the override-cache-ttl feature.
--- bin/named/config.c.orig 2019-08-30 19:08:30 UTC --- bin/named/config.c.orig 2019-10-06 03:16:14 UTC
+++ bin/named/config.c +++ bin/named/config.c
@@ -177,6 +177,7 @@ options {\n\ @@ -177,6 +177,7 @@ options {\n\
notify-source *;\n\ notify-source *;\n\
@ -10,7 +10,7 @@ Add the override-cache-ttl feature.
provide-ixfr true;\n\ provide-ixfr true;\n\
qname-minimization relaxed;\n\ qname-minimization relaxed;\n\
query-source address *;\n\ query-source address *;\n\
--- bin/named/server.c.orig 2019-08-30 19:08:30 UTC --- bin/named/server.c.orig 2019-10-06 03:16:14 UTC
+++ bin/named/server.c +++ bin/named/server.c
@@ -4215,6 +4215,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl @@ -4215,6 +4215,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
} }
@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
result = named_config_get(maps, "max-cache-ttl", &obj); result = named_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS); INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asuint32(obj); view->maxcachettl = cfg_obj_asuint32(obj);
--- lib/dns/include/dns/view.h.orig 2019-08-30 19:08:30 UTC --- lib/dns/include/dns/view.h.orig 2019-10-06 03:16:14 UTC
+++ lib/dns/include/dns/view.h +++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view { @@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid; bool requestnsid;
@ -34,9 +34,9 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl; dns_ttl_t maxncachettl;
dns_ttl_t mincachettl; dns_ttl_t mincachettl;
dns_ttl_t minncachettl; dns_ttl_t minncachettl;
--- lib/dns/resolver.c.orig 2019-08-30 19:08:30 UTC --- lib/dns/resolver.c.orig 2019-10-06 03:16:14 UTC
+++ lib/dns/resolver.c +++ lib/dns/resolver.c
@@ -6007,6 +6007,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb @@ -6028,6 +6028,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. * Enforce the configure maximum cache TTL.
*/ */
if (rdataset->ttl > res->view->maxcachettl) { if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2019-08-30 19:08:30 UTC --- lib/isccfg/namedconf.c.orig 2019-10-06 03:16:14 UTC
+++ lib/isccfg/namedconf.c +++ lib/isccfg/namedconf.c
@@ -1907,6 +1907,7 @@ view_clauses[] = { @@ -1907,6 +1907,7 @@ view_clauses[] = {
#endif #endif

View file

@ -254,7 +254,6 @@ include/pk11/internal.h
include/pk11/pk11.h include/pk11/pk11.h
include/pk11/result.h include/pk11/result.h
include/pk11/site.h include/pk11/site.h
include/pkcs11/cryptoki.h
include/pkcs11/eddsa.h include/pkcs11/eddsa.h
include/pkcs11/pkcs11.h include/pkcs11/pkcs11.h
lib/libbind9.a lib/libbind9.a