From owner-svn-ports-head@freebsd.org Wed Jul 11 09:36:59 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7D8A104A4D1; Wed, 11 Jul 2018 09:36:58 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8500D87159; Wed, 11 Jul 2018 09:36:58 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5EB3810FCD; Wed, 11 Jul 2018 09:36:58 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6B9awEa092437; Wed, 11 Jul 2018 09:36:58 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6B9asBM092417; Wed, 11 Jul 2018 09:36:54 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201807110936.w6B9asBM092417@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 11 Jul 2018 09:36:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474430 - in head/dns: bind911 bind911/files bind912 bind912/files bind913 bind913/files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/dns: bind911 bind911/files bind912 bind912/files bind913 bind913/files X-SVN-Commit-Revision: 474430 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jul 2018 09:36:59 -0000 Author: mat Date: Wed Jul 11 09:36:54 2018 New Revision: 474430 URL: https://svnweb.freebsd.org/changeset/ports/474430 Log: Update BIND9 ports to 9.11.4, 9.12.2 and 9.13.2. Sponsored by: Absolight Deleted: head/dns/bind911/files/patch-CVE-2018-5738 head/dns/bind912/files/patch-CVE-2018-5738 head/dns/bind912/files/patch-libressl2.7 Modified: head/dns/bind911/Makefile (contents, props changed) head/dns/bind911/distinfo (contents, props changed) head/dns/bind911/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind911/files/patch-bin_named_include_named_globals.h (contents, props changed) head/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in (contents, props changed) head/dns/bind911/files/patch-configure (contents, props changed) head/dns/bind912/Makefile (contents, props changed) head/dns/bind912/distinfo (contents, props changed) head/dns/bind912/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind912/files/patch-bin_named_include_named_globals.h (contents, props changed) head/dns/bind912/files/patch-bin_tests_system_dlzexternal_Makefile.in (contents, props changed) head/dns/bind912/files/patch-configure (contents, props changed) head/dns/bind913/Makefile (contents, props changed) head/dns/bind913/distinfo (contents, props changed) head/dns/bind913/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind913/files/patch-configure (contents, props changed) head/dns/bind913/pkg-plist (contents, props changed) Modified: head/dns/bind911/Makefile ============================================================================== --- head/dns/bind911/Makefile Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind911/Makefile Wed Jul 11 09:36:54 2018 (r474430) @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 911 @@ -20,7 +20,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 USES= cpe libedit # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.3 +ISCVERSION= 9.11.4 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: head/dns/bind911/distinfo ============================================================================== --- head/dns/bind911/distinfo Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind911/distinfo Wed Jul 11 09:36:54 2018 (r474430) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521455716 -SHA256 (bind-9.11.3.tar.gz) = 0d9dde14b2ec7f9cdc3b69f19540c7a2e4eee7b6c727965dfae48810965876f5 -SIZE (bind-9.11.3.tar.gz) = 9523375 +TIMESTAMP = 1531290674 +SHA256 (bind-9.11.4.tar.gz) = 595070b031f869f8939656b5a5d11b121211967f15f6afeafa895df745279617 +SIZE (bind-9.11.4.tar.gz) = 9621408 Modified: head/dns/bind911/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind911/files/extrapatch-bind-min-override-ttl Wed Jul 11 09:36:54 2018 (r474430) @@ -1,6 +1,6 @@ ---- bin/named/config.c.orig 2018-01-24 21:23:16 UTC +--- bin/named/config.c.orig 2018-06-10 06:06:33 UTC +++ bin/named/config.c -@@ -171,6 +171,8 @@ options {\n\ +@@ -176,6 +176,8 @@ options {\n\ " max-acache-size 16M;\n\ max-cache-size 90%;\n\ max-cache-ttl 604800; /* 1 week */\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 2018-01-24 21:23:16 UTC +--- bin/named/server.c.orig 2018-06-10 06:06:33 UTC +++ bin/named/server.c -@@ -3699,6 +3699,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3692,6 +3692,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -28,9 +28,9 @@ 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 2018-01-24 21:23:16 UTC +--- lib/dns/include/dns/view.h.orig 2018-06-10 06:06:33 UTC +++ lib/dns/include/dns/view.h -@@ -146,6 +146,8 @@ struct dns_view { +@@ -150,6 +150,8 @@ struct dns_view { isc_boolean_t requestnsid; isc_boolean_t sendcookie; dns_ttl_t maxcachettl; @@ -39,9 +39,9 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2018-01-24 21:23:16 UTC +--- lib/dns/resolver.c.orig 2018-06-10 06:06:33 UTC +++ lib/dns/resolver.c -@@ -5477,6 +5477,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5473,6 +5473,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -60,9 +60,9 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2018-01-24 21:23:16 UTC +--- lib/isccfg/namedconf.c.orig 2018-06-10 06:06:33 UTC +++ lib/isccfg/namedconf.c -@@ -1766,6 +1766,8 @@ view_clauses[] = { +@@ -1770,6 +1770,8 @@ view_clauses[] = { #endif { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, Modified: head/dns/bind911/files/patch-bin_named_include_named_globals.h ============================================================================== --- head/dns/bind911/files/patch-bin_named_include_named_globals.h Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind911/files/patch-bin_named_include_named_globals.h Wed Jul 11 09:36:54 2018 (r474430) @@ -1,8 +1,8 @@ We reference the pid file as being run/named/pid everywere else. ---- bin/named/include/named/globals.h.orig 2018-01-04 05:28:11 UTC +--- bin/named/include/named/globals.h.orig 2018-06-10 06:06:33 UTC +++ bin/named/include/named/globals.h -@@ -135,7 +135,7 @@ EXTERN isc_boolean_t ns_g_forcelock IN +@@ -138,7 +138,7 @@ EXTERN isc_boolean_t ns_g_forcelock IN #if NS_RUN_PID_DIR EXTERN const char * ns_g_defaultpidfile INIT(NS_LOCALSTATEDIR "/run/named/" Modified: head/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in ============================================================================== --- head/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind911/files/patch-bin_tests_system_dlzexternal_Makefile.in Wed Jul 11 09:36:54 2018 (r474430) @@ -1,6 +1,6 @@ ---- bin/tests/system/dlzexternal/Makefile.in.orig 2017-04-14 03:58:25 UTC +--- bin/tests/system/dlzexternal/Makefile.in.orig 2018-06-10 06:06:33 UTC +++ bin/tests/system/dlzexternal/Makefile.in -@@ -31,7 +31,7 @@ OBJS = +@@ -34,7 +34,7 @@ OBJS = @BIND9_MAKE_RULES@ CFLAGS = @CFLAGS@ @SO_CFLAGS@ Modified: head/dns/bind911/files/patch-configure ============================================================================== --- head/dns/bind911/files/patch-configure Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind911/files/patch-configure Wed Jul 11 09:36:54 2018 (r474430) @@ -1,6 +1,6 @@ ---- configure.orig 2018-03-08 20:55:28 UTC +--- configure.orig 2018-06-10 06:06:33 UTC +++ configure -@@ -14465,27 +14465,9 @@ done +@@ -14961,27 +14961,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 -@@ -14528,47 +14510,7 @@ $as_echo "no" >&6; } ;; +@@ -15024,47 +15006,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 -@@ -23242,7 +23184,7 @@ $as_echo "" >&6; } +@@ -23847,7 +23789,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind912/Makefile ============================================================================== --- head/dns/bind912/Makefile Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind912/Makefile Wed Jul 11 09:36:54 2018 (r474430) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc PORTREVISION= 0 .else # dns/bind912 here -PORTREVISION= 1 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -35,7 +35,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 USES= cpe libedit # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.1-P2 +ISCVERSION= 9.12.2 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: head/dns/bind912/distinfo ============================================================================== --- head/dns/bind912/distinfo Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind912/distinfo Wed Jul 11 09:36:54 2018 (r474430) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526711298 -SHA256 (bind-9.12.1-P2.tar.gz) = 0de7c3453461e2f0505ac634b984f8e7afa1952cf7fc972cbefbcc169edf2d29 -SIZE (bind-9.12.1-P2.tar.gz) = 9305005 +TIMESTAMP = 1531290911 +SHA256 (bind-9.12.2.tar.gz) = 9f6a4c8b39a7064d447d8414a09ed667ff21adc69f17461916d8f5a45f348452 +SIZE (bind-9.12.2.tar.gz) = 9424960 Modified: head/dns/bind912/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind912/files/extrapatch-bind-min-override-ttl Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind912/files/extrapatch-bind-min-override-ttl Wed Jul 11 09:36:54 2018 (r474430) @@ -1,6 +1,6 @@ ---- bin/named/config.c.orig 2018-02-18 05:26:12 UTC +--- bin/named/config.c.orig 2018-07-03 07:08:14 UTC +++ bin/named/config.c -@@ -176,12 +176,14 @@ options {\n\ +@@ -182,12 +182,14 @@ options {\n\ max-recursion-queries 75;\n\ max-stale-ttl 604800; /* 1 week */\n\ message-compression yes;\n\ @@ -15,9 +15,9 @@ provide-ixfr true;\n\ query-source address *;\n\ query-source-v6 address *;\n\ ---- bin/named/server.c.orig 2018-02-18 05:26:12 UTC +--- bin/named/server.c.orig 2018-07-03 07:08:14 UTC +++ bin/named/server.c -@@ -4074,6 +4074,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -4072,6 +4072,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-02-18 05:26:12 UTC +--- lib/dns/include/dns/view.h.orig 2018-07-03 07:08:14 UTC +++ lib/dns/include/dns/view.h -@@ -145,6 +145,8 @@ struct dns_view { +@@ -149,6 +149,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-02-18 05:26:12 UTC +--- lib/dns/resolver.c.orig 2018-07-03 07:08:14 UTC +++ lib/dns/resolver.c -@@ -5762,6 +5762,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5756,6 +5756,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-02-18 05:26:12 UTC +--- lib/isccfg/namedconf.c.orig 2018-07-03 07:08:14 UTC +++ lib/isccfg/namedconf.c -@@ -1910,6 +1910,8 @@ view_clauses[] = { +@@ -1914,6 +1914,8 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, Modified: head/dns/bind912/files/patch-bin_named_include_named_globals.h ============================================================================== --- head/dns/bind912/files/patch-bin_named_include_named_globals.h Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind912/files/patch-bin_named_include_named_globals.h Wed Jul 11 09:36:54 2018 (r474430) @@ -1,8 +1,8 @@ We reference the pid file as being run/named/pid everywere else. ---- bin/named/include/named/globals.h.orig 2018-01-17 06:56:09 UTC +--- bin/named/include/named/globals.h.orig 2018-06-10 06:06:19 UTC +++ bin/named/include/named/globals.h -@@ -125,7 +125,7 @@ EXTERN isc_boolean_t named_g_forcelock +@@ -128,7 +128,7 @@ EXTERN isc_boolean_t named_g_forcelock #if NAMED_RUN_PID_DIR EXTERN const char * named_g_defaultpidfile INIT(NAMED_LOCALSTATEDIR "/run/named/" Modified: head/dns/bind912/files/patch-bin_tests_system_dlzexternal_Makefile.in ============================================================================== --- head/dns/bind912/files/patch-bin_tests_system_dlzexternal_Makefile.in Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind912/files/patch-bin_tests_system_dlzexternal_Makefile.in Wed Jul 11 09:36:54 2018 (r474430) @@ -1,6 +1,6 @@ ---- bin/tests/system/dlzexternal/Makefile.in.orig 2016-11-01 20:46:42 UTC +--- bin/tests/system/dlzexternal/Makefile.in.orig 2018-06-10 06:06:19 UTC +++ bin/tests/system/dlzexternal/Makefile.in -@@ -31,7 +31,7 @@ OBJS = +@@ -34,7 +34,7 @@ OBJS = @BIND9_MAKE_RULES@ CFLAGS = @CFLAGS@ @SO_CFLAGS@ Modified: head/dns/bind912/files/patch-configure ============================================================================== --- head/dns/bind912/files/patch-configure Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind912/files/patch-configure Wed Jul 11 09:36:54 2018 (r474430) @@ -1,6 +1,6 @@ ---- configure.orig 2018-03-08 20:56:40 UTC +--- configure.orig 2018-06-10 06:06:19 UTC +++ configure -@@ -14455,27 +14455,9 @@ done +@@ -14939,27 +14939,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 -@@ -14518,47 +14500,7 @@ $as_echo "no" >&6; } ;; +@@ -15002,47 +14984,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 -@@ -23197,7 +23139,7 @@ $as_echo "" >&6; } +@@ -23790,7 +23732,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind913/Makefile ============================================================================== --- head/dns/bind913/Makefile Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind913/Makefile Wed Jul 11 09:36:54 2018 (r474430) @@ -33,7 +33,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 USES= cpe libedit ssl # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.13.1 +ISCVERSION= 9.13.2 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} Modified: head/dns/bind913/distinfo ============================================================================== --- head/dns/bind913/distinfo Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind913/distinfo Wed Jul 11 09:36:54 2018 (r474430) @@ -1,3 +1,3 @@ -TIMESTAMP = 1529066513 -SHA256 (bind-9.13.1.tar.gz) = d081011170a915b3059d3f24e1a14e5540d2892f2a0267af94cfbe6601423d22 -SIZE (bind-9.13.1.tar.gz) = 8787034 +TIMESTAMP = 1531290964 +SHA256 (bind-9.13.2.tar.gz) = 6c044e9ea81add9dbbd2f5dfc224964cc6b6e364e43a8d6d8b574d9282651802 +SIZE (bind-9.13.2.tar.gz) = 8547111 Modified: head/dns/bind913/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind913/files/extrapatch-bind-min-override-ttl Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind913/files/extrapatch-bind-min-override-ttl Wed Jul 11 09:36:54 2018 (r474430) @@ -1,6 +1,6 @@ ---- bin/named/config.c.orig 2018-05-18 05:44:02 UTC +--- bin/named/config.c.orig 2018-07-03 07:51:40 UTC +++ bin/named/config.c -@@ -174,12 +174,14 @@ options {\n\ +@@ -177,12 +177,14 @@ options {\n\ max-recursion-queries 75;\n\ max-stale-ttl 604800; /* 1 week */\n\ message-compression yes;\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-05-18 05:44:02 UTC +--- bin/named/server.c.orig 2018-07-03 07:51:40 UTC +++ bin/named/server.c -@@ -4072,6 +4072,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-05-18 05:44:02 UTC +--- lib/dns/include/dns/view.h.orig 2018-07-03 07:51:40 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-05-18 05:44:02 UTC +--- lib/dns/resolver.c.orig 2018-07-03 07:51:40 UTC +++ lib/dns/resolver.c -@@ -5746,6 +5746,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-05-18 05:44:02 UTC +--- lib/isccfg/namedconf.c.orig 2018-07-03 07:51:40 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/bind913/files/patch-configure ============================================================================== --- head/dns/bind913/files/patch-configure Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind913/files/patch-configure Wed Jul 11 09:36:54 2018 (r474430) @@ -1,6 +1,6 @@ ---- configure.orig 2018-05-22 23:42:35 UTC +--- configure.orig 2018-07-03 07:51:40 UTC +++ configure -@@ -14757,27 +14757,9 @@ done +@@ -14993,27 +14993,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 -@@ -14820,47 +14802,7 @@ $as_echo "no" >&6; } ;; +@@ -15056,47 +15038,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 -@@ -23329,7 +23271,7 @@ $as_echo "" >&6; } +@@ -23693,7 +23635,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind913/pkg-plist ============================================================================== --- head/dns/bind913/pkg-plist Wed Jul 11 09:07:40 2018 (r474429) +++ head/dns/bind913/pkg-plist Wed Jul 11 09:36:54 2018 (r474430) @@ -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