summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2019-07-18 16:10:56 +0000
committerMathieu Arnold <mat@FreeBSD.org>2019-07-18 16:10:56 +0000
commit036a0fde8ad9c7f3e33fd0031a44be78232d3495 (patch)
treed57750b139e5575ea30c0c002d3e71709bb91e62
parentUpdate to 9.11.9. (diff)
Update to 9.14.4.
Changes: https://downloads.isc.org/isc/bind9/9.14.4/RELEASE-NOTES-bind-9.14.4.html
Notes
Notes: svn path=/head/; revision=506856
-rw-r--r--dns/bind914/Makefile2
-rw-r--r--dns/bind914/distinfo6
-rw-r--r--dns/bind914/files/extrapatch-bind-min-override-ttl14
-rw-r--r--dns/bind914/files/extrapatch-no-bind-tools8
-rw-r--r--dns/bind914/files/patch-configure8
5 files changed, 19 insertions, 19 deletions
diff --git a/dns/bind914/Makefile b/dns/bind914/Makefile
index 249f200262fc..5d50c029b8ff 100644
--- a/dns/bind914/Makefile
+++ b/dns/bind914/Makefile
@@ -36,7 +36,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
USES= compiler:c11 cpe libedit pkgconfig ssl
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.14.3
+ISCVERSION= 9.14.4
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
diff --git a/dns/bind914/distinfo b/dns/bind914/distinfo
index 9f4ef6d88b32..047a5c1fe80e 100644
--- a/dns/bind914/distinfo
+++ b/dns/bind914/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560947468
-SHA256 (bind-9.14.3.tar.gz) = ce878aabcf01b61ed114522c32fff9e268b02da55b3c248349860bc3d0c8bdfa
-SIZE (bind-9.14.3.tar.gz) = 6258311
+TIMESTAMP = 1563465156
+SHA256 (bind-9.14.4.tar.gz) = 312efb82a6889074f31ef2849af498b3ec97ca69acd5c4e5e4b4045a8fe6b83f
+SIZE (bind-9.14.4.tar.gz) = 6295768
diff --git a/dns/bind914/files/extrapatch-bind-min-override-ttl b/dns/bind914/files/extrapatch-bind-min-override-ttl
index a6c479c86e96..caaaee5ca719 100644
--- a/dns/bind914/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind914/files/extrapatch-bind-min-override-ttl
@@ -1,6 +1,6 @@
---- bin/named/config.c.orig 2019-05-10 04:51:34 UTC
+--- bin/named/config.c.orig 2019-07-09 18:15:48 UTC
+++ bin/named/config.c
-@@ -179,6 +179,7 @@ options {\n\
+@@ -181,6 +181,7 @@ options {\n\
notify-source *;\n\
notify-source-v6 *;\n\
nsec3-test-zone no;\n\
@@ -8,7 +8,7 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2019-05-10 04:51:34 UTC
+--- bin/named/server.c.orig 2019-07-09 18:15:48 UTC
+++ bin/named/server.c
@@ -4245,6 +4245,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
@@ -22,7 +22,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 2019-05-10 04:51:34 UTC
+--- lib/dns/include/dns/view.h.orig 2019-07-09 18:15:48 UTC
+++ lib/dns/include/dns/view.h
@@ -153,6 +153,7 @@ struct dns_view {
bool requestnsid;
@@ -32,9 +32,9 @@
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2019-05-10 04:51:34 UTC
+--- lib/dns/resolver.c.orig 2019-07-09 18:15:48 UTC
+++ lib/dns/resolver.c
-@@ -6026,6 +6026,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6050,6 +6050,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
/*
@@ -47,7 +47,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2019-05-10 04:51:34 UTC
+--- lib/isccfg/namedconf.c.orig 2019-07-09 18:15:48 UTC
+++ lib/isccfg/namedconf.c
@@ -1901,6 +1901,7 @@ view_clauses[] = {
#endif
diff --git a/dns/bind914/files/extrapatch-no-bind-tools b/dns/bind914/files/extrapatch-no-bind-tools
index 5c7e85f8cd4b..05e8d31d7c7d 100644
--- a/dns/bind914/files/extrapatch-no-bind-tools
+++ b/dns/bind914/files/extrapatch-no-bind-tools
@@ -1,6 +1,6 @@
Exclude the "tools" from building and installing.
---- bin/Makefile.in.orig 2019-03-20 05:57:56 UTC
+--- bin/Makefile.in.orig 2019-07-09 18:15:48 UTC
+++ bin/Makefile.in
@@ -11,8 +11,8 @@ srcdir = @srcdir@
VPATH = @srcdir@
@@ -13,9 +13,9 @@ Exclude the "tools" from building and installing.
TARGETS =
@BIND9_MAKE_RULES@
---- bin/tools/Makefile.in.orig 2019-04-15 14:30:39 UTC
+--- bin/tools/Makefile.in.orig 2019-07-09 18:15:48 UTC
+++ bin/tools/Makefile.in
-@@ -39,10 +39,7 @@ SUBDIRS =
+@@ -40,10 +40,7 @@ SUBDIRS =
DNSTAPTARGETS = dnstap-read@EXEEXT@
NZDTARGETS = named-nzd2nzf@EXEEXT@
@@ -27,7 +27,7 @@ Exclude the "tools" from building and installing.
DNSTAPSRCS = dnstap-read.c
NZDSRCS = named-nzd2nzf.c
-@@ -118,21 +115,6 @@ dnstap:
+@@ -119,21 +116,6 @@ dnstap:
${INSTALL_DATA} ${srcdir}/dnstap-read.1 ${DESTDIR}${mandir}/man1
install:: ${TARGETS} installdirs @DNSTAP@ @NZD_TOOLS@
diff --git a/dns/bind914/files/patch-configure b/dns/bind914/files/patch-configure
index 60bc8b47b833..f5c9eebe0920 100644
--- a/dns/bind914/files/patch-configure
+++ b/dns/bind914/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2019-06-04 15:20:04 UTC
+--- configure.orig 2019-07-09 18:15:48 UTC
+++ configure
-@@ -16347,27 +16347,9 @@ done
+@@ -16823,27 +16823,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
-@@ -16410,47 +16392,7 @@ $as_echo "no" >&6; } ;;
+@@ -16886,47 +16868,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
-@@ -20960,7 +20902,7 @@ $as_echo "" >&6; }
+@@ -21436,7 +21378,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).