diff --git a/dns/bind914/Makefile b/dns/bind914/Makefile index 5bc6436cdaa1..aab322ae942e 100644 --- a/dns/bind914/Makefile +++ b/dns/bind914/Makefile @@ -36,7 +36,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools USES= compiler:c11 cpe libedit ssl # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.14.1 +ISCVERSION= 9.14.2 CPE_VENDOR= isc CPE_VERSION= ${ISCVERSION:C/-.*//} diff --git a/dns/bind914/distinfo b/dns/bind914/distinfo index 24a584c2fb7d..cf3d62b47bd9 100644 --- a/dns/bind914/distinfo +++ b/dns/bind914/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1556117981 -SHA256 (bind-9.14.1.tar.gz) = c3c7485d900a03271a9918a071c123e8951871a219f4c1c4383e37717f11db48 -SIZE (bind-9.14.1.tar.gz) = 6235968 +TIMESTAMP = 1557990570 +SHA256 (bind-9.14.2.tar.gz) = 0e4027573726502ec038db3973a086c02508671723a4845e21da1769a5c27f0c +SIZE (bind-9.14.2.tar.gz) = 6263879 diff --git a/dns/bind914/files/extrapatch-bind-min-override-ttl b/dns/bind914/files/extrapatch-bind-min-override-ttl index 6c5006302a58..a6c479c86e96 100644 --- a/dns/bind914/files/extrapatch-bind-min-override-ttl +++ b/dns/bind914/files/extrapatch-bind-min-override-ttl @@ -1,4 +1,4 @@ ---- bin/named/config.c.orig 2019-04-06 20:09:59 UTC +--- bin/named/config.c.orig 2019-05-10 04:51:34 UTC +++ bin/named/config.c @@ -179,6 +179,7 @@ options {\n\ notify-source *;\n\ @@ -8,9 +8,9 @@ provide-ixfr true;\n\ qname-minimization relaxed;\n\ query-source address *;\n\ ---- bin/named/server.c.orig 2019-04-06 20:09:59 UTC +--- bin/named/server.c.orig 2019-05-10 04:51:34 UTC +++ bin/named/server.c -@@ -4178,6 +4178,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl +@@ -4245,6 +4245,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl } obj = NULL; @@ -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-04-06 20:09:59 UTC +--- lib/dns/include/dns/view.h.orig 2019-05-10 04:51:34 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-04-06 20:09:59 UTC +--- lib/dns/resolver.c.orig 2019-05-10 04:51:34 UTC +++ lib/dns/resolver.c -@@ -6013,6 +6013,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb +@@ -6026,6 +6026,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-04-06 20:09:59 UTC +--- lib/isccfg/namedconf.c.orig 2019-05-10 04:51:34 UTC +++ lib/isccfg/namedconf.c @@ -1901,6 +1901,7 @@ view_clauses[] = { #endif diff --git a/dns/bind914/files/patch-configure b/dns/bind914/files/patch-configure index 38f01eb95d96..96d95f29c28b 100644 --- a/dns/bind914/files/patch-configure +++ b/dns/bind914/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2019-04-06 20:09:59 UTC +--- configure.orig 2019-05-10 04:51:34 UTC +++ configure -@@ -16317,27 +16317,9 @@ done +@@ -16320,27 +16320,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 -@@ -16380,47 +16362,7 @@ $as_echo "no" >&6; } ;; +@@ -16383,47 +16365,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 -@@ -20924,7 +20866,7 @@ $as_echo "" >&6; } +@@ -20927,7 +20869,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh).