groups/241.native_packages_inet.group: git: bump to v2.35.5

Signed-off-by: Ørjan Malde <red@foxi.me>

4 files changed, 27 insertions, 24 deletions

diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 62d2cfb3..9358fb37 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -54,8 +54,8 @@ proxytunnel rsync socat thttpd w3m weechat wget wget2 whois")";
 : ${PKG_FETCHMAIL_URL:=http://krusty.dt.e-technik.tu-dortmund.de/~ma/fetchmail/fetchmail-${PKG_FETCHMAIL_VERSION}.tar.xz};
 : ${PKG_FETCHMAIL_CONFIGURE_ARGS_EXTRA:="--with-kerberos5=no --with-kerberos=no --with-ssl=${PREFIX_NATIVE}"};
 : ${PKG_GIT_DEPENDS:="curl libz"};
-: ${PKG_GIT_SHA256SUM:=6f2287bbde2d215394966732836f3aba62b029161e8eaadaf236578d92c06fe9};
-: ${PKG_GIT_VERSION:=2.35.2};
+: ${PKG_GIT_SHA256SUM:=f4f3c80704217c907ba21891119d2096672e892e4198cc3405bfe3cf6197a5d5};
+: ${PKG_GIT_VERSION:=2.35.5};
 : ${PKG_GIT_URL:=https://github.com/git/git/archive/v${PKG_GIT_VERSION}.tar.gz};
 : ${PKG_GIT_CFLAGS_BUILD_EXTRA:="-std=gnu99"};
 : ${PKG_GIT_CONFIG_CACHE_EXTRA:="
diff --git a/patches/git-2.35.2.local.patch b/patches/git-2.35.5.local.patch
index 0b885529..0b885529 100644
--- a/patches/git-2.35.2.local.patch
+++ b/patches/git-2.35.5.local.patch
diff --git a/patches/git-no-owner-check.patch b/patches/git-no-owner-check.patch
new file mode 100644
index 00000000..cc9d0141
--- /dev/null
+++ b/patches/git-no-owner-check.patch
@@ -0,0 +1,25 @@
+diff -ru git-2.35.5.orig/setup.c git-2.35.5/setup.c
+--- git-2.35.5.orig/setup.c	2022-10-06 23:44:02.000000000 +0200
++++ git-2.35.5/setup.c	2022-10-19 13:48:26.183628821 +0200
+@@ -1130,6 +1130,13 @@
+ static int ensure_valid_ownership(const char *gitfile,
+ 				const char *worktree, const char *gitdir)
+ {
++#ifdef __midipix__
++	(void)gitfile;
++	(void)worktree;
++	(void)gitdir;
++
++	return 1;
++#else
+ 	struct safe_directory_data data = {
+ 		.path = worktree ? worktree : gitdir
+ 	};
+@@ -1148,6 +1155,7 @@
+ 	read_very_early_config(safe_directory_cb, &data);
+ 
+ 	return data.is_safe;
++#endif
+ }
+ 
+ enum discovery_result {
diff --git a/patches/git/git-no-owner-check.patch b/patches/git/git-no-owner-check.patch
deleted file mode 100644
index 8eaffbb5..00000000
--- a/patches/git/git-no-owner-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru git-2.35.2.orig/setup.c git-2.35.2/setup.c
---- git-2.35.2.orig/setup.c	2022-09-25 15:35:21.270533842 +0200
-+++ git-2.35.2/setup.c	2022-09-25 15:33:14.246537819 +0200
-@@ -1116,6 +1116,10 @@
- 
- static int ensure_valid_ownership(const char *path)
- {
-+#ifdef __midipix__
-+	(void)path;
-+	return 1;
-+#else
- 	struct safe_directory_data data = { .path = path };
- 
- 	if (is_path_owned_by_current_user(path))
-@@ -1124,6 +1128,7 @@
- 	read_very_early_config(safe_directory_cb, &data);
- 
- 	return data.is_safe;
-+#endif
- }
- 
- enum discovery_result {