cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to latest commit.

Browse Source
This commit is contained in:
Mathieu Arnold 2020-02-17 11:30:47 +00:00
parent 867d4d4b86
commit 72cb4c9db4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=526365
4 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dns/bind9-devel/Makefile
View File

@ -42,13 +42,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.8a0.2020.02.11
ISCVERSION= 9.15.8a0.2020.02.16
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
GL_COMMIT= d3843161ab45a87ded170c7a4cdc1319b3d21e33
GL_COMMIT= e4671ef2fa4f9764ddc11e95ed5f1bfa56a9e0d7
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

6
dns/bind9-devel/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1581426685
SHA256 (isc-projects-bind9-d3843161ab45a87ded170c7a4cdc1319b3d21e33_GL0.tar.gz) = e381ea3c123b444c78c0afc82ebc8913a0ac291e5eb0fc618151cff16659d734
SIZE (isc-projects-bind9-d3843161ab45a87ded170c7a4cdc1319b3d21e33_GL0.tar.gz) = 6353739
TIMESTAMP = 1581932819
SHA256 (isc-projects-bind9-e4671ef2fa4f9764ddc11e95ed5f1bfa56a9e0d7_GL0.tar.gz) = 123f39e3b2f2495a276e74bfd1917e044599e87a8f742ac6563df0d246756415
SIZE (isc-projects-bind9-e4671ef2fa4f9764ddc11e95ed5f1bfa56a9e0d7_GL0.tar.gz) = 6363381

34
dns/bind9-devel/files/extrapatch-bind-min-override-ttl
View File

@ -1,8 +1,8 @@
Add the override-cache-ttl feature.
--- bin/named/config.c.orig 2020-02-11 10:42:52 UTC
--- bin/named/config.c.orig 2020-02-16 17:41:30 UTC
+++ bin/named/config.c
@@ -178,6 +178,7 @@ options {\n\
@@ -177,6 +177,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-02-11 10:42:52 UTC
--- bin/named/server.c.orig 2020-02-16 17:41:30 UTC
+++ bin/named/server.c
@@ -4303,6 +4303,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
@@ -4323,6 +4323,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
obj = NULL;
@ -24,19 +24,19 @@ 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-02-11 10:42:52 UTC
--- lib/dns/include/dns/view.h.orig 2020-02-16 17:41:30 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid;
bool sendcookie;
dns_ttl_t maxcachettl;
+ dns_ttl_t overridecachettl;
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
--- lib/dns/resolver.c.orig 2020-02-11 10:42:52 UTC
bool requestnsid;
bool sendcookie;
dns_ttl_t maxcachettl;
+ dns_ttl_t overridecachettl;
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
--- lib/dns/resolver.c.orig 2020-02-16 17:41:30 UTC
+++ lib/dns/resolver.c
@@ -6032,6 +6032,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
@@ -6233,6 +6233,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
/*
@ -49,10 +49,10 @@ Add the override-cache-ttl feature.
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2020-02-11 10:42:52 UTC
--- lib/isccfg/namedconf.c.orig 2020-02-16 17:41:30 UTC
+++ lib/isccfg/namedconf.c
@@ -2003,6 +2003,7 @@ view_clauses[] = {
#endif
@@ -1990,6 +1990,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 },
+ { "override-cache-ttl", &cfg_type_duration, 0 },

18
dns/bind9-devel/files/patch-bin_named_include_named_globals.h
View File

@ -1,13 +1,13 @@
We reference the pid file as being run/named/pid everywere else.
--- bin/named/include/named/globals.h.orig 2019-11-12 11:24:41 UTC
--- bin/named/include/named/globals.h.orig 2020-02-16 17:41:30 UTC
+++ bin/named/include/named/globals.h
@@ -131,7 +131,7 @@ EXTERN bool named_g_forcelock INIT(false);
@@ -127,7 +127,7 @@ EXTERN bool named_g_forcelock INIT(false);
#if NAMED_RUN_PID_DIR
EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR
"/run/named/"
- "named.pid");
+ "pid");
#else
EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR
"/run/named.pid");
EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/"
- "named.pid");
+ "pid");
#else /* if NAMED_RUN_PID_DIR */
EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/"
"named.pid");