From 41c3c03a0158264ddc1140120a7fca972f774c0a Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Fri, 3 Feb 2017 22:46:56 +0100
Subject: [PATCH] git: Update from 2.11.0 to 2.11.1

Also save some space by using symlinks to avoid duplicated binaries.
---
 packages/git/build.sh | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/packages/git/build.sh b/packages/git/build.sh
index 64b86101..7873abae 100755
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -1,12 +1,19 @@
-TERMUX_PKG_HOMEPAGE=http://git-scm.com/
+TERMUX_PKG_HOMEPAGE=https://git-scm.com/
 TERMUX_PKG_DESCRIPTION="Distributed version control system designed to handle everything from small to very large projects with speed and efficiency"
 # less is required as a pager for git log, and the busybox less does not handle used escape sequences.
 TERMUX_PKG_DEPENDS="libcurl, less"
-TERMUX_PKG_VERSION=2.11.0
+TERMUX_PKG_VERSION=2.11.1
 TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=7e7e8d69d494892373b87007674be5820a4bc1ef596a0117d03ea3169119fd0b
+TERMUX_PKG_SHA256=c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415
 ## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-tcltk --with-curl --with-shell=$TERMUX_PREFIX/bin/sh ac_cv_header_libintl_h=no ac_cv_fread_reads_directories=yes ac_cv_snprintf_returns_bogus=yes"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+ac_cv_fread_reads_directories=yes
+ac_cv_header_libintl_h=no
+ac_cv_snprintf_returns_bogus=no
+--with-curl
+--without-tcltk
+--with-shell=$TERMUX_PREFIX/bin/sh
+"
 # expat is only used by git-http-push for remote lock management over DAV, so disable:
 # NO_INSTALL_HARDLINKS to use symlinks instead of hardlinks (which does not work on Android M):
 TERMUX_PKG_EXTRA_MAKE_ARGS="NO_NSEC=1 NO_GETTEXT=1 NO_EXPAT=1 NO_INSTALL_HARDLINKS=1 PERL_PATH=$TERMUX_PREFIX/bin/perl"
@@ -15,7 +22,14 @@ TERMUX_PKG_BUILD_IN_SRC="yes"
 # Things to remove to save space:
 #  bin/git-cvsserver - server emulating CVS
 #  bin/git-shell - restricted login shell for Git-only SSH access
-TERMUX_PKG_RM_AFTER_INSTALL="bin/git-cvsserver bin/git-shell Library"
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/git-cvsserver
+bin/git-shell
+libexec/git-core/git-shell
+libexec/git-core/git-cvsserver
+share/man/man1/git-cvsserver.1
+share/man/man1/git-shell.1
+"
 
 termux_step_pre_configure () {
 	# Setup perl so that the build process can execute it:
@@ -41,13 +55,13 @@ termux_step_post_make_install () {
 
 	# Remove clutter:
 	rm -Rf $TERMUX_PREFIX/lib/*-linux*/perl
+
+	# Remove duplicated binaries in bin/ with symlink to the one in libexec/git-core:
+	(cd $TERMUX_PREFIX/bin; ln -s -f ../libexec/git-core/git git)
+	(cd $TERMUX_PREFIX/bin; ln -s -f ../libexec/git-core/git-upload-pack git-upload-pack)
 }
 
 termux_step_post_massage () {
-	# Remove perl if the symlink setup in pre_configure
-	# causes it to be included.
-	rm -Rf bin/perl*
-
 	if [ ! -f libexec/git-core/git-remote-https ]; then
 		echo "ERROR: Built without https support"
 		exit 1
-- 
2.11.0