1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Update to latest commit.

This commit is contained in:
Mathieu Arnold 2019-06-17 21:52:09 +00:00
parent b97c40445f
commit 12eba36807
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=504438
3 changed files with 12 additions and 12 deletions

View File

@ -9,7 +9,7 @@ PORTREVISION= 0
.else
# XXX: correct version
# dns/bind9xx here
PORTREVISION= 2
PORTREVISION= 0
.endif
CATEGORIES= dns net ipv6
# XXX: put the ISC master_site
@ -41,13 +41,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
# XXX: remove 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
ISCVERSION= 9.15.0a0.2019.06.10
ISCVERSION= 9.15.0a0.2019.06.17
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
GL_COMMIT= 32c86e29e23c6829290086f919fed3cf124fe348
GL_COMMIT= ea054d024a196a7196d786ba7d8fda2456eed194
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1560165640
SHA256 (isc-projects-bind9-32c86e29e23c6829290086f919fed3cf124fe348_GL0.tar.gz) = 99f93cc71e75a5f0a4826c40eb76d2435a17b54ab4bb01ad13648ed5e74e8673
SIZE (isc-projects-bind9-32c86e29e23c6829290086f919fed3cf124fe348_GL0.tar.gz) = 6310334
TIMESTAMP = 1560801587
SHA256 (isc-projects-bind9-ea054d024a196a7196d786ba7d8fda2456eed194_GL0.tar.gz) = 73b91c68d9c2f91ad6bf255f9b0affac33111249a6c21849d12b3f06a19ef4e6
SIZE (isc-projects-bind9-ea054d024a196a7196d786ba7d8fda2456eed194_GL0.tar.gz) = 6309814

View File

@ -1,6 +1,6 @@
--- bin/named/config.c.orig 2019-06-10 04:29:24 UTC
--- bin/named/config.c.orig 2019-06-17 13:35:58 UTC
+++ bin/named/config.c
@@ -175,6 +175,7 @@ options {\n\
@@ -172,6 +172,7 @@ options {\n\
notify-source *;\n\
notify-source-v6 *;\n\
nsec3-test-zone no;\n\
@ -8,7 +8,7 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
--- bin/named/server.c.orig 2019-06-10 04:29:24 UTC
--- bin/named/server.c.orig 2019-06-17 13:35:58 UTC
+++ bin/named/server.c
@@ -4226,6 +4226,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-06-10 04:29:24 UTC
--- lib/dns/include/dns/view.h.orig 2019-06-17 13:35:58 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid;
@ -32,7 +32,7 @@
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
--- lib/dns/resolver.c.orig 2019-06-10 04:29:24 UTC
--- lib/dns/resolver.c.orig 2019-06-17 13:35:58 UTC
+++ lib/dns/resolver.c
@@ -6048,6 +6048,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-06-10 04:29:24 UTC
--- lib/isccfg/namedconf.c.orig 2019-06-17 13:35:58 UTC
+++ lib/isccfg/namedconf.c
@@ -1910,6 +1910,7 @@ view_clauses[] = {
#endif