Skip to content

glibc: 2.33-71 -> 2.33-78 (security)#156684

Merged
Ma27 merged 1 commit intoNixOS:stagingfrom
vcunat:p/glibc-patches
Jan 25, 2022
Merged

glibc: 2.33-71 -> 2.33-78 (security)#156684
Ma27 merged 1 commit intoNixOS:stagingfrom
vcunat:p/glibc-patches

Conversation

@vcunat
Copy link
Member

@vcunat vcunat commented Jan 25, 2022

Motivation for this change

https://www.openwall.com/lists/oss-security/2022/01/24/4

Things done

I followed the recipe inside the nix expression's comments.

  • 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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@vcunat vcunat added 1.severity: security Issues which raise a security issue, or PRs that fix one backport staging-21.11 labels Jan 25, 2022
@vcunat vcunat requested a review from TredwellGit January 25, 2022 10:31
@vcunat
Copy link
Member Author

vcunat commented Jan 25, 2022

So far I glanced at zdiff and built glibc on x86_64-linux here and on staging-21.11. The changes are small, so we most likely don't need extensive checking before staging this update (in both branches).

@Ma27 Ma27 merged commit ab6773a into NixOS:staging Jan 25, 2022
@vcunat vcunat deleted the p/glibc-patches branch January 25, 2022 12:12
@github-actions
Copy link
Contributor

Successfully created backport PR #156692 for staging-21.11.

@ofborg ofborg bot added the 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. label Jan 25, 2022
@ofborg ofborg bot requested review from Ma27 and edolstra January 25, 2022 13:21
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 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 Jan 25, 2022
@github-actions
Copy link
Contributor

Backport failed for staging-21.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin staging-21.11
git worktree add -d .worktree/backport-156684-to-staging-21.11 origin/staging-21.11
cd .worktree/backport-156684-to-staging-21.11
git checkout -b backport-156684-to-staging-21.11
ancref=$(git merge-base f0c20873d3473c7395b8878a0af811837b538f77 13ab7d097f2e9b94e7c7544dde9bf29c0e19a7b2)
git cherry-pick -x $ancref..13ab7d097f2e9b94e7c7544dde9bf29c0e19a7b2

3 similar comments
@github-actions
Copy link
Contributor

Backport failed for staging-21.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin staging-21.11
git worktree add -d .worktree/backport-156684-to-staging-21.11 origin/staging-21.11
cd .worktree/backport-156684-to-staging-21.11
git checkout -b backport-156684-to-staging-21.11
ancref=$(git merge-base f0c20873d3473c7395b8878a0af811837b538f77 13ab7d097f2e9b94e7c7544dde9bf29c0e19a7b2)
git cherry-pick -x $ancref..13ab7d097f2e9b94e7c7544dde9bf29c0e19a7b2

@github-actions
Copy link
Contributor

Backport failed for staging-21.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin staging-21.11
git worktree add -d .worktree/backport-156684-to-staging-21.11 origin/staging-21.11
cd .worktree/backport-156684-to-staging-21.11
git checkout -b backport-156684-to-staging-21.11
ancref=$(git merge-base f0c20873d3473c7395b8878a0af811837b538f77 13ab7d097f2e9b94e7c7544dde9bf29c0e19a7b2)
git cherry-pick -x $ancref..13ab7d097f2e9b94e7c7544dde9bf29c0e19a7b2

@github-actions
Copy link
Contributor

Backport failed for staging-21.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git fetch origin staging-21.11
git worktree add -d .worktree/backport-156684-to-staging-21.11 origin/staging-21.11
cd .worktree/backport-156684-to-staging-21.11
git checkout -b backport-156684-to-staging-21.11
ancref=$(git merge-base f0c20873d3473c7395b8878a0af811837b538f77 13ab7d097f2e9b94e7c7544dde9bf29c0e19a7b2)
git cherry-pick -x $ancref..13ab7d097f2e9b94e7c7544dde9bf29c0e19a7b2

vcunat pushed a commit that referenced this pull request Jan 29, 2022
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: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 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