From 1b6f0ae203eb7ba0b4cc94bf6fe63f291d34768f Mon Sep 17 00:00:00 2001
From: Armaan Bhojwani <me@armaanb.net>
Date: Mon, 19 Jul 2021 11:18:30 -0400
Subject: [PATCH] git: update libcurl

---
 core/curl/build   | 17 ++++++++++++++++-
 core/curl/version |  2 +-
 core/git/build    | 11 ++++-------
 core/git/depends  |  3 +--
 core/git/sources  |  4 ++--
 core/git/version  |  2 +-
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/core/curl/build b/core/curl/build
index ac49964..92b5bb5 100755
--- a/core/curl/build
+++ b/core/curl/build
@@ -15,7 +15,22 @@
     --without-libpsl \
     --with-pic \
     --with-openssl \
-    --with-ca-fallback
+    --with-ca-fallback \
+    --disable-ftp \
+    --disable-file \
+    --disable-ldap \
+    --disable-ldaps \
+    --disable-rtsp \
+    --disable-proxy \
+    --disable-dict \
+    --disable-telnet \
+    --disable-tftp \
+    --disable-pop3 \
+    --disable-imap \
+    --disable-smb \
+    --disable-smtp \
+    --disable-gopher \
+    --disable-mqtt
 
 make curl_LDFLAGS=-all-static
 make DESTDIR="$1" install
diff --git a/core/curl/version b/core/curl/version
index 2df10bc..18f1178 100644
--- a/core/curl/version
+++ b/core/curl/version
@@ -1 +1 @@
-7.77.0 1
+7.77.0 2
diff --git a/core/git/build b/core/git/build
index f249edd..16bea6f 100755
--- a/core/git/build
+++ b/core/git/build
@@ -7,24 +7,21 @@ NO_GETTEXT=YesPlease
 NO_SVN_TESTS=YesPlease
 NO_TCLTK=YesPlease
 NO_NSEC=YesPlease
+NO_PERL=YesPlease
 NO_SVN_TESTS=YesPlease
 NO_SYS_POLL_H=1
 NO_CROSS_DIRECTORY_HARDLINKS=1
 NO_INSTALL_HARDLINKS=1
-NO_PERL=YesPlease
 EOF
 
 ./configure \
     --prefix=/usr \
     --libexecdir=/usr/lib \
-    ac_cv_lib_curl_curl_global_init=no \
+    ac_cv_lib_curl_curl_global_init=yes \
     ac_cv_snprintf_returns_bogus=no \
     ac_cv_fread_reads_directories=yes
 
-gmake LIBS="libgit.a xdiff/lib.a -lz"
+gmake LIBS="$(curl-config --static-libs) libgit.a xdiff/lib.a -lz"
 gmake DESTDIR="$1" install
 
-cp -rf man "$1/usr/share/man"
-rm -rf \
-    "$1/usr/share/gitweb" \
-    "$1/usr/share/git-core/templates/hooks/*"
+cp -Rf man "$1/usr/share/man"
diff --git a/core/git/depends b/core/git/depends
index b4099d7..47865d7 100644
--- a/core/git/depends
+++ b/core/git/depends
@@ -1,5 +1,4 @@
+curl     make
 gmake    make
-libevent
 libressl make
-python
 zlib     make
diff --git a/core/git/sources b/core/git/sources
index 311ad2e..ce3eea2 100644
--- a/core/git/sources
+++ b/core/git/sources
@@ -1,2 +1,2 @@
-https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.32.0.tar.xz
-https://mirrors.edge.kernel.org/pub/software/scm/git/git-manpages-2.32.0.tar.xz man
+https://mirrors.edge.kernel.org/pub/software/scm/git/git-VERSION.tar.xz
+https://mirrors.edge.kernel.org/pub/software/scm/git/git-manpages-VERSION.tar.xz man
diff --git a/core/git/version b/core/git/version
index ae682e5..e10fdcb 100644
--- a/core/git/version
+++ b/core/git/version
@@ -1 +1 @@
-2.32.0 3
+2.32.0 1
-- 
2.39.2