From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Mon, 17 Feb 2025 16:20:25 +0000 (+0100)
Subject: dnsdist: Remove h2o from our packages
X-Git-Tag: dnsdist-2.0.0-alpha1~30^2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88cc254db4dc6d6792168df4699bfa972c513eb3;p=thirdparty%2Fpdns.git

dnsdist: Remove h2o from our packages
---

diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index 7bc485fdcf..2a996f1a3f 100644
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -51,12 +51,6 @@ RUN touch /var/lib/rpm/* && if grep -q 'release 8' /etc/redhat-release; then \
 @ENDIF
 
 @IF [ -n "$M_dnsdist$M_all" ]
-
-RUN touch /var/lib/rpm/* && mkdir /libh2o && cd /libh2o && \
-      dnf install -y --allowerasing curl libcurl openssl-devel cmake && \
-      cd /pdns/builder-support/helpers/ && \
-      ./install_h2o.sh
-
 RUN touch /var/lib/rpm/* && if grep -q 'release 8' /etc/redhat-release; then \
       scl enable gcc-toolset-13 -- builder/helpers/build-specs.sh builder-support/specs/dnsdist.spec; \
     else \
diff --git a/builder-support/dockerfiles/Dockerfile.rpmsbom b/builder-support/dockerfiles/Dockerfile.rpmsbom
index 890a72df48..db54cbb325 100644
--- a/builder-support/dockerfiles/Dockerfile.rpmsbom
+++ b/builder-support/dockerfiles/Dockerfile.rpmsbom
@@ -12,7 +12,7 @@ RUN cd /pdns/builder-support/helpers/ && \
 
 @IF [ -n "$M_dnsdist$M_all" ]
 RUN cd /pdns/builder-support/helpers/; \
-    python3 generate-sbom-dnf.py /dist/dnsdist-${BUILDER_VERSION}-${BUILDER_TARGET}.cyclonedx.json dnsdist rust.json quiche.json h2o.json
+    python3 generate-sbom-dnf.py /dist/dnsdist-${BUILDER_VERSION}-${BUILDER_TARGET}.cyclonedx.json dnsdist rust.json quiche.json
 @ENDIF
 
 @IF [ -n "$M_authoritative$M_all" ]