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

openssl: 1.1.1i -> 1.1.1j #113528

Merged
merged 1 commit into from
Feb 18, 2021
Merged

openssl: 1.1.1i -> 1.1.1j #113528

merged 1 commit into from
Feb 18, 2021

Conversation

mweinelt
Copy link
Member

Motivation for this change

https://www.openssl.org/news/secadv/20210216.txt

Fixes: CVE-2021-23839, CVE-2021-23840, CVE-2021-23841

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@mweinelt mweinelt added 1.severity: security Issues which raise a security issue, or PRs that fix one 9.needs: port to stable A PR needs a backport to the stable release. labels Feb 17, 2021
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild label Feb 17, 2021
@ofborg ofborg bot requested a review from peti February 17, 2021 23:39
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 113528 run on x86_64-linux 1

1 package failed to build and are new build failure:
2 packages built:
  • curlFull
  • openssl

The following issues got detected with the above build packages.
Please fix at least the ones listed with your changed packages:

openssl:

Please add a comment on the line above, explaining the purpose of this patch.
Near pkgs/development/libraries/openssl/default.nix:153:7:

    |
153 |       ./1.0.2/nix-ssl-cert-file.patch
    |       ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-patch-comment.md
Please add a comment on the line above, explaining the purpose of this patch.
Near pkgs/development/libraries/openssl/default.nix:155:7:

    |
155 |       (if stdenv.hostPlatform.isDarwin
    |       ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-patch-comment.md
Please add a comment on the line above, explaining the purpose of this patch.
Near pkgs/development/libraries/openssl/default.nix:166:7:

    |
166 |       ./1.1/nix-ssl-cert-file.patch
    |       ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-patch-comment.md
Please add a comment on the line above, explaining the purpose of this patch.
Near pkgs/development/libraries/openssl/default.nix:168:7:

    |
168 |       (if stdenv.hostPlatform.isDarwin
    |       ^

See: https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/missing-patch-comment.md

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

Building curl, openssl and most parts through home-assistant worked so compile wise this should be good to merge.

Copy link
Member

@stigtsp stigtsp left a comment

Choose a reason for hiding this comment

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

LGTM

@stigtsp
Copy link
Member

stigtsp commented Feb 18, 2021

@mweinelt should this go in staging-next?

@mweinelt
Copy link
Member Author

@stigtsp staging-next has been merged earlier today, so there is no difference between the two right now.

@mweinelt mweinelt merged commit ffd61b8 into NixOS:staging Feb 18, 2021
@mweinelt mweinelt deleted the openssl-1.1.1j branch February 18, 2021 12:58
@erictapen
Copy link
Member

Was backported in c40154f.

@erictapen erictapen added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Mar 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants