Date: Wed, 20 Nov 2019 21:48:16 +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: r518055 - in branches/2019Q4/dns: bind911 bind911/files bind914 bind914/files Message-ID: <201911202148.xAKLmG2e067974@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Nov 20 21:48:16 2019 New Revision: 518055 URL: https://svnweb.freebsd.org/changeset/ports/518055 Log: MFH: r514624 r518053 r518054 Update to 9.11.13, 9.14.8. Security: CVE-2019-6477 Modified: branches/2019Q4/dns/bind911/Makefile branches/2019Q4/dns/bind911/distinfo branches/2019Q4/dns/bind911/files/extrapatch-bind-min-override-ttl branches/2019Q4/dns/bind911/files/patch-configure branches/2019Q4/dns/bind914/Makefile branches/2019Q4/dns/bind914/distinfo branches/2019Q4/dns/bind914/files/extrapatch-bind-min-override-ttl Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/dns/bind911/Makefile ============================================================================== --- branches/2019Q4/dns/bind911/Makefile Wed Nov 20 21:41:59 2019 (r518054) +++ branches/2019Q4/dns/bind911/Makefile Wed Nov 20 21:48:16 2019 (r518055) @@ -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.11 +ISCVERSION= 9.11.13 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: branches/2019Q4/dns/bind911/distinfo ============================================================================== --- branches/2019Q4/dns/bind911/distinfo Wed Nov 20 21:41:59 2019 (r518054) +++ branches/2019Q4/dns/bind911/distinfo Wed Nov 20 21:48:16 2019 (r518055) @@ -1,3 +1,3 @@ -TIMESTAMP = 1568842315 -SHA256 (bind-9.11.11.tar.gz) = 615230336645e494d0125a3e92cf1c0f956b7408378aca66667b44eaa9de8a6b -SIZE (bind-9.11.11.tar.gz) = 8176146 +TIMESTAMP = 1574271501 +SHA256 (bind-9.11.13.tar.gz) = fd3f3cc9fcfcdaa752db35eb24598afa1fdcc2509d3227fc90a8631b7b400f7d +SIZE (bind-9.11.13.tar.gz) = 8370441 Modified: branches/2019Q4/dns/bind911/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2019Q4/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Nov 20 21:41:59 2019 (r518054) +++ branches/2019Q4/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Nov 20 21:48:16 2019 (r518055) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2019-08-13 12:48:15 UTC +--- bin/named/config.c.orig 2019-11-06 21:46:22 UTC +++ bin/named/config.c @@ -182,6 +182,8 @@ options {\n\ " max-acache-size 16M;\n\ @@ -9,9 +9,9 @@ max-clients-per-query 100;\n\ max-ncache-ttl 10800; /* 3 hours */\n\ max-recursion-depth 7;\n\ ---- bin/named/server.c.orig 2019-08-13 12:48:15 UTC +--- bin/named/server.c.orig 2019-11-06 21:46:22 UTC +++ bin/named/server.c -@@ -3719,6 +3719,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -3722,6 +3722,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -28,7 +28,7 @@ result = ns_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2019-08-13 12:48:15 UTC +--- lib/dns/include/dns/view.h.orig 2019-11-06 21:46:22 UTC +++ lib/dns/include/dns/view.h @@ -152,6 +152,8 @@ struct dns_view { bool requestnsid; @@ -39,9 +39,9 @@ dns_ttl_t maxncachettl; uint32_t nta_lifetime; uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2019-08-13 12:48:15 UTC +--- lib/dns/resolver.c.orig 2019-11-06 21:46:22 UTC +++ lib/dns/resolver.c -@@ -5490,6 +5490,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -5518,6 +5518,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -60,7 +60,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2019-08-13 12:48:15 UTC +--- lib/isccfg/namedconf.c.orig 2019-11-06 21:46:22 UTC +++ lib/isccfg/namedconf.c @@ -1773,6 +1773,8 @@ view_clauses[] = { #endif Modified: branches/2019Q4/dns/bind911/files/patch-configure ============================================================================== --- branches/2019Q4/dns/bind911/files/patch-configure Wed Nov 20 21:41:59 2019 (r518054) +++ branches/2019Q4/dns/bind911/files/patch-configure Wed Nov 20 21:48:16 2019 (r518055) @@ -1,6 +1,6 @@ ---- configure.orig 2019-08-13 12:48:15 UTC +--- configure.orig 2019-10-02 06:55:45 UTC +++ configure -@@ -15628,27 +15628,9 @@ done +@@ -15626,27 +15626,9 @@ done # problems start to show up. saved_libs="$LIBS" for TRY_LIBS in \ @@ -30,7 +30,7 @@ { $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 -@@ -15691,47 +15673,7 @@ $as_echo "no" >&6; } ;; +@@ -15689,47 +15671,7 @@ $as_echo "no" >&6; } ;; no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; esac @@ -79,7 +79,7 @@ DNS_GSSAPI_LIBS="$LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 -@@ -24716,7 +24658,7 @@ $as_echo "" >&6; } +@@ -24663,7 +24605,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: branches/2019Q4/dns/bind914/Makefile ============================================================================== --- branches/2019Q4/dns/bind914/Makefile Wed Nov 20 21:41:59 2019 (r518054) +++ branches/2019Q4/dns/bind914/Makefile Wed Nov 20 21:48:16 2019 (r518055) @@ -36,7 +36,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools USES= compiler:c11 cpe libedit pkgconfig ssl # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.14.7 +ISCVERSION= 9.14.8 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: branches/2019Q4/dns/bind914/distinfo ============================================================================== --- branches/2019Q4/dns/bind914/distinfo Wed Nov 20 21:41:59 2019 (r518054) +++ branches/2019Q4/dns/bind914/distinfo Wed Nov 20 21:48:16 2019 (r518055) @@ -1,3 +1,3 @@ -TIMESTAMP = 1571265383 -SHA256 (bind-9.14.7.tar.gz) = cea0f54e5908f77ffd21eb312ee9dd4f3f8f93ca312c6118f27d6c0fba45291d -SIZE (bind-9.14.7.tar.gz) = 6320994 +TIMESTAMP = 1574271567 +SHA256 (bind-9.14.8.tar.gz) = e545aa75ced6695a9bf4b591606ef00260fb3c055c2865b299cfe0fe6eeea076 +SIZE (bind-9.14.8.tar.gz) = 6403140 Modified: branches/2019Q4/dns/bind914/files/extrapatch-bind-min-override-ttl ============================================================================== --- branches/2019Q4/dns/bind914/files/extrapatch-bind-min-override-ttl Wed Nov 20 21:41:59 2019 (r518054) +++ branches/2019Q4/dns/bind914/files/extrapatch-bind-min-override-ttl Wed Nov 20 21:48:16 2019 (r518055) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2019-10-02 06:24:10 UTC +--- bin/named/config.c.orig 2019-11-06 21:29:49 UTC +++ bin/named/config.c @@ -181,6 +181,7 @@ options {\n\ notify-source *;\n\ @@ -8,7 +8,7 @@ provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2019-10-02 06:24:10 UTC +--- bin/named/server.c.orig 2019-11-06 21:29:49 UTC +++ bin/named/server.c @@ -4246,6 +4246,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } @@ -22,7 +22,7 @@ result = named_config_get(maps, "max-cache-ttl", &obj); INSIST(result == ISC_R_SUCCESS); view->maxcachettl = cfg_obj_asuint32(obj); ---- lib/dns/include/dns/view.h.orig 2019-10-02 06:24:10 UTC +--- lib/dns/include/dns/view.h.orig 2019-11-06 21:29:49 UTC +++ lib/dns/include/dns/view.h @@ -153,6 +153,7 @@ struct dns_view { bool requestnsid; @@ -32,9 +32,9 @@ dns_ttl_t maxncachettl; dns_ttl_t mincachettl; dns_ttl_t minncachettl; ---- lib/dns/resolver.c.orig 2019-10-02 06:24:10 UTC +--- lib/dns/resolver.c.orig 2019-11-06 21:29:49 UTC +++ lib/dns/resolver.c -@@ -6064,6 +6064,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -6083,6 +6083,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb } /* @@ -47,7 +47,7 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2019-10-02 06:24:10 UTC +--- lib/isccfg/namedconf.c.orig 2019-11-06 21:29:49 UTC +++ lib/isccfg/namedconf.c @@ -1901,6 +1901,7 @@ view_clauses[] = { #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911202148.xAKLmG2e067974>