From e9837bed33d5b58410a0084e344a1fab9255ca84 Mon Sep 17 00:00:00 2001
From: Federico Guerinoni <41150432+guerinoni@users.noreply.github.com>
Date: Fri, 16 Apr 2021 17:38:54 +0200
Subject: [PATCH] Ports: Bump git to 2.31.1

---
 Ports/AvailablePorts.md       |  2 +-
 Ports/git/package.sh          |  2 +-
 Ports/git/patches/build.patch | 59 +++++++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 Ports/git/patches/build.patch

diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 53b4c7f2e7..9d748bb26a 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -31,7 +31,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
 | [`frotz`](frotz/)              | Frotz                                         |                   | https://gitlab.com/DavidGriffith/frotz                |
 | [`gcc`](gcc/)                  | GNU Compiler Collection                       | 10.2.0            | https://gcc.gnu.org/                                  |
 | [`genemu`](genemu)             | Genesis / MegaDrive Emulator                  |                   | https://github.com/rasky/genemu                       |
-| [`git`](git/)                  | Git                                           | 2.26.0            | https://git-scm.com/                                  |
+| [`git`](git/)                  | Git                                           | 2.31.1            | https://git-scm.com/                                  |
 | [`gmp`](gmp/)                  | GNU Multiple Precision Arithmetic Library     | 6.2.1             | https://gmplib.org/                                   |
 | [`gnucobol`](gnucobol/)        | GnuCOBOL                                      | 3.1.2             | https://gnucobol.sourceforge.io/                      |
 | [`gnupg`](gnupg/)              | GnuPG                                         | 2.3.0             | https://gnupg.org/software/index.html                 |
diff --git a/Ports/git/package.sh b/Ports/git/package.sh
index cf9b558216..8b2a1b6383 100755
--- a/Ports/git/package.sh
+++ b/Ports/git/package.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port=git
-version=2.26.0
+version=2.31.1
 useconfigure="true"
 files="https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.xz git-${version}.tar.xz"
 configopts="--target=${SERENITY_ARCH}-pc-serenity CFLAGS=-DNO_IPV6"
diff --git a/Ports/git/patches/build.patch b/Ports/git/patches/build.patch
new file mode 100644
index 0000000000..3035ed4fb1
--- /dev/null
+++ b/Ports/git/patches/build.patch
@@ -0,0 +1,59 @@
+diff --git a/builtin/log.c b/builtin/log.c
+index f67b67d..ae6ebee 100644
+--- a/builtin/log.c
++++ b/builtin/log.c
+@@ -354,7 +354,6 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
+ 	 */
+ 	early_output_timer.it_value.tv_sec = 0;
+ 	early_output_timer.it_value.tv_usec = 500000;
+-	setitimer(ITIMER_REAL, &early_output_timer, NULL);
+ }
+ 
+ static void early_output(int signal)
+@@ -388,7 +387,6 @@ static void setup_early_output(void)
+ 	 */
+ 	early_output_timer.it_value.tv_sec = 0;
+ 	early_output_timer.it_value.tv_usec = 100000;
+-	setitimer(ITIMER_REAL, &early_output_timer, NULL);
+ }
+ 
+ static void finish_early_output(struct rev_info *rev)
+diff --git a/git-compat-util.h b/git-compat-util.h
+index 3b2738c..618f6d2 100644
+--- a/git-compat-util.h
++++ b/git-compat-util.h
+@@ -1251,14 +1251,6 @@ int warn_on_fopen_errors(const char *path);
+ #endif
+ 
+ #ifndef _POSIX_THREAD_SAFE_FUNCTIONS
+-static inline void flockfile(FILE *fh)
+-{
+-	; /* nothing */
+-}
+-static inline void funlockfile(FILE *fh)
+-{
+-	; /* nothing */
+-}
+ #define getc_unlocked(fh) getc(fh)
+ #endif
+ 
+diff --git a/progress.c b/progress.c
+index 31014e6..d48acce 100644
+--- a/progress.c
++++ b/progress.c
+@@ -83,7 +83,6 @@ static void set_progress_signal(void)
+ 	v.it_interval.tv_sec = 1;
+ 	v.it_interval.tv_usec = 0;
+ 	v.it_value = v.it_interval;
+-	setitimer(ITIMER_REAL, &v, NULL);
+ }
+ 
+ static void clear_progress_signal(void)
+@@ -93,7 +92,6 @@ static void clear_progress_signal(void)
+ 	if (progress_testing)
+ 		return;
+ 
+-	setitimer(ITIMER_REAL, &v, NULL);
+ 	signal(SIGALRM, SIG_IGN);
+ 	progress_update = 0;
+ }