From 7a846cc383adc1d1bc752af06dcc413dea9334e9 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Mon, 1 Feb 2021 15:44:44 +0000 Subject: [PATCH] Update to latest commit. --- dns/bind-tools/pkg-plist-devel | 21 ++++++---------- dns/bind9-devel/Makefile | 4 ++-- dns/bind9-devel/distinfo | 6 ++--- .../files/extrapatch-bind-min-override-ttl | 22 ++++++++--------- dns/bind9-devel/pkg-plist | 24 ++++++++----------- 5 files changed, 33 insertions(+), 44 deletions(-) diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index 8d4b18022aed..cb17c58a21ba 100644 --- a/dns/bind-tools/pkg-plist-devel +++ b/dns/bind-tools/pkg-plist-devel @@ -17,26 +17,19 @@ bin/nsec3hash bin/nslookup bin/nsupdate lib/bind-tools/libbind9.so -lib/bind-tools/libbind9.so.1701 -lib/bind-tools/libbind9.so.1701.0.3 +lib/bind-tools/libbind9-9.17.9.so lib/bind-tools/libdns.so -lib/bind-tools/libdns.so.1708 -lib/bind-tools/libdns.so.1708.0.0 +lib/bind-tools/libdns-9.17.9.so lib/bind-tools/libirs.so -lib/bind-tools/libirs.so.1701 -lib/bind-tools/libirs.so.1701.0.0 +lib/bind-tools/libirs-9.17.9.so lib/bind-tools/libisc.so -lib/bind-tools/libisc.so.1707 -lib/bind-tools/libisc.so.1707.0.0 +lib/bind-tools/libisc-9.17.9.so lib/bind-tools/libisccc.so -lib/bind-tools/libisccc.so.1703 -lib/bind-tools/libisccc.so.1703.0.0 +lib/bind-tools/libisccc-9.17.9.so lib/bind-tools/libisccfg.so -lib/bind-tools/libisccfg.so.1703 -lib/bind-tools/libisccfg.so.1703.0.0 +lib/bind-tools/libisccfg-9.17.9.so lib/bind-tools/libns.so -lib/bind-tools/libns.so.1706 -lib/bind-tools/libns.so.1706.0.0 +lib/bind-tools/libns-9.17.9.so man/man1/arpaname.1.gz man/man1/delv.1.gz man/man1/dig.1.gz diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index b1758ca64290..a0710124b1c4 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -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.8a0.2021.01.04 +ISCVERSION= 9.17.9a0.2021.01.29 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 8c6db04f60a6702dabd6de92f8579b547619dbac +GL_COMMIT= 48a89e5fbe96170380307ba197b4b7eb4642e887 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index a42f113dfa5b..54df38e00437 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609765171 -SHA256 (isc-projects-bind9-8c6db04f60a6702dabd6de92f8579b547619dbac_GL0.tar.gz) = dec3a4fd760887ed5951648fa55b05ab174cd3986db80cd17abea25ed6f06f96 -SIZE (isc-projects-bind9-8c6db04f60a6702dabd6de92f8579b547619dbac_GL0.tar.gz) = 4467364 +TIMESTAMP = 1612185562 +SHA256 (isc-projects-bind9-48a89e5fbe96170380307ba197b4b7eb4642e887_GL0.tar.gz) = 9f4f23be953af16efbbc6245bfd72aa284acf8d58f80595da901e2b06414b98f +SIZE (isc-projects-bind9-48a89e5fbe96170380307ba197b4b7eb4642e887_GL0.tar.gz) = 6360296 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index 906806977a11..2a19cea829e0 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-04 06:21:13 UTC +--- bin/named/config.c.orig 2021-01-29 14:54:42 UTC +++ bin/named/config.c -@@ -181,6 +181,7 @@ options {\n\ +@@ -179,6 +179,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-04 06:21:13 UTC +--- bin/named/server.c.orig 2021-01-29 14:54:42 UTC +++ bin/named/server.c -@@ -4433,6 +4433,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4435,6 +4435,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -24,9 +24,9 @@ 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-04 06:21:13 UTC +--- lib/dns/include/dns/view.h.orig 2021-01-29 14:54:42 UTC +++ lib/dns/include/dns/view.h -@@ -152,6 +152,7 @@ struct dns_view { +@@ -154,6 +154,7 @@ struct dns_view { bool requestnsid; bool sendcookie; dns_ttl_t maxcachettl; @@ -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-04 06:21:13 UTC +--- lib/dns/resolver.c.orig 2021-01-29 14:54:42 UTC +++ lib/dns/resolver.c -@@ -6192,6 +6192,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -6389,6 +6389,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } /* @@ -49,11 +49,11 @@ 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-04 06:21:13 UTC +--- lib/isccfg/namedconf.c.orig 2021-01-29 14:54:42 UTC +++ lib/isccfg/namedconf.c -@@ -2034,6 +2034,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2000,6 +2000,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ - { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, + { "max-acache-size", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, + { "override-cache-ttl", &cfg_type_duration, 0 }, { "max-cache-ttl", &cfg_type_duration, 0 }, diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 86c45ad09e9f..db83d9bffca5 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -105,6 +105,7 @@ include/dns/tcpmsg.h include/dns/time.h include/dns/timer.h include/dns/tkey.h +include/dns/transport.h include/dns/tsec.h include/dns/tsig.h include/dns/ttl.h @@ -219,6 +220,7 @@ include/isc/taskpool.h include/isc/thread.h include/isc/time.h include/isc/timer.h +include/isc/tls.h include/isc/tm.h include/isc/types.h include/isc/utf8.h @@ -263,26 +265,19 @@ include/pk11/site.h include/pkcs11/pkcs11.h lib/bind/filter-aaaa.so lib/libbind9.so -lib/libbind9.so.1701 -lib/libbind9.so.1701.0.3 +lib/libbind9-9.17.9.so lib/libdns.so -lib/libdns.so.1708 -lib/libdns.so.1708.0.0 +lib/libdns-9.17.9.so lib/libirs.so -lib/libirs.so.1701 -lib/libirs.so.1701.0.0 +lib/libirs-9.17.9.so lib/libisc.so -lib/libisc.so.1707 -lib/libisc.so.1707.0.0 +lib/libisc-9.17.9.so lib/libisccc.so -lib/libisccc.so.1703 -lib/libisccc.so.1703.0.0 +lib/libisccc-9.17.9.so lib/libisccfg.so -lib/libisccfg.so.1703 -lib/libisccfg.so.1703.0.0 +lib/libisccfg-9.17.9.so lib/libns.so -lib/libns.so.1706 -lib/libns.so.1706.0.0 +lib/libns-9.17.9.so @comment lib/named/filter-aaaa.so @comment man/man1/arpaname.1.gz @comment man/man1/delv.1.gz @@ -313,6 +308,7 @@ lib/libns.so.1706.0.0 %%MANPAGES%%%%NATIVE_PKCS11%%man/man1/pkcs11-tokens.1.gz %%MANPAGES%%man/man5/named.conf.5.gz %%MANPAGES%%man/man5/rndc.conf.5.gz +%%MANPAGES%%man/man8/ddns-confgen.8.gz %%MANPAGES%%man/man8/filter-aaaa.8.gz %%MANPAGES%%man/man8/named.8.gz %%MANPAGES%%man/man8/rndc-confgen.8.gz