feat(cubestore): Bump OpenSSL to 1.1.1h

cube-js · Feb 27, 2021 · a1d091e · a1d091e
1 parent 5cd961f
commit a1d091e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/rust/cross/x86_64-pc-windows-gnu.Dockerfile b/rust/cross/x86_64-pc-windows-gnu.Dockerfile
@@ -5,9 +5,16 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
     apt-get install --assume-yes -y curl pkg-config wget llvm libclang-dev gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 binutils make git automake autoconf ca-certificates gcc g++ mingw-w64-x86-64-dev
 
-RUN wget https://www.openssl.org/source/openssl-1.1.1i.tar.gz -O - | tar -xz
-WORKDIR /openssl-1.1.1i
-RUN ./Configure --prefix=/openssl --openssldir=/openssl/lib --cross-compile-prefix=x86_64-w64-mingw32- mingw64 && make && make install_sw && make install_ssldirs
+# https://www.openssl.org/source/old/1.1.1/
+ARG OPENSSL_VERSION=1.1.1h
+
+RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O - | tar -xz
+WORKDIR /openssl-${OPENSSL_VERSION}
+RUN ./Configure --prefix=/openssl --openssldir=/openssl/lib --cross-compile-prefix=x86_64-w64-mingw32- mingw64 && \
+    make && \
+    make install_sw && \
+    make install_ssldirs && \
+    cd .. && rm -rf /openssl-${OPENSSL_VERSION}
 
 ENV OPENSSL_DIR=/openssl \
     OPENSSL_STATIC=yes \

diff --git a/rust/cross/x86_64-unknown-linux-gnu-buster.Dockerfile b/rust/cross/x86_64-unknown-linux-gnu-buster.Dockerfile
@@ -3,14 +3,17 @@ FROM debian:buster
 RUN apt-get update && apt-get -y upgrade && \
     apt-get install -y curl pkg-config wget llvm libclang-dev clang make
 
-RUN wget https://www.openssl.org/source/openssl-1.1.1i.tar.gz -O - | tar -xz &&\
-    cd openssl-1.1.1i && \
+# https://www.openssl.org/source/old/1.1.1/
+ARG OPENSSL_VERSION=1.1.1h
+
+RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O - | tar -xz &&\
+    cd openssl-${OPENSSL_VERSION} && \
     ./Configure no-shared no-async --prefix=/openssl --openssldir=/openssl/ssl linux-x86_64-clang && \
     make depend && \
     make -j $(nproc) && \
     make install_sw && \
     make install_ssldirs && \
-    cd .. && rm -rf openssl-1.1.1i
+    cd .. && rm -rf ${OPENSSL_VERSION}
 
 ENV PKG_CONFIG_ALLOW_CROSS=1
 ENV OPENSSL_STATIC=true

diff --git a/rust/cross/x86_64-unknown-linux-gnu-stretch.Dockerfile b/rust/cross/x86_64-unknown-linux-gnu-stretch.Dockerfile
@@ -3,14 +3,17 @@ FROM debian:stretch
 RUN apt-get update && apt-get -y upgrade && \
     apt-get install -y curl pkg-config wget llvm libclang-dev clang make
 
-RUN wget https://www.openssl.org/source/openssl-1.1.1i.tar.gz -O - | tar -xz &&\
-    cd openssl-1.1.1i && \
+# https://www.openssl.org/source/old/1.1.1/
+ARG OPENSSL_VERSION=1.1.1h
+
+RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O - | tar -xz &&\
+    cd openssl-${OPENSSL_VERSION} && \
     ./Configure no-shared no-async --prefix=/openssl --openssldir=/openssl/ssl linux-x86_64-clang && \
     make depend && \
     make -j $(nproc) && \
     make install_sw && \
     make install_ssldirs && \
-    cd .. && rm -rf openssl-1.1.1i
+    cd .. && rm -rf ${OPENSSL_VERSION}
 
 ENV PKG_CONFIG_ALLOW_CROSS=1
 ENV OPENSSL_STATIC=true

diff --git a/rust/cross/x86_64-unknown-linux-musl.Dockerfile b/rust/cross/x86_64-unknown-linux-musl.Dockerfile
@@ -10,14 +10,17 @@ RUN ln -s /usr/include/x86_64-linux-gnu/asm /usr/include/x86_64-linux-musl/asm &
 
 RUN mkdir /musl
 
-RUN wget https://www.openssl.org/source/openssl-1.1.1i.tar.gz -O - | tar -xz &&\
-    cd openssl-1.1.1i && \
+# https://www.openssl.org/source/old/1.1.1/
+ARG OPENSSL_VERSION=1.1.1h
+
+RUN wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O - | tar -xz &&\
+    cd openssl-${OPENSSL_VERSION} && \
     CC="musl-gcc -fPIE -pie" ./Configure no-shared no-async --prefix=/musl --openssldir=/musl/ssl linux-x86_64 && \
     make depend && \
     make -j $(nproc) && \
     make install_sw && \
     make install_ssldirs && \
-    cd .. && rm -rf openssl-1.1.1i
+    cd .. && rm -rf openssl-${OPENSSL_VERSION}
 
 ENV PKG_CONFIG_ALLOW_CROSS=true
 ENV PKG_CONFIG_ALL_STATIC=true