From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Wed, 13 Jul 2022 20:23:45 +0000 (+0200)
Subject: add el-9 target
X-Git-Tag: auth-4.8.0-alpha0~12^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4728ab89f071c0d5f596638614efb85a26fafdd4;p=thirdparty%2Fpdns.git

add el-9 target
---

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index f4b579f578..099a755c9c 100644
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -38,6 +38,12 @@ RUN touch /var/lib/rpm/* &&  if $(grep -q 'release 7' /etc/redhat-release); then
 @ENDIF
 
 @IF [ -n "$M_dnsdist$M_all" ]
+
+# remove --enablerepo=epel-testing when new re2 lands
+RUN touch /var/lib/rpm/* && if $(grep -q 'release 9' /etc/redhat-release); then \
+      dnf install -y re2 re2-devel --enablerepo=epel-testing; \
+    fi
+
 RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \
       yum install -y curl openssl-devel cmake && \
       curl -L https://github.com/h2o/h2o/archive/v2.2.6.tar.gz | tar xz && \
diff --git a/builder-support/dockerfiles/Dockerfile.target.el-9 b/builder-support/dockerfiles/Dockerfile.target.el-9
new file mode 100644
index 0000000000..c5766a84e4
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.el-9
@@ -0,0 +1,26 @@
+# First do the source builds
+@INCLUDE Dockerfile.target.sdist
+
+# This defines the distribution base layer
+# Put only the bare minimum of common commands here, without dev tools
+@IF [ ${BUILDER_TARGET} = oraclelinux-9 -o ${BUILDER_TARGET} = el-9 ]
+FROM oraclelinux:9 as dist-base
+@ENDIF
+@IF [ ${BUILDER_TARGET} = oraclelinux-9-amd64 -o ${BUILDER_TARGET} = el-9-amd64 ]
+FROM amd64/oraclelinux:9 as dist-base
+@ENDIF
+@IF [ ${BUILDER_TARGET} = oraclelinux-9-arm64 -o ${BUILDER_TARGET} = el-9-arm64 ]
+FROM arm64v8/oraclelinux:9 as dist-base
+@ENDIF
+
+ARG BUILDER_CACHE_BUSTER=
+RUN touch /var/lib/rpm/* && dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
+    dnf install -y 'dnf-command(config-manager)' yum && \
+    dnf config-manager --set-enabled ol9_codeready_builder
+
+# Do the actual rpm build
+@INCLUDE Dockerfile.rpmbuild
+
+# Do a test install and verify
+# Can be skipped with skiptests=1 in the environment
+# @EXEC [ "$skiptests" = "" ] && include Dockerfile.rpmtest
diff --git a/builder-support/dockerfiles/Dockerfile.target.el-9-amd64 b/builder-support/dockerfiles/Dockerfile.target.el-9-amd64
new file mode 120000
index 0000000000..46968c4cc7
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.el-9-amd64
@@ -0,0 +1 @@
+Dockerfile.target.el-9
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.el-9-arm64 b/builder-support/dockerfiles/Dockerfile.target.el-9-arm64
new file mode 120000
index 0000000000..46968c4cc7
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.el-9-arm64
@@ -0,0 +1 @@
+Dockerfile.target.el-9
\ No newline at end of file
diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec
index 43c9d5b8a0..a55caf2a23 100644
--- a/builder-support/specs/pdns.spec
+++ b/builder-support/specs/pdns.spec
@@ -18,6 +18,7 @@ BuildRequires: systemd
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
 
+BuildRequires: krb5-devel
 BuildRequires: p11-kit-devel
 BuildRequires: libcurl-devel
 %if 0%{?rhel} < 8
@@ -141,7 +142,9 @@ Summary: Geo backend for %{name}
 Group: System Environment/Daemons
 Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires: yaml-cpp-devel
+%if 0%{?rhel} < 9
 BuildRequires: geoip-devel
+%endif
 BuildRequires: libmaxminddb-devel
 %global backends %{backends} geoip