From 5cf678cf5eb81dd59256b7198b54c1d870ba8e38 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 21 Jul 2022 23:20:14 +0900 Subject: [PATCH] Bump QUIC related libraries --- .github/workflows/build.yml | 6 +++--- README.rst | 10 +++++----- configure.ac | 6 +++--- docker/Dockerfile | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 417443f3..dfd6572c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -127,7 +127,7 @@ jobs: run: | git clone https://boringssl.googlesource.com/boringssl cd boringssl - git checkout 27ffcc6e19bbafddf1b59ec0bc6df2904de7eb2c + git checkout b95124305ab15c7523d3e21437309fa5dd717ee8 mkdir build cd build cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON .. @@ -148,7 +148,7 @@ jobs: - name: Build nghttp3 if: matrix.http3 == 'http3' run: | - git clone --depth 1 -b v0.5.0 https://github.com/ngtcp2/nghttp3 + git clone --depth 1 -b v0.6.0 https://github.com/ngtcp2/nghttp3 cd nghttp3 autoreconf -i ./configure --prefix=$PWD/build --enable-lib-only @@ -157,7 +157,7 @@ jobs: - name: Build ngtcp2 if: matrix.http3 == 'http3' run: | - git clone --depth 1 -b v0.6.0 https://github.com/ngtcp2/ngtcp2 + git clone --depth 1 -b v0.7.0 https://github.com/ngtcp2/ngtcp2 cd ngtcp2 autoreconf -i ./configure --prefix=$PWD/build --enable-lib-only PKG_CONFIG_PATH="../openssl/build/lib/pkgconfig" $EXTRA_NGTCP2_OPTS diff --git a/README.rst b/README.rst index f4193122..fb40ac55 100644 --- a/README.rst +++ b/README.rst @@ -149,9 +149,9 @@ following libraries are required: * `OpenSSL with QUIC support `_; or `BoringSSL `_ (commit - 27ffcc6e19bbafddf1b59ec0bc6df2904de7eb2c) -* `ngtcp2 `_ >= 0.6.0 -* `nghttp3 `_ >= 0.4.0 + b95124305ab15c7523d3e21437309fa5dd717ee8) +* `ngtcp2 `_ >= 0.7.0 +* `nghttp3 `_ >= 0.6.0 Use ``--enable-http3`` configure option to enable HTTP/3 feature for h2load and nghttpx. @@ -362,7 +362,7 @@ Build nghttp3: .. code-block:: text - $ git clone --depth 1 -b v0.5.0 https://github.com/ngtcp2/nghttp3 + $ git clone --depth 1 -b v0.6.0 https://github.com/ngtcp2/nghttp3 $ cd nghttp3 $ autoreconf -i $ ./configure --prefix=$PWD/build --enable-lib-only @@ -374,7 +374,7 @@ Build ngtcp2: .. code-block:: text - $ git clone --depth 1 -b v0.6.0 https://github.com/ngtcp2/ngtcp2 + $ git clone --depth 1 -b v0.7.0 https://github.com/ngtcp2/ngtcp2 $ cd ngtcp2 $ autoreconf -i $ ./configure --prefix=$PWD/build --enable-lib-only \ diff --git a/configure.ac b/configure.ac index f6d8ce70..f6cbe1d0 100644 --- a/configure.ac +++ b/configure.ac @@ -540,7 +540,7 @@ fi # ngtcp2 (for src) have_libngtcp2=no if test "x${request_libngtcp2}" != "xno"; then - PKG_CHECK_MODULES([LIBNGTCP2], [libngtcp2 >= 0.6.0], [have_libngtcp2=yes], + PKG_CHECK_MODULES([LIBNGTCP2], [libngtcp2 >= 0.7.0], [have_libngtcp2=yes], [have_libngtcp2=no]) if test "x${have_libngtcp2}" = "xno"; then AC_MSG_NOTICE($LIBNGTCP2_PKG_ERRORS) @@ -557,7 +557,7 @@ have_libngtcp2_crypto_openssl=no if test "x${have_ssl_is_quic}" = "xyes" && test "x${request_libngtcp2}" != "xno"; then PKG_CHECK_MODULES([LIBNGTCP2_CRYPTO_OPENSSL], - [libngtcp2_crypto_openssl >= 0.6.0], + [libngtcp2_crypto_openssl >= 0.7.0], [have_libngtcp2_crypto_openssl=yes], [have_libngtcp2_crypto_openssl=no]) if test "x${have_libngtcp2_crypto_openssl}" = "xno"; then @@ -599,7 +599,7 @@ fi # nghttp3 (for src) have_libnghttp3=no if test "x${request_libnghttp3}" != "xno"; then - PKG_CHECK_MODULES([LIBNGHTTP3], [libnghttp3 >= 0.4.0], [have_libnghttp3=yes], + PKG_CHECK_MODULES([LIBNGHTTP3], [libnghttp3 >= 0.6.0], [have_libnghttp3=yes], [have_libnghttp3=no]) if test "x${have_libnghttp3}" = "xno"; then AC_MSG_NOTICE($LIBNGHTTP3_PKG_ERRORS) diff --git a/docker/Dockerfile b/docker/Dockerfile index eb4b9008..f1e0e430 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,7 +15,7 @@ RUN git clone --depth 1 -b OpenSSL_1_1_1q+quic https://github.com/quictls/openss cd .. && \ rm -rf openssl -RUN git clone --depth 1 -b v0.5.0 https://github.com/ngtcp2/nghttp3 && \ +RUN git clone --depth 1 -b v0.6.0 https://github.com/ngtcp2/nghttp3 && \ cd nghttp3 && \ autoreconf -i && \ ./configure --enable-lib-only && \ @@ -24,7 +24,7 @@ RUN git clone --depth 1 -b v0.5.0 https://github.com/ngtcp2/nghttp3 && \ cd .. && \ rm -rf nghttp3 -RUN git clone --depth 1 -b v0.6.0 https://github.com/ngtcp2/ngtcp2 && \ +RUN git clone --depth 1 -b v0.7.0 https://github.com/ngtcp2/ngtcp2 && \ cd ngtcp2 && \ autoreconf -i && \ ./configure --enable-lib-only \