From 06117619e4886bf0e6840e11af28c526e3d6b484 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Wed, 15 Mar 2023 21:12:44 +0100 Subject: dns/bind918: update to 9.18.13 Changes: https://downloads.isc.org/isc/bind9/9.18.13/doc/arm/html/notes.html#notes-for-bind-9-18-13 --- dns/bind-tools/pkg-plist | 14 +++++++------- dns/bind918/Makefile | 2 +- dns/bind918/distinfo | 6 +++--- dns/bind918/files/extrapatch-bind-min-override-ttl | 14 +++++++------- dns/bind918/pkg-plist | 15 +++++++-------- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist index cd17fa1ac660..fb076de7941e 100644 --- a/dns/bind-tools/pkg-plist +++ b/dns/bind-tools/pkg-plist @@ -17,19 +17,19 @@ bin/nsec3hash bin/nslookup bin/nsupdate lib/bind-tools/libbind9.so -lib/bind-tools/libbind9-9.18.12.so +lib/bind-tools/libbind9-9.18.13.so lib/bind-tools/libdns.so -lib/bind-tools/libdns-9.18.12.so +lib/bind-tools/libdns-9.18.13.so lib/bind-tools/libirs.so -lib/bind-tools/libirs-9.18.12.so +lib/bind-tools/libirs-9.18.13.so lib/bind-tools/libisc.so -lib/bind-tools/libisc-9.18.12.so +lib/bind-tools/libisc-9.18.13.so lib/bind-tools/libisccc.so -lib/bind-tools/libisccc-9.18.12.so +lib/bind-tools/libisccc-9.18.13.so lib/bind-tools/libisccfg.so -lib/bind-tools/libisccfg-9.18.12.so +lib/bind-tools/libisccfg-9.18.13.so lib/bind-tools/libns.so -lib/bind-tools/libns-9.18.12.so +lib/bind-tools/libns-9.18.13.so %%MANPAGES%%man/man1/arpaname.1.gz %%MANPAGES%%man/man1/delv.1.gz %%MANPAGES%%man/man1/dig.1.gz diff --git a/dns/bind918/Makefile b/dns/bind918/Makefile index 2db111fce463..8d6ef6b2184d 100644 --- a/dns/bind918/Makefile +++ b/dns/bind918/Makefile @@ -44,7 +44,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools USES= autoreconf compiler:c11 cpe libedit libtool pkgconfig ssl tar:xz # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.18.12 +ISCVERSION= 9.18.13 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind918/distinfo b/dns/bind918/distinfo index ef589a070a7b..a357ca8629b0 100644 --- a/dns/bind918/distinfo +++ b/dns/bind918/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676477982 -SHA256 (bind-9.18.12.tar.xz) = 47766bb7b063aabbad054386b190aa7f6c14524427afd427c30ec426512027e7 -SIZE (bind-9.18.12.tar.xz) = 5420940 +TIMESTAMP = 1678904915 +SHA256 (bind-9.18.13.tar.xz) = 3b06b6390c1012dd3956b1479c73b2097c0b22207817e2e8aae352fd20e578c7 +SIZE (bind-9.18.13.tar.xz) = 5419040 diff --git a/dns/bind918/files/extrapatch-bind-min-override-ttl b/dns/bind918/files/extrapatch-bind-min-override-ttl index 08df7fe724b8..8486c4740560 100644 --- a/dns/bind918/files/extrapatch-bind-min-override-ttl +++ b/dns/bind918/files/extrapatch-bind-min-override-ttl @@ -1,6 +1,6 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2023-02-03 11:25:47 UTC +--- bin/named/config.c.orig 2023-03-06 09:28:43 UTC +++ bin/named/config.c @@ -184,6 +184,7 @@ options {\n\ notify-source *;\n\ @@ -10,9 +10,9 @@ Add the override-cache-ttl feature. parental-source *;\n\ parental-source-v6 *;\n\ provide-ixfr true;\n\ ---- bin/named/server.c.orig 2023-02-03 11:25:47 UTC +--- bin/named/server.c.orig 2023-03-06 09:28:43 UTC +++ bin/named/server.c -@@ -4547,6 +4547,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4549,6 +4549,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); ---- doc/arm/reference.rst.orig 2023-02-03 11:25:47 UTC +--- doc/arm/reference.rst.orig 2023-03-06 09:28:43 UTC +++ doc/arm/reference.rst @@ -4288,6 +4288,10 @@ Tuning cannot exceed 7 days and is silently truncated to 7 days if set to a @@ -37,7 +37,7 @@ Add the override-cache-ttl feature. .. namedconf:statement:: max-cache-ttl :tags: server :short: Specifies the maximum time (in seconds) that the server caches ordinary (positive) answers. ---- lib/dns/include/dns/view.h.orig 2023-02-03 11:25:47 UTC +--- lib/dns/include/dns/view.h.orig 2023-03-06 09:28:43 UTC +++ lib/dns/include/dns/view.h @@ -157,6 +157,7 @@ struct dns_view { bool requestnsid; @@ -47,7 +47,7 @@ Add the override-cache-ttl feature. dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2023-02-03 11:25:47 UTC +--- lib/dns/resolver.c.orig 2023-03-06 09:28:43 UTC +++ lib/dns/resolver.c @@ -6253,6 +6253,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes } @@ -62,7 +62,7 @@ Add the override-cache-ttl feature. * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2023-02-03 11:25:47 UTC +--- lib/isccfg/namedconf.c.orig 2023-03-06 09:28:43 UTC +++ lib/isccfg/namedconf.c @@ -2100,6 +2100,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ diff --git a/dns/bind918/pkg-plist b/dns/bind918/pkg-plist index fe9832dec2c2..ac50811710a7 100644 --- a/dns/bind918/pkg-plist +++ b/dns/bind918/pkg-plist @@ -124,7 +124,6 @@ include/isc/backtrace.h include/isc/barrier.h include/isc/base32.h include/isc/base64.h -include/isc/bind9.h include/isc/buffer.h include/isc/cmocka.h include/isc/commandline.h @@ -243,19 +242,19 @@ include/ns/xfrout.h lib/bind/filter-a.so lib/bind/filter-aaaa.so lib/libbind9.so -lib/libbind9-9.18.12.so +lib/libbind9-9.18.13.so lib/libdns.so -lib/libdns-9.18.12.so +lib/libdns-9.18.13.so lib/libirs.so -lib/libirs-9.18.12.so +lib/libirs-9.18.13.so lib/libisc.so -lib/libisc-9.18.12.so +lib/libisc-9.18.13.so lib/libisccc.so -lib/libisccc-9.18.12.so +lib/libisccc-9.18.13.so lib/libisccfg.so -lib/libisccfg-9.18.12.so +lib/libisccfg-9.18.13.so lib/libns.so -lib/libns-9.18.12.so +lib/libns-9.18.13.so @comment man/man1/arpaname.1.gz @comment man/man1/delv.1.gz @comment man/man1/dig.1.gz -- cgit v1.2.3