Date: Thu, 18 Feb 2021 07:06:48 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r565908 - in branches/2021Q1/dns: bind911 bind911/files bind916 bind916/files Message-ID: <202102180706.11I76mXt093731@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Feb 18 07:06:48 2021 New Revision: 565908 URL: https://svnweb.freebsd.org/changeset/ports/565908 Log: MFH: r565906 r565907 Update to 9.11.28 & 9.16.12 Security: CVE-2020-8625 Modified: branches/2021Q1/dns/bind911/Makefile branches/2021Q1/dns/bind911/distinfo branches/2021Q1/dns/bind911/files/patch-configure branches/2021Q1/dns/bind916/Makefile branches/2021Q1/dns/bind916/distinfo branches/2021Q1/dns/bind916/files/extrapatch-bind-min-override-ttl branches/2021Q1/dns/bind916/files/patch-configure Directory Properties: branches/2021Q1/ (props changed) Modified: branches/2021Q1/dns/bind911/Makefile ============================================================================== --- branches/2021Q1/dns/bind911/Makefile Thu Feb 18 07:05:01 2021 (r565907) +++ branches/2021Q1/dns/bind911/Makefile Thu Feb 18 07:06:48 2021 (r565908) @@ -24,7 +24,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools USES= cpe libedit pkgconfig # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.27 +ISCVERSION= 9.11.28 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: branches/2021Q1/dns/bind911/distinfo ============================================================================== --- branches/2021Q1/dns/bind911/distinfo Thu Feb 18 07:05:01 2021 (r565907) +++ branches/2021Q1/dns/bind911/distinfo Thu Feb 18 07:06:48 2021 (r565908) @@ -1,3 +1,3 @@ -TIMESTAMP = 1611312288 -SHA256 (bind-9.11.27.tar.gz) = 4cf9f244e2ae63fb4cf846b87c89f3f7d15e83c075d65165ef89a8ff1b376702 -SIZE (bind-9.11.27.tar.gz) = 8289413 +TIMESTAMP = 1613395465 +SHA256 (bind-9.11.28.tar.gz) = 1090cbe6caba37c404d1075887da7e5282ae9a2bc6172d722df15cd480975e74 +SIZE (bind-9.11.28.tar.gz) = 8295208 Modified: branches/2021Q1/dns/bind911/files/patch-configure ============================================================================== --- branches/2021Q1/dns/bind911/files/patch-configure Thu Feb 18 07:05:01 2021 (r565907) +++ branches/2021Q1/dns/bind911/files/patch-configure Thu Feb 18 07:06:48 2021 (r565908) @@ -3,7 +3,7 @@ - Make sure only json-c is detected. - Cleanup the BDB discovery code to find more recent versions. ---- configure.orig 2020-11-16 21:14:24 UTC +--- configure.orig 2021-02-04 13:06:04 UTC +++ configure @@ -15692,27 +15692,9 @@ done # problems start to show up. @@ -124,7 +124,7 @@ have_libjson_c="yes" else as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5 -@@ -24986,7 +24915,7 @@ $as_echo "" >&6; } +@@ -24987,7 +24916,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: branches/2021Q1/dns/bind916/Makefile ============================================================================== --- branches/2021Q1/dns/bind916/Makefile Thu Feb 18 07:05:01 2021 (r565907) +++ branches/2021Q1/dns/bind916/Makefile Thu Feb 18 07:06:48 2021 (r565908) @@ -41,7 +41,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.11 +ISCVERSION= 9.16.12 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: branches/2021Q1/dns/bind916/distinfo ============================================================================== --- branches/2021Q1/dns/bind916/distinfo Thu Feb 18 07:05:01 2021 (r565907) +++ branches/2021Q1/dns/bind916/distinfo Thu Feb 18 07:06:48 2021 (r565908) @@ -1,3 +1,3 @@ -TIMESTAMP = 1611312333 -SHA256 (bind-9.16.11.tar.xz) = 0111f64dd7d8f515cfa129e181cce96ff82070d1b27f11a21f6856110d0699c1 -SIZE (bind-9.16.11.tar.xz) = 5007520 +TIMESTAMP = 1613395604 +SHA256 (bind-9.16.12.tar.xz) = 9914af9311fd349cab441097898d94fb28d0bfd9bf6ed04fe1f97f042644da7f +SIZE (bind-9.16.12.tar.xz) = 5017756 Modified: branches/2021Q1/dns/bind916/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2021Q1/dns/bind916/files/extrapatch-bind-min-override-ttl Thu Feb 18 07:05:01 2021 (r565907) +++ branches/2021Q1/dns/bind916/files/extrapatch-bind-min-override-ttl Thu Feb 18 07:06:48 2021 (r565908) @@ -1,8 +1,8 @@ Add the override-cache-ttl feature. ---- bin/named/config.c.orig 2021-01-11 13:23:31 UTC +--- bin/named/config.c.orig 2021-02-04 11:35:16 UTC +++ bin/named/config.c -@@ -179,6 +179,7 @@ options {\n\ +@@ -180,6 +180,7 @@ options {\n\ notify-source *;\n\ notify-source-v6 *;\n\ nsec3-test-zone no;\n\ @@ -10,7 +10,7 @@ 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-11 13:23:31 UTC +--- bin/named/server.c.orig 2021-02-04 11:35:16 UTC +++ bin/named/server.c @@ -4347,6 +4347,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } @@ -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-11 13:23:31 UTC +--- lib/dns/include/dns/view.h.orig 2021-02-04 11:35:16 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,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-11 13:23:31 UTC +--- lib/dns/resolver.c.orig 2021-02-04 11:35:16 UTC +++ lib/dns/resolver.c -@@ -6281,6 +6281,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes +@@ -6478,6 +6478,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-11 13:23:31 UTC +--- lib/isccfg/namedconf.c.orig 2021-02-04 11:35:16 UTC +++ lib/isccfg/namedconf.c -@@ -2023,6 +2023,7 @@ static cfg_clausedef_t view_clauses[] = { +@@ -2047,6 +2047,7 @@ static cfg_clausedef_t view_clauses[] = { #endif /* ifdef HAVE_LMDB */ { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, Modified: branches/2021Q1/dns/bind916/files/patch-configure ============================================================================== --- branches/2021Q1/dns/bind916/files/patch-configure Thu Feb 18 07:05:01 2021 (r565907) +++ branches/2021Q1/dns/bind916/files/patch-configure Thu Feb 18 07:06:48 2021 (r565908) @@ -1,8 +1,8 @@ Fixup gssapi and db detection. ---- configure.orig 2021-01-11 13:23:31 UTC +--- configure.orig 2021-02-04 11:35:16 UTC +++ configure -@@ -17708,27 +17708,9 @@ done +@@ -17701,27 +17701,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 -@@ -17771,47 +17753,7 @@ $as_echo "no" >&6; } ;; +@@ -17764,47 +17746,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 -@@ -23227,7 +23169,7 @@ $as_echo "" >&6; } +@@ -23199,7 +23141,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102180706.11I76mXt093731>