Pullup ticket #5918 - requested by taca

net/bind912: security fix

Revisions pulled up:
- net/bind912/Makefile                                          1.8-1.9
- net/bind912/PLIST                                             1.2
- net/bind912/distinfo                                          1.6
- net/bind912/options.mk                                        1.3

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Thu Jan 17 08:53:37 UTC 2019

   Modified Files:
   	pkgsrc/net/bind912: Makefile PLIST options.mk

   Log Message:
   Add a "dnstap" option, defaults to off.
   Bump PKGREVISION.

---
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Fri Feb 22 01:24:24 UTC 2019

   Modified Files:
   	pkgsrc/net/bind912: Makefile distinfo

   Log Message:
   net/bind912: update to 9.12.3pl4

   Update bind912 to 9.12.3pl4 (BIND 9.12.3-P4).

   	--- 9.12.3-P4 released ---

   	--- 9.12.3-P3 released (withdrawn) ---

   5141.	[security]	Zone transfer controls for writable DLZ zones were
   			not effective as the allowzonexfr method was not being
   			called for such zones. (CVE-2019-6465) [GL #790]

   	--- 9.12.3-P2 released (withdrawn) ---

   5118.	[security]	Named could crash if it is managing a key with
   			`managed-keys` and the authoritative zone is rolling
   			the key to an unsupported algorithm. (CVE-2018-5745)
   			[GL #780]

   5110.	[security]	Named leaked memory if there were multiple Key Tag
   			EDNS options present. (CVE-2018-5744) [GL #772]

4 files changed, 22 insertions, 11 deletions

diff --git a/net/bind912/Makefile b/net/bind912/Makefile
index 3edcb76191d..c6ac8b8a531 100644
--- a/net/bind912/Makefile
+++ b/net/bind912/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/12/15 16:40:20 taca Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2019/03/04 16:51:40 bsiegert Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
@@ -15,7 +15,7 @@ CONFLICTS+=	host-[0-9]*
 MAKE_JOBS_SAFE=	no
 USE_CWRAPPERS=	no
 
-BIND_VERSION=	9.12.3-P1
+BIND_VERSION=	9.12.3-P4
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/bind912/PLIST b/net/bind912/PLIST
index 38fc6f78a21..c36ce8c79bf 100644
--- a/net/bind912/PLIST
+++ b/net/bind912/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2018/09/09 13:16:01 taca Exp $
+@comment $NetBSD: PLIST,v 1.1.4.1 2019/03/04 16:51:40 bsiegert Exp $
 bin/arpaname
 bin/bind9-config
 bin/delv
@@ -9,6 +9,7 @@ bin/mdig
 bin/named-rrchecker
 bin/nslookup
 bin/nsupdate
+${PLIST.dnstap}bin/dnstap-read
 include/bind9/check.h
 include/bind9/getaddresses.h
 include/bind9/version.h
@@ -35,6 +36,7 @@ include/dns/dns64.h
 include/dns/dnsrps.h
 include/dns/dnssec.h
 include/dns/dnstap.h
+${PLIST.dnstap}include/dns/dnstap.pb-c.h
 include/dns/ds.h
 include/dns/dsdigest.h
 include/dns/dyndb.h
@@ -310,6 +312,7 @@ ${PLIST.pkcs11}man/man8/pkcs11-destroy.8
 ${PLIST.pkcs11}man/man8/pkcs11-keygen.8
 ${PLIST.pkcs11}man/man8/pkcs11-list.8
 ${PLIST.pkcs11}man/man8/pkcs11-tokens.8
+${PLIST.dnstap}man/man1/dnstap-read.1
 man/man8/rndc-confgen.8
 man/man8/rndc.8
 man/man8/tsig-keygen.8
diff --git a/net/bind912/distinfo b/net/bind912/distinfo
index f9d810be9c3..854dc3ad994 100644
--- a/net/bind912/distinfo
+++ b/net/bind912/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2018/12/15 16:40:20 taca Exp $
+$NetBSD: distinfo,v 1.5.2.1 2019/03/04 16:51:40 bsiegert Exp $
 
-SHA1 (bind-9.12.3-P1.tar.gz) = 1bc1ff64051d467fa27b2a8266c5ea3e495609c7
-RMD160 (bind-9.12.3-P1.tar.gz) = eb0c67a00f9b3bba858734ca3aa9e624fac11362
-SHA512 (bind-9.12.3-P1.tar.gz) = c1c91de88e4297e79b527775edd525c6fa948f169977563ab2e6ca93cac7317f8ca85863567f5cc151d4c6e3c081864ab1cf813bcfdd1165b52e9471b8317c28
-Size (bind-9.12.3-P1.tar.gz) = 8625693 bytes
+SHA1 (bind-9.12.3-P4.tar.gz) = 883c1513e0c97887db2c57625b1c6ad5f15f8078
+RMD160 (bind-9.12.3-P4.tar.gz) = a5a314a370e53ac2cb3c743c4886b8b538a2bd63
+SHA512 (bind-9.12.3-P4.tar.gz) = 42c41f47a0282dc08ee875fe098ce84b26384dba5efbaf99b557d34c4271e0d6aac70126f280a3ee157e8604cce16901c8cd51fab791dec82f4a3d00c054f363
+Size (bind-9.12.3-P4.tar.gz) = 8627833 bytes
 SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
 SHA1 (patch-config.threads.in) = 8341bdb11888d3efdde5f115de91b1f46aa40bd0
 SHA1 (patch-configure) = 7d74eef1002351a5513c7c617e28721b39de65d0
diff --git a/net/bind912/options.mk b/net/bind912/options.mk
index 015b735ddb1..805021eb319 100644
--- a/net/bind912/options.mk
+++ b/net/bind912/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.2 2018/10/24 11:10:31 jperkin Exp $
+# $NetBSD: options.mk,v 1.2.2.1 2019/03/04 16:51:40 bsiegert Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bind912
 PKG_SUPPORTED_OPTIONS=	bind-dig-sigchase bind-xml-statistics-server
 PKG_SUPPORTED_OPTIONS+=	bind-json-statistics-server
 PKG_SUPPORTED_OPTIONS+=	inet6 threads readline mysql pgsql ldap dlz-filesystem
-PKG_SUPPORTED_OPTIONS+=	fetchlimit geoip pkcs11 sit tuning
+PKG_SUPPORTED_OPTIONS+=	fetchlimit geoip pkcs11 sit tuning dnstap
 PKG_SUGGESTED_OPTIONS+=	readline
 
-PLIST_VARS+=	inet6 pkcs11
+PLIST_VARS+=	inet6 pkcs11 dnstap
 
 PTHREAD_OPTS+=		native
 .include "../../mk/pthread.buildlink3.mk"
@@ -82,6 +82,14 @@ CONFIGURE_ARGS+=	--enable-sit
 CONFIGURE_ARGS+=	--with-tuning=large
 .endif
 
+.if !empty(PKG_OPTIONS:Mdnstap)
+CONFIGURE_ARGS+=	--enable-dnstap
+PLIST.dnstap=		yes
+.include "../../net/fstrm/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
+.include "../../devel/protobuf-c/buildlink3.mk"
+.endif
+
 ###
 ### The statistics server in bind99 and later needs libxml2
 ###