This is an automated email from the ASF dual-hosted git repository. jianghaiting pushed a commit to branch branch-2.10 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit fa66f853e2115613d38570cab757f938601fea86 Author: Zike Yang <[email protected]> AuthorDate: Tue Sep 13 12:06:49 2022 +0800 [improve][cpp] Upgrade OpenSSL to version 1.1.1n (#17538) (cherry picked from commit 06bac43eff3705fbfab02ae72f78134034ea7d48) --- pulsar-client-cpp/docker/alpine/Dockerfile | 8 ++++---- pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8 | 8 ++++---- pulsar-client-cpp/docker/manylinux1/Dockerfile | 8 ++++---- pulsar-client-cpp/pkg/deb/Dockerfile | 8 ++++---- pulsar-client-cpp/pkg/rpm/Dockerfile | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pulsar-client-cpp/docker/alpine/Dockerfile b/pulsar-client-cpp/docker/alpine/Dockerfile index 12d1e2f9f97..fb3282d09bd 100644 --- a/pulsar-client-cpp/docker/alpine/Dockerfile +++ b/pulsar-client-cpp/docker/alpine/Dockerfile @@ -51,12 +51,12 @@ RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \ rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12 # Compile OpenSSL -RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \ - tar xfz OpenSSL_1_1_0j.tar.gz && \ - cd openssl-OpenSSL_1_1_0j/ && \ +RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz && \ + tar xfz OpenSSL_1_1_1n.tar.gz && \ + cd openssl-OpenSSL_1_1_1n/ && \ ./Configure -fPIC no-shared linux-x86_64 && \ make -j8 && make install && \ - rm -rf /OpenSSL_1_1_0j.tar.gz /openssl-OpenSSL_1_1_0j + rm -rf /OpenSSL_1_1_1n.tar.gz /openssl-OpenSSL_1_1_1n # Download and copile protoubf RUN curl -O -L https://github.com/google/protobuf/releases/download/v3.11.3/protobuf-cpp-3.11.3.tar.gz && \ diff --git a/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8 b/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8 index 862785e9015..2873289545b 100644 --- a/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8 +++ b/pulsar-client-cpp/docker/alpine/Dockerfile-alpine-3.8 @@ -51,12 +51,12 @@ RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \ rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12 # Compile OpenSSL -RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \ - tar xfz OpenSSL_1_1_0j.tar.gz && \ - cd openssl-OpenSSL_1_1_0j/ && \ +RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz && \ + tar xfz OpenSSL_1_1_1n.tar.gz && \ + cd openssl-OpenSSL_1_1_1n/ && \ ./Configure -fPIC no-shared linux-x86_64 && \ make -j8 && make install && \ - rm -rf /OpenSSL_1_1_0j.tar.gz /openssl-OpenSSL_1_1_0j + rm -rf /OpenSSL_1_1_1n.tar.gz /openssl-OpenSSL_1_1_1n # Download and copile protoubf RUN curl -O -L https://github.com/google/protobuf/releases/download/v3.11.3/protobuf-cpp-3.11.3.tar.gz && \ diff --git a/pulsar-client-cpp/docker/manylinux1/Dockerfile b/pulsar-client-cpp/docker/manylinux1/Dockerfile index 502c6f6fe77..ae7059afca1 100644 --- a/pulsar-client-cpp/docker/manylinux1/Dockerfile +++ b/pulsar-client-cpp/docker/manylinux1/Dockerfile @@ -54,12 +54,12 @@ RUN curl -O -L https://zlib.net/zlib-1.2.12.tar.gz && \ rm -rf /zlib-1.2.12.tar.gz /zlib-1.2.12 # Compile OpenSSL -RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \ - tar xvfz OpenSSL_1_1_0j.tar.gz && \ - cd openssl-OpenSSL_1_1_0j/ && \ +RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz && \ + tar xvfz OpenSSL_1_1_1n.tar.gz && \ + cd openssl-OpenSSL_1_1_1n/ && \ ./Configure -fPIC --prefix=/usr/local/ssl/ no-shared linux-x86_64 && \ make && make install && \ - rm -rf /OpenSSL_1_1_0j.tar.gz /openssl-OpenSSL_1_1_0j + rm -rf /OpenSSL_1_1_1n.tar.gz /openssl-OpenSSL_1_1_1n # Download and compile boost RUN curl -O -L https://boostorg.jfrog.io/artifactory/main/release/1.68.0/source/boost_1_68_0.tar.gz && \ diff --git a/pulsar-client-cpp/pkg/deb/Dockerfile b/pulsar-client-cpp/pkg/deb/Dockerfile index 1925827b56a..db33f71de38 100644 --- a/pulsar-client-cpp/pkg/deb/Dockerfile +++ b/pulsar-client-cpp/pkg/deb/Dockerfile @@ -72,12 +72,12 @@ RUN curl -O -L https://github.com/google/snappy/releases/download/1.1.3/snappy-1 make && make install && \ rm -rf /snappy-1.1.3 /snappy-1.1.3.tar.gz -RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \ - tar xvfz OpenSSL_1_1_0j.tar.gz && \ - cd openssl-OpenSSL_1_1_0j/ && \ +RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz && \ + tar xvfz OpenSSL_1_1_1n.tar.gz && \ + cd openssl-OpenSSL_1_1_1n/ && \ ./Configure -fPIC --prefix=/usr/local/ssl/ linux-x86_64 && \ make && make install && \ - rm -rf /OpenSSL_1_1_0j.tar.gz /openssl-OpenSSL_1_1_0j + rm -rf /OpenSSL_1_1_1n.tar.gz /openssl-OpenSSL_1_1_1n # LibCurl RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_61_0/curl-7.61.0.tar.gz && \ diff --git a/pulsar-client-cpp/pkg/rpm/Dockerfile b/pulsar-client-cpp/pkg/rpm/Dockerfile index e83290dccca..ee332c51fd7 100644 --- a/pulsar-client-cpp/pkg/rpm/Dockerfile +++ b/pulsar-client-cpp/pkg/rpm/Dockerfile @@ -72,12 +72,12 @@ RUN curl -O -L https://github.com/google/snappy/releases/download/1.1.3/snappy-1 make && make install && \ rm -rf /snappy-1.1.3 /snappy-1.1.3.tar.gz -RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_0j.tar.gz && \ - tar xvfz OpenSSL_1_1_0j.tar.gz && \ - cd openssl-OpenSSL_1_1_0j/ && \ +RUN curl -O -L https://github.com/openssl/openssl/archive/OpenSSL_1_1_1n.tar.gz && \ + tar xvfz OpenSSL_1_1_1n.tar.gz && \ + cd openssl-OpenSSL_1_1_1n/ && \ ./Configure -fPIC --prefix=/usr/local/ssl/ linux-x86_64 && \ make && make install && \ - rm -rf /OpenSSL_1_1_0j.tar.gz /openssl-OpenSSL_1_1_0j + rm -rf /OpenSSL_1_1_1n.tar.gz /openssl-OpenSSL_1_1_1n # LibCurl RUN curl -O -L https://github.com/curl/curl/releases/download/curl-7_61_0/curl-7.61.0.tar.gz && \
