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.

Sign up for GitHub

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.25.1 -> 2.25.3 [security] #85277

Closed
wants to merge 1 commit into from
Closed

git: 2.25.1 -> 2.25.3 [security] #85277

wants to merge 1 commit into from

Conversation

jamesottaway
Copy link
Contributor

Motivation for this change

v2.25.3 addresses CVE-2020-5260.

See https://lore.kernel.org/lkml/xmqqy2qy7xn8.fsf@gitster.c.googlers.com/

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.

This was referenced Apr 15, 2020
Merged
Merged
@ofborg ofborg bot requested review from the-kenny, wmertens, peti and globin April 15, 2020 07:10
@schmittlauch
Copy link
Member

schmittlauch commented Apr 15, 2020 •
edited

We need to decide whether stable should directly switch to 2.26.1 as well (backporting #85263) or whether this PR gets into release-19.09 and release-20.03, while #85263 goes into master.

/cc @worldofpeace @disassembler as release managers

@wamserma
Copy link
Member

someone please also add the security label and/or add (security) to the PR title

@das-g
Copy link
Member

das-g commented Apr 16, 2020

We need to decide whether stable should directly switch to 2.26.1 as well (backporting #85263) or whether this PR gets into release-19.09 and release-20.03, while #85263 goes into master.

release-19.09 is currently on git 2.23.1, so if we want to be conservative, 2.23.2 would be the fixed version to be used there.

release-20.03 is already on git 2.25.0, so the conservative fix would indeed be 2.25.1 there (backporting this very PR, #85277).

The non-conservative option is indeed to directly switch to 2.26.1 (backporting the other PR: #85263) for those release branches, too.

@jamesottaway jamesottaway changed the title git: 2.25.1 -> 2.25.3 git: 2.25.1 -> 2.25.3 [security] Apr 16, 2020
@wamserma
Copy link
Member

For 19.09 I think we should choose the conservative option.

For 20.03 the clean way would also be the conservative fix of this PR, #85277, as 2.26 slightly changes behaviour on git rebase (Changelog). On the other hand, 20.03 is not yet officially released, so an update to 2.26 can be argued for.

@davidak davidak mentioned this pull request Apr 16, 2020
Closed
3 tasks
@vcunat
Copy link
Member

vcunat commented Apr 16, 2020

master is going to higher version; I used almost exactly this in 20.03: dd3652d

@vcunat vcunat closed this Apr 16, 2020
@jamesottaway jamesottaway deleted the git-2.25.3 branch April 16, 2020 23:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@wmertens wmertens Awaiting requested review from wmertens

@peti peti Awaiting requested review from peti

@globin globin Awaiting requested review from globin

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
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jamesottaway @schmittlauch @wamserma @das-g @vcunat