1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-08 06:48:28 +00:00

Update to latest commit.

This commit is contained in:
Mathieu Arnold 2020-02-24 15:38:12 +00:00
parent 54fc772b49
commit 12b8caf42e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=526976
4 changed files with 15 additions and 15 deletions

View File

@ -48,13 +48,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.8a0.2020.02.16
ISCVERSION= 9.17.0a0.2020.02.24
# XXX: Remove gitlab
USE_GITLAB= yes
GL_SITE= https://gitlab.isc.org
GL_ACCOUNT= isc-projects
GL_PROJECT= bind9
GL_COMMIT= e4671ef2fa4f9764ddc11e95ed5f1bfa56a9e0d7
GL_COMMIT= e5eac7f117023dca086ba0eeeac4dc2049ebbab9
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1581932819
SHA256 (isc-projects-bind9-e4671ef2fa4f9764ddc11e95ed5f1bfa56a9e0d7_GL0.tar.gz) = 123f39e3b2f2495a276e74bfd1917e044599e87a8f742ac6563df0d246756415
SIZE (isc-projects-bind9-e4671ef2fa4f9764ddc11e95ed5f1bfa56a9e0d7_GL0.tar.gz) = 6363381
TIMESTAMP = 1582548390
SHA256 (isc-projects-bind9-e5eac7f117023dca086ba0eeeac4dc2049ebbab9_GL0.tar.gz) = 62ed6e5e1d0ead821c1ba15d98d0a69aab0e9b9ac0f50d030698710dacc230c2
SIZE (isc-projects-bind9-e5eac7f117023dca086ba0eeeac4dc2049ebbab9_GL0.tar.gz) = 6308889

View File

@ -1,6 +1,6 @@
Add the override-cache-ttl feature.
--- bin/named/config.c.orig 2020-02-16 17:41:30 UTC
--- bin/named/config.c.orig 2020-02-24 10:03:07 UTC
+++ bin/named/config.c
@@ -177,6 +177,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 2020-02-16 17:41:30 UTC
--- bin/named/server.c.orig 2020-02-24 10:03:07 UTC
+++ bin/named/server.c
@@ -4323,6 +4323,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
@@ -4322,6 +4322,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 2020-02-16 17:41:30 UTC
--- lib/dns/include/dns/view.h.orig 2020-02-24 10:03:07 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 2020-02-16 17:41:30 UTC
--- lib/dns/resolver.c.orig 2020-02-24 10:03:07 UTC
+++ lib/dns/resolver.c
@@ -6233,6 +6233,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 2020-02-16 17:41:30 UTC
--- lib/isccfg/namedconf.c.orig 2020-02-24 10:03:07 UTC
+++ lib/isccfg/namedconf.c
@@ -1990,6 +1990,7 @@ static cfg_clausedef_t view_clauses[] = {
#endif /* ifdef HAVE_LMDB */

View File

@ -1,8 +1,8 @@
Fixup gssapi and db detection.
--- configure.orig 2020-02-11 10:42:52 UTC
--- configure.orig 2020-02-24 10:03:07 UTC
+++ configure
@@ -17448,27 +17448,9 @@ done
@@ -17436,27 +17436,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
@@ -17511,47 +17493,7 @@ $as_echo "no" >&6; } ;;
@@ -17499,47 +17481,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
@@ -23058,7 +23000,7 @@ $as_echo "" >&6; }
@@ -23046,7 +22988,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).