Mathieu Arnold 2020-10-26 11:40:55 +00:00
parent bbaf30d63f
commit 74d87b7934
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=553339
5 changed files with 17 additions and 16 deletions

View File

@ -8,7 +8,7 @@ PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
PORTREVISION= 0
.else
# dns/bind916 here
PORTREVISION= 1
PORTREVISION= 0
.endif
CATEGORIES= dns net
MASTER_SITES= ISC/bind9/${ISCVERSION}
@ -41,7 +41,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
USES= compiler:c11 cpe libedit pkgconfig ssl tar:xz
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.16.7
ISCVERSION= 9.16.8
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1600870670
SHA256 (bind-9.16.7.tar.xz) = 9f7d1812ebbd26a699f62b6fa8522d5dec57e4bf43af0042a0d60d39ed8314d1
SIZE (bind-9.16.7.tar.xz) = 3241476
TIMESTAMP = 1603640347
SHA256 (bind-9.16.8.tar.xz) = 9e9b9c563692be86ec41f670f6b70e26c14e72445c742d7b5eb4db7d2b5e8d31
SIZE (bind-9.16.8.tar.xz) = 3253744

View File

@ -1,6 +1,6 @@
Add the override-cache-ttl feature.
--- bin/named/config.c.orig 2020-09-04 10:44:49 UTC
--- bin/named/config.c.orig 2020-10-13 08:41:40 UTC
+++ bin/named/config.c
@@ -179,6 +179,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-09-04 10:44:49 UTC
--- bin/named/server.c.orig 2020-10-13 08:41:40 UTC
+++ bin/named/server.c
@@ -4340,6 +4340,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
@@ -4341,6 +4341,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-09-04 10:44:49 UTC
--- lib/dns/include/dns/view.h.orig 2020-10-13 08:41:40 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,7 @@ struct dns_view {
bool requestnsid;
@ -34,9 +34,9 @@ Add the override-cache-ttl feature.
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
--- lib/dns/resolver.c.orig 2020-09-04 10:44:49 UTC
--- lib/dns/resolver.c.orig 2020-10-13 08:41:40 UTC
+++ lib/dns/resolver.c
@@ -6275,6 +6275,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
@@ -6273,6 +6273,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_mes
}
/*
@ -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-09-04 10:44:49 UTC
--- lib/isccfg/namedconf.c.orig 2020-10-13 08:41:40 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-09-04 10:44:49 UTC
--- configure.orig 2020-10-13 08:41:40 UTC
+++ configure
@@ -17673,27 +17673,9 @@ done
@@ -17698,27 +17698,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
@@ -17736,47 +17718,7 @@ $as_echo "no" >&6; } ;;
@@ -17761,47 +17743,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
@@ -23282,7 +23224,7 @@ $as_echo "" >&6; }
@@ -23207,7 +23149,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).

View File

@ -136,6 +136,7 @@ include/isc/base64.h
include/isc/bind9.h
include/isc/buffer.h
include/isc/bufferlist.h
include/isc/cmocka.h
include/isc/commandline.h
include/isc/condition.h
include/isc/counter.h