svn commit: r508745 - in head/dns/bind9-devel: . files
Mathieu Arnold
mat at FreeBSD.org
Mon Aug 12 14:20:32 UTC 2019
Author: mat
Date: Mon Aug 12 14:20:30 2019
New Revision: 508745
URL: https://svnweb.freebsd.org/changeset/ports/508745
Log:
Update to latest commit.
Modified:
head/dns/bind9-devel/Makefile (contents, props changed)
head/dns/bind9-devel/distinfo (contents, props changed)
head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl (contents, props changed)
head/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in (contents, props changed)
head/dns/bind9-devel/files/patch-configure (contents, props changed)
Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile Mon Aug 12 14:20:27 2019 (r508744)
+++ head/dns/bind9-devel/Makefile Mon Aug 12 14:20:30 2019 (r508745)
@@ -41,13 +41,13 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
# XXX: remove tar:bz2
USES= compiler:c11 cpe libedit pkgconfig ssl tar:bz2
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION= 9.15.0a0.2019.08.06
+ISCVERSION= 9.15.0a0.2019.08.12
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
-GL_COMMIT= 48213633ce13299d4e5934dfc90f4f7dd5ec4730
+GL_COMMIT= d60557be82d061849cc062b5ef3ab2fc82423684
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
Modified: head/dns/bind9-devel/distinfo
==============================================================================
--- head/dns/bind9-devel/distinfo Mon Aug 12 14:20:27 2019 (r508744)
+++ head/dns/bind9-devel/distinfo Mon Aug 12 14:20:30 2019 (r508745)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565095080
-SHA256 (isc-projects-bind9-48213633ce13299d4e5934dfc90f4f7dd5ec4730_GL0.tar.gz) = b37a3e6024b56a3c30a8e1dc971e5b4399a05159ae2909afec3f4ecc245d6847
-SIZE (isc-projects-bind9-48213633ce13299d4e5934dfc90f4f7dd5ec4730_GL0.tar.gz) = 6328648
+TIMESTAMP = 1565619108
+SHA256 (isc-projects-bind9-d60557be82d061849cc062b5ef3ab2fc82423684_GL0.tar.gz) = ece0e1d98c11eee2ee6441f72c12cbc5e420cc3ba1812b5846448ceb126f2c4d
+SIZE (isc-projects-bind9-d60557be82d061849cc062b5ef3ab2fc82423684_GL0.tar.gz) = 6326649
Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
==============================================================================
--- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon Aug 12 14:20:27 2019 (r508744)
+++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Mon Aug 12 14:20:30 2019 (r508745)
@@ -1,4 +1,6 @@
---- bin/named/config.c.orig 2019-07-29 20:10:44 UTC
+Add the override-cache-ttl feature.
+
+--- bin/named/config.c.orig 2019-08-12 08:39:30 UTC
+++ bin/named/config.c
@@ -177,6 +177,7 @@ options {\n\
notify-source *;\n\
@@ -8,9 +10,9 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2019-07-29 20:10:44 UTC
+--- bin/named/server.c.orig 2019-08-12 08:39:30 UTC
+++ bin/named/server.c
-@@ -4218,6 +4218,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4217,6 +4217,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
obj = NULL;
@@ -22,7 +24,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-07-29 20:10:44 UTC
+--- lib/dns/include/dns/view.h.orig 2019-08-12 08:39:30 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid;
@@ -32,9 +34,9 @@
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2019-07-29 20:10:44 UTC
+--- lib/dns/resolver.c.orig 2019-08-12 08:39:30 UTC
+++ lib/dns/resolver.c
-@@ -6022,6 +6022,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
+@@ -6011,6 +6011,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
/*
@@ -47,7 +49,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2019-07-29 20:10:44 UTC
+--- lib/isccfg/namedconf.c.orig 2019-08-12 08:39:30 UTC
+++ lib/isccfg/namedconf.c
@@ -1907,6 +1907,7 @@ view_clauses[] = {
#endif
Modified: head/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in
==============================================================================
--- head/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in Mon Aug 12 14:20:27 2019 (r508744)
+++ head/dns/bind9-devel/files/patch-bin_tests_system_dlzexternal_Makefile.in Mon Aug 12 14:20:30 2019 (r508745)
@@ -1,3 +1,5 @@
+BIND9 seems to be abusing LDFLAGS here, and it breaks our linker.
+
--- bin/tests/system/dlzexternal/Makefile.in.orig 2019-06-28 12:33:29 UTC
+++ bin/tests/system/dlzexternal/Makefile.in
@@ -35,7 +35,7 @@ OBJS =
Modified: head/dns/bind9-devel/files/patch-configure
==============================================================================
--- head/dns/bind9-devel/files/patch-configure Mon Aug 12 14:20:27 2019 (r508744)
+++ head/dns/bind9-devel/files/patch-configure Mon Aug 12 14:20:30 2019 (r508745)
@@ -1,6 +1,8 @@
---- configure.orig 2019-08-06 04:55:46 UTC
+Fixup gssapi and db detection.
+
+--- configure.orig 2019-08-12 08:39:30 UTC
+++ configure
-@@ -17183,27 +17183,9 @@ done
+@@ -17216,27 +17216,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@@ -30,7 +32,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
-@@ -17246,47 +17228,7 @@ $as_echo "no" >&6; } ;;
+@@ -17279,47 +17261,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@@ -79,7 +81,7 @@
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -22676,7 +22618,7 @@ $as_echo "" >&6; }
+@@ -22709,7 +22651,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
More information about the svn-ports-head
mailing list