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

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 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.
@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

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 Ma27 force-pushed the glibc231 branch from d0873a5 to 507871a Feb 19, 2020
@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 Feb 19, 2020
@Ma27 Ma27 force-pushed the glibc231 branch from 5c27973 to 6c2b298 Feb 20, 2020
@ofborg ofborg bot requested a review from peti Feb 20, 2020
@vcunat vcunat mentioned this pull request Feb 25, 2020
1 of 10 tasks complete
@Ma27 Ma27 force-pushed the glibc231 branch from 6c2b298 to a2233de Feb 28, 2020
@Ma27 Ma27 force-pushed the glibc231 branch 2 times, most recently from f43be26 to 3c2dc3b Mar 7, 2020
@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.

@vcunat
Copy link
Member

vcunat commented Jun 30, 2020

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.

/cc roundup #88306
@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
Copy link
Member

vcunat left a comment

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
17 of 18 checks passed
17 of 18 checks passed
busybox, busybox.passthru.tests, cups-bjnp, cups-bjnp.passthru.tests, datefudge, datefudge.passthru.tests, gcc49, gcc49.passthru.tests, gcc6, gcc6.passthru.tests, gcc7, gcc7.passthru.tests, glibc, glibc.passthru.tests, imagemagick7, imagemagick7.passthru.tests, swift, swift.passthru.tests, vdr, vdr.passthru.tests on x86_64-darwin
Details
busybox, busybox.passthru.tests, cups-bjnp, cups-bjnp.passthru.tests, datefudge, datefudge.passthru.tests, gcc49, gcc49.passthru.tests, gcc6, gcc6.passthru.tests, gcc7, gcc7.passthru.tests, glibc, glibc.passthru.tests, imagemagick7, imagemagick7.passthru.tests, swift, swift.passthru.tests, vdr, vdr.passthru.tests on x86_64-linux Failure
Details
busybox, busybox.passthru.tests, cups-bjnp, cups-bjnp.passthru.tests, datefudge, datefudge.passthru.tests, gcc49, gcc49.passthru.tests, gcc6.passthru.tests, gcc7.passthru.tests, glibc, glibc.passthru.tests, imagemagick7.passthru.tests, swift, swift.passthru.tests, vdr, vdr.passthru.tests on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
busybox, busybox.passthru.tests, cups-bjnp, cups-bjnp.passthru.tests, datefudge, datefudge.passthru.tests, gcc49, gcc49.passthru.tests, gcc6, gcc6.passthru.tests, gcc7, gcc7.passthru.tests, glibc, glibc.passthru.tests, imagemagick7, imagemagick7.passthru.tests, swift, swift.passthru.tests, vdr, vdr.passthru.tests on aarch64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9cd9838"; rev="9cd98386a38891d1074fc18036b842dc4416f562"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9cd9838"; rev="9cd98386a38891d1074fc18036b842dc4416f562"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9cd9838"; rev="9cd98386a38891d1074fc18036b842dc4416f562"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9cd9838"; rev="9cd98386a38891d1074fc18036b842dc4416f562"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9cd9838"; rev="9cd98386a38891d1074fc18036b842dc4416f562"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9cd9838"; rev="9cd98386a38891d1074fc18036b842dc4416f562"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="9cd9838"; rev="9cd98386a38891d1074fc18036b842dc4416f562"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Staging automation moved this from Ready to Done Jun 30, 2020
@Ma27 Ma27 deleted the glibc231 branch Jun 30, 2020
@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

nixos-discourse commented Jul 22, 2020

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.