From 6a16e464ab29c6ad7b6c14a49cd8b7bcc0632067 Mon Sep 17 00:00:00 2001 From: Nautilus <78522210+sudo-nautilus@users.noreply.github.com> Date: Sat, 27 Mar 2021 16:11:04 +0530 Subject: [PATCH] Update Openssl --- scripts.d/25-openssl.sh | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index f04d8e0..c5cde4e 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -1,44 +1,73 @@ #!/bin/bash OPENSSL_REPO="https://github.com/openssl/openssl.git" -OPENSSL_COMMIT="OpenSSL_1_1_1j" + +OPENSSL_COMMIT="OpenSSL_1_1_1k" ffbuild_enabled() { + return 0 + } ffbuild_dockerstage() { + to_df "ADD $SELF /stage.sh" + to_df "RUN run_stage" + } ffbuild_dockerbuild() { + git-mini-clone "$OPENSSL_REPO" "$OPENSSL_COMMIT" openssl + cd openssl local myconf=( + threads + zlib + no-shared + enable-camellia + enable-ec + enable-srp + --prefix="$FFBUILD_PREFIX" + ) if [[ $TARGET == win64 ]]; then + myconf+=( + --cross-compile-prefix="$FFBUILD_CROSS_PREFIX" + mingw64 + ) + elif [[ $TARGET == win32 ]]; then + myconf+=( + --cross-compile-prefix="$FFBUILD_CROSS_PREFIX" + mingw + ) + else + echo "Unknown target" + return -1 + fi ./Configure "${myconf[@]}" || return -1 @@ -46,8 +75,11 @@ ffbuild_dockerbuild() { sed -i -e "/^CFLAGS=/s|=.*|=${CFLAGS}|" -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" Makefile || return -1 make -j$(nproc) || return -1 + make install_sw || return -1 cd .. + rm -rf openssl + }