From 431e76dbcfee938f565eee5712b8b40ffb58c346 Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Oct 19 2022 11:52:40 +0000
Subject: groups/241.native_packages_inet.group: git: bump to v2.35.5


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

---

diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index 62d2cfb..9358fb3 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.2.local.patch
deleted file mode 100644
index 0b88552..0000000
--- a/patches/git-2.35.2.local.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- git-2.35.2/Makefile.orig	2022-03-24 00:31:43.000000000 +0100
-+++ git-2.35.2/Makefile	2022-04-14 12:43:38.240213010 +0200
-@@ -2213,7 +2213,7 @@
- 	'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
- 	'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
- 
--git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
-+git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
- 		$(filter %.o,$^) $(LIBS)
- 
-@@ -2390,7 +2390,7 @@
- $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
- 
- ifndef NO_PYTHON
--$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
-+$(SCRIPT_PYTHON_GEN): GIT-PREFIX GIT-PYTHON-VARS
- $(SCRIPT_PYTHON_GEN): % : %.py
- 	$(QUIET_GEN) \
- 	sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
-@@ -2538,12 +2538,12 @@
- 
- .SUFFIXES:
- 
--$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir)
-+$(C_OBJ): %.o: %.c $(missing_dep_dirs) $(missing_compdb_dir)
- 	$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
--$(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir)
-+$(ASM_OBJ): %.o: %.S $(missing_dep_dirs) $(missing_compdb_dir)
- 	$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
- 
--%.s: %.c GIT-CFLAGS FORCE
-+%.s: %.c FORCE
- 	$(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
- 
- ifdef USE_COMPUTED_HEADER_DEPENDENCIES
-@@ -2607,17 +2607,17 @@
- compat/nedmalloc/nedmalloc.sp: SP_EXTRA_FLAGS += -Wno-non-pointer-null
- endif
- 
--git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
-+git-%$X: %.o $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
- 
--git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
-+git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
- 		$(IMAP_SEND_LDFLAGS) $(LIBS)
- 
--git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
-+git-http-fetch$X: http.o http-walker.o http-fetch.o $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
- 		$(CURL_LIBCURL) $(LIBS)
--git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
-+git-http-push$X: http.o http-push.o $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
- 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
- 
-@@ -2627,11 +2627,11 @@
- 	ln -s $< $@ 2>/dev/null || \
- 	cp $< $@
- 
--$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS)
-+$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
- 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
- 
--contrib/scalar/scalar$X: $(SCALAR_OBJECTS) GIT-LDFLAGS $(GITLIBS)
-+contrib/scalar/scalar$X: $(SCALAR_OBJECTS) $(GITLIBS)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
- 		$(filter %.o,$^) $(LIBS)
- 
-@@ -2945,7 +2945,7 @@
- 
- t/helper/test-tool$X: $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
- 
--t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS) $(REFTABLE_TEST_LIB)
-+t/helper/test-%$X: t/helper/test-%.o $(GITLIBS) $(REFTABLE_TEST_LIB)
- 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)
- 
- check-sha1:: t/helper/test-tool$X
diff --git a/patches/git-2.35.5.local.patch b/patches/git-2.35.5.local.patch
new file mode 100644
index 0000000..0b88552
--- /dev/null
+++ b/patches/git-2.35.5.local.patch
@@ -0,0 +1,81 @@
+--- git-2.35.2/Makefile.orig	2022-03-24 00:31:43.000000000 +0100
++++ git-2.35.2/Makefile	2022-04-14 12:43:38.240213010 +0200
+@@ -2213,7 +2213,7 @@
+ 	'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
+ 	'-DGIT_INFO_PATH="$(infodir_relative_SQ)"'
+ 
+-git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
++git$X: git.o $(BUILTIN_OBJS) $(GITLIBS)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
+ 		$(filter %.o,$^) $(LIBS)
+ 
+@@ -2390,7 +2390,7 @@
+ $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
+ 
+ ifndef NO_PYTHON
+-$(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
++$(SCRIPT_PYTHON_GEN): GIT-PREFIX GIT-PYTHON-VARS
+ $(SCRIPT_PYTHON_GEN): % : %.py
+ 	$(QUIET_GEN) \
+ 	sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
+@@ -2538,12 +2538,12 @@
+ 
+ .SUFFIXES:
+ 
+-$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir)
++$(C_OBJ): %.o: %.c $(missing_dep_dirs) $(missing_compdb_dir)
+ 	$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+-$(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir)
++$(ASM_OBJ): %.o: %.S $(missing_dep_dirs) $(missing_compdb_dir)
+ 	$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+ 
+-%.s: %.c GIT-CFLAGS FORCE
++%.s: %.c FORCE
+ 	$(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+ 
+ ifdef USE_COMPUTED_HEADER_DEPENDENCIES
+@@ -2607,17 +2607,17 @@
+ compat/nedmalloc/nedmalloc.sp: SP_EXTRA_FLAGS += -Wno-non-pointer-null
+ endif
+ 
+-git-%$X: %.o GIT-LDFLAGS $(GITLIBS)
++git-%$X: %.o $(GITLIBS)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS)
+ 
+-git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) GIT-LDFLAGS $(GITLIBS)
++git-imap-send$X: imap-send.o $(IMAP_SEND_BUILDDEPS) $(GITLIBS)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
+ 		$(IMAP_SEND_LDFLAGS) $(LIBS)
+ 
+-git-http-fetch$X: http.o http-walker.o http-fetch.o GIT-LDFLAGS $(GITLIBS)
++git-http-fetch$X: http.o http-walker.o http-fetch.o $(GITLIBS)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
+ 		$(CURL_LIBCURL) $(LIBS)
+-git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
++git-http-push$X: http.o http-push.o $(GITLIBS)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
+ 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
+ 
+@@ -2627,11 +2627,11 @@
+ 	ln -s $< $@ 2>/dev/null || \
+ 	cp $< $@
+ 
+-$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS)
++$(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o $(GITLIBS)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
+ 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
+ 
+-contrib/scalar/scalar$X: $(SCALAR_OBJECTS) GIT-LDFLAGS $(GITLIBS)
++contrib/scalar/scalar$X: $(SCALAR_OBJECTS) $(GITLIBS)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \
+ 		$(filter %.o,$^) $(LIBS)
+ 
+@@ -2945,7 +2945,7 @@
+ 
+ t/helper/test-tool$X: $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
+ 
+-t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS) $(REFTABLE_TEST_LIB)
++t/helper/test-%$X: t/helper/test-%.o $(GITLIBS) $(REFTABLE_TEST_LIB)
+ 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)
+ 
+ check-sha1:: t/helper/test-tool$X
diff --git a/patches/git-no-owner-check.patch b/patches/git-no-owner-check.patch
new file mode 100644
index 0000000..cc9d014
--- /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 8eaffbb..0000000
--- 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 {