Update to latest commit.

Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2018-06-25 14:39:40 +00:00
parent 70a0614564
commit efc0ec5fb6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=473319
4 changed files with 15 additions and 15 deletions

View File

@ -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.15
ISCVERSION= 9.13.1a0.2018.06.25
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
GL_COMMIT= e495999c621a481db1ae2a5d189c416238a82980
GL_COMMIT= ad20284104b31c4517015c3b92c53d7a02ce6dbb
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1529305510
SHA256 (isc-projects-bind9-e495999c621a481db1ae2a5d189c416238a82980_GL0.tar.gz) = d9b3559bc9a4d35bbe61d5e2316d3c1f97eac9b21e0f36502fc3839d8c7646c0
SIZE (isc-projects-bind9-e495999c621a481db1ae2a5d189c416238a82980_GL0.tar.gz) = 8534156
TIMESTAMP = 1529935154
SHA256 (isc-projects-bind9-ad20284104b31c4517015c3b92c53d7a02ce6dbb_GL0.tar.gz) = 0b0da50315c826732551ba402d06baa7bebaeba2ea2fc524bd4fc06f31cb0897
SIZE (isc-projects-bind9-ad20284104b31c4517015c3b92c53d7a02ce6dbb_GL0.tar.gz) = 8548567

View File

@ -1,6 +1,6 @@
--- bin/named/config.c.orig 2018-06-15 08:58:30 UTC
--- bin/named/config.c.orig 2018-06-25 07:29:23 UTC
+++ bin/named/config.c
@@ -176,12 +176,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\
@ -15,7 +15,7 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
--- bin/named/server.c.orig 2018-06-15 08:58:30 UTC
--- bin/named/server.c.orig 2018-06-25 07:29:23 UTC
+++ bin/named/server.c
@@ -4071,6 +4071,16 @@ configure_view(dns_view_t *view, dns_vie
}
@ -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-06-15 08:58:30 UTC
--- lib/dns/include/dns/view.h.orig 2018-06-25 07:29:23 UTC
+++ lib/dns/include/dns/view.h
@@ -151,6 +151,8 @@ struct dns_view {
isc_boolean_t requestnsid;
@ -45,7 +45,7 @@
dns_ttl_t maxncachettl;
isc_uint32_t nta_lifetime;
isc_uint32_t nta_recheck;
--- lib/dns/resolver.c.orig 2018-06-15 08:58:30 UTC
--- lib/dns/resolver.c.orig 2018-06-25 07:29:23 UTC
+++ lib/dns/resolver.c
@@ -5799,6 +5799,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
@ -66,7 +66,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2018-06-15 08:58:30 UTC
--- lib/isccfg/namedconf.c.orig 2018-06-25 07:29:23 UTC
+++ lib/isccfg/namedconf.c
@@ -1917,6 +1917,8 @@ view_clauses[] = {
{ "max-acache-size", &cfg_type_sizenodefault,

View File

@ -1,6 +1,6 @@
--- configure.orig 2018-06-15 08:58:30 UTC
--- configure.orig 2018-06-25 07:29:23 UTC
+++ configure
@@ -14856,27 +14856,9 @@ done
@@ -14992,27 +14992,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
@@ -14919,47 +14901,7 @@ $as_echo "no" >&6; } ;;
@@ -15055,47 +15037,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
@@ -23311,7 +23253,7 @@ $as_echo "" >&6; }
@@ -23688,7 +23630,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).