From 22f4ca24c3c4b934f2ffa912681703739fd8f834 Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 2 May 2018 23:07:25 +0200
Subject: [PATCH] dnspcap2calidns: Add manpage and packaging

---
 build-scripts/build-auth-rpm                  |  6 +++++
 .../debian-authoritative/pdns-tools.install   |  1 +
 .../debian-authoritative/pdns-tools.manpages  |  1 +
 docs/conf.py                                  |  1 +
 docs/manpages/dnspcap2calidns.1.rst           | 23 +++++++++++++++++++
 5 files changed, 32 insertions(+)
 create mode 100644 docs/manpages/dnspcap2calidns.1.rst

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index aacfe0fa8..fa1692c28 100755
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -451,6 +451,7 @@ fi
 %files tools
 %{_bindir}/calidns
 %{_bindir}/dnsgram
+%{_bindir}/dnspcap2calidns
 %{_bindir}/dnsreplay
 %{_bindir}/dnsscan
 %{_bindir}/dnsscope
@@ -465,6 +466,7 @@ fi
 %{_bindir}/sdig
 %{_mandir}/man1/calidns.1.gz
 %{_mandir}/man1/dnsgram.1.gz
+%{_mandir}/man1/dnspcap2calidns.1.gz
 %{_mandir}/man1/dnsreplay.1.gz
 %{_mandir}/man1/dnsscan.1.gz
 %{_mandir}/man1/dnsscope.1.gz
@@ -774,6 +776,7 @@ exit 0
 %{_bindir}/calidns
 %{_bindir}/dnsbulktest
 %{_bindir}/dnsgram
+%{_bindir}/dnspcap2calidns
 %{_bindir}/dnspcap2protobuf
 %{_bindir}/dnsreplay
 %{_bindir}/dnsscan
@@ -791,6 +794,7 @@ exit 0
 %{_mandir}/man1/calidns.1.gz
 %{_mandir}/man1/dnsbulktest.1.gz
 %{_mandir}/man1/dnsgram.1.gz
+%{_mandir}/man1/dnspcap2calidns.1.gz
 %{_mandir}/man1/dnspcap2protobuf.1.gz
 %{_mandir}/man1/dnsreplay.1.gz
 %{_mandir}/man1/dnsscan.1.gz
@@ -1055,6 +1059,7 @@ exit 0
 %{_bindir}/calidns
 %{_bindir}/dnsbulktest
 %{_bindir}/dnsgram
+%{_bindir}/dnspcap2calidns
 %{_bindir}/dnsreplay
 %{_bindir}/dnsscan
 %{_bindir}/dnsscope
@@ -1071,6 +1076,7 @@ exit 0
 %{_mandir}/man1/calidns.1.gz
 %{_mandir}/man1/dnsbulktest.1.gz
 %{_mandir}/man1/dnsgram.1.gz
+%{_mandir}/man1/dnspcap2calidns.1.gz
 %{_mandir}/man1/dnsreplay.1.gz
 %{_mandir}/man1/dnsscan.1.gz
 %{_mandir}/man1/dnsscope.1.gz
diff --git a/build-scripts/debian-authoritative/pdns-tools.install b/build-scripts/debian-authoritative/pdns-tools.install
index b9eaaa9b4..b8091214d 100644
--- a/build-scripts/debian-authoritative/pdns-tools.install
+++ b/build-scripts/debian-authoritative/pdns-tools.install
@@ -1,6 +1,7 @@
 usr/bin/calidns
 usr/bin/dnsbulktest
 usr/bin/dnsgram
+usr/bin/dnspcap2calidns
 usr/bin/dnspcap2protobuf
 usr/bin/dnsreplay
 usr/bin/dnsscan
diff --git a/build-scripts/debian-authoritative/pdns-tools.manpages b/build-scripts/debian-authoritative/pdns-tools.manpages
index 67b6f7d95..a5195d1f8 100644
--- a/build-scripts/debian-authoritative/pdns-tools.manpages
+++ b/build-scripts/debian-authoritative/pdns-tools.manpages
@@ -1,6 +1,7 @@
 debian/tmp/usr/share/man/man1/calidns.1
 debian/tmp/usr/share/man/man1/dnsbulktest.1
 debian/tmp/usr/share/man/man1/dnsgram.1
+debian/tmp/usr/share/man/man1/dnspcap2calidns.1
 debian/tmp/usr/share/man/man1/dnspcap2protobuf.1
 debian/tmp/usr/share/man/man1/dnsreplay.1
 debian/tmp/usr/share/man/man1/dnsscan.1
diff --git a/docs/conf.py b/docs/conf.py
index 44bb3ed4c..5c9cf3981 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -170,6 +170,7 @@ descriptions = {
     'calidns': 'A DNS recursor testing tool',
     'dnsbulktest': 'A debugging tool for intermittent resolver failures',
     'dnsgram': 'A debugging tool for intermittent resolver failures',
+    'dnspcap2calidns': 'A tool to convert PCAPs of DNS traffic to calidns input',
     'dnspcap2protobuf': 'A tool to convert PCAPs of DNS traffic to PowerDNS Protobuf',
     'dnsreplay': 'A PowerDNS nameserver debugging tool',
     'dnsscan': 'List the amount of queries per qtype in a pcap',
diff --git a/docs/manpages/dnspcap2calidns.1.rst b/docs/manpages/dnspcap2calidns.1.rst
new file mode 100644
index 000000000..f85f724a7
--- /dev/null
+++ b/docs/manpages/dnspcap2calidns.1.rst
@@ -0,0 +1,23 @@
+dnspcap2calidns
+================
+
+Synopsis
+--------
+
+:program:`dnspcap2calidns` *PCAPFILE* *OUTFILE*
+
+Description
+-----------
+
+:program:`dnspcap2calidns` reads the PCAP file *PCAPFILE* for DNS queries and
+writes these to *OUTFILE* in the format understood by :program:`calidns`
+
+Options
+-------
+
+--help           Show a summary of options.
+--version        Display the version of dnspcap2calidns
+
+See also
+--------
+:manpage:`calidns(1)`
-- 
2.40.0