From edff9aa401dea4d7bb06474033d801c59974e4a4 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 25 Jun 2017 20:34:43 +0200
Subject: [PATCH] git: Update from 2.13.1 to 2.13.2

---
 packages/git/build.sh            | 11 +++--------
 packages/git/run-command.c.patch | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 packages/git/run-command.c.patch

diff --git a/packages/git/build.sh b/packages/git/build.sh
index f902f6502..379431849 100755
--- a/packages/git/build.sh
+++ b/packages/git/build.sh
@@ -2,10 +2,9 @@ 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.13.1.2
-_REAL_VERSION=2.13.1
-TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${_REAL_VERSION}.tar.xz
-TERMUX_PKG_SHA256=3bc1becd983f77ab154a46801624369dbc40c3dd04b4c4b07ad026f5684688fe
+TERMUX_PKG_VERSION=2.13.2
+TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=0d10ac3751466f81652b62cbda83cc8d8ffd014911462138e039f176e413dde5
 ## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 ac_cv_fread_reads_directories=yes
@@ -44,10 +43,6 @@ termux_step_pre_configure () {
 
 	# Fixes build if utfcpp is installed:
 	CPPFLAGS="-I$TERMUX_PKG_SRCDIR $CPPFLAGS"
-
-	# XXX: Should no longer be necessary after git v2.13.2:
-	# https://public-inbox.org/git/20170605203409.GB25777@dinwoodie.org/T/
-	CPPFLAGS+=" -DSHA1DC_FORCE_LITTLEENDIAN"
 }
 
 termux_step_post_make_install () {
diff --git a/packages/git/run-command.c.patch b/packages/git/run-command.c.patch
new file mode 100644
index 000000000..7b5e4a4d8
--- /dev/null
+++ b/packages/git/run-command.c.patch
@@ -0,0 +1,25 @@
+diff -u -r ../git-2.13.2/run-command.c ./run-command.c
+--- ../git-2.13.2/run-command.c	2017-06-25 00:50:12.000000000 +0200
++++ ./run-command.c	2017-06-25 20:16:53.815627960 +0200
+@@ -491,8 +491,10 @@
+ #else
+ 	bug_die(pthread_sigmask(SIG_SETMASK, &all, &as->old),
+ 		"blocking all signals");
++# ifndef __ANDROID__
+ 	bug_die(pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &as->cs),
+ 		"disabling cancellation");
++# endif
+ #endif
+ }
+ 
+@@ -502,8 +504,10 @@
+ 	if (sigprocmask(SIG_SETMASK, &as->old, NULL))
+ 		die_errno("sigprocmask");
+ #else
++# ifndef __ANDROID__
+ 	bug_die(pthread_setcancelstate(as->cs, NULL),
+ 		"re-enabling cancellation");
++# endif
+ 	bug_die(pthread_sigmask(SIG_SETMASK, &as->old, NULL),
+ 		"restoring signal mask");
+ #endif