Enable ED25519 in auth builds

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index 7bfcaed91a3faf5e865d999c5e8f072ef85b9f8c..0971ad3f27898ae8dfe39c92ac039330ac2cdad2 100755 (executable)
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -285,6 +285,7 @@ Requires(postun): /sbin/service
 
 BuildRequires: boost-devel
 BuildRequires: lua-devel
+BuildRequires: libsodium-devel
 BuildRequires: bison
 Provides: powerdns = %{version}-%{release}
 
@@ -394,6 +395,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
        --with-lua \
        --with-dynmodules='bind %{backends} random' \
        --enable-tools \
+       --enable-libsodium \
        --without-protobuf \
        --enable-remotebackend-http \
        --enable-unit-tests
@@ -543,6 +545,7 @@ BuildRequires: systemd-units
 BuildRequires: systemd-devel
 BuildRequires: boost-devel
 BuildRequires: lua-devel
+BuildRequires: libsodium-devel
 BuildRequires: bison
 BuildRequires: openssl-devel
 BuildRequires: protobuf-devel
@@ -687,6 +690,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
        --with-lua \
        --with-dynmodules='%{backends} random' \
        --enable-tools \
+       --enable-libsodium \
        --enable-unit-tests \
        --enable-systemd
 

diff --git a/build-scripts/debian-authoritative/control.in b/build-scripts/debian-authoritative/control.in
index f9ec15bf0d70805816d02978fd6fd32e123058c2..8f58a18d9afe946d906887709651d6d102b17af9 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, 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, liblua5.2-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@
+Build-Depends: debhelper (>= 9~), dh-autoreconf, dh-systemd, po-debconf, 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, liblua5.2-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@
 Homepage: http://www.powerdns.com/
 
 Package: pdns-server

diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules
index 4b37fbb7a4503d8b6e65f9b20f1af5a3917e8ea1..1430d0661e4c4d93cd4fd283b14b1f3918a203e1 100755 (executable)
--- a/build-scripts/debian-authoritative/rules
+++ b/build-scripts/debian-authoritative/rules
@@ -9,6 +9,9 @@ ENABLE_SYSTEMD := --enable-systemd --with-systemd=/lib/systemd/system
 LIBSYSTEMD_DEV := , libsystemd-dev
 DEBHELPER_WITH_SYSTEMD := --with systemd
 
+ENABLE_LIBSODIUM := --enable-libsodium
+LIBSODIUM_DEV := , libsodium-dev
+
 # $(ID) and $(VERSION_ID) come from the environment, source this from /etc/os-release
 ifeq ($(ID), ubuntu)
   ifeq ($(VERSION_ID), 14.04)
@@ -16,11 +19,16 @@ ifeq ($(ID), ubuntu)
     ENABLE_SYSTEMD=
     LIBSYSTEMD_DEV=
     DEBHELPER_WITH_SYSTEMD=
+
+    # Also disable libsodium
+    ENABLE_LIBSODIUM=
+    LIBSODIUM_DEV=
   endif
 endif
 
 debian/control: debian/control.in
-       sed -e "s!@LIBSYSTEMDDEV@!$(LIBSYSTEMD_DEV)!" $< > $@
+       sed -e "s!@LIBSYSTEMDDEV@!$(LIBSYSTEMD_DEV)!" \
+           -e "s!@LIBSODIUMDEV@!$(LIBSODIUM_DEV)!" $< > $@
 
 # Use new build system
 %:
@@ -46,7 +54,8 @@ override_dh_auto_configure:
                --enable-botan1.10 \
                --enable-tools \
                --enable-unit-tests \
-               $(ENABLE_SYSTEMD)
+               $(ENABLE_SYSTEMD) \
+               $(ENABLE_LIBSODIUM)
 
 # pdns-server has a debug package
 override_dh_strip: