git: 43b84549fb47 - main - dns/bind916: update to 9.16.22
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 28 Oct 2021 06:35:43 UTC
The branch main has been updated by mat:
URL: https://cgit.FreeBSD.org/ports/commit/?id=43b84549fb478bdf8cbd77db6f2ca6b84ba22c72
commit 43b84549fb478bdf8cbd77db6f2ca6b84ba22c72
Author: Mathieu Arnold <mat@FreeBSD.org>
AuthorDate: 2021-10-28 06:17:58 +0000
Commit: Mathieu Arnold <mat@FreeBSD.org>
CommitDate: 2021-10-28 06:19:47 +0000
dns/bind916: update to 9.16.22
MFH: 2021Q4
Security: CVE-2021-25219
---
dns/bind916/Makefile | 2 +-
dns/bind916/distinfo | 6 +++---
dns/bind916/files/extrapatch-bind-min-override-ttl | 12 ++++++------
dns/bind916/files/patch-configure | 8 ++++----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dns/bind916/Makefile b/dns/bind916/Makefile
index 3265d09cd51d..d94b6a22822a 100644
--- a/dns/bind916/Makefile
+++ b/dns/bind916/Makefile
@@ -40,7 +40,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
USES= compiler:c11 cpe libedit pkgconfig ssl tar:xz
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.16.21
+ISCVERSION= 9.16.22
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
diff --git a/dns/bind916/distinfo b/dns/bind916/distinfo
index ce029531078a..3c1f2bc303a4 100644
--- a/dns/bind916/distinfo
+++ b/dns/bind916/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632745650
-SHA256 (bind-9.16.21.tar.xz) = 65da5fd4fb80b7d0d7452876f81fd6d67cdcee54a5e3c1d65610334665dfa815
-SIZE (bind-9.16.21.tar.xz) = 5057816
+TIMESTAMP = 1635400990
+SHA256 (bind-9.16.22.tar.xz) = 65e7b2af6479db346e2fc99bcfb6ec3240066468e09dbec575ebc7c57d994061
+SIZE (bind-9.16.22.tar.xz) = 5059000
diff --git a/dns/bind916/files/extrapatch-bind-min-override-ttl b/dns/bind916/files/extrapatch-bind-min-override-ttl
index e1f06078adc4..8a588257cc20 100644
--- a/dns/bind916/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind916/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
Add the override-cache-ttl feature.
---- bin/named/config.c.orig 2021-09-07 09:37:05 UTC
+--- bin/named/config.c.orig 2021-10-13 10:56:16 UTC
+++ bin/named/config.c
@@ -180,6 +180,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 2021-09-07 09:37:05 UTC
+--- bin/named/server.c.orig 2021-10-13 10:56:16 UTC
+++ bin/named/server.c
-@@ -4411,6 +4411,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4413,6 +4413,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-09-07 09:37:05 UTC
+--- lib/dns/include/dns/view.h.orig 2021-10-13 10:56:16 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,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-09-07 09:37:05 UTC
+--- lib/dns/resolver.c.orig 2021-10-13 10:56:16 UTC
+++ lib/dns/resolver.c
@@ -6476,6 +6476,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-09-07 09:37:05 UTC
+--- lib/isccfg/namedconf.c.orig 2021-10-13 10:56:16 UTC
+++ lib/isccfg/namedconf.c
@@ -2048,6 +2048,7 @@ static cfg_clausedef_t view_clauses[] = {
#endif /* ifdef HAVE_LMDB */
diff --git a/dns/bind916/files/patch-configure b/dns/bind916/files/patch-configure
index de6888343d83..62f59c6713da 100644
--- a/dns/bind916/files/patch-configure
+++ b/dns/bind916/files/patch-configure
@@ -1,8 +1,8 @@
Fixup gssapi and db detection.
---- configure.orig 2021-06-08 10:45:10 UTC
+--- configure.orig 2021-10-13 10:56:16 UTC
+++ configure
-@@ -17758,27 +17758,9 @@ done
+@@ -17760,27 +17760,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@@ -32,7 +32,7 @@ Fixup gssapi and db detection.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking as $TRY_LIBS" >&5
$as_echo_n "checking linking as $TRY_LIBS... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -17821,47 +17803,7 @@ $as_echo "no" >&6; } ;;
+@@ -17823,47 +17805,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@@ -81,7 +81,7 @@ Fixup gssapi and db detection.
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23262,7 +23204,7 @@ $as_echo "" >&6; }
+@@ -23264,7 +23206,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).