diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2021-03-22 15:14:04 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2021-03-22 15:14:04 +0000 |
commit | 059d02cb67e4f50dd3adc96ade0dc0a36a77ca29 (patch) | |
tree | 2f8415a18c0ff1a09c7d125879a28c685e7fd98d /dns | |
parent | Update to v5.33.8-8-g3e25f6d2dc. (diff) |
Update to latest commit.
Notes
Notes:
svn path=/head/; revision=568968
Diffstat (limited to 'dns')
-rw-r--r-- | dns/bind-tools/pkg-plist-devel | 16 | ||||
-rw-r--r-- | dns/bind9-devel/Makefile | 4 | ||||
-rw-r--r-- | dns/bind9-devel/distinfo | 6 | ||||
-rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 12 | ||||
-rw-r--r-- | dns/bind9-devel/pkg-plist | 18 |
5 files changed, 30 insertions, 26 deletions
diff --git a/dns/bind-tools/pkg-plist-devel b/dns/bind-tools/pkg-plist-devel index 1a5616ba1bae..85ddaa200dda 100644 --- a/dns/bind-tools/pkg-plist-devel +++ b/dns/bind-tools/pkg-plist-devel @@ -17,19 +17,19 @@ bin/nsec3hash bin/nslookup bin/nsupdate lib/bind-tools/libbind9.so -lib/bind-tools/libbind9-9.17.10.so +lib/bind-tools/libbind9-9.17.11.so lib/bind-tools/libdns.so -lib/bind-tools/libdns-9.17.10.so +lib/bind-tools/libdns-9.17.11.so lib/bind-tools/libirs.so -lib/bind-tools/libirs-9.17.10.so +lib/bind-tools/libirs-9.17.11.so lib/bind-tools/libisc.so -lib/bind-tools/libisc-9.17.10.so +lib/bind-tools/libisc-9.17.11.so lib/bind-tools/libisccc.so -lib/bind-tools/libisccc-9.17.10.so +lib/bind-tools/libisccc-9.17.11.so lib/bind-tools/libisccfg.so -lib/bind-tools/libisccfg-9.17.10.so +lib/bind-tools/libisccfg-9.17.11.so lib/bind-tools/libns.so -lib/bind-tools/libns-9.17.10.so +lib/bind-tools/libns-9.17.11.so man/man1/arpaname.1.gz man/man1/delv.1.gz man/man1/dig.1.gz @@ -47,6 +47,7 @@ man/man1/host.1.gz man/man1/mdig.1.gz @comment man/man1/named-checkconf.1.gz @comment man/man1/named-checkzone.1.gz +@comment man/man1/named-compilezone.1.gz @comment man/man1/named-journalprint.1.gz @comment man/man1/named-nzd2nzf.1.gz man/man1/named-rrchecker.1.gz @@ -56,6 +57,7 @@ man/man1/nsupdate.1.gz @comment man/man5/named.conf.5.gz @comment man/man5/rndc.conf.5.gz @comment man/man8/ddns-confgen.8.gz +@comment man/man8/filter-a.8.gz @comment man/man8/filter-aaaa.8.gz @comment man/man8/named.8.gz @comment man/man8/rndc-confgen.8.gz diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index 0e408ed3e5b4..b53a8d7e4de5 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -50,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.10a0.2021.03.15 +ISCVERSION= 9.17.11a0.2021.03.22 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= a9339fe7fc68198a2b74b9623defca784308214c +GL_COMMIT= 28923bc6952ff273b30c69dcbef0b9aeebf5a5c6 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index c70113637626..a35dc494df64 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615811533 -SHA256 (isc-projects-bind9-a9339fe7fc68198a2b74b9623defca784308214c_GL0.tar.gz) = c5da134ab58524378310101a4e127797ea082ed35c2c6bcac2522cbb294312f0 -SIZE (isc-projects-bind9-a9339fe7fc68198a2b74b9623defca784308214c_GL0.tar.gz) = 6418081 +TIMESTAMP = 1616417566 +SHA256 (isc-projects-bind9-28923bc6952ff273b30c69dcbef0b9aeebf5a5c6_GL0.tar.gz) = 5e8bdfa8b3036b1726b99e7bed635935b4c3889f5963d5ef3b7c4fe95bae373f +SIZE (isc-projects-bind9-28923bc6952ff273b30c69dcbef0b9aeebf5a5c6_GL0.tar.gz) = 6424596 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index ae2e6d65075d..6f0b0a092fa0 100644 --- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl +++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2021-02-19 12:30:50 UTC +--- bin/named/config.c.orig 2021-03-22 10:06:45 UTC +++ bin/named/config.c @@ -181,6 +181,7 @@ options {\n\ notify-source *;\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-02-19 12:30:50 UTC +--- bin/named/server.c.orig 2021-03-22 10:06:45 UTC +++ bin/named/server.c -@@ -4445,6 +4445,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4456,6 +4456,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-02-19 12:30:50 UTC +--- lib/dns/include/dns/view.h.orig 2021-03-22 10:06:45 UTC +++ lib/dns/include/dns/view.h @@ -154,6 +154,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 2021-02-19 12:30:50 UTC +--- lib/dns/resolver.c.orig 2021-03-22 10:06:45 UTC +++ lib/dns/resolver.c @@ -6388,6 +6388,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } @@ -49,7 +49,7 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2021-02-19 12:30:50 UTC +--- lib/isccfg/namedconf.c.orig 2021-03-22 10:06:45 UTC +++ lib/isccfg/namedconf.c @@ -2024,6 +2024,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist index 00eddeeacc80..7214cc9221dc 100644 --- a/dns/bind9-devel/pkg-plist +++ b/dns/bind9-devel/pkg-plist @@ -263,22 +263,22 @@ include/pk11/pk11.h include/pk11/result.h include/pk11/site.h include/pkcs11/pkcs11.h +lib/bind/filter-a.so lib/bind/filter-aaaa.so lib/libbind9.so -lib/libbind9-9.17.10.so +lib/libbind9-9.17.11.so lib/libdns.so -lib/libdns-9.17.10.so +lib/libdns-9.17.11.so lib/libirs.so -lib/libirs-9.17.10.so +lib/libirs-9.17.11.so lib/libisc.so -lib/libisc-9.17.10.so +lib/libisc-9.17.11.so lib/libisccc.so -lib/libisccc-9.17.10.so +lib/libisccc-9.17.11.so lib/libisccfg.so -lib/libisccfg-9.17.10.so +lib/libisccfg-9.17.11.so lib/libns.so -lib/libns-9.17.10.so -@comment lib/named/filter-aaaa.so +lib/libns-9.17.11.so @comment man/man1/arpaname.1.gz @comment man/man1/delv.1.gz @comment man/man1/dig.1.gz @@ -296,6 +296,7 @@ lib/libns-9.17.10.so @comment man/man1/mdig.1.gz %%MANPAGES%%man/man1/named-checkconf.1.gz %%MANPAGES%%man/man1/named-checkzone.1.gz +%%MANPAGES%%man/man1/named-compilezone.1.gz %%MANPAGES%%man/man1/named-journalprint.1.gz %%MANPAGES%%%%LMDB%%man/man1/named-nzd2nzf.1.gz @comment man/man1/named-rrchecker.1.gz @@ -309,6 +310,7 @@ lib/libns-9.17.10.so %%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-a.8.gz %%MANPAGES%%man/man8/filter-aaaa.8.gz %%MANPAGES%%man/man8/named.8.gz %%MANPAGES%%man/man8/rndc-confgen.8.gz |