Update to 9.11.5-P4.

MFH:		2019Q1 (blanket)
Security:	CVE-2018-5744 CVE-2018-5745 CVE-2019-6465

4 files changed, 14 insertions, 14 deletions

diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index feda914d2195..c44f08dc1c0c 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	911
@@ -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.5-P1
+ISCVERSION=	9.11.5-P4
 
 CPE_VENDOR=	isc
 CPE_VERSION=	${ISCVERSION:C/-.*//}
diff --git a/dns/bind911/distinfo b/dns/bind911/distinfo
index 5d106ed2529a..bcd5423d4fed 100644
--- a/dns/bind911/distinfo
+++ b/dns/bind911/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1544687911
-SHA256 (bind-9.11.5-P1.tar.gz) = 6cd6dbf016569f12d4a0ed629e44e895d9ed41c6908274ed2e617666c5491928
-SIZE (bind-9.11.5-P1.tar.gz) = 8814650
+TIMESTAMP = 1550649103
+SHA256 (bind-9.11.5-P4.tar.gz) = 7e8c08192bcbaeb6e9f2391a70e67583b027b90e8c4bc1605da6eb126edde434
+SIZE (bind-9.11.5-P4.tar.gz) = 8819038
diff --git a/dns/bind911/files/extrapatch-bind-min-override-ttl b/dns/bind911/files/extrapatch-bind-min-override-ttl
index 8abc2b7be407..43c308c63d7f 100644
--- a/dns/bind911/files/extrapatch-bind-min-override-ttl
+++ b/dns/bind911/files/extrapatch-bind-min-override-ttl
@@ -1,4 +1,4 @@
---- bin/named/config.c.orig	2018-10-06 01:36:17 UTC
+--- bin/named/config.c.orig	2019-02-05 00:06:43 UTC
 +++ bin/named/config.c
 @@ -177,6 +177,8 @@ options {\n\
  "	max-acache-size 16M;\n\
@@ -9,9 +9,9 @@
  	max-clients-per-query 100;\n\
  	max-ncache-ttl 10800; /* 3 hours */\n\
  	max-recursion-depth 7;\n\
---- bin/named/server.c.orig	2018-10-06 01:36:17 UTC
+--- bin/named/server.c.orig	2019-02-05 00:06:43 UTC
 +++ bin/named/server.c
-@@ -3695,6 +3695,16 @@ configure_view(dns_view_t *view, dns_vie
+@@ -3695,6 +3695,16 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewl
  	}
  
  	obj = NULL;
@@ -28,7 +28,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	2018-10-06 01:36:17 UTC
+--- lib/dns/include/dns/view.h.orig	2019-02-05 00:06:43 UTC
 +++ lib/dns/include/dns/view.h
 @@ -152,6 +152,8 @@ struct dns_view {
  	bool			requestnsid;
@@ -39,9 +39,9 @@
  	dns_ttl_t			maxncachettl;
  	uint32_t			nta_lifetime;
  	uint32_t			nta_recheck;
---- lib/dns/resolver.c.orig	2018-10-06 01:36:17 UTC
+--- lib/dns/resolver.c.orig	2019-02-05 00:06:43 UTC
 +++ lib/dns/resolver.c
-@@ -5474,6 +5474,18 @@ cache_name(fetchctx_t *fctx, dns_name_t 
+@@ -5474,6 +5474,18 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, dns_adb
  		}
  
  		/*
@@ -60,7 +60,7 @@
  		 * Enforce the configure maximum cache TTL.
  		 */
  		if (rdataset->ttl > res->view->maxcachettl) {
---- lib/isccfg/namedconf.c.orig	2018-10-06 01:36:17 UTC
+--- lib/isccfg/namedconf.c.orig	2019-02-05 00:06:43 UTC
 +++ lib/isccfg/namedconf.c
 @@ -1773,6 +1773,8 @@ view_clauses[] = {
  #endif
diff --git a/dns/bind911/files/patch-bin_named_include_named_globals.h b/dns/bind911/files/patch-bin_named_include_named_globals.h
index 159550d369dc..bcd09ee23fa0 100644
--- a/dns/bind911/files/patch-bin_named_include_named_globals.h
+++ b/dns/bind911/files/patch-bin_named_include_named_globals.h
@@ -1,8 +1,8 @@
 We reference the pid file as being run/named/pid everywere else.
 
---- bin/named/include/named/globals.h.orig	2018-10-06 01:36:17 UTC
+--- bin/named/include/named/globals.h.orig	2019-02-05 00:06:43 UTC
 +++ bin/named/include/named/globals.h
-@@ -139,7 +139,7 @@ EXTERN bool		ns_g_forcelock		INIT(false)
+@@ -139,7 +139,7 @@ EXTERN bool		ns_g_forcelock		INIT(false);
  #if NS_RUN_PID_DIR
  EXTERN const char *		ns_g_defaultpidfile 	INIT(NS_LOCALSTATEDIR
  							     "/run/named/"