From 3a14529504480989d2c51df129a0cc73f2216690 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 25 Mar 2023 17:29:56 -0700 Subject: [PATCH] Migrate from OpenSSL@1.1 to OpenSSL@3 for standalone builds. --- script/build-vendor-libraries.sh | 3 +-- script/relink-dynamic-libraries.js | 8 ++++---- script/stage-vendor-libraries.sh | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/script/build-vendor-libraries.sh b/script/build-vendor-libraries.sh index f82a9092e..231184e4f 100755 --- a/script/build-vendor-libraries.sh +++ b/script/build-vendor-libraries.sh @@ -27,7 +27,7 @@ RPATH="@rpath" OS=$(uname) ARCH=$(uname -m) SCRIPTDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) -OPENSSL_VERSION="1.1.1t" +OPENSSL_VERSION="3.1.0" CURL_VERSION="7.88.1" LIBMICROHTTPD_VERSION="0.9.76" FFMPEG_VERSION="6.0" @@ -500,7 +500,6 @@ function delete_unused_libraries() { } clean - mkdir vendor cd vendor diff --git a/script/relink-dynamic-libraries.js b/script/relink-dynamic-libraries.js index c87eaa719..e67b89c6c 100644 --- a/script/relink-dynamic-libraries.js +++ b/script/relink-dynamic-libraries.js @@ -27,14 +27,14 @@ const libraries = [ 'libavcodec-musikcube.60.dylib', 'libavformat-musikcube.60.dylib', 'libavutil-musikcube.58.dylib', - 'libcrypto.1.1.dylib', + 'libcrypto.3.dylib', 'libcurl.4.dylib', 'libmicrohttpd.12.dylib', 'libmp3lame.0.dylib', 'libogg.0.dylib', 'libopenmpt.0.dylib', 'libopus.0.dylib', - 'libssl.1.1.dylib', + 'libssl.3.dylib', 'libswresample-musikcube.4.dylib', 'libtag.1.19.0.dylib', 'libvorbis.0.dylib', @@ -47,14 +47,14 @@ const symlinks = [ ['libavcodec-musikcube.60.dylib', 'libavcodec-musikcube.dylib'], ['libavformat-musikcube.60.dylib', 'libavformat-musikcube.dylib'], ['libavutil-musikcube.58.dylib', 'libavutil-musikcube.dylib'], - ['libcrypto.1.1.dylib', 'libcrypto.dylib'], + ['libcrypto.3.dylib', 'libcrypto.dylib'], ['libcurl.4.dylib', 'libcurl.dylib'], ['libmicrohttpd.12.dylib', 'libmicrohttpd.dylib'], ['libmp3lame.0.dylib', 'libmp3lame.dylib'], ['libogg.0.dylib', 'libogg.dylib'], ['libopenmpt.0.dylib', 'libopenmpt.dylib'], ['libopus.0.dylib', 'libopus.dylib'], - ['libssl.1.1.dylib', 'libssl.dylib'], + ['libssl.3.dylib', 'libssl.dylib'], ['libswresample-musikcube.4.dylib', 'libswresample-musikcube.dylib'], ['libtag.1.19.0.dylib', 'libtag.dylib'], ['libvorbis.0.dylib', 'libvorbis.dylib'], diff --git a/script/stage-vendor-libraries.sh b/script/stage-vendor-libraries.sh index b38b835cd..63dbc9462 100755 --- a/script/stage-vendor-libraries.sh +++ b/script/stage-vendor-libraries.sh @@ -17,8 +17,8 @@ if [[ "$PLATFORM" == 'Darwin' ]]; then cp vendor/bin/lib/libogg.0.dylib ./bin/lib cp vendor/bin/lib/libvorbis.0.dylib ./bin/lib cp vendor/bin/lib/libvorbisenc.2.dylib ./bin/lib - cp vendor/bin/lib/libcrypto.1.1.dylib ./bin/lib - cp vendor/bin/lib/libssl.1.1.dylib ./bin/lib + cp vendor/bin/lib/libcrypto.3.dylib ./bin/lib + cp vendor/bin/lib/libssl.3.dylib ./bin/lib cp vendor/bin/lib/libcurl.4.dylib ./bin/lib cp vendor/bin/lib/libmicrohttpd.12.dylib ./bin/lib cp vendor/bin/lib/libmp3lame.0.dylib ./bin/lib @@ -36,8 +36,8 @@ elif [[ "$PLATFORM" == 'Linux' ]]; then cp vendor/bin/lib/libavformat-musikcube.so.60 ./bin/lib cp vendor/bin/lib/libavutil-musikcube.so.58 ./bin/lib cp vendor/bin/lib/libswresample-musikcube.so.4 ./bin/lib - cp vendor/bin/lib/libcrypto.so.1.1 ./bin/lib - cp vendor/bin/lib/libssl.so.1.1 ./bin/lib + cp vendor/bin/lib/libcrypto.so.3 ./bin/lib + cp vendor/bin/lib/libssl.so.3 ./bin/lib cp vendor/bin/lib/libcurl.so.4 ./bin/lib cp vendor/bin/lib/libmp3lame.so.0 ./bin/lib cp vendor/bin/lib/libmicrohttpd.so.12 ./bin/lib