bump git

Freetz-NG · Oct 22, 2024 · b31de39 · b31de39 · github-actions · Oct 22, 2024
1 parent 3b32842
commit b31de39
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -86,7 +86,7 @@ Latest changes
    * CA-bundle 2024-09-24
    * Curl 8.10.1
    * Dropbear 2024.86
-   * Git 2.46.2
+   * Git 2.47.0
    * htpdate 2.0.0
    * ImageMagick 7.1.1-38
    * mc (Midnight Commander) 4.8.31/4.8.32

diff --git a/make/pkgs/git/Config.in b/make/pkgs/git/Config.in
@@ -1,5 +1,5 @@
 config FREETZ_PACKAGE_GIT
-	bool "Git 2.46.2"
+	bool "Git 2.47.0"
 	select FREETZ_BUSYBOX_START_STOP_DAEMON
 	select FREETZ_LIB_libpthread if FREETZ_TARGET_UCLIBC_HAS_multiple_libs
 	select FREETZ_LIB_libcurl

diff --git a/make/pkgs/git/git.mk b/make/pkgs/git/git.mk
@@ -1,6 +1,6 @@
-$(call PKG_INIT_BIN, 2.46.2)
+$(call PKG_INIT_BIN, 2.47.0)
 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz
-$(PKG)_HASH:=5ee8a1c68536094a4f7f9515edc154b12a275b8a57dda4c21ecfbf1afbae2ca3
+$(PKG)_HASH:=1ce114da88704271b43e027c51e04d9399f8c88e9ef7542dae7aebae7d87bc4e
 $(PKG)_SITE:=@KERNEL/software/scm/git
 ### WEBSITE:=https://www.git-scm.com/
 ### MANPAGE:=https://www.git-scm.com/docs

diff --git a/make/pkgs/git/patches/010-missing_NO_INSTALL_HARDLINKS.patch b/make/pkgs/git/patches/010-missing_NO_INSTALL_HARDLINKS.patch
@@ -1,14 +1,14 @@
 --- Makefile
 +++ Makefile
-@@ -2466,6 +2466,7 @@
+@@ -2515,6 +2515,7 @@
 
  $(BUILT_INS): git$X
  	$(QUIET_BUILT_IN)$(RM) $@ && \
 +	test -z "$(NO_INSTALL_HARDLINKS)" && \
  	ln $< $@ 2>/dev/null || \
  	ln -s $< $@ 2>/dev/null || \
  	cp $< $@
-@@ -2840,6 +2841,7 @@
+@@ -2881,6 +2882,7 @@
 
  $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
  	$(QUIET_LNCP)$(RM) $@ && \

diff --git a/make/pkgs/git/patches/040-template_dir.patch b/make/pkgs/git/patches/040-template_dir.patch
@@ -1,6 +1,6 @@
 --- Makefile
 +++ Makefile
-@@ -617,7 +617,7 @@
+@@ -625,7 +625,7 @@
  gitwebstaticdir = $(gitwebdir)/static
  perllibdir = $(sharedir)/perl5
  localedir = $(sharedir)/locale

diff --git a/make/pkgs/git/patches/050-dont-overwrite-patched-configure.patch b/make/pkgs/git/patches/050-dont-overwrite-patched-configure.patch
@@ -1,6 +1,6 @@
 --- Makefile
 +++ Makefile
-@@ -2633,7 +2633,7 @@
+@@ -2682,7 +2682,7 @@
  		   autoconf -o configure configure.ac+ && \
  		   $(RM) configure.ac+