-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
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
OpenSSL-related fixes for staging-next (2024-10-02) #345998
OpenSSL-related fixes for staging-next (2024-10-02) #345998
Conversation
Is this only for edk2, or are you planning to add more to it? If just edk2, then the title should reflect this. |
I'll planned to address multiple OpenSSL related issues here (if there are any). Otherwise I'll rename to EDK2 fixes. |
Signed-off-by: Markus Theil <theil.markus@gmail.com>
openssl_3 is no longer unambiguous with openssl_3_2 and openssl_3_3 also present. Rename to openssl_3_0. Signed-off-by: Markus Theil <theil.markus@gmail.com>
Signed-off-by: Markus Theil <theil.markus@gmail.com>
56d732c
to
f962382
Compare
I nevertheless adapted this and removed openssl_3. As it is not clear if openssl_3 should point to the oldest or newest version of 3.x. openssl_3_0 and openssl_3_3 are more explicit in this now. |
Please don't. Right now |
I'd prefer this state fixed, but this particular PR isn't a good place, I believe. |
Signed-off-by: Markus Theil <theil.markus@gmail.com>
Ok, I'll remove it again. |
I definitely prefer the result of this PR to the status quo, FWIW. |
I'd separate that. And maybe it's better done in |
I am not sure if it makes sense to have package name churn because my hope is that we can drop 3.0 in 25.05, given that the only issues with 3.3 have been too‐small RSA keys in tests and weird build systems like EDK2 that are poking at internal headers because they expect vendored sources. |
Signed-off-by: Markus Theil <theil.markus@gmail.com> Picked from PR #345998
We generally prefer to not clutter nixpkgs with patches but use pkgs.fetchpatch in Haskell land. |
Signed-off-by: Markus Theil <theil.markus@gmail.com> Picked from PR #345998 In particular, this fixes OVMF build (a channel blocker). https://hydra.nixos.org/build/274346247/nixlog/1/tail
I think that's general, but I don't expect there's anywhere to fetch this from yet. BTW, I pushed that commit to |
Yeah, I noticed that commit, that’s why I came here. Its not a big issue, just wanted to remark it. The patch could be fetched from here: |
@maralorn I also used to have this preference, but Alyssa pointed out to me that if an unmerged pull request is force‐pushed (say, because of upstream review feedback), GitHub will sometimes garbage‐collect the old commit and break future Nixpkgs reproducibility (you can look at random old Nixpkgs PRs and see 404s on the previous commit hashes from force‐pushes). This is sort of a general problem with FODs, but it made me lean more towards vendoring patches that aren’t available in a more stable place (upstream commit, another distro’s repository, etc.). |
About the PR, though, I think that removing 3.2 should be uncontroversial but it could probably use a compatibility alias since it’s already seen a release. |
I was aware of that problem. But I thought that can be fixed by modifying the URL to not mention the pull request. Do even the simple |
It's a property of git that unreachable commits are meant to be forgotten (eventually). |
Yeah, though IMO the rebase‐oriented GitHub code review flow means that previous versions of a PR should not be considered unreachable. There’s links directly to them from the PR pages that are 404s. Garbage collection shouldn’t lead to dangling pointers :) But it is what it is so it’s worth keeping in mind. |
Signed-off-by: Markus Theil <theil.markus@gmail.com> Picked from PR #345998 except that vcunat used `openssl` instead of `openssl_3_3` I do think that we should be well covered with 3.0 and 3.3. https://github.com/openssl/openssl/blob/openssl-3.3.0/NEWS.md
This PR is used to track broken packages after bumping OpenSSL default version from 3.0 -> 3.3. Furthermore some more cleanup with the different OpenSSL 3.x versions is done.
[x] edk2/OVMF: upstream currently not able to build with OpenSSL 3.3, set default OpenSSL to 3.0 for this package. (see: tianocore/edk2#6184)
[x] haskellPackages.openssl-streams: repo contains old 1024 Bit RSA key, which OpenSSL 3.3 does not accept by default. Tests failed. Upstream seems dead for some years.
[x] WIP: Adapted openssl_3 to openssl_3_0, removed openssl_3_2 which only had a single user (switched cloudflare-warp to openssl_3_3)
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.