From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 14 Aug 2019 16:16:21 +0000 (+0200)
Subject: Update h2o to 2.2.6, fixing CVE-2019-9512, CVE-2019-9514 and CVE-2019-9515
X-Git-Tag: dnsdist-1.4.0-rc2~22^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F8200%2Fhead;p=thirdparty%2Fpdns.git

Update h2o to 2.2.6, fixing CVE-2019-9512, CVE-2019-9514 and CVE-2019-9515
---

diff --git a/builder-support/dockerfiles/Dockerfile.debbuild-prepare b/builder-support/dockerfiles/Dockerfile.debbuild-prepare
index 22a27b06d9..a043b26bbc 100644
--- a/builder-support/dockerfiles/Dockerfile.debbuild-prepare
+++ b/builder-support/dockerfiles/Dockerfile.debbuild-prepare
@@ -27,8 +27,8 @@ RUN tar xvf /sdist/pdns-recursor-${BUILDER_VERSION}.tar.bz2
 RUN if grep 'VERSION="9 (stretch)"' /etc/os-release; then \
   mkdir /libh2o && cd /libh2o && \
   apt-get install -q -y curl libssl-dev zlib1g-dev cmake && \
-  curl -L https://github.com/h2o/h2o/archive/v2.2.5.tar.gz | tar xz && \
-  CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.5 && \
+  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 && \
   make install && \
   cd /pdns; \
   fi
diff --git a/builder-support/dockerfiles/Dockerfile.rpmbuild b/builder-support/dockerfiles/Dockerfile.rpmbuild
index ffc05dc379..ea285a0b4e 100644
--- a/builder-support/dockerfiles/Dockerfile.rpmbuild
+++ b/builder-support/dockerfiles/Dockerfile.rpmbuild
@@ -43,8 +43,8 @@ RUN if $(grep -q 'release 6' /etc/redhat-release); then \
     else \
       mkdir /libh2o && cd /libh2o && \
       yum install -y curl openssl-devel cmake && \
-      curl -L https://github.com/h2o/h2o/archive/v2.2.5.tar.gz | tar xz && \
-      CFLAGS='-fPIC' cmake -DWITH_PICOTLS=off -DWITH_BUNDLED_SSL=off -DWITH_MRUBY=off -DCMAKE_INSTALL_PREFIX=/opt ./h2o-2.2.5 && \
+      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 && \
       make install && \
       cd /pdns; \
     fi