distro/deb: add dnstap subpackage

introduce new dependencies:

* libfstrm
* libprotobuf-c

diff --git a/distro/deb/control b/distro/deb/control
index d5be5f5c00a13a2bd59b9b11047cbf8983cc2d09..ac9f5b9fad7a357e73de88ea01e8c9cd3da823d3 100644 (file)
--- a/distro/deb/control
+++ b/distro/deb/control
@@ -8,11 +8,13 @@ Build-Depends:
  debhelper (>= 9~),
  libcmocka-dev (>= 1.0.0),
  libedit-dev,
+ libfstrm-dev,
  libgnutls28-dev,
  libknot-dev (>= 2.8),
  liblmdb-dev,
  libluajit-5.1-dev,
  libnghttp2-dev,
+ libprotobuf-c-dev,
  libsystemd-dev (>= 227) [linux-any],
  libcap-ng-dev,
  libuv1-dev,
@@ -20,6 +22,7 @@ Build-Depends:
  pkg-config,
  meson (>= 0.46),
  doxygen,
+ protobuf-c-compiler,
  python3-breathe,
  python3-sphinx,
  python3-sphinx-rtd-theme,
@@ -74,6 +77,26 @@ Description: Debug symbols for Knot Resolver
  This package provides the debug symbols for Knot Resolver needed
  for properly debugging errors in Knot Resolver with gdb.
 
+Package: knot-resolver-module-dnstap
+Architecture: any
+Multi-Arch: same
+Depends:
+ knot-resolver (= ${binary:Version}),
+ libfstrm0,
+ libprotobuf-c1,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: dnstap module for Knot Resolver
+ The Knot Resolver is a caching full resolver implementation
+ written in C and LuaJIT, including both a resolver library and a
+ daemon. Modular architecture of the library keeps the core tiny and
+ efficient, and provides a state-machine like API for
+ extensions. There are three built-in modules - iterator, cache,
+ validator, and many external.
+ .
+ This package contains dnstap module for logging DNS responses
+ to a unix socket in dnstap format.
+
 Package: knot-resolver-module-http
 Architecture: all
 Depends:

diff --git a/distro/deb/knot-resolver-module-dnstap.install b/distro/deb/knot-resolver-module-dnstap.install
new file mode 100644 (file)
index 0000000..ae5404e
--- /dev/null
+++ b/distro/deb/knot-resolver-module-dnstap.install
@@ -0,0 +1 @@
+usr/lib/knot-resolver/kres_modules/dnstap.so

diff --git a/distro/deb/knot-resolver.install b/distro/deb/knot-resolver.install
index 542794cfec7b0179a1e1df2c9fdf5b513d5281c1..1e770bb725d57e0a3c89c647166f24b69631aebc 100644 (file)
--- a/distro/deb/knot-resolver.install
+++ b/distro/deb/knot-resolver.install
@@ -6,7 +6,12 @@ usr/lib/*.so.*
 usr/lib/tmpfiles.d/knot-resolver.conf
 usr/lib/knot-resolver/*.so
 usr/lib/knot-resolver/*.lua
-usr/lib/knot-resolver/kres_modules/*.so
+usr/lib/knot-resolver/kres_modules/bogus_log.so
+usr/lib/knot-resolver/kres_modules/edns_keepalive.so
+usr/lib/knot-resolver/kres_modules/hints.so
+usr/lib/knot-resolver/kres_modules/nsid.so
+usr/lib/knot-resolver/kres_modules/refuse_nord.so
+usr/lib/knot-resolver/kres_modules/stats.so
 usr/lib/knot-resolver/kres_modules/daf.lua
 usr/lib/knot-resolver/kres_modules/daf/*
 usr/lib/knot-resolver/kres_modules/detect_time_jump.lua

diff --git a/distro/deb/rules b/distro/deb/rules
index 4b727590aed2646d10adf01a3755eb78361b915f..3445b8ce53606d96ee0936ff202ba4c0318bd73d 100755 (executable)
--- a/distro/deb/rules
+++ b/distro/deb/rules
@@ -27,6 +27,7 @@ override_dh_auto_build:
                -Ddoc=enabled \
                -Dsystemd_files=enabled \
                -Dclient=enabled \
+               -Ddnstap=enabled \
                -Dkeyfile_default=/usr/share/dns/root.key \
                -Droot_hints=/usr/share/dns/root.hints \
                -Dinstall_kresd_conf=enabled \