summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dns/bind9-devel/Makefile10
-rw-r--r--dns/bind9-devel/distinfo6
-rw-r--r--dns/bind9-devel/files/extrapatch-bind-min-override-ttl22
-rw-r--r--dns/bind9-devel/files/patch-configure8
-rw-r--r--dns/bind9-devel/pkg-plist1
5 files changed, 23 insertions, 24 deletions
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 0d0e3a1..4c688ff 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
PORTREVISION= 0
.else
# dns/bind9xx here
-PORTREVISION= 2
+PORTREVISION= 0
.endif
CATEGORIES= dns net ipv6
MASTER_SITES= LOCAL/mat/bind
@@ -31,8 +31,8 @@ LICENSE= MPL
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.12.0a.2017.04.20
-HASH= 706c6ac5
+ISCVERSION= 9.12.0a.2017.06.14
+HASH= d6b626e
USES= cpe libedit
@@ -278,8 +278,8 @@ post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm
${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/FAQ \
- ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/CHANGES* ${WRKSRC}/HISTORY.md \
+ ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
.endif # BIND_TOOLS_SLAVE
# Can't use USE_PYTHON=autoplist
diff --git a/dns/bind9-devel/distinfo b/dns/bind9-devel/distinfo
index 8a9e79e..c78595a 100644
--- a/dns/bind9-devel/distinfo
+++ b/dns/bind9-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492693611
-SHA256 (bind9-706c6ac5.tar.gz) = ea2efadf91f26b97fbd4e79a6ce22dfd680440c3f76e2d8219a7208e989b087d
-SIZE (bind9-706c6ac5.tar.gz) = 11874695
+TIMESTAMP = 1497526827
+SHA256 (bind9-d6b626e.tar.gz) = 4c665fb50d3360510754fe27de6117827d04bf075300518943012a995b1cf52a
+SIZE (bind9-d6b626e.tar.gz) = 11875169
diff --git a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
index d2a6e52..a28843d 100644
--- a/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
---- bin/named/config.c.orig 2017-04-20 07:59:45 UTC
+--- bin/named/config.c.orig 2017-06-14 01:08:21 UTC
+++ bin/named/config.c
-@@ -158,6 +158,8 @@ options {\n\
+@@ -155,6 +155,8 @@ options {\n\
lame-ttl 600;\n\
servfail-ttl 1;\n\
max-ncache-ttl 10800; /* 3 hours */\n\
@@ -9,9 +9,9 @@
max-cache-ttl 604800; /* 1 week */\n\
transfer-format many-answers;\n\
max-cache-size 90%;\n\
---- bin/named/server.c.orig 2017-04-20 07:59:45 UTC
+--- bin/named/server.c.orig 2017-06-14 01:08:21 UTC
+++ bin/named/server.c
-@@ -3751,6 +3751,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3713,6 +3713,16 @@ configure_view(dns_view_t *view, dns_vie
}
obj = NULL;
@@ -28,9 +28,9 @@
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 2017-04-20 07:59:45 UTC
+--- lib/dns/include/dns/view.h.orig 2017-06-14 01:08:21 UTC
+++ lib/dns/include/dns/view.h
-@@ -146,6 +146,8 @@ struct dns_view {
+@@ -143,6 +143,8 @@ struct dns_view {
isc_boolean_t requestnsid;
isc_boolean_t sendcookie;
dns_ttl_t maxcachettl;
@@ -39,7 +39,7 @@
dns_ttl_t maxncachettl;
isc_uint32_t nta_lifetime;
isc_uint32_t nta_recheck;
---- lib/dns/resolver.c.orig 2017-04-20 07:59:45 UTC
+--- lib/dns/resolver.c.orig 2017-06-14 01:08:21 UTC
+++ lib/dns/resolver.c
@@ -5468,6 +5468,18 @@ cache_name(fetchctx_t *fctx, dns_name_t
}
@@ -60,11 +60,11 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl)
---- lib/isccfg/namedconf.c.orig 2017-04-20 07:59:45 UTC
+--- lib/isccfg/namedconf.c.orig 2017-06-14 01:08:21 UTC
+++ lib/isccfg/namedconf.c
-@@ -1882,6 +1882,8 @@ view_clauses[] = {
- { "nosit-udp-size", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE },
- { "max-acache-size", &cfg_type_sizenodefault, 0 },
+@@ -1893,6 +1893,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 },
diff --git a/dns/bind9-devel/files/patch-configure b/dns/bind9-devel/files/patch-configure
index 3f2a871..8bb0469 100644
--- a/dns/bind9-devel/files/patch-configure
+++ b/dns/bind9-devel/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2017-04-13 01:05:08 UTC
+--- configure.orig 2017-05-12 01:09:53 UTC
+++ configure
-@@ -14401,27 +14401,9 @@ done
+@@ -14402,27 +14402,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
-@@ -14464,47 +14446,7 @@ $as_echo "no" >&6; } ;;
+@@ -14465,47 +14447,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
-@@ -22666,7 +22608,7 @@ $as_echo "" >&6; }
+@@ -22825,7 +22767,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
diff --git a/dns/bind9-devel/pkg-plist b/dns/bind9-devel/pkg-plist
index 921f06d..b3a9e36 100644
--- a/dns/bind9-devel/pkg-plist
+++ b/dns/bind9-devel/pkg-plist
@@ -12,7 +12,6 @@ bin/nsupdate
include/bind9/check.h
include/bind9/getaddresses.h
include/bind9/version.h
-include/dns/acache.h
include/dns/acl.h
include/dns/adb.h
include/dns/badcache.h
OpenPOWER on IntegriCloud