diff options
| -rw-r--r-- | dns/bind9-devel/Makefile | 6 | ||||
| -rw-r--r-- | dns/bind9-devel/distinfo | 6 | ||||
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 18 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-bin_named_include_named_globals.h | 4 | ||||
| -rw-r--r-- | dns/bind9-devel/pkg-plist | 1 |
5 files changed, 19 insertions, 16 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index a0710124b1c4..0f07b11f896a 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -40,7 +40,9 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT LIB_DEPENDS= libuv.so:devel/libuv \ + libnghttp2.so:www/libnghttp2 \ libxml2.so:textproc/libxml2 + .if !defined(BIND_TOOLS_SLAVE) RUN_DEPENDS= bind-tools>0:dns/bind-tools .endif @@ -48,13 +50,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.9a0.2021.01.29 +ISCVERSION= 9.17.9a0.2021.02.14 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 48a89e5fbe96170380307ba197b4b7eb4642e887 +GL_COMMIT= 8c1df63312a02d2352312b07f292d8e84672fec2 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index 54df38e00437..5095107e2e45 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1612185562 -SHA256 (isc-projects-bind9-48a89e5fbe96170380307ba197b4b7eb4642e887_GL0.tar.gz) = 9f4f23be953af16efbbc6245bfd72aa284acf8d58f80595da901e2b06414b98f -SIZE (isc-projects-bind9-48a89e5fbe96170380307ba197b4b7eb4642e887_GL0.tar.gz) = 6360296 +TIMESTAMP = 1613380526 +SHA256 (isc-projects-bind9-8c1df63312a02d2352312b07f292d8e84672fec2_GL0.tar.gz) = d405e2bea2569222646260b87cb1e7661a572c356342fc44fa52acca823f2abc +SIZE (isc-projects-bind9-8c1df63312a02d2352312b07f292d8e84672fec2_GL0.tar.gz) = 6393007 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 2a19cea829e0..e795c0f65aac 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,8 +1,8 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2021-01-29 14:54:42 UTC +--- bin/named/config.c.orig 2021-02-14 23:02:44 UTC +++ bin/named/config.c -@@ -179,6 +179,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 2021-01-29 14:54:42 UTC +--- bin/named/server.c.orig 2021-02-14 23:02:44 UTC +++ bin/named/server.c -@@ -4435,6 +4435,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4441,6 +4441,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 2021-01-29 14:54:42 UTC +--- lib/dns/include/dns/view.h.orig 2021-02-14 23:02:44 UTC +++ lib/dns/include/dns/view.h @@ -154,6 +154,7 @@ struct dns_view { bool requestnsid; @@ -34,9 +34,9 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2021-01-29 14:54:42 UTC +--- lib/dns/resolver.c.orig 2021-02-14 23:02:44 UTC +++ lib/dns/resolver.c -@@ -6389,6 +6389,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -6388,6 +6388,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 2021-01-29 14:54:42 UTC +--- lib/isccfg/namedconf.c.orig 2021-02-14 23:02:44 UTC +++ lib/isccfg/namedconf.c -@@ -2000,6 +2000,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2007,6 +2007,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ { "max-acache-size", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, diff --git a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h index 6c5488bb97b2..173ad8b5d006 100644 --- a/dns/bind9-devel/files/patch-bin_named_include_named_globals.h +++ b/dns/bind9-devel/files/patch-bin_named_include_named_globals.h @@ -1,8 +1,8 @@ We reference the pid file as being run/named/pid everywere else. ---- bin/named/include/named/globals.h.orig 2020-11-11 21:48:13 UTC +--- bin/named/include/named/globals.h.orig 2021-02-08 02:55:31 UTC +++ bin/named/include/named/globals.h -@@ -128,7 +128,7 @@ EXTERN bool named_g_forcelock INIT(false); +@@ -130,7 +130,7 @@ EXTERN bool named_g_forcelock INIT(false); #if NAMED_RUN_PID_DIR EXTERN const char *named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/" diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index db83d9bffca5..52d583791b1a 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -223,6 +223,7 @@ include/isc/timer.h include/isc/tls.h include/isc/tm.h include/isc/types.h +include/isc/url.h include/isc/utf8.h include/isc/util.h include/isccc/alist.h |