From 0f1203d1e4e3fba547884f9f9b8a9fff1f9ba87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Fri, 5 May 2023 22:11:21 +0200
Subject: groups.d/241.native_packages_inet.group: git: bump to v2.35.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 patches/git-2.35.8.local.patch | 103 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 patches/git-2.35.8.local.patch

(limited to 'patches/git-2.35.8.local.patch')

diff --git a/patches/git-2.35.8.local.patch b/patches/git-2.35.8.local.patch
new file mode 100644
index 00000000..581f6ea7
--- /dev/null
+++ b/patches/git-2.35.8.local.patch
@@ -0,0 +1,103 @@
+--- 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
+--- git-2.35.6/git-compat-util.h.orig	2022-12-13 13:17:26.000000000 +0100
++++ git-2.35.6/git-compat-util.h	2023-03-28 08:13:34.179644083 +0200
+@@ -221,7 +221,7 @@
+ #include <time.h>
+ #include <signal.h>
+ #include <assert.h>
+-#include <regex.h>
++#include <pcreposix.h>
+ #include <utime.h>
+ #include <syslog.h>
+ #if !defined(NO_POLL_H)
+--- git-2.35.6/compat/regex/regex.c.orig	2022-12-13 13:17:26.000000000 +0100
++++ git-2.35.6/compat/regex/regex.c	2023-03-28 08:18:00.186635875 +0200
+@@ -66,7 +66,7 @@
+ #undef alloca
+ #define alloca alloca_is_bad_you_should_never_use_it
+ #endif
+-#include <regex.h>
++#include "compat/regex/regex.h"
+ #include "regex_internal.h"
+ 
+ #include "regex_internal.c"
-- 
cgit v1.2.3