svn commit: r523212 - in head/dns/bind9-devel: . files
Mathieu Arnold
mat at FreeBSD.org
Thu Jan 16 08:33:05 UTC 2020
Author: mat
Date: Thu Jan 16 08:33:04 2020
New Revision: 523212
URL: https://svnweb.freebsd.org/changeset/ports/523212
Log:
Update to latest commit.
Fixes a startup issue.
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-configure (contents, props changed)
Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile Thu Jan 16 07:49:37 2020 (r523211)
+++ head/dns/bind9-devel/Makefile Thu Jan 16 08:33:04 2020 (r523212)
@@ -42,13 +42,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.7a0.2020.01.13
+ISCVERSION= 9.15.7a0.2020.01.16
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
-GL_COMMIT= 423a627946d935e74e3682af68553963ee4187c1
+GL_COMMIT= 48989e94263c0ba916dab06f2d186f572bfd6599
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}
Modified: head/dns/bind9-devel/distinfo
==============================================================================
--- head/dns/bind9-devel/distinfo Thu Jan 16 07:49:37 2020 (r523211)
+++ head/dns/bind9-devel/distinfo Thu Jan 16 08:33:04 2020 (r523212)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578912612
-SHA256 (isc-projects-bind9-423a627946d935e74e3682af68553963ee4187c1_GL0.tar.gz) = 37e938e092fc21f7ec801ae493ded235c3ad33d5d344968b45e897a2a617bee2
-SIZE (isc-projects-bind9-423a627946d935e74e3682af68553963ee4187c1_GL0.tar.gz) = 6338881
+TIMESTAMP = 1579163094
+SHA256 (isc-projects-bind9-48989e94263c0ba916dab06f2d186f572bfd6599_GL0.tar.gz) = f0fee3ecb51ecf47f86c4a06ef09f7639355392e598f0a5f80792f35768cb399
+SIZE (isc-projects-bind9-48989e94263c0ba916dab06f2d186f572bfd6599_GL0.tar.gz) = 6340792
Modified: head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl
==============================================================================
--- head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Thu Jan 16 07:49:37 2020 (r523211)
+++ head/dns/bind9-devel/files/extrapatch-bind-min-override-ttl Thu Jan 16 08:33:04 2020 (r523212)
@@ -1,6 +1,6 @@
Add the override-cache-ttl feature.
---- bin/named/config.c.orig 2019-12-13 08:58:14 UTC
+--- bin/named/config.c.orig 2020-01-16 07:41:10 UTC
+++ bin/named/config.c
@@ -178,6 +178,7 @@ options {\n\
notify-source *;\n\
@@ -10,9 +10,9 @@ Add the override-cache-ttl feature.
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
---- bin/named/server.c.orig 2019-12-13 08:58:14 UTC
+--- bin/named/server.c.orig 2020-01-16 07:41:10 UTC
+++ bin/named/server.c
-@@ -4354,6 +4354,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
+@@ -4303,6 +4303,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
obj = NULL;
@@ -24,7 +24,7 @@ Add the override-cache-ttl feature.
result = named_config_get(maps, "max-cache-ttl", &obj);
INSIST(result == ISC_R_SUCCESS);
view->maxcachettl = cfg_obj_asduration(obj);
---- lib/dns/include/dns/view.h.orig 2019-12-13 08:58:14 UTC
+--- lib/dns/include/dns/view.h.orig 2020-01-16 07:41:10 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid;
@@ -34,7 +34,7 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
---- lib/dns/resolver.c.orig 2019-12-13 08:58:14 UTC
+--- lib/dns/resolver.c.orig 2020-01-16 07:41:10 UTC
+++ lib/dns/resolver.c
@@ -6032,6 +6032,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
@@ -49,7 +49,7 @@ Add the override-cache-ttl feature.
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig 2019-12-13 08:58:14 UTC
+--- lib/isccfg/namedconf.c.orig 2020-01-16 07:41:10 UTC
+++ lib/isccfg/namedconf.c
@@ -1980,6 +1980,7 @@ view_clauses[] = {
#endif
Modified: head/dns/bind9-devel/files/patch-configure
==============================================================================
--- head/dns/bind9-devel/files/patch-configure Thu Jan 16 07:49:37 2020 (r523211)
+++ head/dns/bind9-devel/files/patch-configure Thu Jan 16 08:33:04 2020 (r523212)
@@ -1,8 +1,8 @@
Fixup gssapi and db detection.
---- configure.orig 2019-12-13 08:58:14 UTC
+--- configure.orig 2020-01-16 07:41:10 UTC
+++ configure
-@@ -17437,27 +17437,9 @@ done
+@@ -17440,27 +17440,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@@ -32,7 +32,7 @@ Fixup gssapi and db detection.
{ $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
-@@ -17500,47 +17482,7 @@ $as_echo "no" >&6; } ;;
+@@ -17503,47 +17485,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@@ -81,7 +81,7 @@ Fixup gssapi and db detection.
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -23052,7 +22994,7 @@ $as_echo "" >&6; }
+@@ -23055,7 +22997,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).
More information about the svn-ports-all
mailing list