From f2fef7ec5957d819b11d116e736db6b134bce8e2 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Sat, 29 Apr 2023 14:32:20 +0200
Subject: git: bump to 2.40.1

---
 core/git/build     | 21 ++++-----------------
 core/git/checksums |  4 ++--
 core/git/sources   |  4 ++--
 core/git/version   |  2 +-
 4 files changed, 9 insertions(+), 22 deletions(-)

(limited to 'core')

diff --git a/core/git/build b/core/git/build
index b61896fa..66665b66 100755
--- a/core/git/build
+++ b/core/git/build
@@ -10,6 +10,8 @@ NO_PYTHON=YesPlease
 NO_SYS_POLL_H=1
 NO_CROSS_DIRECTORY_HARDLINKS=1
 NO_INSTALL_HARDLINKS=1
+NO_CURL=
+CURL_LDFLAGS=$(pkgconf --static --libs libcurl)
 EOF
 
 export LDFLAGS="$LDFLAGS -static"
@@ -23,20 +25,5 @@ export LDFLAGS="$LDFLAGS -static"
 make
 make DESTDIR="$1" install
 
-clman -d "$1" man1/*.1 man5/*.5 man7/*.7
-
-# Build and install remote-http helper. This doesn't happen by default when
-# building static git.
-set -x
-export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=600 -I$PWD -I$PWD/compat/regex -I$PWD/xdiff -include config.h"
-for obj in http http-walker; do
-    # shellcheck disable=2086
-    "${CC:=cc}" $CFLAGS -c "$obj.c"
-done
-
-# shellcheck disable=2086,2046
-"$CC" $LDFLAGS $CFLAGS -o "$1/usr/libexec/git-core/git-remote-http" remote-curl.c http.o http-walker.o libgit.a common-main.o xdiff/lib.a $(pkg-config --static --libs zlib libcurl)
-
-for remote in https ftp ftps; do
-    ln -sf git-remote-http "$1/usr/libexec/git-core/git-remote-$remote"
-done
+# Install manual pages
+clman -d "$1" man[0-9]/*.[0-9]
diff --git a/core/git/checksums b/core/git/checksums
index a140f7ff..250122d5 100644
--- a/core/git/checksums
+++ b/core/git/checksums
@@ -1,3 +1,3 @@
 %BLAKE3
-e4b4c4f6139c20f3a0f7bf761e74772bc0c9fee86f14366a8db7c9afc7eb7136  git-2.40.0.tar.xz
-34ab0f20419733a6b576466330b5dd5e7ed3699997a177d39febe80134df5f66  git-manpages-2.40.0.tar.xz
+6cbc9197fa1cd585a4abeb778a4aeed932324c5fe9d5d041ca9d71be40881d78  git-2.40.1.tar.xz
+97a3abb0ec753c9fe4c1cc526e3f1bce40cb241a57cdd7718ef748d08fbc7c05  git-manpages-2.40.1.tar.xz
diff --git a/core/git/sources b/core/git/sources
index db33976a..10219426 100644
--- a/core/git/sources
+++ b/core/git/sources
@@ -1,2 +1,2 @@
-https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.40.0.tar.xz
-https://www.kernel.org/pub/software/scm/git/git-manpages-2.40.0.tar.xz
+https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.40.1.tar.xz
+https://www.kernel.org/pub/software/scm/git/git-manpages-2.40.1.tar.xz
diff --git a/core/git/version b/core/git/version
index 4ce29de9..3fb476cf 100644
--- a/core/git/version
+++ b/core/git/version
@@ -1 +1 @@
-2.40.0 1
+2.40.1 1
-- 
cgit v1.2.3