From 6f7f89d95f10d0a9b58d935def06d80f6e77ffb6 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 11 Feb 2022 14:48:57 +0100
Subject: [PATCH] el7 builds: switch to boost 1.69

---
 builder-support/specs/dnsdist.spec       | 14 ++++++++++++--
 builder-support/specs/pdns-recursor.spec |  9 +++++++++
 builder-support/specs/pdns.spec          |  9 +++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 97cdb7fdbf..2192c0373d 100644
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -11,14 +11,19 @@ BuildRequires: libedit-devel
 BuildRequires: openssl-devel
 
 %if 0%{?suse_version}
-BuildRequires: boost-devel
 BuildRequires: lua-devel
 BuildRequires: systemd
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
 %endif
-%if 0%{?rhel} >= 7
+
+%if 0%{?rhel} < 8
+BuildRequires: boost169-devel
+%else
 BuildRequires: boost-devel
+%endif
+
+%if 0%{?rhel} >= 7
 BuildRequires: gnutls-devel
 BuildRequires: libcap-devel
 BuildRequires: libnghttp2-devel
@@ -59,6 +64,11 @@ dnsdist is a high-performance DNS loadbalancer that is scriptable in Lua.
 sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.in
 
 %build
+%if 0%{?rhel} < 8
+export CPPFLAGS=-I/usr/include/boost169
+export LDFLAGS=-L/usr/lib64/boost169
+%endif
+
 %configure \
   --enable-option-checking=fatal \
   --sysconfdir=/etc/dnsdist \
diff --git a/builder-support/specs/pdns-recursor.spec b/builder-support/specs/pdns-recursor.spec
index b806482df3..983312690e 100644
--- a/builder-support/specs/pdns-recursor.spec
+++ b/builder-support/specs/pdns-recursor.spec
@@ -9,7 +9,11 @@ Source0: %{name}-%{getenv:BUILDER_VERSION}.tar.bz2
 
 Provides: powerdns-recursor = %{version}-%{release}
 
+%if 0%{?rhel} < 8
+BuildRequires: boost169-devel
+%else
 BuildRequires: boost-devel
+%endif
 BuildRequires: libcap-devel
 BuildRequires: systemd
 BuildRequires: systemd-devel
@@ -43,6 +47,11 @@ package if you need a dns cache for your network.
 %autosetup -p1 -n %{name}-%{getenv:BUILDER_VERSION} 
 
 %build
+%if 0%{?rhel} < 8
+export CPPFLAGS=-I/usr/include/boost169
+export LDFLAGS=-L/usr/lib64/boost169
+%endif
+
 %configure \
     --enable-option-checking=fatal \
     --sysconfdir=%{_sysconfdir}/%{name} \
diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec
index 86bdc752d8..754ccc5903 100644
--- a/builder-support/specs/pdns.spec
+++ b/builder-support/specs/pdns.spec
@@ -20,7 +20,11 @@ BuildRequires: systemd-devel
 
 BuildRequires: p11-kit-devel
 BuildRequires: libcurl-devel
+%if 0%{?rhel} < 8
+BuildRequires: boost169-devel
+%else
 BuildRequires: boost-devel
+%endif
 BuildRequires: libsodium-devel
 BuildRequires: bison
 BuildRequires: openssl-devel
@@ -182,6 +186,11 @@ This package contains the ixfrdist program.
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED"
 
+%if 0%{?rhel} < 8
+export CPPFLAGS=-I/usr/include/boost169
+export LDFLAGS=-L/usr/lib64/boost169
+%endif
+
 %configure \
   --enable-option-checking=fatal \
   --sysconfdir=%{_sysconfdir}/%{name} \
-- 
2.47.2