auth: Use luajit and link in protobuf+p11kit in pkgs

diff --git a/builder-support/debian/debian-stretch/control b/builder-support/debian/debian-stretch/control
index a2802ccde0a39fb0482e96c8b1d283300db35d1a..8911dadf95830ce1cb20955dc19bfafc76bb4231 100644 (file)
--- a/builder-support/debian/debian-stretch/control
+++ b/builder-support/debian/debian-stretch/control
@@ -23,9 +23,11 @@ Build-Depends: autoconf,
                libgeoip-dev,
                libkrb5-dev,
                libldap2-dev,
-               liblua5.3-dev,
+               libluajit-5.1-dev,
                libopendbx1-dev,
+               libp11-kit-dev,
                libpq-dev,
+               libprotobuf-dev,
                libsodium-dev,
                libsqlite3-dev,
                libssl-dev,
@@ -34,6 +36,7 @@ Build-Depends: autoconf,
                libyaml-cpp-dev (>= 0.5),
                pkg-config,
                po-debconf,
+               protobuf-compiler,
                ragel,
                unixodbc-dev (>= 2.3.1)
 Homepage: http://www.powerdns.com/

diff --git a/builder-support/debian/debian-stretch/pdns-tools.install b/builder-support/debian/debian-stretch/pdns-tools.install
index dd9d70c4f1634fd519dc657094359e3eb9220194..6ca38a9e4397ade10bce8dc81e39252223330901 100644 (file)
--- a/builder-support/debian/debian-stretch/pdns-tools.install
+++ b/builder-support/debian/debian-stretch/pdns-tools.install
@@ -1,6 +1,7 @@
 usr/bin/calidns
 usr/bin/dnsbulktest
 usr/bin/dnsgram
+usr/bin/dnspcap2protobuf
 usr/bin/dnsreplay
 usr/bin/dnsscan
 usr/bin/dnsscope

diff --git a/builder-support/debian/debian-stretch/pdns-tools.manpages b/builder-support/debian/debian-stretch/pdns-tools.manpages
index afbafe82f88e85c1deb2fd0f9622bc3221bff479..b8b70a83da965e2134a2ea3cddf87f76e2b43b55 100644 (file)
--- a/builder-support/debian/debian-stretch/pdns-tools.manpages
+++ b/builder-support/debian/debian-stretch/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/dnspcap2protobuf.1
 debian/tmp/usr/share/man/man1/dnsreplay.1
 debian/tmp/usr/share/man/man1/dnsscan.1
 debian/tmp/usr/share/man/man1/dnsscope.1

diff --git a/builder-support/debian/debian-stretch/rules b/builder-support/debian/debian-stretch/rules
index 70efdf2941de6f61cf2963d7ae886c6e15b30ebb..b87448cf45a5823e2a029044d117167a315187bf 100755 (executable)
--- a/builder-support/debian/debian-stretch/rules
+++ b/builder-support/debian/debian-stretch/rules
@@ -27,11 +27,12 @@ override_dh_auto_configure:
                --sysconfdir=/etc/powerdns \
                --with-dynmodules="$(backends)" \
                --with-modules="" \
-               --enable-libsodium \
                --enable-tools \
-               --without-protobuf \
+               --enable-libsodium \
+               --with-luajit \
+               --with-protobuf \
                --enable-unit-tests \
-               --enable-reproducible \
+               --enable-experimental-pkcs11 \
                $(CONFIGURE_ARGS)
 
 override_dh_strip: