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.26.1 #85263

Merged
merged 1 commit into from Apr 16, 2020
Merged

git: 2.25.1 -> 2.26.1 #85263

merged 1 commit into from Apr 16, 2020

Conversation

jamesottaway
Copy link
Contributor

Motivation for this change

v2.26.1 addresses CVE-2020-5260 as detailed here: 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.

jamesottaway
jamesottaway commented Apr 15, 2020
View reviewed changes
pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -189,7 +189,7 @@ stdenv.mkDerivation {
ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend
'' + stdenv.lib.optionalString perlSupport ''
# wrap perl commands
makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/git-credential-netrc \
makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This was due to git/git@1c78c78

@ofborg ofborg bot requested review from wmertens, globin, the-kenny and peti April 15, 2020 04:32
@jamesottaway
Copy link
Contributor Author

jamesottaway commented Apr 15, 2020 •
edited

If the minor version bump isn't kosher then I also opened #85277 (git: 2.25.1 -> 2.25.3).

@schmittlauch schmittlauch mentioned this pull request Apr 15, 2020
Closed
10 tasks
@das-g
Copy link
Member

das-g commented Apr 15, 2020

If the minor version bump isn't kosher then I also opened #85277 (git: 2.25.1 -> 2.25.3).

For master that should be OK, unless we know it'd break something. For release-19.09 we might want to go from 2.23.1 to 2.23.2

This was referenced Apr 16, 2020
Closed
Closed
@vcunat vcunat changed the base branch from master to staging-next April 16, 2020 14:59
@vcunat vcunat self-assigned this Apr 16, 2020
@vcunat vcunat merged commit 9d77dc2 into NixOS:staging-next Apr 16, 2020
@jamesottaway jamesottaway deleted the git-2.26.1 branch April 16, 2020 23:41
@jamesottaway
Copy link
Contributor Author

For release-19.09 we might want to go from 2.23.1 to 2.23.2

What's the difference between the release-* and nixos-* branches?

@vcunat
Copy link
Member

vcunat commented Apr 17, 2020

release-* are the branches we push to. After builds finish, tests succeed, etc. the "channel" branches nixos-* are bumped (or not); these used to live in the separate nixpkgs-channels repo. Some more information about the process is linked from https://status.nixos.org/

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

@wmertens wmertens Awaiting requested review from wmertens

@globin globin Awaiting requested review from globin

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

@peti peti Awaiting requested review from peti

Assignees

@vcunat vcunat

Labels
1.severity: security 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jamesottaway @das-g @vcunat @Janik-Haag