Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Freeze] Add some changes from #59809 to freeze branch. #59828

Merged
merged 8 commits into from Mar 22, 2021

Conversation

Ch3LL
Copy link
Contributor

@Ch3LL Ch3LL commented Mar 17, 2021

add some changes from #59809 into freeze.

@Ch3LL Ch3LL requested a review from a team as a code owner March 17, 2021 18:04
@Ch3LL Ch3LL requested review from garethgreenaway and removed request for a team March 17, 2021 18:04
@Ch3LL Ch3LL added the Aluminium Release Post Mg and Pre Si label Mar 17, 2021
s0undt3ch
s0undt3ch previously approved these changes Mar 17, 2021
hl-tam and others added 8 commits March 22, 2021 07:19
When loading `libcrypto`, Salt checks for a Homebrew installation of `openssl`
at Homebrew's default prefix of `/usr/local`. However, on Apple Silicon Macs,
Homebrew's default installation prefix is `/opt/homebrew`. On all platforms,
the prefix is configurable.  If Salt doesn't find one of those `libcrypto`s,
it will fall back on the un-versioned `/usr/lib/libcrypto.dylib`, which will
cause the following crash:

    Application Specific Information:
    /usr/lib/libcrypto.dylib
    abort() called
    Invalid dylib load. Clients should not load the unversioned libcrypto dylib as it does not have a stable ABI.

This commit checks $HOMEBREW_PREFIX instead of hard-coding `/usr/local`.
Right now, if `_find_libcrypto` can't find any externally-managed versions of
libcrypto, it will fall back on the pre-Catalina un-versioned system libcrypto.
This does not exist on Big Sur and it would be better to raise an exception
here rather than crashing later when trying to open it.
This commit simplifies the unit tests for _find_libcrypto by mocking out the
host's filesystem and testing the common libcrypto installations (brew, ports,
etc.) on Big Sur. It simplifies the tests for falling back on system versions
of libcrypto on previous versions of macOS.
@Ch3LL Ch3LL merged commit b9c52e4 into saltstack:freeze Mar 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Aluminium Release Post Mg and Pre Si
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants