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

salt: update to 3007.1. #52887

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

salt: update to 3007.1. #52887

wants to merge 1 commit into from

Conversation

lvdh
Copy link

@lvdh lvdh commented Nov 2, 2024

Testing the changes

  • I tested the changes in this PR: briefly, on x86_64-glibc
    • The build installs successfully.
    • Running salt-minion is successful, including connection to an existing salt-master.
    • Running salt-master from this build is untested.

Local build testing

  • I built this PR locally for my native architecture, x86_64-glibc
  • I built this PR locally for these architectures, all crossbuilds:
    • aarch64
    • aarch64-musl
    • armv6l
    • armv6l-musl
    • armv7l
    • armv7l-musl
    • x86_64-musl

Additional notes

  • xlint template: ok
  • changes:
    • template:
      • Update version and checksum.
    • patches:
      • Remove one patch specific to version 3006.8.
      • Adapt one patch to upstream updates, no functional changes.

@lvdh
Copy link
Author

lvdh commented Nov 2, 2024

Forgot to CC the maintainer, I do apologize: @Vaelatern

@lvdh
Copy link
Author

lvdh commented Nov 3, 2024

Ah, the suite contains a check for i686.
Glad to see it passed. I shall include it in future local crossbuilds.

@Vaelatern
Copy link
Member

Vaelatern commented Nov 3, 2024

We need to add more patches for the most recent python we are running.
https://patch-diff.githubusercontent.com/raw/saltstack/salt/pull/66899.patch is one

Yes this patch is still needed on 3006.8 >.> but figuring out what works is hard.

Good news is I have a broken Salt install I'll test this PR on :)

@lvdh
Copy link
Author

lvdh commented Nov 3, 2024

Thanks for the useful input! And for testing :) Looking forward to your findings, particularly the stuff that breaks.

I'll have a go at basic tests, this time with both minion+master on Void.

@Vaelatern
Copy link
Member

Yeah, I've tested and the patch I mentioned isn't enough yet...

@Vaelatern
Copy link
Member

Ok I got it functional for python 3.12 but 3.13 is on the horizon.

Vaelatern pushed a commit to Vaelatern/void-packages that referenced this pull request Dec 13, 2024
Closes: void-linux#52887 [via git-merge-pr]
@Vaelatern
Copy link
Member

My branch is here https://github.com/Vaelatern/void-packages/tree/salt-3007

I want to test a master/minion setup with this too. Also want to test with python 3.13 and fix it up for that, in advance of the upcoming python3.13 bump @ahesford (I think you're doing that?)

@ahesford
Copy link
Member

Yes, my intention is to push Python tomorrow.

@Vaelatern
Copy link
Member

Have you needed to make any changes to salt that I should be aware of so that I can incorporate Py 3.13 into salt?

@ahesford
Copy link
Member

No, salt builds as-is on my branch.

@Vaelatern
Copy link
Member

Vaelatern commented Dec 23, 2024

Confirming that this does not presently work with python 3.13. It was broken before, but there are more changes necessary to salt for the newest Python.

EDIT: It works but there is a need for a patch we don't yet have, to salt/utils/pycrypto.py for a mechanism removed in py3.13

@Vaelatern
Copy link
Member

saltstack/salt#67118

@Vaelatern
Copy link
Member

Vaelatern commented Dec 23, 2024

saltstack/salt#67119
Salt will need another patch for spwd. I've not yet authored one, but my branch has one I've proposed upstream for crypt.

Vaelatern pushed a commit to Vaelatern/void-packages that referenced this pull request Dec 23, 2024
Closes: void-linux#52887 [via git-merge-pr]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants