Update to latest commit.

This commit is contained in:
Mathieu Arnold 2019-07-30 17:27:20 +00:00
parent 21f2463e18
commit 451f5847ea
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=507653
4 changed files with 15 additions and 15 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.0a0.2019.07.21 ISCVERSION= 9.15.0a0.2019.07.29
# 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= 03b8e7ccb7c702aff4e2d10f54deb2ef5a7946c2 GL_COMMIT= 03de34194d7c02eb946d7c9f3ee2496b55568724
CPE_VENDOR= isc CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//} CPE_VERSION= ${ISCVERSION:C/-.*//}

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1563803945 TIMESTAMP = 1564503167
SHA256 (isc-projects-bind9-03b8e7ccb7c702aff4e2d10f54deb2ef5a7946c2_GL0.tar.gz) = 7c42b6a1af0547e0c9546c4b53da67b8d98580cd9fd408a2bc1344192f4138a9 SHA256 (isc-projects-bind9-03de34194d7c02eb946d7c9f3ee2496b55568724_GL0.tar.gz) = 3d4d7367e630152533e0fe97db90d34fe2d5d9de33bfc324d4d7a69679784196
SIZE (isc-projects-bind9-03b8e7ccb7c702aff4e2d10f54deb2ef5a7946c2_GL0.tar.gz) = 6340946 SIZE (isc-projects-bind9-03de34194d7c02eb946d7c9f3ee2496b55568724_GL0.tar.gz) = 6330921

View file

@ -1,4 +1,4 @@
--- bin/named/config.c.orig 2019-07-22 02:18:48 UTC --- bin/named/config.c.orig 2019-07-29 20:10:44 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\
@ -8,9 +8,9 @@
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-07-22 02:18:48 UTC --- bin/named/server.c.orig 2019-07-29 20:10:44 UTC
+++ bin/named/server.c +++ bin/named/server.c
@@ -4226,6 +4226,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl @@ -4218,6 +4218,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
} }
obj = NULL; obj = NULL;
@ -22,7 +22,7 @@
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-07-22 02:18:48 UTC --- lib/dns/include/dns/view.h.orig 2019-07-29 20:10:44 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;
@ -32,9 +32,9 @@
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-07-22 02:18:48 UTC --- lib/dns/resolver.c.orig 2019-07-29 20:10:44 UTC
+++ lib/dns/resolver.c +++ lib/dns/resolver.c
@@ -6048,6 +6048,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb @@ -6022,6 +6022,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
} }
/* /*
@ -47,9 +47,9 @@
* 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-07-22 02:18:48 UTC --- lib/isccfg/namedconf.c.orig 2019-07-29 20:10:44 UTC
+++ lib/isccfg/namedconf.c +++ lib/isccfg/namedconf.c
@@ -1911,6 +1911,7 @@ view_clauses[] = { @@ -1907,6 +1907,7 @@ view_clauses[] = {
#endif #endif
{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 }, { "max-cache-size", &cfg_type_sizeorpercent, 0 },

View file

@ -1,4 +1,4 @@
--- configure.orig 2019-07-22 02:18:48 UTC --- configure.orig 2019-07-29 20:10:44 UTC
+++ configure +++ configure
@@ -17246,27 +17246,9 @@ done @@ -17246,27 +17246,9 @@ done
# problems start to show up. # problems start to show up.
@ -79,7 +79,7 @@
DNS_GSSAPI_LIBS="$LIBS" DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
@@ -22572,7 +22514,7 @@ $as_echo "" >&6; } @@ -22688,7 +22630,7 @@ $as_echo "" >&6; }
# Check other locations for includes. # Check other locations for includes.
# Order is important (sigh). # Order is important (sigh).