net/bind914: update to 9.14.4

Update bind914 to 9.14.4.

	--- 9.14.4 released ---

5260.	[bug]		dnstap-read was producing malformed output for large
			packets. [GL #1093]

5258.	[func]		Added support for the GeoIP2 API from MaxMind,
			when BIND is compiled using "configure --with-geoip2".
			The legacy GeoIP API can be enabled by using
			"configure --with-geoip" instead. These options
			cannot be used together.

			Certain geoip ACL settings that were available with
			legacy GeoIP are not available when using GeoIP2.
			See the ARM for details. [GL #182]

5257.	[bug]		Some statistics data was not being displayed.
			Add shading to the zone tables. [GL #1030]

5256.	[bug]		Ensure that glue records are included in root
			priming responses if "minimal-responses" is not
			set to "yes". [GL #1092]

5255.	[bug]		Errors encountered while reloading inline-signing
			zones could be ignored, causing the zone content to
			be left in an incompletely updated state rather than
			reverted. [GL #1109]

5254.	[func]		Collect metrics to report to the statistics-channel
			DNSSEC signing operations (dnssec-sign) and refresh
			operations (dnssec-refresh) per zone and per keytag.
			[GL #513]

5253.	[port]		Support platforms that don't define ULLONG_MAX.
			[GL #1098]

5251.	[bug]		Statistics were broken in x86 Windows builds.
			[GL #1081]

5249.	[bug]		Fix a possible underflow in recursion clients
			statistics when hitting recursive clients
			soft quota. [GL #1067]

4 files changed, 23 insertions, 27 deletions

diff --git a/net/bind914/Makefile b/net/bind914/Makefile
index f5b00a0a0c5..cb3b3d56ad0 100644
--- a/net/bind914/Makefile
+++ b/net/bind914/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2019/06/28 17:01:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2019/07/18 03:02:02 taca Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
@@ -15,7 +14,7 @@ CONFLICTS+=	host-[0-9]*
 
 MAKE_JOBS_SAFE=	no
 
-BIND_VERSION=	9.14.3
+BIND_VERSION=	9.14.4
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/bind914/distinfo b/net/bind914/distinfo
index 249ec14e51a..6a505b2935e 100644
--- a/net/bind914/distinfo
+++ b/net/bind914/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2019/06/26 21:52:42 jklos Exp $
+$NetBSD: distinfo,v 1.7 2019/07/18 03:02:02 taca Exp $
 
-SHA1 (bind-9.14.3.tar.gz) = aac68ca0242419de24663dca935b63ba54189d9e
-RMD160 (bind-9.14.3.tar.gz) = dc7bd989fd5cf20db954078af5a54e6f1bc558a9
-SHA512 (bind-9.14.3.tar.gz) = 46974be2adea512c58b82184566ea5e8a9faf67aeb78ea33356861f0a7edce37eac05c21e8fbbc7f7db4e87404fe71ed59d9eac46e6e4758d95139a21891f437
-Size (bind-9.14.3.tar.gz) = 6258311 bytes
-SHA1 (patch-bin_named_Makefile.in) = 12e071c61e0f326d0fd7613c6b8884ad0da35214
+SHA1 (bind-9.14.4.tar.gz) = 4b6fdb95b96786556befdedd1f0f3f93409672ad
+RMD160 (bind-9.14.4.tar.gz) = d5b732b9c344d84885b3928ece88731e723185ff
+SHA512 (bind-9.14.4.tar.gz) = f5f4dc9b6a1d60838b59ce57ad37dc1e51fa26719aa203405a73850780f06bdc6ecea71c762efd464f946bdcce5a7c324de98caea36d2fe2781cce116fcd4932
+Size (bind-9.14.4.tar.gz) = 6295768 bytes
+SHA1 (patch-bin_named_Makefile.in) = 741e3708c670baaec45446f6bb364ada448ae330
 SHA1 (patch-bin_named_main.c) = 51c8ab464a009575b6513c7ed4b79f89446eb7d0
 SHA1 (patch-bin_named_pfilter.c) = b54f872c883c8fbc2d9c04df65c185dc057cc36b
 SHA1 (patch-bin_named_pfilter.h) = c14617cb266a4b5d33ba6e5db98562e806792833
@@ -35,6 +35,6 @@ SHA1 (patch-lib_dns_validator.c) = 7d7471efe5109f5b2d6f9e99fe15fa314fdd217d
 SHA1 (patch-lib_dns_view.c) = 25095827adbc75dc629b0f435dbd711b599c86c9
 SHA1 (patch-lib_isc_backtrace.c) = 5fa1dd0f18ae757233d9cc21e36a5f6a84990db1
 SHA1 (patch-lib_isc_rwlock.c) = ca4d71a6437078f0facb32731d2742dc6e4be7c5
-SHA1 (patch-lib_isc_stats.c) = 0dde2b7cbde80f608e52bf8136b3af227b65ba4b
+SHA1 (patch-lib_isc_stats.c) = 9857f640fb0becfab1a7f347f835610230bd3279
 SHA1 (patch-lib_isc_unix_socket.c) = 4f7be1616bac7263069292f909896373f0e6fab8
 SHA1 (patch-lib_isc_unix_time.c) = 04312e043601688aa2b0a09dad1bcb51d9273e9d
diff --git a/net/bind914/patches/patch-bin_named_Makefile.in b/net/bind914/patches/patch-bin_named_Makefile.in
index 65e8ee6550b..836ed1863a3 100644
--- a/net/bind914/patches/patch-bin_named_Makefile.in
+++ b/net/bind914/patches/patch-bin_named_Makefile.in
@@ -1,18 +1,18 @@
-$NetBSD: patch-bin_named_Makefile.in,v 1.1 2019/04/30 03:34:34 taca Exp $
+$NetBSD: patch-bin_named_Makefile.in,v 1.2 2019/07/18 03:02:02 taca Exp $
 
 * Add support for blacklistd.
 
---- bin/named/Makefile.in.orig	2019-04-06 20:09:59.000000000 +0000
+--- bin/named/Makefile.in.orig	2019-07-09 18:15:48.000000000 +0000
 +++ bin/named/Makefile.in
-@@ -84,6 +84,7 @@ SUBDIRS =	unix
+@@ -85,6 +85,7 @@ SUBDIRS =	unix
  
  TARGETS =	named@EXEEXT@
  
 +BLACKLISTLINKOBJS= pfilter.@O@
  GEOIPLINKOBJS = geoip.@O@
+ GEOIP2LINKOBJS = geoip.@O@
  
- OBJS =		builtin.@O@ config.@O@ control.@O@ \
-@@ -91,12 +92,13 @@ OBJS =		builtin.@O@ config.@O@ control.@
+@@ -94,12 +95,13 @@ OBJS =		builtin.@O@ config.@O@ control.@
  		log.@O@ logconf.@O@ main.@O@ \
  		server.@O@ statschannel.@O@ \
  		tkeyconf.@O@ tsigconf.@O@ zoneconf.@O@ \
@@ -25,9 +25,9 @@ $NetBSD: patch-bin_named_Makefile.in,v 1.1 2019/04/30 03:34:34 taca Exp $
  
 +BLACKLISTLINKSRCS= pfilter.c
  GEOIPLINKSRCS = geoip.c
+ GEOIP2LINKSRCS = geoip.c
  
- SRCS =		builtin.c config.c control.c \
-@@ -104,7 +106,7 @@ SRCS =		builtin.c config.c control.c \
+@@ -109,7 +111,7 @@ SRCS =		builtin.c config.c control.c \
  		log.c logconf.c main.c \
  		server.c statschannel.c \
  		tkeyconf.c tsigconf.c zoneconf.c \
diff --git a/net/bind914/patches/patch-lib_isc_stats.c b/net/bind914/patches/patch-lib_isc_stats.c
index 76adac43818..54b5e4379f2 100644
--- a/net/bind914/patches/patch-lib_isc_stats.c
+++ b/net/bind914/patches/patch-lib_isc_stats.c
@@ -1,18 +1,15 @@
-$NetBSD: patch-lib_isc_stats.c,v 1.2 2019/05/20 16:31:08 taca Exp $
+$NetBSD: patch-lib_isc_stats.c,v 1.3 2019/07/18 03:02:02 taca Exp $
 
 * Platform fixes from NetBSD base system.
 
---- lib/isc/stats.c.orig	2019-05-10 04:51:34.000000000 +0000
+--- lib/isc/stats.c.orig	2019-07-09 18:15:48.000000000 +0000
 +++ lib/isc/stats.c
-@@ -30,7 +30,11 @@
+@@ -30,7 +30,7 @@
  #define ISC_STATS_MAGIC			ISC_MAGIC('S', 't', 'a', 't')
  #define ISC_STATS_VALID(x)		ISC_MAGIC_VALID(x, ISC_STATS_MAGIC)
  
-+#ifndef _LP64
-+typedef atomic_int_fast32_t isc_stat_t;
-+#else
+-#if defined(_WIN32) && !defined(_WIN64)
++#if (defined(_WIN32) && !defined(_WIN64)) || !defined(_LP64)
+ typedef atomic_int_fast32_t isc_stat_t;
+ #else
  typedef atomic_int_fast64_t isc_stat_t;
-+#endif
- 
- struct isc_stats {
- 	unsigned int		magic;