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.14.0 -> 2.14.1 #28119

Merged
merged 1 commit into from Aug 11, 2017
Merged

git: 2.14.0 -> 2.14.1 #28119

merged 1 commit into from Aug 11, 2017

Conversation

infinisil
Copy link
Member

The new version contains a security fix for CVE-2017-1000117

More information regarding this update can be found here:
http://marc.info/?l=git&m=150238802328673&w=2

Motivation for this change
Things done

Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers.

  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@infinisil
git: 2.14.0 -> 2.14.1
4a0efc9 
The new version contains a security fix for CVE-2017-1000117

More information regarding this update can be found here:
http://marc.info/?l=git&m=150238802328673&w=2
@mention-bot
Copy link

@infinisil, thanks for your PR! By analyzing the history of the files in this pull request, we identified @mimadrid, @fpletz and @peti to be potential reviewers.

@infinisil
Copy link
Member Author

This also needs to be done for the 17.03 release (update from 2.12.2 -> 2.12.4)

For svn: http://mail-archives.apache.org/mod_mbox/subversion-announce/201708.mbox/%3C2fefe468-7d41-11e7-aea1-9312c6089150%40apache.org%3E

For hg: https://www.mercurial-scm.org/pipermail/mercurial/2017-August/050522.html

@NeQuissimus
Copy link
Member

thx, I was just about to do this :)

@NeQuissimus NeQuissimus merged commit 30d1c62 into NixOS:master Aug 11, 2017
@infinisil
Copy link
Member Author

@NeQuissimus You could update the others, I'm a bit short on time now ;)

@NeQuissimus
Copy link
Member

Pushed git from 2.12.2 to 2.14.1 on 17.03

@NeQuissimus
Copy link
Member

I'll do mercurial, @fpletz already did subversion

@globin
Copy link
Member

globin commented Aug 11, 2017

Please test on 17.03 after cherry-picking! This broke git!

@NeQuissimus
Copy link
Member

NeQuissimus commented Aug 11, 2017 •
edited

What? I ran it! Let me see...

@NeQuissimus
Copy link
Member

Oh, you fixed it already... This is weird, I definitely nix-build it. Not sure what I built then. My bad!

@infinisil
Copy link
Member Author

infinisil commented Aug 11, 2017 •
edited

@NeQuissimus @AmineChikhaoui What command did you run and on which revision exactly? Not trying to play police, I just really wanna know what caused this, so we can learn from it :)

@NeQuissimus
Copy link
Member

Pretty sure this only broke on release-17.03.
nix-build -A git after I cherry-picked it onto the branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
1.severity: security 8.has: package (update)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@infinisil @mention-bot @NeQuissimus @globin