You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2022/08/30 15:00:40 UTC
[trafficserver-ci] branch main updated: Updating to latest h3 tools: openssl 1.1.1q (#111)
This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git
The following commit(s) were added to refs/heads/main by this push:
new d11b4d6 Updating to latest h3 tools: openssl 1.1.1q (#111)
d11b4d6 is described below
commit d11b4d63af88bc980b3cc6e470bf8fd0278d7ccf
Author: Brian Neradt <br...@gmail.com>
AuthorDate: Tue Aug 30 10:00:36 2022 -0500
Updating to latest h3 tools: openssl 1.1.1q (#111)
---
docker/alma/build_h3_tools.sh | 25 ++++++++++++++-----------
docker/centos7/build_h3_tools.sh | 25 ++++++++++++++-----------
docker/centos8/build_h3_tools.sh | 25 ++++++++++++++-----------
docker/fedora32/build_h3_tools.sh | 25 ++++++++++++++-----------
docker/fedora35/build_h3_tools.sh | 25 ++++++++++++++-----------
docker/fedora36/build_h3_tools.sh | 25 ++++++++++++++-----------
docker/rockylinux8/build_h3_tools.sh | 25 ++++++++++++++-----------
7 files changed, 98 insertions(+), 77 deletions(-)
diff --git a/docker/alma/build_h3_tools.sh b/docker/alma/build_h3_tools.sh
index 54e56a4..11b8297 100644
--- a/docker/alma/build_h3_tools.sh
+++ b/docker/alma/build_h3_tools.sh
@@ -36,7 +36,7 @@
set -e
# Update this as the draft we support updates.
-OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1m+quic"}
+OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1q+quic"}
# Set these, if desired, to change these to your preferred installation
# directory
@@ -79,8 +79,8 @@ set -x
echo "Building OpenSSL with QUIC support"
[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
-git checkout 7c0006ccf891c20cd0b1e9e6a436f9d1f3153b7b
-./config --prefix=${OPENSSL_PREFIX}
+git checkout f105ac0bfdae1ce009b8fd86bc6d9f65e5576352
+./config enable-tls1_3 --prefix=${OPENSSL_PREFIX}
${MAKE} -j $(nproc)
${MAKE} install_sw
@@ -93,7 +93,7 @@ cd ..
echo "Building nghttp3..."
[ ! -d nghttp3 ] && git clone https://github.com/ngtcp2/nghttp3.git
cd nghttp3
-git checkout b9e565cb48e92ded110162a65511f78681fb13c3
+git checkout 635a532c8ff98cdbd6c141f85583632919102912
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -110,7 +110,7 @@ cd ..
echo "Building ngtcp2..."
[ ! -d ngtcp2 ] && git clone https://github.com/ngtcp2/ngtcp2.git
cd ngtcp2
-git checkout 982502f9ac594a45bc13804416a443522d906f29
+git checkout ee8efbe9aa7f209f483e2fe1e78183e62cd166cb
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -131,12 +131,15 @@ cd nghttp2
# This commit will be removed whenever the nghttp2 author rebases origin/quic.
# For reference, this commit is currently described as:
#
-# commit 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
-# Author: Tatsuhiro Tsujikawa <ta...@gmail.com>
-# Date: Mon Aug 16 16:58:11 2021 +0900
+# commit 1340b296dde152fb0771f1eb4e4c221047d37ab7 (HEAD -> master, origin/master, origin/HEAD)
+# Merge: f919cf1a fc5a020b
+# Author: Tatsuhiro Tsujikawa <40...@users.noreply.github.com>
+# Date: Mon Aug 29 21:22:56 2022 +0900
#
-# Compile with the latest ngtcp2
-git checkout 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
+# Merge pull request #1787 from heitbaum/patch-1
+#
+# Fix typographic error
+git checkout 1340b296dde152fb0771f1eb4e4c221047d37ab7
autoreconf -if
./configure \
@@ -154,7 +157,7 @@ cd ..
echo "Building curl ..."
[ ! -d curl ] && git clone https://github.com/curl/curl.git
cd curl
-git checkout 2bfa57bff184437028025933d26fecb215355173
+git checkout 2fc031d834d488854ffc58bf7dbcef7fa7c1fc28
autoreconf -i
./configure \
--prefix=${BASE} \
diff --git a/docker/centos7/build_h3_tools.sh b/docker/centos7/build_h3_tools.sh
index 54e56a4..11b8297 100644
--- a/docker/centos7/build_h3_tools.sh
+++ b/docker/centos7/build_h3_tools.sh
@@ -36,7 +36,7 @@
set -e
# Update this as the draft we support updates.
-OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1m+quic"}
+OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1q+quic"}
# Set these, if desired, to change these to your preferred installation
# directory
@@ -79,8 +79,8 @@ set -x
echo "Building OpenSSL with QUIC support"
[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
-git checkout 7c0006ccf891c20cd0b1e9e6a436f9d1f3153b7b
-./config --prefix=${OPENSSL_PREFIX}
+git checkout f105ac0bfdae1ce009b8fd86bc6d9f65e5576352
+./config enable-tls1_3 --prefix=${OPENSSL_PREFIX}
${MAKE} -j $(nproc)
${MAKE} install_sw
@@ -93,7 +93,7 @@ cd ..
echo "Building nghttp3..."
[ ! -d nghttp3 ] && git clone https://github.com/ngtcp2/nghttp3.git
cd nghttp3
-git checkout b9e565cb48e92ded110162a65511f78681fb13c3
+git checkout 635a532c8ff98cdbd6c141f85583632919102912
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -110,7 +110,7 @@ cd ..
echo "Building ngtcp2..."
[ ! -d ngtcp2 ] && git clone https://github.com/ngtcp2/ngtcp2.git
cd ngtcp2
-git checkout 982502f9ac594a45bc13804416a443522d906f29
+git checkout ee8efbe9aa7f209f483e2fe1e78183e62cd166cb
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -131,12 +131,15 @@ cd nghttp2
# This commit will be removed whenever the nghttp2 author rebases origin/quic.
# For reference, this commit is currently described as:
#
-# commit 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
-# Author: Tatsuhiro Tsujikawa <ta...@gmail.com>
-# Date: Mon Aug 16 16:58:11 2021 +0900
+# commit 1340b296dde152fb0771f1eb4e4c221047d37ab7 (HEAD -> master, origin/master, origin/HEAD)
+# Merge: f919cf1a fc5a020b
+# Author: Tatsuhiro Tsujikawa <40...@users.noreply.github.com>
+# Date: Mon Aug 29 21:22:56 2022 +0900
#
-# Compile with the latest ngtcp2
-git checkout 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
+# Merge pull request #1787 from heitbaum/patch-1
+#
+# Fix typographic error
+git checkout 1340b296dde152fb0771f1eb4e4c221047d37ab7
autoreconf -if
./configure \
@@ -154,7 +157,7 @@ cd ..
echo "Building curl ..."
[ ! -d curl ] && git clone https://github.com/curl/curl.git
cd curl
-git checkout 2bfa57bff184437028025933d26fecb215355173
+git checkout 2fc031d834d488854ffc58bf7dbcef7fa7c1fc28
autoreconf -i
./configure \
--prefix=${BASE} \
diff --git a/docker/centos8/build_h3_tools.sh b/docker/centos8/build_h3_tools.sh
index 54e56a4..11b8297 100644
--- a/docker/centos8/build_h3_tools.sh
+++ b/docker/centos8/build_h3_tools.sh
@@ -36,7 +36,7 @@
set -e
# Update this as the draft we support updates.
-OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1m+quic"}
+OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1q+quic"}
# Set these, if desired, to change these to your preferred installation
# directory
@@ -79,8 +79,8 @@ set -x
echo "Building OpenSSL with QUIC support"
[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
-git checkout 7c0006ccf891c20cd0b1e9e6a436f9d1f3153b7b
-./config --prefix=${OPENSSL_PREFIX}
+git checkout f105ac0bfdae1ce009b8fd86bc6d9f65e5576352
+./config enable-tls1_3 --prefix=${OPENSSL_PREFIX}
${MAKE} -j $(nproc)
${MAKE} install_sw
@@ -93,7 +93,7 @@ cd ..
echo "Building nghttp3..."
[ ! -d nghttp3 ] && git clone https://github.com/ngtcp2/nghttp3.git
cd nghttp3
-git checkout b9e565cb48e92ded110162a65511f78681fb13c3
+git checkout 635a532c8ff98cdbd6c141f85583632919102912
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -110,7 +110,7 @@ cd ..
echo "Building ngtcp2..."
[ ! -d ngtcp2 ] && git clone https://github.com/ngtcp2/ngtcp2.git
cd ngtcp2
-git checkout 982502f9ac594a45bc13804416a443522d906f29
+git checkout ee8efbe9aa7f209f483e2fe1e78183e62cd166cb
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -131,12 +131,15 @@ cd nghttp2
# This commit will be removed whenever the nghttp2 author rebases origin/quic.
# For reference, this commit is currently described as:
#
-# commit 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
-# Author: Tatsuhiro Tsujikawa <ta...@gmail.com>
-# Date: Mon Aug 16 16:58:11 2021 +0900
+# commit 1340b296dde152fb0771f1eb4e4c221047d37ab7 (HEAD -> master, origin/master, origin/HEAD)
+# Merge: f919cf1a fc5a020b
+# Author: Tatsuhiro Tsujikawa <40...@users.noreply.github.com>
+# Date: Mon Aug 29 21:22:56 2022 +0900
#
-# Compile with the latest ngtcp2
-git checkout 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
+# Merge pull request #1787 from heitbaum/patch-1
+#
+# Fix typographic error
+git checkout 1340b296dde152fb0771f1eb4e4c221047d37ab7
autoreconf -if
./configure \
@@ -154,7 +157,7 @@ cd ..
echo "Building curl ..."
[ ! -d curl ] && git clone https://github.com/curl/curl.git
cd curl
-git checkout 2bfa57bff184437028025933d26fecb215355173
+git checkout 2fc031d834d488854ffc58bf7dbcef7fa7c1fc28
autoreconf -i
./configure \
--prefix=${BASE} \
diff --git a/docker/fedora32/build_h3_tools.sh b/docker/fedora32/build_h3_tools.sh
index 54e56a4..11b8297 100644
--- a/docker/fedora32/build_h3_tools.sh
+++ b/docker/fedora32/build_h3_tools.sh
@@ -36,7 +36,7 @@
set -e
# Update this as the draft we support updates.
-OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1m+quic"}
+OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1q+quic"}
# Set these, if desired, to change these to your preferred installation
# directory
@@ -79,8 +79,8 @@ set -x
echo "Building OpenSSL with QUIC support"
[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
-git checkout 7c0006ccf891c20cd0b1e9e6a436f9d1f3153b7b
-./config --prefix=${OPENSSL_PREFIX}
+git checkout f105ac0bfdae1ce009b8fd86bc6d9f65e5576352
+./config enable-tls1_3 --prefix=${OPENSSL_PREFIX}
${MAKE} -j $(nproc)
${MAKE} install_sw
@@ -93,7 +93,7 @@ cd ..
echo "Building nghttp3..."
[ ! -d nghttp3 ] && git clone https://github.com/ngtcp2/nghttp3.git
cd nghttp3
-git checkout b9e565cb48e92ded110162a65511f78681fb13c3
+git checkout 635a532c8ff98cdbd6c141f85583632919102912
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -110,7 +110,7 @@ cd ..
echo "Building ngtcp2..."
[ ! -d ngtcp2 ] && git clone https://github.com/ngtcp2/ngtcp2.git
cd ngtcp2
-git checkout 982502f9ac594a45bc13804416a443522d906f29
+git checkout ee8efbe9aa7f209f483e2fe1e78183e62cd166cb
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -131,12 +131,15 @@ cd nghttp2
# This commit will be removed whenever the nghttp2 author rebases origin/quic.
# For reference, this commit is currently described as:
#
-# commit 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
-# Author: Tatsuhiro Tsujikawa <ta...@gmail.com>
-# Date: Mon Aug 16 16:58:11 2021 +0900
+# commit 1340b296dde152fb0771f1eb4e4c221047d37ab7 (HEAD -> master, origin/master, origin/HEAD)
+# Merge: f919cf1a fc5a020b
+# Author: Tatsuhiro Tsujikawa <40...@users.noreply.github.com>
+# Date: Mon Aug 29 21:22:56 2022 +0900
#
-# Compile with the latest ngtcp2
-git checkout 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
+# Merge pull request #1787 from heitbaum/patch-1
+#
+# Fix typographic error
+git checkout 1340b296dde152fb0771f1eb4e4c221047d37ab7
autoreconf -if
./configure \
@@ -154,7 +157,7 @@ cd ..
echo "Building curl ..."
[ ! -d curl ] && git clone https://github.com/curl/curl.git
cd curl
-git checkout 2bfa57bff184437028025933d26fecb215355173
+git checkout 2fc031d834d488854ffc58bf7dbcef7fa7c1fc28
autoreconf -i
./configure \
--prefix=${BASE} \
diff --git a/docker/fedora35/build_h3_tools.sh b/docker/fedora35/build_h3_tools.sh
index 54e56a4..11b8297 100644
--- a/docker/fedora35/build_h3_tools.sh
+++ b/docker/fedora35/build_h3_tools.sh
@@ -36,7 +36,7 @@
set -e
# Update this as the draft we support updates.
-OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1m+quic"}
+OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1q+quic"}
# Set these, if desired, to change these to your preferred installation
# directory
@@ -79,8 +79,8 @@ set -x
echo "Building OpenSSL with QUIC support"
[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
-git checkout 7c0006ccf891c20cd0b1e9e6a436f9d1f3153b7b
-./config --prefix=${OPENSSL_PREFIX}
+git checkout f105ac0bfdae1ce009b8fd86bc6d9f65e5576352
+./config enable-tls1_3 --prefix=${OPENSSL_PREFIX}
${MAKE} -j $(nproc)
${MAKE} install_sw
@@ -93,7 +93,7 @@ cd ..
echo "Building nghttp3..."
[ ! -d nghttp3 ] && git clone https://github.com/ngtcp2/nghttp3.git
cd nghttp3
-git checkout b9e565cb48e92ded110162a65511f78681fb13c3
+git checkout 635a532c8ff98cdbd6c141f85583632919102912
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -110,7 +110,7 @@ cd ..
echo "Building ngtcp2..."
[ ! -d ngtcp2 ] && git clone https://github.com/ngtcp2/ngtcp2.git
cd ngtcp2
-git checkout 982502f9ac594a45bc13804416a443522d906f29
+git checkout ee8efbe9aa7f209f483e2fe1e78183e62cd166cb
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -131,12 +131,15 @@ cd nghttp2
# This commit will be removed whenever the nghttp2 author rebases origin/quic.
# For reference, this commit is currently described as:
#
-# commit 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
-# Author: Tatsuhiro Tsujikawa <ta...@gmail.com>
-# Date: Mon Aug 16 16:58:11 2021 +0900
+# commit 1340b296dde152fb0771f1eb4e4c221047d37ab7 (HEAD -> master, origin/master, origin/HEAD)
+# Merge: f919cf1a fc5a020b
+# Author: Tatsuhiro Tsujikawa <40...@users.noreply.github.com>
+# Date: Mon Aug 29 21:22:56 2022 +0900
#
-# Compile with the latest ngtcp2
-git checkout 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
+# Merge pull request #1787 from heitbaum/patch-1
+#
+# Fix typographic error
+git checkout 1340b296dde152fb0771f1eb4e4c221047d37ab7
autoreconf -if
./configure \
@@ -154,7 +157,7 @@ cd ..
echo "Building curl ..."
[ ! -d curl ] && git clone https://github.com/curl/curl.git
cd curl
-git checkout 2bfa57bff184437028025933d26fecb215355173
+git checkout 2fc031d834d488854ffc58bf7dbcef7fa7c1fc28
autoreconf -i
./configure \
--prefix=${BASE} \
diff --git a/docker/fedora36/build_h3_tools.sh b/docker/fedora36/build_h3_tools.sh
index 54e56a4..11b8297 100644
--- a/docker/fedora36/build_h3_tools.sh
+++ b/docker/fedora36/build_h3_tools.sh
@@ -36,7 +36,7 @@
set -e
# Update this as the draft we support updates.
-OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1m+quic"}
+OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1q+quic"}
# Set these, if desired, to change these to your preferred installation
# directory
@@ -79,8 +79,8 @@ set -x
echo "Building OpenSSL with QUIC support"
[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
-git checkout 7c0006ccf891c20cd0b1e9e6a436f9d1f3153b7b
-./config --prefix=${OPENSSL_PREFIX}
+git checkout f105ac0bfdae1ce009b8fd86bc6d9f65e5576352
+./config enable-tls1_3 --prefix=${OPENSSL_PREFIX}
${MAKE} -j $(nproc)
${MAKE} install_sw
@@ -93,7 +93,7 @@ cd ..
echo "Building nghttp3..."
[ ! -d nghttp3 ] && git clone https://github.com/ngtcp2/nghttp3.git
cd nghttp3
-git checkout b9e565cb48e92ded110162a65511f78681fb13c3
+git checkout 635a532c8ff98cdbd6c141f85583632919102912
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -110,7 +110,7 @@ cd ..
echo "Building ngtcp2..."
[ ! -d ngtcp2 ] && git clone https://github.com/ngtcp2/ngtcp2.git
cd ngtcp2
-git checkout 982502f9ac594a45bc13804416a443522d906f29
+git checkout ee8efbe9aa7f209f483e2fe1e78183e62cd166cb
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -131,12 +131,15 @@ cd nghttp2
# This commit will be removed whenever the nghttp2 author rebases origin/quic.
# For reference, this commit is currently described as:
#
-# commit 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
-# Author: Tatsuhiro Tsujikawa <ta...@gmail.com>
-# Date: Mon Aug 16 16:58:11 2021 +0900
+# commit 1340b296dde152fb0771f1eb4e4c221047d37ab7 (HEAD -> master, origin/master, origin/HEAD)
+# Merge: f919cf1a fc5a020b
+# Author: Tatsuhiro Tsujikawa <40...@users.noreply.github.com>
+# Date: Mon Aug 29 21:22:56 2022 +0900
#
-# Compile with the latest ngtcp2
-git checkout 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
+# Merge pull request #1787 from heitbaum/patch-1
+#
+# Fix typographic error
+git checkout 1340b296dde152fb0771f1eb4e4c221047d37ab7
autoreconf -if
./configure \
@@ -154,7 +157,7 @@ cd ..
echo "Building curl ..."
[ ! -d curl ] && git clone https://github.com/curl/curl.git
cd curl
-git checkout 2bfa57bff184437028025933d26fecb215355173
+git checkout 2fc031d834d488854ffc58bf7dbcef7fa7c1fc28
autoreconf -i
./configure \
--prefix=${BASE} \
diff --git a/docker/rockylinux8/build_h3_tools.sh b/docker/rockylinux8/build_h3_tools.sh
index 54e56a4..11b8297 100644
--- a/docker/rockylinux8/build_h3_tools.sh
+++ b/docker/rockylinux8/build_h3_tools.sh
@@ -36,7 +36,7 @@
set -e
# Update this as the draft we support updates.
-OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1m+quic"}
+OPENSSL_BRANCH=${OPENSSL_BRANCH:-"OpenSSL_1_1_1q+quic"}
# Set these, if desired, to change these to your preferred installation
# directory
@@ -79,8 +79,8 @@ set -x
echo "Building OpenSSL with QUIC support"
[ ! -d openssl-quic ] && git clone -b ${OPENSSL_BRANCH} https://github.com/quictls/openssl.git openssl-quic
cd openssl-quic
-git checkout 7c0006ccf891c20cd0b1e9e6a436f9d1f3153b7b
-./config --prefix=${OPENSSL_PREFIX}
+git checkout f105ac0bfdae1ce009b8fd86bc6d9f65e5576352
+./config enable-tls1_3 --prefix=${OPENSSL_PREFIX}
${MAKE} -j $(nproc)
${MAKE} install_sw
@@ -93,7 +93,7 @@ cd ..
echo "Building nghttp3..."
[ ! -d nghttp3 ] && git clone https://github.com/ngtcp2/nghttp3.git
cd nghttp3
-git checkout b9e565cb48e92ded110162a65511f78681fb13c3
+git checkout 635a532c8ff98cdbd6c141f85583632919102912
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -110,7 +110,7 @@ cd ..
echo "Building ngtcp2..."
[ ! -d ngtcp2 ] && git clone https://github.com/ngtcp2/ngtcp2.git
cd ngtcp2
-git checkout 982502f9ac594a45bc13804416a443522d906f29
+git checkout ee8efbe9aa7f209f483e2fe1e78183e62cd166cb
autoreconf -if
./configure \
--prefix=${BASE} \
@@ -131,12 +131,15 @@ cd nghttp2
# This commit will be removed whenever the nghttp2 author rebases origin/quic.
# For reference, this commit is currently described as:
#
-# commit 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
-# Author: Tatsuhiro Tsujikawa <ta...@gmail.com>
-# Date: Mon Aug 16 16:58:11 2021 +0900
+# commit 1340b296dde152fb0771f1eb4e4c221047d37ab7 (HEAD -> master, origin/master, origin/HEAD)
+# Merge: f919cf1a fc5a020b
+# Author: Tatsuhiro Tsujikawa <40...@users.noreply.github.com>
+# Date: Mon Aug 29 21:22:56 2022 +0900
#
-# Compile with the latest ngtcp2
-git checkout 25f29e7634a2c8c5ba5c63432e5d94217a6535ef
+# Merge pull request #1787 from heitbaum/patch-1
+#
+# Fix typographic error
+git checkout 1340b296dde152fb0771f1eb4e4c221047d37ab7
autoreconf -if
./configure \
@@ -154,7 +157,7 @@ cd ..
echo "Building curl ..."
[ ! -d curl ] && git clone https://github.com/curl/curl.git
cd curl
-git checkout 2bfa57bff184437028025933d26fecb215355173
+git checkout 2fc031d834d488854ffc58bf7dbcef7fa7c1fc28
autoreconf -i
./configure \
--prefix=${BASE} \