From owner-svn-ports-all@freebsd.org Mon Mar 19 11:21:41 2018 Return-Path: Delivered-To: svn-ports-all@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 98F82F67195; Mon, 19 Mar 2018 11:21:41 +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 E069F6AA73; Mon, 19 Mar 2018 11:21:40 +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 A06C560C4; Mon, 19 Mar 2018 11:21:40 +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 w2JBLehm035213; Mon, 19 Mar 2018 11:21:40 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2JBLcqV035192; Mon, 19 Mar 2018 11:21:38 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201803191121.w2JBLcqV035192@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 19 Mar 2018 11:21:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465009 - in head/dns: bind910 bind910/files bind911 bind911/files bind912 bind912/files bind99 bind99/files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/dns: bind910 bind910/files bind911 bind911/files bind912 bind912/files bind99 bind99/files X-SVN-Commit-Revision: 465009 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Mar 2018 11:21:41 -0000 Author: mat Date: Mon Mar 19 11:21:38 2018 New Revision: 465009 URL: https://svnweb.freebsd.org/changeset/ports/465009 Log: Update BIND9 ports to 9.9.12, 9.10.7, 9.11.3 and 9.12.1. Sponsored by: Absolight Modified: head/dns/bind910/Makefile (contents, props changed) head/dns/bind910/distinfo (contents, props changed) head/dns/bind910/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind910/files/patch-configure (contents, props changed) head/dns/bind910/pkg-plist (contents, props changed) 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-configure (contents, props changed) head/dns/bind911/pkg-plist (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-configure (contents, props changed) head/dns/bind99/Makefile (contents, props changed) head/dns/bind99/distinfo (contents, props changed) head/dns/bind99/files/extrapatch-bind-min-override-ttl (contents, props changed) head/dns/bind99/files/patch-configure (contents, props changed) head/dns/bind99/pkg-plist (contents, props changed) Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind910/Makefile Mon Mar 19 11:21:38 2018 (r465009) @@ -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= 910 @@ -19,7 +19,7 @@ DEPRECATED= Going out of support, please migrate to dn EXPIRATION_DATE= 2018-06-30 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.6-P1 +ISCVERSION= 9.10.7 USES= cpe libedit Modified: head/dns/bind910/distinfo ============================================================================== --- head/dns/bind910/distinfo Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind910/distinfo Mon Mar 19 11:21:38 2018 (r465009) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516059365 -SHA256 (bind-9.10.6-P1.tar.gz) = 9b8b4f6ecfc82a491774bf713d8a888b954c427526035eb715544438f36a2334 -SIZE (bind-9.10.6-P1.tar.gz) = 9452495 +TIMESTAMP = 1521455507 +SHA256 (bind-9.10.7.tar.gz) = e15e70982d966cd4b194ff483f5cc636c0017b054ae2e332ca3f28fe53f11660 +SIZE (bind-9.10.7.tar.gz) = 9171441 Modified: head/dns/bind910/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind910/files/extrapatch-bind-min-override-ttl Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind910/files/extrapatch-bind-min-override-ttl Mon Mar 19 11:21:38 2018 (r465009) @@ -1,17 +1,22 @@ ---- bin/named/config.c.orig 2018-01-04 05:35:08 UTC +--- bin/named/config.c.orig 2018-01-24 21:17:00 UTC +++ bin/named/config.c -@@ -154,6 +154,8 @@ options {\n\ - min-roots 2;\n\ - lame-ttl 600;\n\ +@@ -167,11 +167,13 @@ options {\n\ max-ncache-ttl 10800; /* 3 hours */\n\ -+ override-cache-ttl 0; /* do not override */\n\ -+ min-cache-ttl 0; /* no minimal, zero is allowed */\n\ - max-cache-ttl 604800; /* 1 week */\n\ - transfer-format many-answers;\n\ - max-cache-size 0;\n\ ---- bin/named/server.c.orig 2018-01-04 05:35:08 UTC + max-recursion-depth 7;\n\ + max-recursion-queries 75;\n\ ++ min-cache-ttl 0; /* no minimal, zero is allowed */\n\ + min-roots 2;\n\ + minimal-responses false;\n\ + notify-source *;\n\ + notify-source-v6 *;\n\ + nsec3-test-zone no;\n\ ++ override-cache-ttl 0; /* do not override */\n\ + provide-ixfr true;\n\ + query-source address *;\n\ + query-source-v6 address *;\n\ +--- bin/named/server.c.orig 2018-01-24 21:17:00 UTC +++ bin/named/server.c -@@ -2890,6 +2890,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -2854,6 +2854,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -28,7 +33,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 2018-01-04 05:35:08 UTC +--- lib/dns/include/dns/view.h.orig 2018-01-24 21:17:00 UTC +++ lib/dns/include/dns/view.h @@ -151,6 +151,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -39,9 +44,9 @@ dns_ttl_t maxncachettl; dns_ttl_t prefetch_trigger; dns_ttl_t prefetch_eligible; ---- lib/dns/resolver.c.orig 2018-01-04 05:35:08 UTC +--- lib/dns/resolver.c.orig 2018-01-24 21:17:00 UTC +++ lib/dns/resolver.c -@@ -5387,6 +5387,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5416,6 +5416,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -59,11 +64,11 @@ + /* * Enforce the configure maximum cache TTL. */ - if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2018-01-04 05:35:08 UTC + if (rdataset->ttl > res->view->maxcachettl) { +--- lib/isccfg/namedconf.c.orig 2018-01-24 21:17:00 UTC +++ lib/isccfg/namedconf.c -@@ -1591,6 +1591,8 @@ view_clauses[] = { - #endif +@@ -1600,6 +1600,8 @@ view_clauses[] = { + { "lame-ttl", &cfg_type_uint32, 0 }, { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizenodefault, 0 }, + { "override-cache-ttl", &cfg_type_uint32, 0 }, Modified: head/dns/bind910/files/patch-configure ============================================================================== --- head/dns/bind910/files/patch-configure Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind910/files/patch-configure Mon Mar 19 11:21:38 2018 (r465009) @@ -1,6 +1,6 @@ ---- configure.orig 2017-07-24 05:31:21 UTC +--- configure.orig 2018-03-08 20:55:52 UTC +++ configure -@@ -14348,27 +14348,9 @@ done +@@ -14387,27 +14387,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 -@@ -14411,47 +14393,7 @@ $as_echo "no" >&6; } ;; +@@ -14450,47 +14432,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 -@@ -22036,7 +21978,7 @@ $as_echo "" >&6; } +@@ -22349,7 +22291,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind910/pkg-plist ============================================================================== --- head/dns/bind910/pkg-plist Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind910/pkg-plist Mon Mar 19 11:21:38 2018 (r465009) @@ -159,6 +159,7 @@ include/isc/lang.h include/isc/lex.h include/isc/lfsr.h include/isc/lib.h +include/isc/likely.h include/isc/list.h include/isc/log.h include/isc/magic.h @@ -259,6 +260,7 @@ include/pk11/pk11.h include/pk11/result.h include/pk11/site.h include/pkcs11/cryptoki.h +include/pkcs11/eddsa.h include/pkcs11/pkcs11.h include/pkcs11/pkcs11f.h include/pkcs11/pkcs11t.h Modified: head/dns/bind911/Makefile ============================================================================== --- head/dns/bind911/Makefile Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind911/Makefile Mon Mar 19 11:21:38 2018 (r465009) @@ -3,7 +3,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/} -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 911 @@ -16,7 +16,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.11.2-P1 +ISCVERSION= 9.11.3 USES= cpe libedit Modified: head/dns/bind911/distinfo ============================================================================== --- head/dns/bind911/distinfo Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind911/distinfo Mon Mar 19 11:21:38 2018 (r465009) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516059868 -SHA256 (bind-9.11.2-P1.tar.gz) = cec31548832fca3f85d95178d4019b7d702039e8595d4c93914feba337df1212 -SIZE (bind-9.11.2-P1.tar.gz) = 9783329 +TIMESTAMP = 1521455716 +SHA256 (bind-9.11.3.tar.gz) = 0d9dde14b2ec7f9cdc3b69f19540c7a2e4eee7b6c727965dfae48810965876f5 +SIZE (bind-9.11.3.tar.gz) = 9523375 Modified: head/dns/bind911/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind911/files/extrapatch-bind-min-override-ttl Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind911/files/extrapatch-bind-min-override-ttl Mon Mar 19 11:21:38 2018 (r465009) @@ -1,17 +1,17 @@ ---- bin/named/config.c.orig 2018-01-04 05:28:11 UTC +--- bin/named/config.c.orig 2018-01-24 21:23:16 UTC +++ bin/named/config.c -@@ -154,6 +154,8 @@ options {\n\ - lame-ttl 600;\n\ - servfail-ttl 1;\n\ - max-ncache-ttl 10800; /* 3 hours */\n\ -+ override-cache-ttl 0; /* do not override */\n\ -+ min-cache-ttl 0; /* no minimal, zero is allowed */\n\ - max-cache-ttl 604800; /* 1 week */\n\ - transfer-format many-answers;\n\ +@@ -171,6 +171,8 @@ options {\n\ + " max-acache-size 16M;\n\ max-cache-size 90%;\n\ ---- bin/named/server.c.orig 2018-01-04 05:28:11 UTC + max-cache-ttl 604800; /* 1 week */\n\ ++ min-cache-ttl 0; /* no minimal, zero is allowed */\n\ ++ override-cache-ttl 0; /* do not override */\n\ + 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 -@@ -3713,6 +3713,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -3699,6 +3699,16 @@ configure_view(dns_view_t *view, dns_vie } 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 2018-01-04 05:28:11 UTC +--- lib/dns/include/dns/view.h.orig 2018-01-24 21:23:16 UTC +++ lib/dns/include/dns/view.h @@ -146,6 +146,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -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-04 05:28:11 UTC +--- lib/dns/resolver.c.orig 2018-01-24 21:23:16 UTC +++ lib/dns/resolver.c -@@ -5448,6 +5448,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5477,6 +5477,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -59,11 +59,11 @@ + /* * Enforce the configure maximum cache TTL. */ - if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2018-01-04 05:28:11 UTC + if (rdataset->ttl > res->view->maxcachettl) { +--- lib/isccfg/namedconf.c.orig 2018-01-24 21:23:16 UTC +++ lib/isccfg/namedconf.c -@@ -1765,6 +1765,8 @@ view_clauses[] = { - { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, +@@ -1766,6 +1766,8 @@ view_clauses[] = { + #endif { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, + { "override-cache-ttl", &cfg_type_uint32, 0 }, Modified: head/dns/bind911/files/patch-configure ============================================================================== --- head/dns/bind911/files/patch-configure Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind911/files/patch-configure Mon Mar 19 11:21:38 2018 (r465009) @@ -1,6 +1,6 @@ ---- configure.orig 2017-07-24 05:36:50 UTC +--- configure.orig 2018-03-08 20:55:28 UTC +++ configure -@@ -14402,27 +14402,9 @@ done +@@ -14465,27 +14465,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 -@@ -14465,47 +14447,7 @@ $as_echo "no" >&6; } ;; +@@ -14528,47 +14510,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 -@@ -22825,7 +22767,7 @@ $as_echo "" >&6; } +@@ -23242,7 +23184,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind911/pkg-plist ============================================================================== --- head/dns/bind911/pkg-plist Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind911/pkg-plist Mon Mar 19 11:21:38 2018 (r465009) @@ -145,6 +145,7 @@ include/isc/commandline.h include/isc/condition.h include/isc/counter.h include/isc/crc64.h +include/isc/deprecated.h include/isc/dir.h include/isc/entropy.h include/isc/errno.h @@ -170,6 +171,7 @@ include/isc/lang.h include/isc/lex.h include/isc/lfsr.h include/isc/lib.h +include/isc/likely.h include/isc/list.h include/isc/log.h include/isc/magic.h @@ -271,6 +273,7 @@ include/pk11/pk11.h include/pk11/result.h include/pk11/site.h include/pkcs11/cryptoki.h +include/pkcs11/eddsa.h include/pkcs11/pkcs11.h include/pkcs11/pkcs11f.h include/pkcs11/pkcs11t.h Modified: head/dns/bind912/Makefile ============================================================================== --- head/dns/bind912/Makefile Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind912/Makefile Mon Mar 19 11:21:38 2018 (r465009) @@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc PORTREVISION= 0 .else # dns/bind912 here -PORTREVISION= 3 +PORTREVISION= 0 .endif CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} @@ -30,7 +30,7 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.12.0 +ISCVERSION= 9.12.1 USES= cpe libedit Modified: head/dns/bind912/distinfo ============================================================================== --- head/dns/bind912/distinfo Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind912/distinfo Mon Mar 19 11:21:38 2018 (r465009) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516788319 -SHA256 (bind-9.12.0.tar.gz) = 29870e9bf9dcc31ead3793ca754a7b0236a0785a7a9dc0f859a0bc42e19b3c82 -SIZE (bind-9.12.0.tar.gz) = 9282550 +TIMESTAMP = 1521456447 +SHA256 (bind-9.12.1.tar.gz) = 16e446425c35e48b651ddf1171d2115ebf32b07670b652e1030a174038937510 +SIZE (bind-9.12.1.tar.gz) = 9302783 Modified: head/dns/bind912/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind912/files/extrapatch-bind-min-override-ttl Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind912/files/extrapatch-bind-min-override-ttl Mon Mar 19 11:21:38 2018 (r465009) @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2018-01-12 19:49:09 UTC +--- bin/named/config.c.orig 2018-02-18 05:26:12 UTC +++ bin/named/config.c @@ -176,12 +176,14 @@ options {\n\ max-recursion-queries 75;\n\ @@ -15,9 +15,9 @@ provide-ixfr true;\n\ query-source address *;\n\ query-source-v6 address *;\n\ ---- bin/named/server.c.orig 2018-01-12 19:49:09 UTC +--- bin/named/server.c.orig 2018-02-18 05:26:12 UTC +++ bin/named/server.c -@@ -4067,6 +4067,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -4074,6 +4074,16 @@ configure_view(dns_view_t *view, dns_vie } obj = NULL; @@ -34,7 +34,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 2018-01-12 19:49:09 UTC +--- lib/dns/include/dns/view.h.orig 2018-02-18 05:26:12 UTC +++ lib/dns/include/dns/view.h @@ -145,6 +145,8 @@ struct dns_view { isc_boolean_t requestnsid; @@ -45,9 +45,9 @@ dns_ttl_t maxncachettl; isc_uint32_t nta_lifetime; isc_uint32_t nta_recheck; ---- lib/dns/resolver.c.orig 2018-01-12 19:49:09 UTC +--- lib/dns/resolver.c.orig 2018-02-18 05:26:12 UTC +++ lib/dns/resolver.c -@@ -5758,6 +5758,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5762,6 +5762,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-01-12 19:49:09 UTC +--- lib/isccfg/namedconf.c.orig 2018-02-18 05:26:12 UTC +++ lib/isccfg/namedconf.c -@@ -1909,6 +1909,8 @@ view_clauses[] = { +@@ -1910,6 +1910,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-configure ============================================================================== --- head/dns/bind912/files/patch-configure Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind912/files/patch-configure Mon Mar 19 11:21:38 2018 (r465009) @@ -1,6 +1,6 @@ ---- configure.orig 2017-12-06 17:32:49 UTC +--- configure.orig 2018-03-08 20:56:40 UTC +++ configure -@@ -14442,27 +14442,9 @@ done +@@ -14455,27 +14455,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 -@@ -14505,47 +14487,7 @@ $as_echo "no" >&6; } ;; +@@ -14518,47 +14500,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 -@@ -23145,7 +23087,7 @@ $as_echo "" >&6; } +@@ -23197,7 +23139,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind99/Makefile Mon Mar 19 11:21:38 2018 (r465009) @@ -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= 99 @@ -19,7 +19,7 @@ DEPRECATED= Going out of support, please migrate to dn EXPIRATION_DATE= 2018-06-30 # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.9.11-P1 +ISCVERSION= 9.9.12 USES= cpe libedit Modified: head/dns/bind99/distinfo ============================================================================== --- head/dns/bind99/distinfo Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind99/distinfo Mon Mar 19 11:21:38 2018 (r465009) @@ -1,3 +1,3 @@ -TIMESTAMP = 1516059275 -SHA256 (bind-9.9.11-P1.tar.gz) = 40a8dd0eedf44236a77e4009c61daa065447b09461bffddab3b0aefcbf358fa8 -SIZE (bind-9.9.11-P1.tar.gz) = 8868987 +TIMESTAMP = 1521455029 +SHA256 (bind-9.9.12.tar.gz) = 9e39dcd35320c2aeb260a45037ac57c97c964e717d10e3c9f74ff4472f939761 +SIZE (bind-9.9.12.tar.gz) = 8694636 Modified: head/dns/bind99/files/extrapatch-bind-min-override-ttl ============================================================================== --- head/dns/bind99/files/extrapatch-bind-min-override-ttl Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind99/files/extrapatch-bind-min-override-ttl Mon Mar 19 11:21:38 2018 (r465009) @@ -1,17 +1,22 @@ ---- bin/named/config.c.orig 2018-01-04 05:41:15 UTC +--- bin/named/config.c.orig 2018-01-24 21:11:07 UTC +++ bin/named/config.c -@@ -141,6 +141,8 @@ options {\n\ - min-roots 2;\n\ - lame-ttl 600;\n\ +@@ -154,11 +154,13 @@ options {\n\ max-ncache-ttl 10800; /* 3 hours */\n\ -+ override-cache-ttl 0; /* do not override */\n\ -+ min-cache-ttl 0; /* no minimal, zero is allowed */\n\ - max-cache-ttl 604800; /* 1 week */\n\ - transfer-format many-answers;\n\ - max-cache-size 0;\n\ ---- bin/named/server.c.orig 2018-01-04 05:41:15 UTC + max-recursion-depth 7;\n\ + max-recursion-queries 50;\n\ ++ min-cache-ttl 0; /* no minimal, zero is allowed */\n\ + min-roots 2;\n\ + minimal-responses false;\n\ + notify-source *;\n\ + notify-source-v6 *;\n\ + nsec3-test-zone no;\n\ ++ override-cache-ttl 0; /* do not override */\n\ + provide-ixfr true;\n\ + query-source address *;\n\ + query-source-v6 address *;\n\ +--- bin/named/server.c.orig 2018-01-24 21:11:07 UTC +++ bin/named/server.c -@@ -2647,6 +2647,16 @@ configure_view(dns_view_t *view, cfg_obj +@@ -2611,6 +2611,16 @@ configure_view(dns_view_t *view, cfg_obj } obj = NULL; @@ -28,7 +33,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 2018-01-04 05:41:15 UTC +--- lib/dns/include/dns/view.h.orig 2018-01-24 21:11:07 UTC +++ lib/dns/include/dns/view.h @@ -148,6 +148,8 @@ struct dns_view { isc_boolean_t provideixfr; @@ -39,9 +44,9 @@ dns_ttl_t maxncachettl; in_port_t dstport; dns_aclenv_t aclenv; ---- lib/dns/resolver.c.orig 2018-01-04 05:41:15 UTC +--- lib/dns/resolver.c.orig 2018-01-24 21:11:07 UTC +++ lib/dns/resolver.c -@@ -5126,6 +5126,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5153,6 +5153,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -59,10 +64,10 @@ + /* * Enforce the configure maximum cache TTL. */ - if (rdataset->ttl > res->view->maxcachettl) ---- lib/isccfg/namedconf.c.orig 2018-01-04 05:41:15 UTC + if (rdataset->ttl > res->view->maxcachettl) { +--- lib/isccfg/namedconf.c.orig 2018-01-24 21:11:07 UTC +++ lib/isccfg/namedconf.c -@@ -1475,6 +1475,8 @@ view_clauses[] = { +@@ -1487,6 +1487,8 @@ view_clauses[] = { { "lame-ttl", &cfg_type_uint32, 0 }, { "max-acache-size", &cfg_type_sizenodefault, 0 }, { "max-cache-size", &cfg_type_sizenodefault, 0 }, Modified: head/dns/bind99/files/patch-configure ============================================================================== --- head/dns/bind99/files/patch-configure Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind99/files/patch-configure Mon Mar 19 11:21:38 2018 (r465009) @@ -1,6 +1,6 @@ ---- configure.orig 2017-07-24 05:26:01 UTC +--- configure.orig 2018-03-08 20:56:13 UTC +++ configure -@@ -14509,27 +14509,9 @@ done +@@ -14635,27 +14635,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 -@@ -14572,47 +14554,7 @@ $as_echo "no" >&6; } ;; +@@ -14698,47 +14680,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 -@@ -20809,7 +20751,7 @@ $as_echo "" >&6; } +@@ -21001,7 +20943,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). Modified: head/dns/bind99/pkg-plist ============================================================================== --- head/dns/bind99/pkg-plist Mon Mar 19 11:21:33 2018 (r465008) +++ head/dns/bind99/pkg-plist Mon Mar 19 11:21:38 2018 (r465009) @@ -146,6 +146,7 @@ include/isc/lang.h include/isc/lex.h include/isc/lfsr.h include/isc/lib.h +include/isc/likely.h include/isc/list.h include/isc/log.h include/isc/magic.h