Enable ED25519 in recursor builds

diff --git a/build-scripts/build-recursor-rpm b/build-scripts/build-recursor-rpm
index 8b27f5c5ccf3b3242e783f10ab6f3875a404f548..b1d42d681c9be6312ecc50ffc54582d9c94ee555 100755 (executable)
--- a/build-scripts/build-recursor-rpm
+++ b/build-scripts/build-recursor-rpm
@@ -122,6 +122,7 @@ Source1: pdns-recursor.init
 Provides: powerdns-recursor = %{version}-%{release}
 BuildRequires: boost148-devel
 BuildRequires: lua-devel
+BuildRequires: libsodium-devel
 #BuildRequires: protobuf-devel
 #BuildRequires: protobuf-compiler
 
@@ -146,6 +147,7 @@ package if you need a dns cache for your network.
        --disable-silent-rules \
        --with-protobuf \
        --enable-unit-tests \
+       --enable-libsodium \
        --with-boost=/usr/include/boost148 LIBRARY_PATH=/usr/lib64/boost148
 
 make %{?_smp_mflags} LIBRARY_PATH=/usr/lib64/boost148
@@ -214,6 +216,7 @@ BuildRequires: boost-devel
 BuildRequires: lua-devel
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
+BuildRequires: libsodium-devel
 BuildRequires: hostname
 BuildRequires: protobuf-devel
 BuildRequires: protobuf-compiler
@@ -240,6 +243,7 @@ package if you need a dns cache for your network.
        --disable-silent-rules \
        --enable-unit-tests \
        --with-protobuf \
+       --enable-libsodium \
        --enable-systemd
 
 make %{?_smp_mflags}

diff --git a/build-scripts/debian-recursor/control.in b/build-scripts/debian-recursor/control.in
index a7e2b4e443d0929835631df6d9575c7aeaeb25aa..d1dbaee2500ddf6f83a716096a82617e377e250d 100644 (file)
--- a/build-scripts/debian-recursor/control.in
+++ b/build-scripts/debian-recursor/control.in
@@ -4,7 +4,7 @@ Priority: extra
 Standards-Version: 3.9.6
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Origin: PowerDNS
-Build-Depends: debhelper (>= 9~), dh-systemd, quilt, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, liblua5.2-dev, libprotobuf-dev, protobuf-compiler, pkg-config @LIBSYSTEMDDEV@
+Build-Depends: debhelper (>= 9~), dh-systemd, quilt, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, liblua5.2-dev, libprotobuf-dev, protobuf-compiler, pkg-config @LIBSYSTEMDDEV@ @LIBSODIUMDEV@
 Homepage: http://www.powerdns.com/
 
 Package: pdns-recursor

diff --git a/build-scripts/debian-recursor/rules b/build-scripts/debian-recursor/rules
index 983fea9fa0a19b9f535375b7ee0f0ebd20e5adeb..6128fbaa2d9fd17f97a647cf9f11d45e915e90a3 100755 (executable)
--- a/build-scripts/debian-recursor/rules
+++ b/build-scripts/debian-recursor/rules
@@ -11,6 +11,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)
@@ -18,11 +21,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
 %:
@@ -43,7 +51,8 @@ override_dh_auto_configure:
                --libexecdir='$${prefix}/lib' \
                --with-lua \
                --with-protobuf=yes \
-               $(ENABLE_SYSTEMD)
+               $(ENABLE_SYSTEMD) \
+               $(ENABLE_LIBSODIUM)
 
 override_dh_auto_install:
        ./pdns_recursor --config | sed \