From e10348f958792f753d0270ffc32608050c680363 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Tue, 5 Oct 2021 00:37:40 +0200
Subject: add openssl 1.1.1l

---
 php-7.4-opt/build.Dockerfile                       |   8 ++++++++
 php-7.4-opt/copy.Dockerfile                        |   1 +
 .../out/php-7.4.20-opt-apcu_5.1.20-1_amd64.deb     | Bin 52760 -> 52764 bytes
 .../out/php-7.4.20-opt-imagick_3.4.4-1_amd64.deb   | Bin 126156 -> 126136 bytes
 .../out/php-7.4.20-opt-memcached_3.1.5-1_amd64.deb | Bin 49342 -> 49338 bytes
 .../out/php-7.4.20-opt-openssl_1.1.1l-1_amd64.deb  | Bin 0 -> 6757604 bytes
 .../out/php-7.4.20-opt-redis_5.3.4-1_amd64.deb     | Bin 211140 -> 211144 bytes
 php-7.4-opt/out/php-7.4.20-opt_7.4.20-1_amd64.deb  | Bin 20198356 -> 20201264 bytes
 8 files changed, 9 insertions(+)
 create mode 100644 php-7.4-opt/out/php-7.4.20-opt-openssl_1.1.1l-1_amd64.deb

diff --git a/php-7.4-opt/build.Dockerfile b/php-7.4-opt/build.Dockerfile
index 79bc3f6..956a52d 100644
--- a/php-7.4-opt/build.Dockerfile
+++ b/php-7.4-opt/build.Dockerfile
@@ -89,6 +89,14 @@ RUN cd libsodium-1.0.18 \
   && ./configure --prefix=$DEP_PREFIX \
   && make \
   && checkinstall -y --pkgname $PACKAGE_NAME-libsodium
+RUN wget "https://www.openssl.org/source/openssl-1.1.1l.tar.gz" --no-check-certificate
+RUN tar xzf openssl-1.1.1l.tar.gz
+RUN cd openssl-1.1.1l \
+  && ./config shared --prefix=/opt/php-7.4/dependencies no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms enable-ec_nistp_64_gcc_128 \
+  && make depend \
+  && make -f Makefile all \
+  && make test \
+  && checkinstall -y --pkgname $PACKAGE_NAME-openssl
 RUN wget https://www.php.net/distributions/$PHP_VERSION.tar.gz
 RUN tar xzf $PHP_VERSION.tar.gz
 RUN cd $PHP_VERSION \
diff --git a/php-7.4-opt/copy.Dockerfile b/php-7.4-opt/copy.Dockerfile
index fed73b5..7fa7a43 100644
--- a/php-7.4-opt/copy.Dockerfile
+++ b/php-7.4-opt/copy.Dockerfile
@@ -11,6 +11,7 @@ COPY --from=build-stage /krb5-1.17.2/src/php-7.4.20-opt-krb5_1-1_amd64.deb .
 COPY --from=build-stage /php-7.4.20/ext/imagick-3.4.4/php-7.4.20-opt-imagick_3.4.4-1_amd64.deb .
 COPY --from=build-stage /php-7.4.20/ext/apcu-5.1.20/php-7.4.20-opt-apcu_5.1.20-1_amd64.deb .
 COPY --from=build-stage /libsodium-1.0.18/php-7.4.20-opt-libsodium_1.0.18-1_amd64.deb .
+COPY --from=build-stage /openssl-1.1.1l/php-7.4.20-opt-openssl_1.1.1l-1_amd64.deb .
 COPY --from=build-stage /php-7.4.20/ext/php-memcached-3.1.5/php-7.4.20-opt-memcached_3.1.5-1_amd64.deb .
 COPY --from=build-stage /php-7.4.20/ext/phpredis-5.3.4/php-7.4.20-opt-redis_5.3.4-1_amd64.deb .
 
diff --git a/php-7.4-opt/out/php-7.4.20-opt-apcu_5.1.20-1_amd64.deb b/php-7.4-opt/out/php-7.4.20-opt-apcu_5.1.20-1_amd64.deb
index 943ef43..5c7bf82 100644
Binary files a/php-7.4-opt/out/php-7.4.20-opt-apcu_5.1.20-1_amd64.deb and b/php-7.4-opt/out/php-7.4.20-opt-apcu_5.1.20-1_amd64.deb differ
diff --git a/php-7.4-opt/out/php-7.4.20-opt-imagick_3.4.4-1_amd64.deb b/php-7.4-opt/out/php-7.4.20-opt-imagick_3.4.4-1_amd64.deb
index 9e4c7b0..9d5cb20 100644
Binary files a/php-7.4-opt/out/php-7.4.20-opt-imagick_3.4.4-1_amd64.deb and b/php-7.4-opt/out/php-7.4.20-opt-imagick_3.4.4-1_amd64.deb differ
diff --git a/php-7.4-opt/out/php-7.4.20-opt-memcached_3.1.5-1_amd64.deb b/php-7.4-opt/out/php-7.4.20-opt-memcached_3.1.5-1_amd64.deb
index 7336d81..4661fee 100644
Binary files a/php-7.4-opt/out/php-7.4.20-opt-memcached_3.1.5-1_amd64.deb and b/php-7.4-opt/out/php-7.4.20-opt-memcached_3.1.5-1_amd64.deb differ
diff --git a/php-7.4-opt/out/php-7.4.20-opt-openssl_1.1.1l-1_amd64.deb b/php-7.4-opt/out/php-7.4.20-opt-openssl_1.1.1l-1_amd64.deb
new file mode 100644
index 0000000..93c13d9
Binary files /dev/null and b/php-7.4-opt/out/php-7.4.20-opt-openssl_1.1.1l-1_amd64.deb differ
diff --git a/php-7.4-opt/out/php-7.4.20-opt-redis_5.3.4-1_amd64.deb b/php-7.4-opt/out/php-7.4.20-opt-redis_5.3.4-1_amd64.deb
index 7c6fda1..c598538 100644
Binary files a/php-7.4-opt/out/php-7.4.20-opt-redis_5.3.4-1_amd64.deb and b/php-7.4-opt/out/php-7.4.20-opt-redis_5.3.4-1_amd64.deb differ
diff --git a/php-7.4-opt/out/php-7.4.20-opt_7.4.20-1_amd64.deb b/php-7.4-opt/out/php-7.4.20-opt_7.4.20-1_amd64.deb
index 00506b3..af5a385 100644
Binary files a/php-7.4-opt/out/php-7.4.20-opt_7.4.20-1_amd64.deb and b/php-7.4-opt/out/php-7.4.20-opt_7.4.20-1_amd64.deb differ
-- 
cgit v1.2.3