From 2b203b2ff630047b561936e8ee9a6b2ff93fedfe Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Tue, 18 Apr 2017 13:33:56 +0200 Subject: [PATCH] Add net-snmp support to recursor and dnsdist pkgs --- build-scripts/build-dnsdist-rpm | 3 ++- build-scripts/build-recursor-rpm | 4 ++++ build-scripts/debian-dnsdist/control.in | 2 +- build-scripts/debian-dnsdist/rules | 1 + build-scripts/debian-recursor/control.in | 2 +- build-scripts/debian-recursor/rules | 1 + 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build-scripts/build-dnsdist-rpm b/build-scripts/build-dnsdist-rpm index 86e094cc3..487d9df09 100755 --- 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 b1d42d681..44c66bf02 100755 --- 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 589864823..0a1b84020 100644 --- 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 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 07bfd180c..82a143652 100755 --- 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 d1dbaee25..0f79775f4 100644 --- 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 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 6128fbaa2..bd5b728c4 100755 --- 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) -- 2.40.0