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

MFH: r499957 r499958 r499959

Browse Source 
Update to BIND9 9.11.6-P1, 9.12.4-P1, and 9.14.1.

Security:	CVE-2018-5743, CVE-2019-6467
This commit is contained in:
Mathieu Arnold 2019-04-25 07:22:22 +00:00
parent 2f77030567
commit 730f5e09e9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2019Q2/; revision=499961
9 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dns/bind911/Makefile
View File

@ -20,7 +20,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2
USES= cpe libedit
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.11.6
ISCVERSION= 9.11.6-P1
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

6
dns/bind911/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1551432618
SHA256 (bind-9.11.6.tar.gz) = 4499007f3a6b8bba84fc757053caeabf36466d6f7d278baccef9fd109beac6d4
SIZE (bind-9.11.6.tar.gz) = 8125093
TIMESTAMP = 1556110950
SHA256 (bind-9.11.6-P1.tar.gz) = 58ace2abb4d048b67abcdef0649ecd6cbd3b0652734a41a1d34f942d5500f8ef
SIZE (bind-9.11.6-P1.tar.gz) = 8102241

2
dns/bind912/Makefile
View File

@ -32,7 +32,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2
USES= compiler:c11 cpe libedit
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.12.4
ISCVERSION= 9.12.4-P1
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

6
dns/bind912/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1551432826
SHA256 (bind-9.12.4.tar.gz) = 81bf24b2b86f7288ccf727aff59f1d752cc3e9de30a7480d24d67736256a0d53
SIZE (bind-9.12.4.tar.gz) = 7936647
TIMESTAMP = 1556117908
SHA256 (bind-9.12.4-P1.tar.gz) = e27a5aee2b0c1a925001dda71eea7e19b0cce54a7b18a61912cde5ff0afbc7c5
SIZE (bind-9.12.4-P1.tar.gz) = 7914907

2
dns/bind914/Makefile
View File

@ -33,7 +33,7 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2
USES= compiler:c11 cpe libedit ssl
# ISC releases things like 9.8.0-P1, which our versioning doesn't like
ISCVERSION= 9.14.0
ISCVERSION= 9.14.1
CPE_VENDOR= isc
CPE_VERSION= ${ISCVERSION:C/-.*//}

6
dns/bind914/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1553504518
SHA256 (bind-9.14.0.tar.gz) = 4edd459830bb97f749e25a5d42a2a4a093d7800e9962fca4300996cf7ea680af
SIZE (bind-9.14.0.tar.gz) = 6290135
TIMESTAMP = 1556117981
SHA256 (bind-9.14.1.tar.gz) = c3c7485d900a03271a9918a071c123e8951871a219f4c1c4383e37717f11db48
SIZE (bind-9.14.1.tar.gz) = 6235968

16
dns/bind914/files/extrapatch-bind-min-override-ttl
View File

@ -1,4 +1,4 @@
--- bin/named/config.c.orig 2019-03-13 02:03:34 UTC
--- bin/named/config.c.orig 2019-04-06 20:09:59 UTC
+++ bin/named/config.c
@@ -179,6 +179,7 @@ options {\n\
notify-source *;\n\
@ -8,9 +8,9 @@
provide-ixfr true;\n\
qname-minimization relaxed;\n\
query-source address *;\n\
--- bin/named/server.c.orig 2019-03-13 02:03:34 UTC
--- bin/named/server.c.orig 2019-04-06 20:09:59 UTC
+++ bin/named/server.c
@@ -4162,6 +4162,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
@@ -4178,6 +4178,11 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
}
obj = NULL;
@ -22,7 +22,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-03-13 02:03:34 UTC
--- lib/dns/include/dns/view.h.orig 2019-04-06 20:09:59 UTC
+++ lib/dns/include/dns/view.h
@@ -153,6 +153,7 @@ struct dns_view {
bool requestnsid;
@ -32,9 +32,9 @@
dns_ttl_t maxncachettl;
dns_ttl_t mincachettl;
dns_ttl_t minncachettl;
--- lib/dns/resolver.c.orig 2019-03-13 02:03:34 UTC
--- lib/dns/resolver.c.orig 2019-04-06 20:09:59 UTC
+++ lib/dns/resolver.c
@@ -6009,6 +6009,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
@@ -6013,6 +6013,12 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
}
/*
@ -47,9 +47,9 @@
* Enforce the configure maximum cache TTL.
*/
if (rdataset->ttl > res->view->maxcachettl) {
--- lib/isccfg/namedconf.c.orig 2019-03-13 02:03:34 UTC
--- lib/isccfg/namedconf.c.orig 2019-04-06 20:09:59 UTC
+++ lib/isccfg/namedconf.c
@@ -1899,6 +1899,7 @@ view_clauses[] = {
@@ -1901,6 +1901,7 @@ view_clauses[] = {
#endif
{ "max-acache-size", &cfg_type_sizenodefault, CFG_CLAUSEFLAG_OBSOLETE },
{ "max-cache-size", &cfg_type_sizeorpercent, 0 },

8
dns/bind914/files/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig 2019-03-13 02:03:34 UTC
--- configure.orig 2019-04-06 20:09:59 UTC
+++ configure
@@ -16318,27 +16318,9 @@ done
@@ -16317,27 +16317,9 @@ done
# problems start to show up.
saved_libs="$LIBS"
for TRY_LIBS in \
@ -30,7 +30,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
@@ -16381,47 +16363,7 @@ $as_echo "no" >&6; } ;;
@@ -16380,47 +16362,7 @@ $as_echo "no" >&6; } ;;
no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;;
esac
@ -79,7 +79,7 @@
DNS_GSSAPI_LIBS="$LIBS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
@@ -20928,7 +20870,7 @@ $as_echo "" >&6; }
@@ -20924,7 +20866,7 @@ $as_echo "" >&6; }
# Check other locations for includes.
# Order is important (sigh).

1
dns/bind914/pkg-plist
View File

@ -44,7 +44,6 @@ include/dns/dns64.h
include/dns/dnsrps.h
include/dns/dnssec.h
include/dns/dnstap.h
%%DNSTAP%%include/dns/dnstap.pb-c.h
include/dns/ds.h
include/dns/dsdigest.h
include/dns/dyndb.h