Lightweight coding agent that runs in your terminal
Rust
Use OpenSSL 3.6.4 for musl builds (#45149)
zm-oaia592c38c16cd
diff --git a/.github/scripts/install-musl-build-tools.sh b/.github/scripts/install-musl-build-tools.shindex 49035f5391..a7d37b7ff9 100644--- a/.github/scripts/install-musl-build-tools.sh+++ b/.github/scripts/install-musl-build-tools.sh@@ -17,7 +17,7 @@ if [[ -n "${APT_INSTALL_ARGS:-}" ]]; thenfisudo apt-get update "${apt_update_args[@]}"-sudo apt-get install -y "${apt_install_args[@]}" ca-certificates curl musl-tools pkg-config libcap-dev g++ clang libc++-dev libc++abi-dev lld xz-utils+sudo apt-get install -y "${apt_install_args[@]}" ca-certificates curl musl-tools pkg-config libcap-dev g++ clang libc++-dev libc++abi-dev lld xz-utils perl makecase "${TARGET}" inx86_64-unknown-linux-musl)@@ -47,6 +47,8 @@ elseexit 1fi+OPENSSL_CC="${musl_linker}" bash "$(dirname "${BASH_SOURCE[0]}")/install-musl-openssl.sh"+zig_target="${TARGET/-unknown-linux-musl/-linux-musl}"runner_temp="${RUNNER_TEMP:-/tmp}"tool_root="${runner_temp}/codex-musl-tools-${TARGET}"diff --git a/.github/scripts/install-musl-openssl.sh b/.github/scripts/install-musl-openssl.shnew file mode 100644index 0000000000..15c50c51e4--- /dev/null+++ b/.github/scripts/install-musl-openssl.sh@@ -0,0 +1,51 @@+#!/usr/bin/env bash+set -euo pipefail++: "${TARGET:?TARGET environment variable is required}"+: "${GITHUB_ENV:?GITHUB_ENV environment variable is required}"+: "${OPENSSL_CC:?OPENSSL_CC must name the target musl compiler}"++case "${TARGET}" in+ x86_64-unknown-linux-musl) openssl_target="linux-x86_64" ;;+ aarch64-unknown-linux-musl) openssl_target="linux-aarch64" ;;+ *) echo "Unexpected musl target: ${TARGET}" >&2; exit 1 ;;+esac++# openssl-src's latest 300.x crate still contains 3.6.3. Build the upstream+# security release until that crate catches up, keeping the existing 3.x ABI.+openssl_version="3.6.4"+openssl_sha256="9bffaa1ad1e07b354c21bd3324ec02fa15579f45a7d0494b3e74bc449b7333ef"+openssl_root="${RUNNER_TEMP:-/tmp}/codex-musl-tools-${TARGET}/openssl-${openssl_version}"+openssl_prefix="${openssl_root}/prefix"++if [[ ! -f "${openssl_prefix}/.complete" ]]; then+ mkdir -p "${openssl_root}"+ archive="${openssl_root}/openssl-${openssl_version}.tar.gz"+ curl -fsSL "https://github.com/openssl/openssl/releases/download/openssl-${openssl_version}/openssl-${openssl_version}.tar.gz" -o "${archive}"+ echo "${openssl_sha256} ${archive}" | sha256sum -c -+ tar -xzf "${archive}" -C "${openssl_root}"++ (+ cd "${openssl_root}/openssl-${openssl_version}"+ # Match openssl-src's default/legacy configuration for musl, including+ # disabling shared libraries, zlib, engines, and unsupported async APIs.+ CC="${OPENSSL_CC}" perl ./Configure "${openssl_target}" \+ "--prefix=${openssl_prefix}" --openssldir=/usr/local/ssl --libdir=lib \+ no-shared no-module no-tests no-comp no-zlib no-zlib-dynamic \+ no-ssl3 no-md2 no-rc5 no-weak-ssl-ciphers no-camellia no-idea no-seed \+ no-engine no-async -DOPENSSL_NO_SECURE_MEMORY+ make -j"${OPENSSL_BUILD_JOBS:-$(nproc)}" build_libs+ make install_dev+ )+ touch "${openssl_prefix}/.complete"+fi++# Scope these overrides to the target so host build dependencies are unaffected.+# openssl-sys honors OPENSSL_NO_VENDOR even when Cargo enables `vendored`.+target_env="${TARGET^^}"+target_env="${target_env//-/_}"+{+ echo "${target_env}_OPENSSL_DIR=${openssl_prefix}"+ echo "${target_env}_OPENSSL_NO_VENDOR=1"+ echo "${target_env}_OPENSSL_STATIC=1"+} >> "${GITHUB_ENV}"