git: Update version to 2.34.1

- Update from 2.33.1 to 2.34.1
- Update of rootfile - The "--preserve-merges" option of "git rebase" has been removed.
- Changelog is too large to include here.
   The changes for version 2.34.0 can be found in the source tarball in
   Documentation/RelNotes/2.34.0.txt and for version 2.34.1 in
   Documentation/RelNotes/2.34.1.txt

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index 67e2015bcffc2ace2bd65932d2f7e77ee578181f..0c803e964fbab7ab6becdf8312571996505e9bea 100644 (file)
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -121,7 +121,6 @@ usr/libexec/git-core/git-quiltimport
 usr/libexec/git-core/git-range-diff
 usr/libexec/git-core/git-read-tree
 usr/libexec/git-core/git-rebase
-usr/libexec/git-core/git-rebase--preserve-merges
 usr/libexec/git-core/git-receive-pack
 usr/libexec/git-core/git-reflog
 usr/libexec/git-core/git-remote

diff --git a/lfs/git b/lfs/git
index 59610a6a1be1d7be7ceb6912143864f7189b634a..ca9bfc1d5c21846daa8cf388e8d27f1213aec02b 100644 (file)
--- a/lfs/git
+++ b/lfs/git
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.33.1
+VER        = 2.34.1
 
 THISAPP    = git-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 20
+PAK_VER    = 21
 
 DEPS       = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3462f34d9c17288eee854b7645f6a0a1
+$(DL_FILE)_MD5 = f442dade3c73ea39473f6700b3e04dcd
 
 install : $(TARGET)