aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dns/bind9-devel/Makefile4
-rw-r--r--dns/bind9-devel/distinfo6
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl12
-rw-r--r--dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in8
-rw-r--r--dns/bind9-devel/files/patch-configure4
5 files changed, 17 insertions, 17 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index f1c6bd4f8ee3..ceb19e9cfe86 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -30,8 +30,8 @@ COMMENT= BIND DNS suite with updated DNSSEC and DNS64
LICENSE= MPL
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.12.0a.2016.10.20
-HASH= bcbacc4
+ISCVERSION= 9.12.0a.2016.11.01
+HASH= 7960fc5
USES= cpe libedit
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index e882c95c9977..57c07ac8348a 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1477309973
-SHA256 (bind9-bcbacc4.tar.gz) = 3de382563c27fb80239e6bdf7a578ed7480e769bdbe332708cf5deb2d9b7cc14
-SIZE (bind9-bcbacc4.tar.gz) = 11870730
+TIMESTAMP = 1478081390
+SHA256 (bind9-7960fc5.tar.gz) = b269cdf0b4af4a2248741948e9b05d4f2327e921f2f844b375659aa97509b90e
+SIZE (bind9-7960fc5.tar.gz) = 11872613
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index 8ba211db088c..748e70b6556a 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 2016-10-16 01:06:28 UTC
+--- bin/named/config.c.orig 2016-11-01 20:46:42 UTC
+++ bin/named/config.c
@@ -154,6 +154,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 2016-10-16 01:06:28 UTC
+--- bin/named/server.c.orig 2016-11-01 20:46:42 UTC
+++ bin/named/server.c
@@ -3638,6 +3638,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 2016-10-16 01:06:28 UTC
+--- lib/dns/include/dns/view.h.orig 2016-11-01 20:46:42 UTC
+++ lib/dns/include/dns/view.h
@@ -146,6 +146,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 2016-10-16 01:06:28 UTC
+--- lib/dns/resolver.c.orig 2016-11-01 20:46:42 UTC
+++ lib/dns/resolver.c
-@@ -5431,6 +5431,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
+@@ -5433,6 +5433,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 2016-10-16 01:06:28 UTC
+--- lib/isccfg/namedconf.c.orig 2016-11-01 20:46:42 UTC
+++ lib/isccfg/namedconf.c
@@ -1734,6 +1734,8 @@ view_clauses[] = {
{ "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },
diff --git a/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in b/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in
index 7c4bf00c2b2a..7430899c4ac8 100644
--- a/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in
+++ b/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in
@@ -1,11 +1,11 @@
---- bin/tests/system/dlzexternal/Makefile.in.orig 2016-06-27 05:29:38 UTC
+--- bin/tests/system/dlzexternal/Makefile.in.orig 2016-11-01 20:46:42 UTC
+++ bin/tests/system/dlzexternal/Makefile.in
-@@ -35,7 +35,7 @@ OBJS = ${DLOPENOBJS}
+@@ -31,7 +31,7 @@ OBJS =
@BIND9_MAKE_RULES@
CFLAGS = @CFLAGS@ @SO_CFLAGS@
-SO_LDFLAGS = @LDFLAGS@ @SO_LDFLAGS@
+SO_LDFLAGS = @SO_LDFLAGS@
- dlopen@EXEEXT@: ${DLOPENOBJS}
- ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
+ driver.@SO@: ${SO_OBJS}
+ ${LIBTOOL_MODE_LINK} @SO_LD@ ${SO_LDFLAGS} -o $@ driver.@O@
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 98d5343c2f9c..a6e1bfeb1788 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig 2016-10-20 00:03:20 UTC
+--- configure.orig 2016-11-01 20:46:42 UTC
+++ configure
@@ -14359,27 +14359,9 @@ done
# problems start to show up.
@@ -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
-@@ -22544,7 +22486,7 @@ $as_echo "" >&6; }
+@@ -22571,7 +22513,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).