Date: Mon, 18 Jun 2018 08:17:49 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472675 - in head/dns/bind9-devel: . files Message-ID: <201806180817.w5I8HnBR083809@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jun 18 08:17:49 2018 New Revision: 472675 URL: https://svnweb.freebsd.org/changeset/ports/472675 Log: Update to latest commit. Sponsored by: Absolight Deleted: head/dns/bind9-devel/files/patch-CVE-2018-5738 Modified: head/dns/bind9-devel/Makefile (contents, props changed) head/dns/bind9-devel/distinfo (contents, props changed) head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind9-devel/files/patch-configure (contents, props changed) head/dns/bind9-devel/pkg-plist (contents, props changed) Modified: head/dns/bind9-devel/Makefile ============================================================================== --- head/dns/bind9-devel/Makefile Mon Jun 18 07:32:56 2018 (r472674) +++ head/dns/bind9-devel/Makefile Mon Jun 18 08:17:49 2018 (r472675) @@ -9,7 +9,7 @@ PORTREVISION= 0 .else # XXX: correct version # dns/bind9xx here -PORTREVISION= 1 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 # XXX: put the ISC master_site @@ -40,13 +40,13 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 # XXX: remove tar:bz2 USES= cpe libedit ssl tar:bz2 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.13.0a0.2018.06.08 +ISCVERSION= 9.13.0a0.2018.06.15 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= b8fbe4aab40f5a41b9b0f00586c972d5afdba05f +GL_COMMIT= e495999c621a481db1ae2a5d189c416238a82980 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: head/dns/bind9-devel/distinfo ============================================================================== --- head/dns/bind9-devel/distinfo Mon Jun 18 07:32:56 2018 (r472674) +++ head/dns/bind9-devel/distinfo Mon Jun 18 08:17:49 2018 (r472675) @@ -1,3 +1,3 @@ -TIMESTAMP = 1528712121 -SHA256 (isc-projects-bind9-b8fbe4aab40f5a41b9b0f00586c972d5afdba05f_GL0.tar.gz) = a1b32af9f19a77b73661ef6690603bb9b011591f700f6e64819fa04e6399cd59 -SIZE (isc-projects-bind9-b8fbe4aab40f5a41b9b0f00586c972d5afdba05f_GL0.tar.gz) = 8925777 +TIMESTAMP = 1529305510 +SHA256 (isc-projects-bind9-e495999c621a481db1ae2a5d189c416238a82980_GL0.tar.gz) = d9b3559bc9a4d35bbe61d5e2316d3c1f97eac9b21e0f36502fc3839d8c7646c0 +SIZE (isc-projects-bind9-e495999c621a481db1ae2a5d189c416238a82980_GL0.tar.gz) = 8534156 Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon Jun 18 07:32:56 2018 (r472674) +++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon Jun 18 08:17:49 2018 (r472675) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2018-06-08 18:48:01 UTC +--- bin/named/config.c.orig 2018-06-15 08:58:30 UTC +++ bin/named/config.c @@ -176,12 +176,14 @@ options {\n\ max-recursion-queries 75;\n\ @@ -13,11 +13,11 @@ nsec3-test-zone no;\n\ + override-cache-ttl 0; /* do not override */\n\ provide-ixfr true;\n\ + qname-minimization relaxed;\n\ query-source address *;\n\ - query-source-v6 address *;\n\ ---- bin/named/server.c.orig 2018-06-08 18:48:01 UTC +--- bin/named/server.c.orig 2018-06-15 08:58:30 UTC +++ bin/named/server.c -@@ -4074,6 +4074,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -4071,6 +4071,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -34,9 +34,9 @@ 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 2018-06-08 18:48:01 UTC +--- lib/dns/include/dns/view.h.orig 2018-06-15 08:58:30 UTC +++ lib/dns/include/dns/view.h -@@ -149,6 +149,8 @@ struct dns_view { +@@ -151,6 +151,8 @@ struct dns_view { isc_boolean_t requestnsid; isc_boolean_t sendcookie; dns_ttl_t maxcachettl; @@ -45,9 +45,9 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2018-06-08 18:48:01 UTC +--- lib/dns/resolver.c.orig 2018-06-15 08:58:30 UTC +++ lib/dns/resolver.c -@@ -5748,6 +5748,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5799,6 +5799,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -66,9 +66,9 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2018-06-08 18:48:01 UTC +--- lib/isccfg/namedconf.c.orig 2018-06-15 08:58:30 UTC +++ lib/isccfg/namedconf.c -@@ -1916,6 +1916,8 @@ view_clauses[] = { +@@ -1917,6 +1917,8 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, Modified: head/dns/bind9-devel/files/patch-configure ============================================================================== --- head/dns/bind9-devel/files/patch-configure Mon Jun 18 07:32:56 2018 (r472674) +++ head/dns/bind9-devel/files/patch-configure Mon Jun 18 08:17:49 2018 (r472675) @@ -1,6 +1,6 @@ ---- configure.orig 2018-06-08 18:48:01 UTC +--- configure.orig 2018-06-15 08:58:30 UTC +++ configure -@@ -14848,27 +14848,9 @@ done +@@ -14856,27 +14856,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 -@@ -14911,47 +14893,7 @@ $as_echo "no" >&6; } ;; +@@ -14919,47 +14901,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 -@@ -23303,7 +23245,7 @@ $as_echo "" >&6; } +@@ -23311,7 +23253,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind9-devel/pkg-plist ============================================================================== --- head/dns/bind9-devel/pkg-plist Mon Jun 18 07:32:56 2018 (r472674) +++ head/dns/bind9-devel/pkg-plist Mon Jun 18 08:17:49 2018 (r472675) @@ -120,6 +120,7 @@ include/dns/view.h include/dns/xfrin.h include/dns/zone.h include/dns/zonekey.h +include/dns/zoneverify.h include/dns/zt.h include/dst/dst.h include/dst/gssapi.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806180817.w5I8HnBR083809>