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

git: 2.26.1 -> 2.26.2 (security, CVE-2020-11008) #85666

Merged
merged 1 commit into from Apr 22, 2020
Merged

git: 2.26.1 -> 2.26.2 (security, CVE-2020-11008) #85666

merged 1 commit into from Apr 22, 2020

Conversation

primeos
Copy link
Member

@primeos primeos commented Apr 21, 2020 •
edited

See: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.17.5.txt

Motivation for this change

I did already test the basic functionality and it should be fine, but I'll do some additional checks to be sure. -> LGTM :)

Diffoscope: No file additions/removals.

TODO: Needs port to stable (but 2.25.3 -> 2.25.4 might be better / more appropriate).
Done: See links/references at the bottom of this page.

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.

@ofborg ofborg bot requested review from peti, the-kenny, wmertens and globin April 21, 2020 10:21
@primeos
Copy link
Member Author

primeos commented Apr 21, 2020 •
edited

WIP: Regression in the AArch64 test.
No regression: Seems to only fail on @GrahamcOfBorg (https://github.com/NixOS/nixpkgs/runs/592580808) and not on Hydra (https://hydra.nixos.org/job/nixpkgs/trunk/git.aarch64-linux/all).

@FRidh
Copy link
Member

FRidh commented Apr 22, 2020

We have an openssl update in staging which should become the new staging-next by the end of the day. I suggest to include this update there as well.

@FRidh FRidh added this to WIP in Staging via automation Apr 22, 2020
@primeos primeos changed the base branch from master to staging-next April 22, 2020 11:43
@primeos
Copy link
Member Author

primeos commented Apr 22, 2020

@FRidh I changed the base branch to staging-next, if you meant staging -> staging-next I can also change it to staging (currently you should also be able to do this without any issues/conflicts).

@FRidh FRidh changed the base branch from staging-next to staging April 22, 2020 11:53
@FRidh FRidh merged commit 7d2561c into NixOS:staging Apr 22, 2020
Staging automation moved this from WIP to Done Apr 22, 2020
This was referenced Apr 22, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peti peti Awaiting requested review from peti

@the-kenny the-kenny Awaiting requested review from the-kenny

@wmertens wmertens Awaiting requested review from wmertens

@globin globin Awaiting requested review from globin

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@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
1.severity: security 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
Staging
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@primeos @FRidh