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.

Sign up for GitHub

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

Jump to bottom

[master] Fix _find_libcrypto for MacOS and Onedir #64878

Merged
merged 6 commits into from
Aug 4, 2023
Merged

[master] Fix _find_libcrypto for MacOS and Onedir #64878

merged 6 commits into from
Aug 4, 2023

Conversation

garethgreenaway
Copy link
Contributor

@garethgreenaway garethgreenaway commented Jul 28, 2023 •
edited
Loading

What does this PR do?

Look in location salt is running from, this accounts for running from an unpacked onedir file that has not been installed.

What issues does this PR fix or reference?

Fixes: #64877

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

Commits signed with GPG?

Yes

Please review Salt's Contributing Guide for best practices.

See GitHub's page on GPG signing for more information about signing commits with GPG.

@garethgreenaway garethgreenaway requested a review from a team as a code owner July 28, 2023 21:43
@garethgreenaway garethgreenaway requested review from twangboy and removed request for a team July 28, 2023 21:43
@salt-project-bot-prod-environment salt-project-bot-prod-environment bot changed the title Fix _find_libcrypto for MacOS and Onedir [master] Fix _find_libcrypto for MacOS and Onedir Jul 28, 2023
@garethgreenaway garethgreenaway temporarily deployed to ci July 28, 2023 22:32 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 28, 2023 22:32 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 28, 2023 22:32 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 28, 2023 22:32 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 28, 2023 22:50 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 28, 2023 22:52 — with GitHub Actions Inactive
whytewolf
whytewolf previously approved these changes Jul 28, 2023
View reviewed changes
@garethgreenaway garethgreenaway temporarily deployed to ci July 29, 2023 03:41 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 29, 2023 03:41 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 29, 2023 03:41 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 29, 2023 03:41 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 29, 2023 03:41 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 29, 2023 03:41 — with GitHub Actions Inactive
s0undt3ch
s0undt3ch suggested changes Jul 29, 2023
View reviewed changes
Copy link
Collaborator

@s0undt3ch s0undt3ch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be going into 3006.x too correct?

salt/utils/rsax931.py Outdated Show resolved Hide resolved
tests/unit/utils/test_rsax931.py Outdated Show resolved Hide resolved
@garethgreenaway garethgreenaway temporarily deployed to ci July 30, 2023 20:46 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 30, 2023 20:46 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 30, 2023 20:46 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 30, 2023 20:46 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 30, 2023 21:00 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci July 30, 2023 21:08 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway added this to the Chlorine v3007.0 milestone Aug 2, 2023
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 00:18 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 00:18 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 00:18 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 00:35 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 00:40 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 02:32 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 05:18 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 05:18 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 05:18 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 05:18 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 05:18 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 05:18 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:19 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:19 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:19 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:19 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:19 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:19 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:40 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:40 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:40 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:40 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:40 — with GitHub Actions Inactive
@garethgreenaway garethgreenaway temporarily deployed to ci August 3, 2023 14:40 — with GitHub Actions Inactive
@s0undt3ch s0undt3ch merged commit b49eb84 into saltstack:master Aug 4, 2023
370 checks passed
@github-actions
Copy link

github-actions bot commented Aug 4, 2023

💔 All backports failed

Status Branch Result
❌ 3006.x Backport failed because of merge conflicts

You might need to backport the following PRs to 3006.x:
- moving test to pytest.
- removing unused os.path.join. moving all patch decorators into the test functions.
- Adding changelog.
- Look in location salt is running from, this accounts for running from an unpacked onedir file that has not been installed.

Manual backport

To create the backport manually run:

backport --pr 64878

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ch3LL Ch3LL Ch3LL approved these changes

@dwoz dwoz dwoz approved these changes

@s0undt3ch s0undt3ch s0undt3ch approved these changes

@twangboy twangboy Awaiting requested review from twangboy

@whytewolf whytewolf Awaiting requested review from whytewolf

Assignees
No one assigned
Labels
backport:3006.x Backport PR to 3006.x branch Chlorine v3007.0
Projects
None yet
Milestone
Chlorine v3007.0
Development

Successfully merging this pull request may close these issues.

[BUG] Mac Onedir Cannot locate OpenSSL libcrypto
6 participants
@garethgreenaway @s0undt3ch @whytewolf @dwoz @Ch3LL @twangboy