do not merge: centos 10 stream support in builder

builder-support/dockerfiles/Dockerfile.rpmbuild

@@ -61,10 +61,10 @@ RUN touch /var/lib/rpm/* &&  if $(grep -q 'release 7' /etc/redhat-release); then
 
 # --allowerasing does not exist on el7, so we fall back to just installing
 # this is fine because --allowerasing is only there to deal with libcurl conflicting with libcurl-minimal on some el9 images
-RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \
-      yum install -y --allowerasing curl libcurl openssl-devel cmake || yum install -y curl libcurl openssl-devel cmake && \
-      cd /pdns/builder-support/helpers/ && \
-      ./install_h2o.sh
+#RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \
+#      yum install -y --allowerasing curl libcurl openssl-devel cmake || yum install -y curl libcurl openssl-devel cmake && \
+#      cd /pdns/builder-support/helpers/ && \
+#      ./install_h2o.sh
 
 RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then \
       scl enable devtoolset-11 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \

builder-support/dockerfiles/Dockerfile.target.centos-10-stream

@@ -0,0 +1,22 @@
+# 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
+# presumably at some point the -development suffix can go
+FROM quay.io/centos/centos:stream10-development as dist-base
+
+ARG BUILDER_CACHE_BUSTER=
+
+# put epel-release back here later
+RUN dnf install -y https://mirrors.kernel.org/fedora-epel/10/Everything/x86_64/Packages/e/epel-release-10-1.el10_0.noarch.rpm
+RUN touch /var/lib/rpm/* && \
+    dnf install -y 'dnf-command(config-manager)' && \
+    dnf config-manager --set-enabled crb
+
+# Do the actual rpm build
+@INCLUDE Dockerfile.rpmbuild
+
+# Do a test install and verify
+# Can be skipped with skippackagetest=1 in the environment
+@EXEC [ "$skippackagetest" = "" ] && include Dockerfile.rpmtest

builder-support/specs/dnsdist.spec

@@ -28,13 +28,8 @@ BuildRequires: gnutls-devel
 BuildRequires: libcap-devel
 BuildRequires: libnghttp2-devel
 BuildRequires: lmdb-devel
-%ifarch aarch64
 BuildRequires: lua-devel
 %define lua_implementation lua
-%else
-BuildRequires: luajit-devel
-%define lua_implementation luajit
-%endif
 BuildRequires: re2-devel
 BuildRequires: systemd
 BuildRequires: systemd-devel
@@ -84,7 +79,6 @@ export RANLIB=gcc-ranlib
   --enable-unit-tests \
   --enable-lto=thin \
   --enable-dns-over-tls \
-  --with-h2o \
 %if 0%{?suse_version}
   --disable-dnscrypt \
   --without-libsodium \

builder-support/specs/pdns-recursor.spec

@@ -27,13 +27,8 @@ BuildRequires: net-snmp-devel
 BuildRequires: libsodium-devel
 %endif
 
-%ifarch aarch64
 BuildRequires: lua-devel
 %define lua_implementation lua
-%else
-BuildRequires: luajit-devel
-%define lua_implementation luajit
-%endif
 
 %ifarch ppc64 ppc64le
 BuildRequires: libatomic

builder-support/specs/pdns.spec

@@ -35,13 +35,8 @@ BuildRequires: libsodium-devel
 
 Requires(pre): shadow-utils
 
-%ifarch aarch64
 BuildRequires: lua-devel
 %define lua_implementation lua
-%else
-BuildRequires: luajit-devel
-%define lua_implementation luajit
-%endif
 
 Provides: powerdns = %{version}-%{release}
 %global backends %{backends} bind
@@ -140,22 +135,6 @@ BuildRequires: unixODBC-devel
 %description backend-odbc
 This package contains the godbc backend for %{name}
 
-%package backend-geoip
-Summary: Geo backend for %{name}
-Group: System Environment/Daemons
-Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: yaml-cpp-devel
-%if 0%{?rhel} < 9 && 0%{?amzn} != 2023
-BuildRequires: geoip-devel
-%endif
-BuildRequires: libmaxminddb-devel
-%global backends %{backends} geoip
-
-%description backend-geoip
-This package contains the geoip backend for %{name}
-It allows different answers to DNS queries coming from different
-IP address ranges or based on the geoipgraphic location
-
 %package backend-lmdb
 Summary: LMDB backend for %{name}
 Group: System Environment/Daemons
@@ -176,16 +155,6 @@ BuildRequires: tinycdb-devel
 %description backend-tinydns
 This package contains the TinyDNS backend for %{name}
 
-%if 0%{?amzn} != 2
-%package ixfrdist
-BuildRequires: yaml-cpp-devel
-Summary: A program to redistribute zones over AXFR and IXFR
-Group: System Environment/Daemons
-
-%description ixfrdist
-This package contains the ixfrdist program.
-%endif
-
 %prep
 %autosetup -p1 -n %{name}-%{getenv:BUILDER_VERSION}
 
@@ -209,9 +178,6 @@ export LDFLAGS=-L/usr/lib64/boost169
   --enable-tools \
 %if 0%{?amzn} != 2023
   --with-libsodium \
-%endif
-%if 0%{?amzn} != 2
-  --enable-ixfrdist \
 %endif
   --enable-unit-tests \
   --enable-lua-records \
@@ -398,21 +364,8 @@ systemctl daemon-reload ||:
 %doc modules/godbcbackend/4.3.0_to_4.7.0_schema.mssql.sql
 %{_libdir}/%{name}/libgodbcbackend.so
 
-%files backend-geoip
-%{_libdir}/%{name}/libgeoipbackend.so
-
 %files backend-lmdb
 %{_libdir}/%{name}/liblmdbbackend.so
 
 %files backend-tinydns
 %{_libdir}/%{name}/libtinydnsbackend.so
-
-%if 0%{?amzn} != 2
-%files ixfrdist
-%{_bindir}/ixfrdist
-%{_mandir}/man1/ixfrdist.1.gz
-%{_mandir}/man5/ixfrdist.yml.5.gz
-%{_sysconfdir}/%{name}/ixfrdist.example.yml
-%{_unitdir}/ixfrdist.service
-%{_unitdir}/ixfrdist@.service
-%endif