diff options
| -rw-r--r-- | dns/bind9-devel/Makefile | 4 | ||||
| -rw-r--r-- | dns/bind9-devel/distinfo | 6 | ||||
| -rw-r--r-- | dns/bind9-devel/files/extrapatch-bind-min-override-ttl | 22 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-bin_named_server.c | 11 | ||||
| -rw-r--r-- | dns/bind9-devel/files/patch-configure | 8 |
5 files changed, 20 insertions, 31 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index a5dcb433d0b8..0ca0e574fd3b 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -34,13 +34,13 @@ LICENSE= MPL20 LICENSE_FILE= ${WRKSRC}/COPYRIGHT # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.13.0a0.2018.04.06 +ISCVERSION= 9.13.0a0.2018.04.13 # XXX: Remove gitlab USE_GITLAB= yes GL_SITE= https://gitlab.isc.org GL_ACCOUNT= isc-projects GL_PROJECT= bind9 -GL_COMMIT= 76fa1c181c6fc5ea8e7b52186bfaab6edd6b49bb +GL_COMMIT= 293d9132d736e2ed8abb4595a4a9cef178beaee9 # XXX: remove tar:bz2 USES= cpe libedit tar:bz2 diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo index adfb5494f1cb..8673e6fcb266 100644 --- a/dns/bind9-devel/distinfo +++ b/dns/bind9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523269093 -SHA256 (isc-projects-bind9-76fa1c181c6fc5ea8e7b52186bfaab6edd6b49bb_GL0.tar.gz) = bda5aa83818b285635fb503b1c347404f9dc8a446777afe0dc9f5b1c37658f9d -SIZE (isc-projects-bind9-76fa1c181c6fc5ea8e7b52186bfaab6edd6b49bb_GL0.tar.gz) = 8966215 +TIMESTAMP = 1523871970 +SHA256 (isc-projects-bind9-293d9132d736e2ed8abb4595a4a9cef178beaee9_GL0.tar.gz) = 5a2d68bd76e69a870dd22d53e410bbb989333e81872b3548c5936ede367d94bf +SIZE (isc-projects-bind9-293d9132d736e2ed8abb4595a4a9cef178beaee9_GL0.tar.gz) = 8962363 diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl index be62dfa83c70..8b72387a8faa 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 2018-04-06 06:10:50 UTC +--- bin/named/config.c.orig 2018-04-13 19:02:44 UTC +++ bin/named/config.c @@ -179,12 +179,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-04-06 06:10:50 UTC +--- bin/named/server.c.orig 2018-04-13 19:02:44 UTC +++ bin/named/server.c -@@ -4077,6 +4077,16 @@ configure_view(dns_view_t *view, dns_vie +@@ -4068,6 +4068,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-04-06 06:10:50 UTC +--- lib/dns/include/dns/view.h.orig 2018-04-13 19:02:44 UTC +++ lib/dns/include/dns/view.h @@ -148,6 +148,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-04-06 06:10:50 UTC +--- lib/dns/resolver.c.orig 2018-04-13 19:02:44 UTC +++ lib/dns/resolver.c -@@ -5752,6 +5752,18 @@ cache_name(fetchctx_t *fctx, dns_name_t +@@ -5746,6 +5746,18 @@ cache_name(fetchctx_t *fctx, dns_name_t } /* @@ -66,14 +66,14 @@ * Enforce the configure maximum cache TTL. */ if (rdataset->ttl > res->view->maxcachettl) { ---- lib/isccfg/namedconf.c.orig 2018-04-06 06:10:50 UTC +--- lib/isccfg/namedconf.c.orig 2018-04-13 19:02:44 UTC +++ lib/isccfg/namedconf.c @@ -1916,6 +1916,8 @@ view_clauses[] = { { "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE }, { "max-cache-size", &cfg_type_sizeorpercent, 0 }, -+ { "override-cache-ttl", &cfg_type_uint32, 0 }, -+ { "min-cache-ttl", &cfg_type_uint32, 0 }, - { "max-cache-ttl", &cfg_type_uint32, 0 }, ++ { "override-cache-ttl", &cfg_type_ttlval, 0 }, ++ { "min-cache-ttl", &cfg_type_ttlval, 0 }, + { "max-cache-ttl", &cfg_type_ttlval, 0 }, { "max-clients-per-query", &cfg_type_uint32, 0 }, - { "max-ncache-ttl", &cfg_type_uint32, 0 }, + { "max-ncache-ttl", &cfg_type_ttlval, 0 }, diff --git a/dns/bind9-devel/files/patch-bin_named_server.c b/dns/bind9-devel/files/patch-bin_named_server.c deleted file mode 100644 index 455ab222f113..000000000000 --- a/dns/bind9-devel/files/patch-bin_named_server.c +++ /dev/null @@ -1,11 +0,0 @@ ---- bin/named/server.c.orig 2018-04-06 06:10:50 UTC -+++ bin/named/server.c -@@ -3552,7 +3552,7 @@ configure_dnstap(const cfg_obj_t **maps, - fstrm_iothr_options_set_reopen_interval(fopt, i); - } - -- CHECKM(dns_dt_create2(named_g_mctx, dmode, dpath, -+ CHECKM(dns_dt_create(named_g_mctx, dmode, dpath, - &fopt, named_g_server->task, - &named_g_server->dtenv), - "unable to create dnstap environment"); diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure index 0ead582fce98..c496fa1bde82 100644 --- a/dns/bind9-devel/files/patch-configure +++ b/dns/bind9-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2018-04-06 06:10:50 UTC +--- configure.orig 2018-04-13 19:02:44 UTC +++ configure -@@ -14764,27 +14764,9 @@ done +@@ -14763,27 +14763,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 -@@ -14827,47 +14809,7 @@ $as_echo "no" >&6; } ;; +@@ -14826,47 +14808,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 -@@ -23487,7 +23429,7 @@ $as_echo "" >&6; } +@@ -23456,7 +23398,7 @@ $as_echo "" >&6; } # Check other locations for includes. # Order is important (sigh). |