Merge branch 'dockcross:master' into update_openssh

Merge pull request #573 from bensuperpc/update-web-wasm
Update emscripten to 2.0.29
2025-06-20 18:04:26 +02:00 · 2021-09-01 01:58:25 +02:00 · 2021-09-01 01:57:22 +02:00 · 2021-08-31 22:19:41 +02:00 · 2021-08-31 22:00:48 +02:00
3 changed files with 6 additions and 6 deletions
--- a/imagefiles/build-and-install-openssh.sh
+++ b/imagefiles/build-and-install-openssh.sh
@ -2,7 +2,7 @@

 set -ex

-OPENSSH_ROOT=V_8_5_P1
+OPENSSH_ROOT=V_8_7_P1

 cd /usr/src
 curl --connect-timeout 20 \
--- a/imagefiles/build-and-install-openssl.sh
+++ b/imagefiles/build-and-install-openssl.sh
@ -47,9 +47,9 @@ source $MY_DIR/utils.sh
 # copied from https://github.com/pypa/manylinux/tree/master/docker/build_scripts
 #

-OPENSSL_ROOT=openssl-1.1.1i
-# Hash from https://www.openssl.org/source/openssl-1.1.1i.tar.gz.sha256
-OPENSSL_HASH=e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+OPENSSL_ROOT=openssl-1.1.1k
+# Hash from https://www.openssl.org/source/openssl-1.1.1k.tar.gz.sha256
+OPENSSL_HASH=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
 OPENSSL_DOWNLOAD_URL=http://www.openssl.org/source/

 # a recent enough perl is needed to build openssl
--- a/web-wasm/Dockerfile.in
+++ b/web-wasm/Dockerfile.in
@ -1,4 +1,4 @@
-FROM emscripten/emsdk:2.0.27
+FROM emscripten/emsdk:2.0.29
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

 # Revert back to "/bin/sh" as default shell
@ -52,7 +52,7 @@ RUN ln -s /usr/bin/python3 /usr/bin/python

 #include "common.docker"

-ENV EMSCRIPTEN_VERSION 2.0.27
+ENV EMSCRIPTEN_VERSION 2.0.29

 ENV PATH /emsdk:/emsdk/upstream/bin/:/emsdk/upstream/emscripten:${PATH}
 ENV CC=/emsdk/upstream/emscripten/emcc \
Author	SHA1	Message	Date
Bensuperpc	22aed58e56	Merge branch 'dockcross:master' into update_openssh	2021-09-01 01:58:25 +02:00
Bensuperpc	b456e8a0fa	Merge pull request #573 from bensuperpc/update-web-wasm Update emscripten to 2.0.29	2021-09-01 01:57:22 +02:00
Bensuperpc	71d4c783b1	Update openSSH to V_8_7_P1 Update openSSH to V_8_7_P1 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-31 22:19:41 +02:00
Bensuperpc	7764b101d4	Update emscripten to 2.0.29 Update emscripten to 2.0.29 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-31 22:00:48 +02:00