Enable PKCS#11 in auth builds

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index d616c83ea5a49d3f25fb69d9934f68e33ec6bc4b..73109fd101eae44ca559914081c5772e3ce7db15 100755 (executable)
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -534,6 +534,7 @@ BuildRequires: bison
 BuildRequires: openssl-devel
 BuildRequires: protobuf-devel
 BuildRequires: protobuf-compiler
+BuildRequires: p11-kit-devel
 Provides: powerdns = %{version}-%{release}
 %global backends %{backends} bind
 
@@ -676,6 +677,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
        --enable-tools \
        --enable-libsodium \
        --enable-unit-tests \
+       --enable-experimental-pkcs11 \
        --enable-systemd
 
 make %{?_smp_mflags}

diff --git a/build-scripts/debian-authoritative/control.in b/build-scripts/debian-authoritative/control.in
index b9a9a835c8facc291cc813bac8d0d61ca999c763..cac26994e406b1cf53e48dfc04fcbf2466dceb5c 100644 (file)
--- a/build-scripts/debian-authoritative/control.in
+++ b/build-scripts/debian-authoritative/control.in
@@ -4,7 +4,7 @@ Priority: extra
 Standards-Version: 3.9.8
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Origin: PowerDNS
-Build-Depends: debhelper (>= 9~), dh-autoreconf, dh-systemd, po-debconf, curl, libtool, flex, bison, libmysqlclient-dev, libpq-dev, libssl-dev, libgdbm-dev, libldap2-dev, libsqlite3-dev, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, libboost-program-options-dev, libboost-test-dev, autotools-dev, automake, autoconf, libluajit5.1-dev, pkg-config, ragel, libgmp-dev, libbotan1.10-dev, libcurl4-openssl-dev, libzmq-dev, libyaml-cpp-dev (>= 0.5), libgeoip-dev, libopendbx1-dev, libcdb-dev, unixodbc-dev (>= 2.3.1), libprotobuf-dev, protobuf-compiler @LIBSYSTEMDDEV@ @LIBSODIUMDEV@
+Build-Depends: debhelper (>= 9~), dh-autoreconf, dh-systemd, po-debconf, curl, libtool, flex, bison, libmysqlclient-dev, libpq-dev, libssl-dev, libgdbm-dev, libldap2-dev, libsqlite3-dev, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, libboost-program-options-dev, libboost-test-dev, autotools-dev, automake, autoconf, libluajit5.1-dev, pkg-config, ragel, libgmp-dev, libbotan1.10-dev, libcurl4-openssl-dev, libzmq-dev, libyaml-cpp-dev (>= 0.5), libgeoip-dev, libopendbx1-dev, libcdb-dev, unixodbc-dev (>= 2.3.1), libprotobuf-dev, protobuf-compiler, libp11-kit-dev @LIBSYSTEMDDEV@ @LIBSODIUMDEV@
 Homepage: http://www.powerdns.com/
 
 Package: pdns-server

diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules
index 5bebdff959a7b8dccfdc19a1a776e7492eab8fcf..84fae94c5c1be8f35500971e957c12afa26828c0 100755 (executable)
--- a/build-scripts/debian-authoritative/rules
+++ b/build-scripts/debian-authoritative/rules
@@ -54,6 +54,7 @@ override_dh_auto_configure:
                --enable-tools \
                --enable-unit-tests \
                --with-luajit \
+               --enable-experimental-pkcs11 \
                $(ENABLE_SYSTEMD) \
                $(ENABLE_LIBSODIUM)