From: Adolf Belka <adolf.belka@ipfire.org>
Date: Thu, 21 Apr 2022 19:31:30 +0000 (+0200)
Subject: git: Update to version 2.36.0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b84073efb4113afe48e6ca12e1c04ed934bd855;p=people%2Fms%2Fipfire-2.x.git

git: Update to version 2.36.0

- Update from 2.35.1 to 2.36.0
- Update of rootfile
- Changelog
   2.36 Release Notes
	These are too long to include here. To see the details go to the following link
        https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.36.0.txt
   2.35.3.txt Release Notes
	This release merges up the fixes that appear in v2.35.3.
   2.35.2 Release Notes
	This release merges up the fixes that appear in v2.30.3,
	v2.31.2, v2.32.1, v2.33.2 and v2.34.2 to address the security
	issue CVE-2022-24765; see the release notes for these versions
	for details.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>
---

diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index 0c803e964f..e2bce72bbb 100644
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -66,6 +66,7 @@ usr/libexec/git-core/git-for-each-repo
 usr/libexec/git-core/git-format-patch
 usr/libexec/git-core/git-fsck
 usr/libexec/git-core/git-fsck-objects
+usr/libexec/git-core/git-fsmonitor--daemon
 usr/libexec/git-core/git-gc
 usr/libexec/git-core/git-get-tar-commit-id
 usr/libexec/git-core/git-grep
@@ -73,6 +74,7 @@ usr/libexec/git-core/git-grep
 #usr/libexec/git-core/git-gui--askpass
 usr/libexec/git-core/git-hash-object
 usr/libexec/git-core/git-help
+usr/libexec/git-core/git-hook
 usr/libexec/git-core/git-http-backend
 usr/libexec/git-core/git-http-fetch
 usr/libexec/git-core/git-http-push
diff --git a/lfs/git b/lfs/git
index bbb0336554..d61e429f68 100644
--- a/lfs/git
+++ b/lfs/git
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.35.1
+VER        = 2.36.0
 SUMMARY    = Fast, scalable, distributed revision control system
 
 THISAPP    = git-$(VER)
@@ -33,7 +33,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 22
+PAK_VER    = 23
 
 DEPS       = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
 
@@ -47,7 +47,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 028ff97b47748871da145720d0d258a0dcf4acc60b10c787dee5703fcab5f6e621c5671ee9e7a25009e82a2830400f35fa232d88c62606a6687260c744680025
+$(DL_FILE)_BLAKE2 = 72bb148fc5fded2976554788eaf599d20fe9f200ac1dd1ddd4ed89f7f5c8d6c1025907080620bab477b4efadf41d883e890dff73c80d0ff5f0becd83f13ebd88
 
 install : $(TARGET)