From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 15 Dec 2017 13:32:41 +0000 (+0100)
Subject: auth: Use luajit and link in protobuf+p11kit in pkgs
X-Git-Tag: dnsdist-1.3.3~83^2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71d6323d210b50d0717b319849381db4437d43b5;p=thirdparty%2Fpdns.git

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 a2802ccde0..8911dadf95 100644
--- 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 dd9d70c4f1..6ca38a9e43 100644
--- 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 afbafe82f8..b8b70a83da 100644
--- 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 70efdf2941..b87448cf45 100755
--- 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: