Add net-snmp support to recursor and dnsdist pkgs

diff --git a/build-scripts/build-dnsdist-rpm b/build-scripts/build-dnsdist-rpm
index 86e094cc3167c693b2019577d7089616fb427251..487d9df09dd094fef186ba535f100621ae94cf64 100755 (executable)
--- a/build-scripts/build-dnsdist-rpm
+++ b/build-scripts/build-dnsdist-rpm
@@ -121,6 +121,7 @@ Requires(pre): ${SHADOW_REQUIRES}
 BuildRequires: boost-devel
 BuildRequires: lua-devel
 BuildRequires: readline-devel
+BuildRequires: net-snmp-devel
 ${PROTOBUF_BUILDREQUIRES}
 ${RE2_BUILDREQUIRES}
 ${SODIUM_BUILDREQUIRES}
@@ -135,7 +136,7 @@ ${SETUP}
 %build
 %configure \
   --sysconfdir=/etc/dnsdist \
-  --without-net-snmp \
+  --with-net-snmp \
   ${RE2_CONFIGURE}
   ${SODIUM_CONFIGURE}
   ${DNSCRYPT_CONFIGURE}

diff --git a/build-scripts/build-recursor-rpm b/build-scripts/build-recursor-rpm
index b1d42d681c9be6312ecc50ffc54582d9c94ee555..44c66bf020963c47c07454a02e4464a685a993aa 100755 (executable)
--- a/build-scripts/build-recursor-rpm
+++ b/build-scripts/build-recursor-rpm
@@ -125,6 +125,7 @@ BuildRequires: lua-devel
 BuildRequires: libsodium-devel
 #BuildRequires: protobuf-devel
 #BuildRequires: protobuf-compiler
+BuildRequires: net-snmp-devel
 
 Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
@@ -148,6 +149,7 @@ package if you need a dns cache for your network.
        --with-protobuf \
        --enable-unit-tests \
        --enable-libsodium \
+       --with-net-snmp \
        --with-boost=/usr/include/boost148 LIBRARY_PATH=/usr/lib64/boost148
 
 make %{?_smp_mflags} LIBRARY_PATH=/usr/lib64/boost148
@@ -217,6 +219,7 @@ BuildRequires: lua-devel
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
 BuildRequires: libsodium-devel
+BuildRequires: net-snmp-devel
 BuildRequires: hostname
 BuildRequires: protobuf-devel
 BuildRequires: protobuf-compiler
@@ -244,6 +247,7 @@ package if you need a dns cache for your network.
        --enable-unit-tests \
        --with-protobuf \
        --enable-libsodium \
+       --with-net-snmp \
        --enable-systemd
 
 make %{?_smp_mflags}

diff --git a/build-scripts/debian-dnsdist/control.in b/build-scripts/debian-dnsdist/control.in
index 58986482348804fc835dfa2c8bbab751a479cd3a..0a1b8402024c68dc58107e236d6e675decbe5350 100644 (file)
--- a/build-scripts/debian-dnsdist/control.in
+++ b/build-scripts/debian-dnsdist/control.in
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: PowerDNS Autobuilder <powerdns.support@powerdns.com>
 Origin: PowerDNS
-Build-Depends: debhelper (>= 9), dh-autoreconf, dh-systemd (>= 1.5), libboost-dev, libedit-dev, liblua5.2-dev, protobuf-compiler, libprotobuf-dev, pkg-config @LIBRE2DEV@ @LIBSODIUMDEV@ @LIBSYSTEMDDEV@
+Build-Depends: debhelper (>= 9), dh-autoreconf, dh-systemd (>= 1.5), libboost-dev, libedit-dev, liblua5.2-dev, protobuf-compiler, libprotobuf-dev, lib-snmp-dev, pkg-config @LIBRE2DEV@ @LIBSODIUMDEV@ @LIBSYSTEMDDEV@
 Standards-Version: 3.9.7
 Homepage: http://dnsdist.org
 

diff --git a/build-scripts/debian-dnsdist/rules b/build-scripts/debian-dnsdist/rules
index 07bfd180c0cc4dac1393865aed3c837f901a685b..82a14365226d5502dba5200042e7d4302541ed80 100755 (executable)
--- a/build-scripts/debian-dnsdist/rules
+++ b/build-scripts/debian-dnsdist/rules
@@ -53,6 +53,7 @@ override_dh_auto_configure:
          --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
          --libexecdir='$${prefix}/lib' \
          --with-protobuf=yes \
+         --with-net-snmp \
          $(ENABLE_SYSTEMD) \
          $(ENABLE_RE2) \
          $(ENABLE_LIBSODIUM)

diff --git a/build-scripts/debian-recursor/control.in b/build-scripts/debian-recursor/control.in
index d1dbaee2500ddf6f83a716096a82617e377e250d..0f79775f416e3f2e72b61a3f485e7db62a75175d 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@ @LIBSODIUMDEV@
+Build-Depends: debhelper (>= 9~), dh-systemd, quilt, dpkg-dev (>= 1.17.0~), libboost-dev, libboost-serialization-dev, liblua5.2-dev, libsnmp-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 6128fbaa2d9fd17f97a647cf9f11d45e915e90a3..bd5b728c407cbbb3b2713923a4fc6311722828f3 100755 (executable)
--- a/build-scripts/debian-recursor/rules
+++ b/build-scripts/debian-recursor/rules
@@ -51,6 +51,7 @@ override_dh_auto_configure:
                --libexecdir='$${prefix}/lib' \
                --with-lua \
                --with-protobuf=yes \
+               --with-net-snmp \
                $(ENABLE_SYSTEMD) \
                $(ENABLE_LIBSODIUM)