dnsperf: Fix build with BIND 9.12.3 and newer

5 files changed, 68 insertions, 1 deletions

diff --git a/benchmarks/dnsperf/distinfo b/benchmarks/dnsperf/distinfo
index dcdf9bb2eb0..16493a1512a 100644
--- a/benchmarks/dnsperf/distinfo
+++ b/benchmarks/dnsperf/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.3 2017/05/03 06:59:13 mef Exp $
+$NetBSD: distinfo,v 1.4 2018/10/27 12:04:33 tron Exp $
 
 SHA1 (dnsperf-src-2.1.0.0-1.tar.gz) = 1a5d32feb41dd174f82f57ba62389d3480619c91
 RMD160 (dnsperf-src-2.1.0.0-1.tar.gz) = 0392903f300750ca53785f342a547eee5eb9db6d
 SHA512 (dnsperf-src-2.1.0.0-1.tar.gz) = 5571bd0855aba4affcdf81724919e60ab6762d646f8d9a6abf177a2a588675c636842f2fb708bf648004b9c411e9c9b68789f7c6bbbd87afc24c8299a21aa6c9
 Size (dnsperf-src-2.1.0.0-1.tar.gz) = 561502 bytes
 SHA1 (patch-Makefile.in) = 9f5377a75d9674a3aeb12f933f0a552564534d91
+SHA1 (patch-datafile.h) = d05f41b5d02048ffe5ca7261cd0164202fb9821a
+SHA1 (patch-dns.h) = 1c78fc5dd05c4eb32563c2cfacdabadfa9937c1b
+SHA1 (patch-os.h) = 53b573fddee3495a8b8e73088b1a4742a6b1b9ae
+SHA1 (patch-util.h) = 94893a9d867aabd43650e66ffbbb0995ceb9becd
diff --git a/benchmarks/dnsperf/patches/patch-datafile.h b/benchmarks/dnsperf/patches/patch-datafile.h
new file mode 100644
index 00000000000..96709fd3137
--- /dev/null
+++ b/benchmarks/dnsperf/patches/patch-datafile.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-datafile.h,v 1.1 2018/10/27 12:04:33 tron Exp $
+
+Fix build with BIND 9.12.3 and newer
+
+--- datafile.h.orig	2015-12-16 00:46:49.000000000 +0000
++++ datafile.h	2018-10-27 12:57:12.538706870 +0100
+@@ -19,6 +19,10 @@
+ #define PERF_DATAFILE_H 1
+ 
+ #include <isc/types.h>
++#include <isc/boolean.h>
++#include <isc/int.h>
++
++#define ISC_PRINT_QUADFORMAT PRIu64
+ 
+ typedef struct perf_datafile perf_datafile_t;
+ 
diff --git a/benchmarks/dnsperf/patches/patch-dns.h b/benchmarks/dnsperf/patches/patch-dns.h
new file mode 100644
index 00000000000..4985c1e7556
--- /dev/null
+++ b/benchmarks/dnsperf/patches/patch-dns.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-dns.h,v 1.1 2018/10/27 12:04:33 tron Exp $
+
+Fix build with BIND 9.12.3 and newer
+
+--- dns.h.orig	2015-12-16 00:46:50.000000000 +0000
++++ dns.h	2018-10-27 12:58:23.298408393 +0100
+@@ -33,6 +33,8 @@
+  */
+ 
+ #include <isc/types.h>
++#include <isc/boolean.h>
++#include <isc/int.h>
+ 
+ #ifndef PERF_DNS_H
+ #define PERF_DNS_H 1
diff --git a/benchmarks/dnsperf/patches/patch-os.h b/benchmarks/dnsperf/patches/patch-os.h
new file mode 100644
index 00000000000..941aab3b061
--- /dev/null
+++ b/benchmarks/dnsperf/patches/patch-os.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-os.h,v 1.1 2018/10/27 12:04:33 tron Exp $
+
+Fix build with BIND 9.12.3 and newer
+
+--- os.h.orig	2015-12-16 00:46:50.000000000 +0000
++++ os.h	2018-10-27 12:59:42.370351276 +0100
+@@ -18,6 +18,9 @@
+ #ifndef PERF_OS_H
+ #define PERF_OS_H 1
+ 
++#include <isc/boolean.h>
++#include <isc/int.h>
++
+ void
+ perf_os_blocksignal(int sig, isc_boolean_t block);
+ 
diff --git a/benchmarks/dnsperf/patches/patch-util.h b/benchmarks/dnsperf/patches/patch-util.h
new file mode 100644
index 00000000000..69089fe9283
--- /dev/null
+++ b/benchmarks/dnsperf/patches/patch-util.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-util.h,v 1.1 2018/10/27 12:04:33 tron Exp $
+
+Fix build with BIND 9.12.3 and newer
+
+--- util.h.orig	2015-12-16 00:46:49.000000000 +0000
++++ util.h	2018-10-27 12:59:01.184426825 +0100
+@@ -21,6 +21,8 @@
+ #include <sys/time.h>
+ 
+ #include <isc/types.h>
++#include <isc/boolean.h>
++#include <isc/int.h>
+ 
+ #include "log.h"
+