Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dnsdist-1.8x: Switch to our fork of h2o to mitigate http2 rapid reset #13349

Merged
merged 2 commits into from
Oct 11, 2023
Merged

dnsdist-1.8x: Switch to our fork of h2o to mitigate http2 rapid reset #13349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40b949c
dnsdist: Switch to our fork of h2o to mitigate http2 rapid reset
rgacogne Oct 11, 2023
ad3958e
builder-support: Use curl's "fail fast with no output at all on serve…
rgacogne Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion builder-support/debian/dnsdist/debian-buster/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 10),
libedit-dev,
libfstrm-dev,
libgnutls28-dev,
libh2o-evloop-dev,
liblmdb-dev,
libluajit-5.1-dev [!arm64 !s390x],
liblua5.3-dev [arm64 s390x],
Expand Down
5 changes: 2 additions & 3 deletions builder-support/debian/dnsdist/debian-buster/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ override_dh_auto_clean:
dh_auto_clean

override_dh_auto_configure:
# LIBS has been added because Ubuntu Bionic and Cosmic don't have the fix for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908124 pulled in
LIBS='-lwslay' \
./configure \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
Expand All @@ -60,7 +58,8 @@ override_dh_auto_configure:
--with-ebpf \
--with-service-user='_dnsdist' \
--with-service-group='_dnsdist' \
$(CONFIGURE_ARGS)
$(CONFIGURE_ARGS) \
PKG_CONFIG_PATH=/opt/lib/pkgconfig

override_dh_auto_build-arch:
dh_auto_build -- V=1
Expand Down
6 changes: 6 additions & 0 deletions builder-support/dockerfiles/Dockerfile.debbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ RUN mv pdns-recursor*.deb /dist; mv pdns-recursor*.ddeb /dist || true
@ENDIF

@IF [ -n "$M_dnsdist$M_all" ]
RUN mkdir /libh2o && cd /libh2o && \
apt-get update && apt-get install -y cmake curl libssl-dev zlib1g-dev && \
curl -f -L https://github.com/PowerDNS/h2o/archive/refs/tags/v2.2.6+pdns2.tar.gz | tar xz && \
CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.6-pdns2 && \
make install

RUN builder/helpers/build-debs.sh dnsdist-${BUILDER_VERSION}

RUN mv dnsdist*.deb /dist; mv dnsdist*.ddeb /dist || true
Expand Down
4 changes: 2 additions & 2 deletions builder-support/dockerfiles/Dockerfile.rpmbuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then
# 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 && \
curl -L https://github.com/h2o/h2o/archive/v2.2.6.tar.gz | tar xz && \
CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.6 && \
curl -f -L https://github.com/PowerDNS/h2o/archive/refs/tags/v2.2.6+pdns2.tar.gz | tar xz && \
CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.6-pdns2 && \
make install

RUN touch /var/lib/rpm/* && if $(grep -q 'release 7' /etc/redhat-release); then \
Expand Down