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

Jump to bottom

glibc: 2.30 -> 2.31 #79391

Merged
merged 14 commits into from Jun 30, 2020
Merged

glibc: 2.30 -> 2.31 #79391

merged 14 commits into from Jun 30, 2020

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Feb 6, 2020

Motivation for this change

Changelog: https://sourceware.org/ml/libc-announce/2020/msg00001.html
Hydra jobset: https://hydra.nixos.org/jobset/nixpkgs/glibc-231

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.

@Ma27 Ma27 added this to the 20.09 milestone Feb 6, 2020
@ofborg ofborg bot requested a review from edolstra February 6, 2020 22:07
@ofborg ofborg bot requested a review from Synthetica9 February 8, 2020 15:01
@FRidh
Copy link
Member

FRidh commented Feb 10, 2020

Could the Hydra job be stopped? Now around branch-off we need the Hydra capacity.
https://hydra.nixos.org/jobset/nixpkgs/glibc-231#tabs-evaluations

@vcunat
Copy link
Member

vcunat commented Feb 10, 2020 •
edited

OK, done. I don't expect there will immediately be human time for stabilizing yet another glibc bump anyway. (We haven't really fixed the previous one yet.)

EDIT: I had reduced the scheduling shares on that jobset some days ago, so the impact hopefully wasn't too large.

@Ma27
Copy link
Member Author

Ma27 commented Feb 10, 2020

Agreed, that's why I added this to the 20.09 milestone :) Was mainly interested how much that one would break.

@FRidh FRidh added this to WIP in Staging Feb 11, 2020
@FRidh
Copy link
Member

FRidh commented Feb 19, 2020

Hydra is not doing much at the moment, and we don't have anything significant in staging either, so I suggest rebasing this and evaluating a single jobset.

@Ma27
Copy link
Member Author

Ma27 commented Feb 19, 2020

Thanks for the heads-up, rebased onto latest staging, Hydra evaluation is currently running :)

@Ma27
Copy link
Member Author

Ma27 commented Feb 19, 2020

Btw feel free to abort the jobset if this consumes too much resources (I don't have the permission to do that).

@vcunat
Copy link
Member

vcunat commented Feb 19, 2020

In config it has very few scheduling shares, so Hydra should automatically give priority to other jobs.

@ofborg ofborg bot requested review from fpletz and globin February 19, 2020 22:04
@ofborg ofborg bot requested a review from peti February 20, 2020 18:59
@vcunat vcunat mentioned this pull request Feb 25, 2020
Merged
10 tasks
@Ma27 Ma27 force-pushed the glibc231 branch 2 times, most recently from f43be26 to 3c2dc3b Compare March 12, 2020 18:20
@Ma27
Copy link
Member Author

Ma27 commented Jun 29, 2020

@vcunat the branch now points to staging. For testing purposes I built hello on aarch64-linux :)

I'll mark this as "Ready for review" now, but from my PoV this seems mergable.

@Ma27 Ma27 marked this pull request as ready for review June 29, 2020 13:56
@vcunat
Copy link
Member

vcunat commented Jun 30, 2020 •
edited

I had a glance at the stable 2.31 branch (NEWS). First of all, the ./2.30-cve-2020-1752.patch is still needed (you haven't deleted the file... maybe a rebasing conflict), and CVE-2020-10029 sounds important to add as well.

Perhaps we could again take the whole stable branch; the main complication there is around bootstrapping, so I used to do that in an ugly way: generate the large diff (all commits together since 2.31) and put that gzipped into nixpkgs.

@Ma27
Copy link
Member Author

Ma27 commented Jun 30, 2020

@vcunat applied the two CVE patches for now.

vcunat
vcunat approved these changes Jun 30, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Seems suitable for staging branch.

Staging automation moved this from WIP to Ready Jun 30, 2020
@Ma27
Copy link
Member Author

Ma27 commented Jun 30, 2020

@vcunat so, as soon as ofborg is ready (and we have a few more reviews?), this is mergable?

@vcunat vcunat merged commit e640908 into staging Jun 30, 2020
Staging automation moved this from Ready to Done Jun 30, 2020
@Ma27 Ma27 deleted the glibc231 branch June 30, 2020 22:35
@Ma27
Copy link
Member Author

Ma27 commented Jul 12, 2020

@vcunat btw I assume that the Hydra jobset (https://hydra.nixos.org/jobset/nixpkgs/glibc-231) can be disabled now, right?

@vcunat
Copy link
Member

vcunat commented Jul 12, 2020

OK. Auto-evals were disabled long ago; now I disabled it whole.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/bad-locale-support-perl-warning-setting-locale-failed/8261/1

@Ma27 Ma27 mentioned this pull request Feb 2, 2021
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

@edolstra edolstra Awaiting requested review from edolstra

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@fpletz fpletz Awaiting requested review from fpletz

@globin globin Awaiting requested review from globin

@peti peti Awaiting requested review from peti

@ck3d ck3d Awaiting requested review from ck3d

@zimbatm zimbatm Awaiting requested review from zimbatm

@veprbl veprbl Awaiting requested review from veprbl

@dtzWill dtzWill Awaiting requested review from dtzWill

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

Assignees
No one assigned
Labels
6.topic: printing 6.topic: python 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
Staging
  
Done
Milestone
20.09
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Ma27 @FRidh @vcunat @nixos-discourse