Various fixes to make dnsdist and auth work on el-8

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index 6ef0e39979d17700e1414a1816c2a477c72a5df2..2561c39797071096d3d81e361c26b232d7ad7b7c 100644 (file)
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -19,7 +19,11 @@ BuildRequires: systemd-units
 BuildRequires: systemd-devel
 %endif
 
+%if 0%{?rhel} == 8
+BuildRequires: boost1.78-devel
+%else
 BuildRequires: boost-devel
+%endif
 BuildRequires: python3-pyyaml
 BuildRequires: clang
 BuildRequires: lld
@@ -70,6 +74,10 @@ dnsdist is a high-performance DNS loadbalancer that is scriptable in Lua.
 
 %build
 # We need to build with LLVM/clang to be able to use LTO, since we are linking against a static Rust library built with LLVM
+%if 0%{?rhel} == 8
+export BOOST_INCLUDEDIR=/usr/include/boost1.78
+export BOOST_LIBRARYDIR=/usr/lib64/boost1.78
+%endif
 export CC=clang
 export CXX=clang++
 # build-id SHA1 prevents an issue with the debug symbols ("export: `-Wl,--build-id=sha1': not a valid identifier")

diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec
index 6674bf371a71629e23cd6a1fcddba5f8c8d77dee..2bb54d85f8f37d40a0db94ddea6b86fd5c73614f 100644 (file)
--- a/builder-support/specs/pdns.spec
+++ b/builder-support/specs/pdns.spec
@@ -20,7 +20,11 @@ BuildRequires: systemd-devel
 BuildRequires: krb5-devel
 BuildRequires: p11-kit-devel
 BuildRequires: libcurl-devel
+%if 0%{?rhel} == 8
+BuildRequires: boost1.78-devel
+%else
 BuildRequires: boost-devel
+%endif
 BuildRequires: bison
 BuildRequires: openssl-devel
 BuildRequires: libsodium-devel
@@ -172,7 +176,13 @@ This package contains the ixfrdist program.
 %autosetup -p1 -n %{name}-%{getenv:BUILDER_VERSION}
 
 %build
-export CPPFLAGS="-DLDAP_DEPRECATED"
+%if 0%{?rhel} == 8
+export BOOST_INCLUDEDIR=/usr/include/boost1.78
+export BOOST_LIBRARYDIR=/usr/lib64/boost1.78
+export CPPFLAGS=-I$BOOST_INCLUDEDIR
+export LDFLAGS=-L$BOOST_LIBRARYDIR
+%endif
+export CPPFLAGS="$CPPFLAGS -DLDAP_DEPRECATED"
 
 %configure \
   --enable-option-checking=fatal \

diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc
index b34c4c0623dd750c5c39f0795e6e174c4141520e..0a10b031fd1d8461d441af196ffb4b6f244c75f7 100644 (file)
--- a/modules/geoipbackend/geoipbackend.cc
+++ b/modules/geoipbackend/geoipbackend.cc
@@ -34,6 +34,7 @@
 #include <fstream>
 #include <filesystem>
 #include <utility>
+#include <math.h>
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wshadow"
 #include <yaml-cpp/yaml.h>