[staging] git: 2.44.1 -> 2.45.1 #312211
[staging] git: 2.44.1 -> 2.45.1 #312211
Conversation
JohnRTitor
added
the
1.severity: security
|
Result of 3 packages built:
|
There was a problem hiding this comment.
Notes for the “git: 2.44.1 -> 2.45.1” commit
I was able to build and run these packages on NixOS 23.11 (x86-64):
gitgitMinimalgitSVNgitFull
I tried cloning a repo with each of them, and they all worked. For this commit, I only have one small suggestion. You wrote the commit message like this:
git: 2.44.1 -> 2.45.1
Fixes CVE-2024-32002, CVE-2024-32004, CVE-2024-32020,
CVE-2024-32021 and CVE-2024-32465
https://github.com/git/git/blob/v2.45.1/Documentation/RelNotes/2.45.1.txt
I would add a blank line in between the subject and the body of the commit:
git: 2.44.1 -> 2.45.1
Fixes CVE-2024-32002, CVE-2024-32004, CVE-2024-32020,
CVE-2024-32021 and CVE-2024-32465
https://github.com/git/git/blob/v2.45.1/Documentation/RelNotes/2.45.1.txt
Notes for the “git: add passthru.update script” commit
The update script gives errors if git isn’t already up to date:
$ git switch update-git
Switched to branch 'update-git'
Your branch is up to date with 'pr-JohnRTitor/update-git'.
$ git revert de05a8c1cf94dc7f5eee0074ca91cb0e1d2481cd
Auto-merging pkgs/applications/version-management/git/default.nix
[update-git c18a58b71366] Revert "git: 2.44.1 -> 2.45.1"
1 file changed, 2 insertions(+), 2 deletions(-)
$ nix-shell maintainers/scripts/update.nix --argstr package git
Going to be running update for following packages:
- git-2.44.1
Press Enter key to continue...
Running update for:
- git-2.44.1: UPDATING ...
- git-2.44.1: ERROR
--- SHOWING ERROR LOG FOR git-2.44.1 ----------------------
grep: warning: stray \ before {
warning: could not open directory 'pkgs/applications/version-management/git-and-tools/git/': No such file or directory
fatal: pathspec '/home/jayman/Documents/Home/VC/Git/Partially mine/nixpkgs/repo/pkgs/applications/version-management/git-and-tools/git/default.nix' did not match any files
--- SHOWING ERROR LOG FOR git-2.44.1 ----------------------
The update script for git-2.44.1 failed with exit code 128
$ Despite the errors, it does successfully update git.
Fixes CVE-2024-32002, CVE-2024-32004, CVE-2024-32020, CVE-2024-32021 and CVE-2024-32465 https://github.com/git/git/blob/v2.45.1/Documentation/RelNotes/2.45.1.txt
JohnRTitor
added
the
12.approvals: 1
Done. |
wegank
removed
the
12.approvals: 1
There was a problem hiding this comment.
I still get errors when I run the update script, but it does work despite those errors. Considering the fact that this PR fixes security issues, my recommendation is to merge it as is. Once this PR gets merged, I’ll open an issue for the update script errors.
SebTM
added
the
12.approvals: 3+
vcunat
removed
the
1.severity: security
|
As the changelog says, this is not a security update. We got the fixes in PR #311801 already. |
SuperSandro2000
added
1.severity: security
| + ( | ||
| if svnSupport then | ||
| '' | ||
| # wrap git-svn | ||
| wrapProgram $out/libexec/git-core/git-svn \ | ||
| --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${ | ||
| perlPackages.makePerlPath (perlLibs ++ [ svn.out ]) | ||
| }" \ | ||
| --prefix PATH : "${svn.out}/bin" '' | ||
| else | ||
| '' | ||
| # replace git-svn by notification script | ||
| notSupported $out/libexec/git-core/git-svn | ||
| '' | ||
| ) |
There was a problem hiding this comment.
bruh, the formatter is just uglyfing the code
SuperSandro2000
force-pushed
the
update-git
branch
from
782ed3f to
f3692ef
Compare
|
I've dropped the formatting commit because I wanted to merge this PR and it just felt wrong adding so much noise to the file without any urgency. Doing the formatting in one go with a proper entry to |
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.