From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 4 Feb 2019 15:16:12 +0000 (+0100)
Subject: Make sure that the systemd binaries are available during the build
X-Git-Tag: auth-4.2.0-beta1~23^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F7451%2Fhead;p=thirdparty%2Fpdns.git

Make sure that the systemd binaries are available during the build

Otherwise the detection of systemd's sandboxing features does not
work properly, since it uses `systemctl` to determine the version
of systemd.
---

diff --git a/builder-support/debian/authoritative/debian-jessie/control b/builder-support/debian/authoritative/debian-jessie/control
index 6033792820..ffa5d4b1f9 100644
--- a/builder-support/debian/authoritative/debian-jessie/control
+++ b/builder-support/debian/authoritative/debian-jessie/control
@@ -39,6 +39,7 @@ Build-Depends: autoconf,
                po-debconf,
                protobuf-compiler,
                ragel,
+               systemd [linux-any],
                unixodbc-dev (>= 2.3.1)
 Homepage: http://www.powerdns.com/
 
diff --git a/builder-support/debian/authoritative/debian-stretch/control b/builder-support/debian/authoritative/debian-stretch/control
index d39fb13b4d..4d66500c99 100644
--- a/builder-support/debian/authoritative/debian-stretch/control
+++ b/builder-support/debian/authoritative/debian-stretch/control
@@ -40,6 +40,7 @@ Build-Depends: autoconf,
                po-debconf,
                protobuf-compiler,
                ragel,
+               systemd [linux-any],
                unixodbc-dev (>= 2.3.1)
 Homepage: http://www.powerdns.com/
 
diff --git a/builder-support/debian/dnsdist/debian-jessie/control b/builder-support/debian/dnsdist/debian-jessie/control
index ae39c8a77a..5e6fe2ca4e 100644
--- a/builder-support/debian/dnsdist/debian-jessie/control
+++ b/builder-support/debian/dnsdist/debian-jessie/control
@@ -16,7 +16,8 @@ Build-Depends: debhelper (>= 9~),
                libsystemd-dev [linux-any],
                pkg-config,
                protobuf-compiler,
-               ragel
+               ragel,
+               systemd [linux-any]
 Standards-Version: 4.1.0
 Homepage: http://dnsdist.org
 Vcs-Git: https://anonscm.debian.org/git/pkg-dns/dnsdist.git
diff --git a/builder-support/debian/dnsdist/debian-stretch/control b/builder-support/debian/dnsdist/debian-stretch/control
index 90e319c407..04ac68fc07 100644
--- a/builder-support/debian/dnsdist/debian-stretch/control
+++ b/builder-support/debian/dnsdist/debian-stretch/control
@@ -17,7 +17,8 @@ Build-Depends: debhelper (>= 10~),
                libsystemd-dev [linux-any],
                pkg-config,
                protobuf-compiler,
-               ragel
+               ragel,
+               systemd [linux-any]
 Standards-Version: 4.1.0
 Homepage: http://dnsdist.org
 Vcs-Git: https://anonscm.debian.org/git/pkg-dns/dnsdist.git
diff --git a/builder-support/debian/recursor/debian-jessie/control b/builder-support/debian/recursor/debian-jessie/control
index e2d261335b..f2fa238e38 100644
--- a/builder-support/debian/recursor/debian-jessie/control
+++ b/builder-support/debian/recursor/debian-jessie/control
@@ -16,7 +16,8 @@ Build-Depends: debhelper (>= 9~),
                libsystemd-dev [linux-any],
                pkg-config,
                protobuf-compiler,
-               ragel
+               ragel,
+               systemd [linux-any]
 Homepage: https://www.powerdns.com/
 
 Package: pdns-recursor
diff --git a/builder-support/debian/recursor/debian-stretch/control b/builder-support/debian/recursor/debian-stretch/control
index 065a07e92c..0b23de49eb 100644
--- a/builder-support/debian/recursor/debian-stretch/control
+++ b/builder-support/debian/recursor/debian-stretch/control
@@ -15,7 +15,8 @@ Build-Depends: debhelper (>= 10~),
                libsystemd-dev [linux-any],
                pkg-config,
                protobuf-compiler,
-               ragel
+               ragel,
+               systemd [linux-any]
 Vcs-Git: https://anonscm.debian.org/git/pkg-dns/pdns-recursor.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-dns/pdns-recursor.git
 Homepage: https://www.powerdns.com/
diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 6785561850..1aa93848a4 100644
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -20,6 +20,7 @@ BuildRequires: re2-devel
 %if 0%{?suse_version}
 BuildRequires: boost-devel
 BuildRequires: lua-devel
+BuildRequires: systemd
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
 %endif
@@ -39,6 +40,7 @@ BuildRequires: net-snmp-devel
 BuildRequires: protobuf-compiler
 BuildRequires: protobuf-devel
 BuildRequires: re2-devel
+BuildRequires: systemd
 BuildRequires: systemd-devel
 BuildRequires: systemd-units
 %endif
diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec
index efc1f081c7..4f79fe4167 100644
--- a/builder-support/specs/pdns.spec
+++ b/builder-support/specs/pdns.spec
@@ -23,6 +23,7 @@ Requires(post): systemd-sysv
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
+BuildRequires: systemd
 BuildRequires: systemd-units
 BuildRequires: systemd-devel