From df934c193e6c4b7383196449b9cc973cb47d533c Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Fri, 18 Mar 2022 14:12:52 -0700 Subject: [PATCH] Aligning 'openssl' versions across toolchain build phases. --- .../toolchain/container/toolchain-remote-wget-list | 2 +- toolkit/scripts/toolchain/container/toolchain-sha256sums | 2 +- .../toolchain/container/toolchain_build_in_chroot.sh | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/toolkit/scripts/toolchain/container/toolchain-remote-wget-list b/toolkit/scripts/toolchain/container/toolchain-remote-wget-list index 96d17c989f4..dc2f8a4260c 100644 --- a/toolkit/scripts/toolchain/container/toolchain-remote-wget-list +++ b/toolkit/scripts/toolchain/container/toolchain-remote-wget-list @@ -58,7 +58,7 @@ https://download.savannah.gnu.org/releases/man-db/man-db-2.10.1.tar.xz https://archive.mozilla.org/pub/nspr/releases/v4.21/src/nspr-4.21.tar.gz https://cpan.metacpan.org/authors/id/E/ET/ETHER/Test-Warnings-0.028.tar.gz https://cpan.metacpan.org/authors/id/M/MS/MSCHOUT/Text-Template-1.51.tar.gz -https://www.openssl.org/source/openssl-1.1.1g.tar.gz +https://www.openssl.org/source/openssl-1.1.1k.tar.gz https://ftp.gnu.org/gnu/sed/sed-4.8.tar.xz https://www.sqlite.org/2021/sqlite-autoconf-3360000.tar.gz https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.37/util-linux-2.37.2.tar.xz diff --git a/toolkit/scripts/toolchain/container/toolchain-sha256sums b/toolkit/scripts/toolchain/container/toolchain-sha256sums index faead28b003..ecc513f9608 100644 --- a/toolkit/scripts/toolchain/container/toolchain-sha256sums +++ b/toolkit/scripts/toolchain/container/toolchain-sha256sums @@ -42,7 +42,7 @@ c2faa85e625cd7567dc1dec9f23d1af1f73e2ca6468bce1bdc13387ec56f97e8 man-pages-5.02 0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f mpfr-4.1.0.tar.xz 30306e0c76e0f9f1f0de987cf1c82a5c21e1ce6568b9227f7da5b71cbea86c9d ncurses-6.2.tar.gz 15ea32c7b100217b6e3193bc03e77f485d9bf7504051443ba9ce86d1c17c6b5a nspr-4.21.tar.gz -ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46 openssl-1.1.1g.tar.gz +892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 openssl-1.1.1k.tar.gz ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd patch-2.7.6.tar.xz 6f436b447cf56d22464f980fac1916e707a040e96d52172984c5d184c09b859b perl-5.32.0.tar.xz 6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591 pkg-config-0.29.2.tar.gz diff --git a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh index 177335980d8..de3d9309369 100755 --- a/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh +++ b/toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh @@ -753,9 +753,9 @@ popd rm -rf Text-Template-1.51 touch /logs/status_text_template_complete -echo OpenSSL-1.1.1g -tar xf openssl-1.1.1g.tar.gz -pushd openssl-1.1.1g +echo OpenSSL-1.1.1k +tar xf openssl-1.1.1k.tar.gz +pushd openssl-1.1.1k sslarch= ./config --prefix=/usr \ --openssldir=/etc/pki/tls \ @@ -773,7 +773,7 @@ make all -j$(nproc) sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile make MANSUFFIX=ssl install popd -rm -rf openssl-1.1.1g +rm -rf openssl-1.1.1k touch /logs/status_openssl_complete echo Python-3.9.10