From 20b1a3b682edc53c9d65b810dee30a6ab0a9d046 Mon Sep 17 00:00:00 2001
From: Cameron Youell <cameronyouell@gmail.com>
Date: Mon, 27 Mar 2023 17:25:00 +1100
Subject: [PATCH] Ports/git: Update git to version 2.40.0

---
 Ports/AvailablePorts.md                       |  2 +-
 Ports/git/package.sh                          |  4 ++--
 ...emove-unimplemented-setitimer-calls.patch} | 19 -------------------
 Ports/git/patches/ReadMe.md                   |  8 ++------
 4 files changed, 5 insertions(+), 28 deletions(-)
 rename Ports/git/patches/{0001-Remove-some-unimplemented-function-calls.patch => 0001-Remove-unimplemented-setitimer-calls.patch} (80%)

diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 1e5ae45353..e6fcf5ffca 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -82,7 +82,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`genemu`](genemu/)                                 | Genesis / MegaDrive Emulator                                    | e39f690                  | https://github.com/rasky/genemu                                                |
 | [`genext2fs`](genext2fs/)                           | genext2fs                                                       | 1.5.0                    | https://github.com/bestouff/genext2fs                                          |
 | [`gettext`](gettext/)                               | GNU gettext                                                     | 0.21                     | https://www.gnu.org/software/gettext/                                          |
-| [`git`](git/)                                       | Git                                                             | 2.39.1                   | https://git-scm.com/                                                           |
+| [`git`](git/)                                       | Git                                                             | 2.40.0                   | https://git-scm.com/                                                           |
 | [`glib`](glib/)                                     | GLib                                                            | 2.75.2                   | https://wiki.gnome.org/Projects/GLib                                           |
 | [`glm`](glm/)                                       | OpenGL Mathematics (GLM)                                        | 0.9.9.8                  | https://github.com/g-truc/glm                                                  |
 | [`gltron`](gltron/)                                 | GLTron                                                          | 0.70                     | http://gltron.org                                                              |
diff --git a/Ports/git/package.sh b/Ports/git/package.sh
index e1f9df6df0..2bb049943a 100755
--- a/Ports/git/package.sh
+++ b/Ports/git/package.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env -S bash ../.port_include.sh
 port='git'
-version='2.39.1'
-files="https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.xz git-${version}.tar.xz 40a38a0847b30c371b35873b3afcf123885dd41ea3ecbbf510efa97f3ce5c161"
+version='2.40.0'
+files="https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.xz git-${version}.tar.xz b17a598fbf58729ef13b577465eb93b2d484df1201518b708b5044ff623bf46d"
 auth_type='sha256'
 useconfigure='true'
 configopts=("--target=${SERENITY_ARCH}-pc-serenity" "--with-lib=${SERENITY_INSTALL_ROOT}/usr/local" "CFLAGS=-DNO_IPV6" "LDFLAGS=-L${SERENITY_INSTALL_ROOT}/usr/local/lib")
diff --git a/Ports/git/patches/0001-Remove-some-unimplemented-function-calls.patch b/Ports/git/patches/0001-Remove-unimplemented-setitimer-calls.patch
similarity index 80%
rename from Ports/git/patches/0001-Remove-some-unimplemented-function-calls.patch
rename to Ports/git/patches/0001-Remove-unimplemented-setitimer-calls.patch
index 761e0c4557..54fb2f0fd5 100644
--- a/Ports/git/patches/0001-Remove-some-unimplemented-function-calls.patch
+++ b/Ports/git/patches/0001-Remove-unimplemented-setitimer-calls.patch
@@ -34,25 +34,6 @@ index 89447a50838562795bb80172db8102ff7a42e91b..3552e1807860b30eb18366487e547634
  }
  
  static void finish_early_output(struct rev_info *rev)
-diff --git a/git-compat-util.h b/git-compat-util.h
-index a76d0526f79266e1dc512072a4236876df8f8726..596ac243f673d30748e3792d7926ea1b22d4911e 100644
---- a/git-compat-util.h
-+++ b/git-compat-util.h
-@@ -1471,14 +1471,6 @@ int open_nofollow(const char *path, int flags);
- #endif
- 
- #ifndef _POSIX_THREAD_SAFE_FUNCTIONS
--static inline void flockfile(FILE *fh UNUSED)
--{
--	; /* nothing */
--}
--static inline void funlockfile(FILE *fh UNUSED)
--{
--	; /* nothing */
--}
- #define getc_unlocked(fh) getc(fh)
- #endif
- 
 diff --git a/progress.c b/progress.c
 index 0cdd875d37f166bedbbeb5f0e889046674ed58be..4b7f5b0b5a48b1b895befef12217e5822d118563 100644
 --- a/progress.c
diff --git a/Ports/git/patches/ReadMe.md b/Ports/git/patches/ReadMe.md
index 29d6141a0b..638a7581b3 100644
--- a/Ports/git/patches/ReadMe.md
+++ b/Ports/git/patches/ReadMe.md
@@ -1,13 +1,9 @@
 # Patches for git on SerenityOS
 
-## `0001-Remove-some-unimplemented-function-calls.patch`
+## `0001-Remove-unimplemented-setitimer-calls.patch`
 
-Remove some unimplemented function calls
-
-i.e. f(un)lockfile stubs and setitimer.
+Remove unimplemented setitimer function calls
 
 ## `0002-Remove-uname-detection-in-config.mak.uname.patch`
 
 Remove uname detection in config.mak.uname
-
-