Skip to content

cc-wrapper: fix inverted logic around fortify & fortify3 mutual exclusion#217394

Merged
risicle merged 1 commit intoNixOS:stagingfrom
risicle:ris-fortify3-fortify-mutual-exclusion-fix
Feb 21, 2023
Merged

cc-wrapper: fix inverted logic around fortify & fortify3 mutual exclusion#217394
risicle merged 1 commit intoNixOS:stagingfrom
risicle:ris-fortify3-fortify-mutual-exclusion-fix

Conversation

@risicle
Copy link
Contributor

@risicle risicle commented Feb 21, 2023

Description of changes

Follow up to #212498. I will have to rely on someone else to test this (perhaps against #217390), because I don't have a built staging cached or the resources to build one quickly.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@risicle risicle requested a review from Ericson2314 as a code owner February 21, 2023 00:31
@risicle risicle added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Feb 21, 2023
@risicle risicle changed the title cc-wrapper: fix inverted logic around fortify & fortify3 mutual exclusion cc-wrapper: fix inverted logic around fortify & fortify3 mutual exclusion Feb 21, 2023
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 21, 2023
Copy link
Contributor

@trofi trofi left a comment

Choose a reason for hiding this comment

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

Confirmed libomxil-bellagio now builds unmodified in staging.

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 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants