summaryrefslogtreecommitdiff
path: root/dns/bind9-devel/files
diff options
context:
space:
mode:
Diffstat (limited to 'dns/bind9-devel/files')
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl12
-rw-r--r--dns/bind9-devel/files/patch-configure8
2 files changed, 10 insertions, 10 deletions
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 594b6a427d69..a1a60c76ab96 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig 2015-12-19 01:04:14 UTC
+--- bin/named/config.c.orig 2016-03-09 04:02:43 UTC
+++ bin/named/config.c
@@ -159,6 +159,8 @@ options {\n\
lame-ttl 600;\n\
@@ -9,7 +9,7 @@
max-cache-ttl 604800; /* 1 week */\n\
transfer-format many-answers;\n\
max-cache-size 90%;\n\
---- bin/named/server.c.orig 2015-12-19 01:04:14 UTC
+--- bin/named/server.c.orig 2016-03-09 04:02:43 UTC
+++ bin/named/server.c
@@ -3022,6 +3022,16 @@ configure_view(dns_view_t *view, dns_vie
}
@@ -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 2015-12-19 01:04:14 UTC
+--- lib/dns/include/dns/view.h.orig 2016-03-09 04:02:43 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,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 2015-12-19 01:04:14 UTC
+--- lib/dns/resolver.c.orig 2016-03-09 04:02:43 UTC
+++ lib/dns/resolver.c
-@@ -5397,6 +5397,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
+@@ -5419,6 +5419,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
/*
@@ -60,7 +60,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig 2015-12-19 01:04:14 UTC
+--- lib/isccfg/namedconf.c.orig 2016-03-09 04:02:43 UTC
+++ lib/isccfg/namedconf.c
@@ -1677,6 +1677,8 @@ view_clauses[] = {
{ "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 24c3f3016d2b..0e90987fd423 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2015-12-15 23:30:08 UTC
+--- configure.orig 2016-03-09 04:02:43 UTC
+++ configure
-@@ -14113,27 +14113,9 @@ done
+@@ -14151,27 +14151,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
-@@ -14176,47 +14158,7 @@ $as_echo "no" >&6; } ;;
+@@ -14214,47 +14196,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
-@@ -21870,7 +21812,7 @@ $as_echo "" >&6; }
+@@ -21949,7 +21891,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).