cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r553338 r553339

Browse Source 
Update to 9.11.24 & 9.16.8.

Changes:	https://downloads.isc.org/isc/bind9/9.11.24/RELEASE-NOTES-bind-9.11.24.html
Changes:	https://downloads.isc.org/isc/bind9/9.16.8/doc/arm/html/notes.html#notes-for-bind-9-16-8
This commit is contained in:
Mathieu Arnold 2020-10-26 11:42:06 +00:00
parent f96e5b58c1
commit b7e33773b5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=553342
10 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dns/bind911/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
PORTREVISION= 1
PORTREVISION= 0
CATEGORIES= dns net
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX= 911
@ -24,7 +24,7 @@ RUN_DEPENDS= bind-tools>0:dns/bind-tools
USES= cpe libedit pkgconfig
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.11.23
ISCVERSION= 9.11.24
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

6
dns/bind911/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1600870608
SHA256 (bind-9.11.23.tar.gz) = 6e194d2f2a4c9fc18f5989b7a28b71161d1703c0d9b2c0fb8c0a545cc05ad2e1
SIZE (bind-9.11.23.tar.gz) = 8257821
TIMESTAMP = 1603640264
SHA256 (bind-9.11.24.tar.gz) = f261587c5d37c7f14e8393547c4556faefa701a646930f1b6408d71519a30428
SIZE (bind-9.11.24.tar.gz) = 8273237

12
dns/bind911/files/extrapatch-bind-min-override-ttl
View File

@ -1,7 +1,7 @@
- Add the min-cache-ttl config knob.
- Add the override-cache-ttl config knob.
--- bin/named/config.c.orig 2020-06-10 18:00:37 UTC
--- bin/named/config.c.orig 2020-10-13 11:00:08 UTC
+++ bin/named/config.c
@@ -182,6 +182,8 @@ options {\n\
" max-acache-size 16M;\n\
@ -12,7 +12,7 @@
max-clients-per-query 100;\n\
max-ncache-ttl 10800; /* 3 hours */\n\
max-recursion-depth 7;\n\
--- bin/named/server.c.orig 2020-06-10 18:00:37 UTC
--- bin/named/server.c.orig 2020-10-13 11:00:08 UTC
+++ bin/named/server.c
@@ -3720,6 +3720,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
@ -31,7 +31,7 @@
result = ns_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 2020-06-10 18:00:37 UTC
--- lib/dns/include/dns/view.h.orig 2020-10-13 11:00:08 UTC
+++ lib/dns/include/dns/view.h
@@ -152,6 +152,8 @@ struct dns_view {
bool requestnsid;
@ -42,9 +42,9 @@
dns_ttl_t maxncachettl;
uint32_t nta_lifetime;
uint32_t nta_recheck;
--- lib/dns/resolver.c.orig 2020-06-10 18:00:37 UTC
--- lib/dns/resolver.c.orig 2020-10-13 11:00:08 UTC
+++ lib/dns/resolver.c
@@ -5549,6 +5549,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
@@ -5572,6 +5572,18 @@ cache_name(fetchctx_t *fctx, dns_message_t *rmessage,
}
/*
@ -63,7 +63,7 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2020-06-10 18:00:37 UTC
--- lib/isccfg/namedconf.c.orig 2020-10-13 11:00:08 UTC
+++ lib/isccfg/namedconf.c
@@ -1773,6 +1773,8 @@ view_clauses[] = {
#endif

12
dns/bind911/files/patch-configure
View File

@ -3,9 +3,9 @@
- Make sure only json-c is detected.
- Cleanup the BDB discovery code to find more recent versions.
--- configure.orig 2020-07-03 13:08:06 UTC
--- configure.orig 2020-10-13 11:00:08 UTC
+++ configure
@@ -15655,27 +15655,9 @@ done
@@ -15692,27 +15692,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@ -35,7 +35,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
@@ -15718,47 +15700,7 @@ $as_echo "no" >&6; } ;;
@@ -15755,47 +15737,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@ -84,7 +84,7 @@
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
@@ -18595,7 +18537,7 @@ case "$use_libjson" in
@@ -18662,7 +18604,7 @@ case "$use_libjson" in
auto|yes)
for d in /usr /usr/local /opt/local
do
@ -93,7 +93,7 @@
then
if test ${d} != /usr
then
@@ -18603,29 +18545,16 @@ case "$use_libjson" in
@@ -18670,29 +18612,16 @@ case "$use_libjson" in
LIBS="$LIBS -L${d}/lib"
fi
have_libjson="yes"
@ -124,7 +124,7 @@
have_libjson_c="yes"
else
as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5
@@ -24839,7 +24768,7 @@ $as_echo "" >&6; }
@@ -24967,7 +24896,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).

1
dns/bind911/pkg-plist
View File

@ -132,6 +132,7 @@ include/isc/bind9.h
include/isc/boolean.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

4
dns/bind916/Makefile
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/-.*//}

6
dns/bind916/distinfo
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

14
dns/bind916/files/extrapatch-bind-min-override-ttl
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 */

8
dns/bind916/files/patch-configure
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).

1
dns/bind916/pkg-plist
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