From f232d0ba4224cd34025d7d62db42f399cd2d8446 Mon Sep 17 00:00:00 2001 From: EWouters <6179932+EWouters@users.noreply.github.com> Date: Fri, 1 Sep 2023 19:41:40 +0200 Subject: [PATCH] Ports/git: Update git to version 2.42.0 --- Ports/AvailablePorts.md | 2 +- Ports/git/package.sh | 4 ++-- ...e-some-unimplemented-function-calls.patch} | 21 +++++++++---------- Ports/git/patches/ReadMe.md | 8 +++++-- 4 files changed, 19 insertions(+), 16 deletions(-) rename Ports/git/patches/{0001-Remove-unimplemented-setitimer-calls.patch => 0001-Remove-some-unimplemented-function-calls.patch} (71%) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index ffed1fd180..ff42a6a0d4 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -96,7 +96,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`genext2fs`](genext2fs/) | genext2fs | 1.5.0 | https://github.com/bestouff/genext2fs | | [`gettext`](gettext/) | GNU gettext | 0.22 | https://www.gnu.org/software/gettext/ | | [`giflib`](giflib/) | GIFLib | 5.2.1 | https://sourceforge.net/projects/giflib/ | -| [`git`](git/) | Git | 2.40.0 | https://git-scm.com/ | +| [`git`](git/) | Git | 2.42.0 | https://git-scm.com/ | | [`glib`](glib/) | GLib | 2.77.0 | 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 5eb638e91b..13648d4796 100755 --- a/Ports/git/package.sh +++ b/Ports/git/package.sh @@ -1,8 +1,8 @@ #!/usr/bin/env -S bash ../.port_include.sh port='git' -version='2.40.0' +version='2.42.0' files=( - "https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.xz#b17a598fbf58729ef13b577465eb93b2d484df1201518b708b5044ff623bf46d" + "https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.xz#3278210e9fd2994b8484dd7e3ddd9ea8b940ef52170cdb606daa94d887c93b0d" ) useconfigure='true' configopts=( diff --git a/Ports/git/patches/0001-Remove-unimplemented-setitimer-calls.patch b/Ports/git/patches/0001-Remove-some-unimplemented-function-calls.patch similarity index 71% rename from Ports/git/patches/0001-Remove-unimplemented-setitimer-calls.patch rename to Ports/git/patches/0001-Remove-some-unimplemented-function-calls.patch index 54fb2f0fd5..b7235bd81b 100644 --- a/Ports/git/patches/0001-Remove-unimplemented-setitimer-calls.patch +++ b/Ports/git/patches/0001-Remove-some-unimplemented-function-calls.patch @@ -5,16 +5,15 @@ Subject: [PATCH] Remove some unimplemented function calls i.e. f(un)lockfile stubs and setitimer. --- - builtin/log.c | 6 ------ - git-compat-util.h | 8 -------- - progress.c | 14 -------------- - 3 files changed, 28 deletions(-) + builtin/log.c | 6 ------ + progress.c | 14 -------------- + 2 files changed, 20 deletions(-) diff --git a/builtin/log.c b/builtin/log.c -index 89447a50838562795bb80172db8102ff7a42e91b..3552e1807860b30eb18366487e5476346290bcea 100644 +index db3a88bfe96058679dff1059a6f4769599ee1801..a06d2824bc776e039b90e0bdfeb081835bc7b835 100644 --- a/builtin/log.c +++ b/builtin/log.c -@@ -430,9 +430,6 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list) +@@ -442,9 +442,6 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list) * trigger every second even if we're blocked on a * reader! */ @@ -23,8 +22,8 @@ index 89447a50838562795bb80172db8102ff7a42e91b..3552e1807860b30eb18366487e547634 - setitimer(ITIMER_REAL, &early_output_timer, NULL); } - static void early_output(int signal) -@@ -464,9 +461,6 @@ static void setup_early_output(void) + static void early_output(int signal UNUSED) +@@ -476,9 +473,6 @@ static void setup_early_output(void) * * This is a one-time-only trigger. */ @@ -35,10 +34,10 @@ index 89447a50838562795bb80172db8102ff7a42e91b..3552e1807860b30eb18366487e547634 static void finish_early_output(struct rev_info *rev) diff --git a/progress.c b/progress.c -index 0cdd875d37f166bedbbeb5f0e889046674ed58be..4b7f5b0b5a48b1b895befef12217e5822d118563 100644 +index f695798acac72bd703dfacc59f83054fd761b619..9e9369eb34dc169d2bcdc2a38285765547a8e3fa 100644 --- a/progress.c +++ b/progress.c -@@ -67,7 +67,6 @@ static void progress_interval(int signum) +@@ -69,7 +69,6 @@ static void progress_interval(int signum UNUSED) static void set_progress_signal(void) { struct sigaction sa; @@ -46,7 +45,7 @@ index 0cdd875d37f166bedbbeb5f0e889046674ed58be..4b7f5b0b5a48b1b895befef12217e582 if (progress_testing) return; -@@ -79,23 +78,10 @@ static void set_progress_signal(void) +@@ -81,23 +80,10 @@ static void set_progress_signal(void) sigemptyset(&sa.sa_mask); sa.sa_flags = SA_RESTART; sigaction(SIGALRM, &sa, NULL); diff --git a/Ports/git/patches/ReadMe.md b/Ports/git/patches/ReadMe.md index 638a7581b3..29d6141a0b 100644 --- a/Ports/git/patches/ReadMe.md +++ b/Ports/git/patches/ReadMe.md @@ -1,9 +1,13 @@ # Patches for git on SerenityOS -## `0001-Remove-unimplemented-setitimer-calls.patch` +## `0001-Remove-some-unimplemented-function-calls.patch` -Remove unimplemented setitimer function calls +Remove some unimplemented function calls + +i.e. f(un)lockfile stubs and setitimer. ## `0002-Remove-uname-detection-in-config.mak.uname.patch` Remove uname detection in config.mak.uname + +