From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 8 Sep 2025 11:55:15 +0000 (+0200)
Subject: Various fixes to make dnsdist and auth work on el-8
X-Git-Tag: rec-5.4.0-alpha1~100^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a61469ad477053890bdd75f3ad88408e01edb86;p=thirdparty%2Fpdns.git

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 6ef0e39979..2561c39797 100644
--- 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 6674bf371a..2bb54d85f8 100644
--- 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 b34c4c0623..0a10b031fd 100644
--- 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>