Update to 9.14.5.

This commit is contained in:
Mathieu Arnold 2019-08-22 17:09:24 +00:00
parent 4165ba7de8
commit ae66657c19
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=509613
5 changed files with 17 additions and 15 deletions

View File

@ -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.4
ISCVERSION= 9.14.5
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1563465156
SHA256 (bind-9.14.4.tar.gz) = 312efb82a6889074f31ef2849af498b3ec97ca69acd5c4e5e4b4045a8fe6b83f
SIZE (bind-9.14.4.tar.gz) = 6295768
TIMESTAMP = 1566490199
SHA256 (bind-9.14.5.tar.gz) = 12d0672cb83d985b57038ce7eb8a71c6bc7ebd379d67109c5f966f7527988045
SIZE (bind-9.14.5.tar.gz) = 6313555

View File

@ -1,4 +1,4 @@
--- bin/named/config.c.orig 2019-07-09 18:15:48 UTC
--- bin/named/config.c.orig 2019-08-13 12:42:31 UTC
+++ bin/named/config.c
@@ -181,6 +181,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-07-09 18:15:48 UTC
--- bin/named/server.c.orig 2019-08-13 12:42:31 UTC
+++ bin/named/server.c
@@ -4245,6 +4245,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
@@ -4246,6 +4246,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-07-09 18:15:48 UTC
--- lib/dns/include/dns/view.h.orig 2019-08-13 12:42:31 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-07-09 18:15:48 UTC
--- lib/dns/resolver.c.orig 2019-08-13 12:42:31 UTC
+++ lib/dns/resolver.c
@@ -6050,6 +6050,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
@@ -6035,6 +6035,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-07-09 18:15:48 UTC
--- lib/isccfg/namedconf.c.orig 2019-08-13 12:42:31 UTC
+++ lib/isccfg/namedconf.c
@@ -1901,6 +1901,7 @@ view_clauses[] = {
#endif

View File

@ -1,6 +1,6 @@
--- configure.orig 2019-07-09 18:15:48 UTC
--- configure.orig 2019-08-13 12:42:31 UTC
+++ configure
@@ -16823,27 +16823,9 @@ done
@@ -16837,27 +16837,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
@@ -16886,47 +16868,7 @@ $as_echo "no" >&6; } ;;
@@ -16900,47 +16882,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
@@ -21436,7 +21378,7 @@ $as_echo "" >&6; }
@@ -21571,7 +21513,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).

View File

@ -139,6 +139,7 @@ include/isc/counter.h
include/isc/crc64.h
include/isc/deprecated.h
include/isc/dir.h
include/isc/endian.h
include/isc/errno.h
include/isc/error.h
include/isc/event.h
@ -196,6 +197,7 @@ include/isc/resultclass.h
include/isc/rwlock.h
include/isc/safe.h
include/isc/serial.h
include/isc/siphash.h
include/isc/sockaddr.h
include/isc/socket.h
include/isc/stat.h