diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 34b88eebd..4bc0d5265 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -13,8 +13,8 @@ to spot check configuration issues. * added support for the `piggy` debug tool to help with log collection and remote app monitoring. disabled by default. -* updated Linux/macOS dependencies for standalone builds: boost 1.79.0, - openssl 1.1.1n, curl 7.82.0, ffmpeg 5.0.1, libopenmtp 0.6.2 +* updated Linux/macOS dependencies for standalone *nix builds: boost 1.79.0, + openssl 3.0.2, curl 7.83.0, ffmpeg 5.0.1, libopenmtp 0.6.2 -------------------------------------------------------------------------------- diff --git a/script/build-vendor-libraries.sh b/script/build-vendor-libraries.sh index 4ea93dcf6..baf838fe4 100755 --- a/script/build-vendor-libraries.sh +++ b/script/build-vendor-libraries.sh @@ -29,8 +29,8 @@ ARCH=$(uname -m) SCRIPTDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) BOOST_VERSION_URL_PATH="1.79.0" BOOST_VERSION="1_79_0" -OPENSSL_VERSION="1.1.1n" -CURL_VERSION="7.82.0" +OPENSSL_VERSION="3.0.2" +CURL_VERSION="7.83.0" LIBMICROHTTPD_VERSION="0.9.75" FFMPEG_VERSION="5.0.1" LAME_VERSION="3.100" @@ -138,6 +138,11 @@ function build_openssl() { make make install_sw cd .. + if [ -d "bin/lib64" ]; then + mv bin/lib64/pkgconfig/* bin/lib/pkgconfig/ + mv bin/lib64/* bin/lib/ + rm -rf bin/lib64 + fi } # diff --git a/script/relink-dynamic-libraries.js b/script/relink-dynamic-libraries.js index ba65d6839..2ff6778b2 100644 --- a/script/relink-dynamic-libraries.js +++ b/script/relink-dynamic-libraries.js @@ -28,8 +28,8 @@ const libraries = [ 'libavformat-musikcube.59.dylib', 'libavutil-musikcube.57.dylib', 'libswresample-musikcube.4.dylib', - 'libcrypto.1.1.dylib', - 'libssl.1.1.dylib', + 'libcrypto.3.dylib', + 'libssl.3.dylib', 'libcurl.4.dylib', 'libmicrohttpd.12.dylib', 'libmp3lame.0.dylib', @@ -46,8 +46,8 @@ const symlinks = [ ['libavformat-musikcube.59.dylib', 'libavformat-musikcube.dylib'], ['libavutil-musikcube.57.dylib', 'libavutil-musikcube.dylib'], ['libswresample-musikcube.4.dylib', 'libswresample-musikcube.dylib'], - ['libcrypto.1.1.dylib', 'libcrypto.dylib'], - ['libssl.1.1.dylib', 'libssl.dylib'], + ['libcrypto.3.dylib', 'libcrypto.dylib'], + ['libssl.3.dylib', 'libssl.dylib'], ['libcurl.4.dylib', 'libcurl.dylib'], ['libmicrohttpd.12.dylib', 'libmicrohttpd.dylib'], ['libmp3lame.0.dylib', 'libmp3lame.dylib'], diff --git a/script/stage-vendor-libraries.sh b/script/stage-vendor-libraries.sh index 3749ed85c..26d827547 100755 --- a/script/stage-vendor-libraries.sh +++ b/script/stage-vendor-libraries.sh @@ -28,8 +28,8 @@ if [[ "$PLATFORM" == 'Darwin' ]]; then cp vendor/bin/lib/libboost_filesystem.dylib ./bin/lib cp vendor/bin/lib/libboost_system.dylib ./bin/lib cp vendor/bin/lib/libboost_thread.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 @@ -51,8 +51,8 @@ elif [[ "$PLATFORM" == 'Linux' ]]; then cp vendor/bin/lib/libboost_filesystem.so.1.79.0 ./bin/lib cp vendor/bin/lib/libboost_system.so.1.79.0 ./bin/lib cp vendor/bin/lib/libboost_thread.so.1.79.0 ./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