1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-11 02:50:24 +00:00

Update to latest commit.

This commit is contained in:
Mathieu Arnold 2019-01-21 15:44:16 +00:00
parent 7aa20354c3
commit 112bc7b561
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=490867
3 changed files with 11 additions and 11 deletions

View File

@ -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.13.4a0.2019.01.13
ISCVERSION= 9.13.4a0.2019.01.21
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
GL_COMMIT= 3b1a914395f32ae31f08379e95d174a7d14cd8df
GL_COMMIT= 914e8ddd6126200a698d1a52dce800eaeb088730
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1547453851
SHA256 (isc-projects-bind9-3b1a914395f32ae31f08379e95d174a7d14cd8df_GL0.tar.gz) = 73129078c2643226643f1ffdfbf4fcd9670a273f9203541a83c52f60102ddd59
SIZE (isc-projects-bind9-3b1a914395f32ae31f08379e95d174a7d14cd8df_GL0.tar.gz) = 6334993
TIMESTAMP = 1548074594
SHA256 (isc-projects-bind9-914e8ddd6126200a698d1a52dce800eaeb088730_GL0.tar.gz) = 156570ae4ac279a672d0872339f3e45a282e71a85ff1dbd62ac23d8d16d4b868
SIZE (isc-projects-bind9-914e8ddd6126200a698d1a52dce800eaeb088730_GL0.tar.gz) = 6337698

View File

@ -1,4 +1,4 @@
--- bin/named/config.c.orig 2019-01-14 02:09:02 UTC
--- bin/named/config.c.orig 2019-01-21 07:04:08 UTC
+++ bin/named/config.c
@@ -179,6 +179,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-01-14 02:09:02 UTC
--- bin/named/server.c.orig 2019-01-21 07:04:08 UTC
+++ bin/named/server.c
@@ -4153,6 +4153,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-01-14 02:09:02 UTC
--- lib/dns/include/dns/view.h.orig 2019-01-21 07:04:08 UTC
+++ lib/dns/include/dns/view.h
@@ -153,6 +153,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-01-14 02:09:02 UTC
--- lib/dns/resolver.c.orig 2019-01-21 07:04:08 UTC
+++ lib/dns/resolver.c
@@ -5986,6 +5986,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
@@ -6008,6 +6008,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-01-14 02:09:02 UTC
--- lib/isccfg/namedconf.c.orig 2019-01-21 07:04:08 UTC
+++ lib/isccfg/namedconf.c
@@ -1900,6 +1900,7 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,