mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-06 06:30:19 +00:00
Update to latest commit.
This commit is contained in:
parent
5fa4e01ef6
commit
f1cb88df89
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=555465
@ -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.6a0.2020.11.08
|
||||
ISCVERSION= 9.17.6a0.2020.11.21
|
||||
# XXX: Remove gitlab
|
||||
USE_GITLAB= yes
|
||||
GL_SITE= https://gitlab.isc.org
|
||||
GL_ACCOUNT= isc-projects
|
||||
GL_PROJECT= bind9
|
||||
GL_COMMIT= f6d967db542554511a071e946a87edadb0687c86
|
||||
GL_COMMIT= ff2bc7891e99442df51acea1110ad599ddc6756a
|
||||
|
||||
CPE_VENDOR= isc
|
||||
CPE_VERSION= ${ISCVERSION:C/-.*//}
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1604920313
|
||||
SHA256 (isc-projects-bind9-f6d967db542554511a071e946a87edadb0687c86_GL0.tar.gz) = d9a697b39082e554628a2805ac9b51ffc62008eb2527b8f8c5334e657ab7c937
|
||||
SIZE (isc-projects-bind9-f6d967db542554511a071e946a87edadb0687c86_GL0.tar.gz) = 4364563
|
||||
TIMESTAMP = 1605521926
|
||||
SHA256 (isc-projects-bind9-ff2bc7891e99442df51acea1110ad599ddc6756a_GL0.tar.gz) = 5129368da2a1339f8643417b2b657bb91adf859cb08d690a47e8215eaed6996d
|
||||
SIZE (isc-projects-bind9-ff2bc7891e99442df51acea1110ad599ddc6756a_GL0.tar.gz) = 4409759
|
||||
|
@ -1,8 +1,8 @@
|
||||
Add the override-cache-ttl feature.
|
||||
|
||||
--- bin/named/config.c.orig 2020-11-08 22:06:04 UTC
|
||||
--- bin/named/config.c.orig 2020-11-11 21:48:13 UTC
|
||||
+++ bin/named/config.c
|
||||
@@ -180,6 +180,7 @@ options {\n\
|
||||
@@ -181,6 +181,7 @@ options {\n\
|
||||
notify-source *;\n\
|
||||
notify-source-v6 *;\n\
|
||||
nsec3-test-zone no;\n\
|
||||
@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
|
||||
provide-ixfr true;\n\
|
||||
qname-minimization relaxed;\n\
|
||||
query-source address *;\n\
|
||||
--- bin/named/server.c.orig 2020-11-08 22:06:04 UTC
|
||||
--- bin/named/server.c.orig 2020-11-11 21:48:13 UTC
|
||||
+++ bin/named/server.c
|
||||
@@ -4343,6 +4343,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
|
||||
@@ -4346,6 +4346,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
|
||||
}
|
||||
|
||||
obj = NULL;
|
||||
@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
|
||||
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-11-08 22:06:04 UTC
|
||||
--- lib/dns/include/dns/view.h.orig 2020-11-11 21:48:13 UTC
|
||||
+++ lib/dns/include/dns/view.h
|
||||
@@ -152,6 +152,7 @@ struct dns_view {
|
||||
bool requestnsid;
|
||||
@ -34,7 +34,7 @@ Add the override-cache-ttl feature.
|
||||
dns_ttl_t maxncachettl;
|
||||
dns_ttl_t mincachettl;
|
||||
dns_ttl_t minncachettl;
|
||||
--- lib/dns/resolver.c.orig 2020-11-08 22:06:04 UTC
|
||||
--- lib/dns/resolver.c.orig 2020-11-11 21:48:13 UTC
|
||||
+++ lib/dns/resolver.c
|
||||
@@ -6185,6 +6185,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
|
||||
}
|
||||
@ -49,9 +49,9 @@ Add the override-cache-ttl feature.
|
||||
* Enforce the configure maximum cache TTL.
|
||||
*/
|
||||
if (rdataset->ttl > res->view->maxcachettl) {
|
||||
--- lib/isccfg/namedconf.c.orig 2020-11-08 22:06:04 UTC
|
||||
--- lib/isccfg/namedconf.c.orig 2020-11-11 21:48:13 UTC
|
||||
+++ lib/isccfg/namedconf.c
|
||||
@@ -1993,6 +1993,7 @@ static cfg_clausedef_t view_clauses[] = {
|
||||
@@ -1998,6 +1998,7 @@ static cfg_clausedef_t view_clauses[] = {
|
||||
#endif /* ifdef HAVE_LMDB */
|
||||
{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
|
||||
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },
|
||||
|
@ -1,8 +1,8 @@
|
||||
We reference the pid file as being run/named/pid everywere else.
|
||||
|
||||
--- bin/named/include/named/globals.h.orig 2020-02-16 17:41:30 UTC
|
||||
--- bin/named/include/named/globals.h.orig 2020-11-11 21:48:13 UTC
|
||||
+++ bin/named/include/named/globals.h
|
||||
@@ -127,7 +127,7 @@ EXTERN bool named_g_forcelock INIT(false);
|
||||
@@ -128,7 +128,7 @@ EXTERN bool named_g_forcelock INIT(false);
|
||||
|
||||
#if NAMED_RUN_PID_DIR
|
||||
EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/"
|
||||
|
@ -236,7 +236,6 @@ include/isccc/types.h
|
||||
include/isccc/util.h
|
||||
include/isccfg/aclconf.h
|
||||
include/isccfg/cfg.h
|
||||
include/isccfg/dnsconf.h
|
||||
include/isccfg/grammar.h
|
||||
include/isccfg/kaspconf.h
|
||||
include/isccfg/log.h
|
||||
|
Loading…
Reference in New Issue
Block a user