sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git: Update from 2.18.0 to 2.19.0

Browse Source
This commit is contained in:
Fredrik Fornwall 2018-09-11 23:56:13 +02:00
parent b1a9c9c562
commit 9c3e786b9d
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/git/build.sh
View File

@ -2,9 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://git-scm.com/
TERMUX_PKG_DESCRIPTION="Fast, scalable, distributed revision control system"
# less is required as a pager for git log, and the busybox less does not handle used escape sequences.
TERMUX_PKG_DEPENDS="libcurl, less, openssl, pcre2"
TERMUX_PKG_VERSION=2.18.0
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92
TERMUX_PKG_VERSION=2.19.0
TERMUX_PKG_SHA256=180feff58fc0d965d23ea010aa2c69ead92ec318eb9b09cf737529aec62f3ef4
TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz
## This requires a working $TERMUX_PREFIX/bin/sh on the host building:
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="

18
packages/git/config.c.patch
View File

@ -1,7 +1,7 @@
diff -u -r ../git-2.16.0/config.c ./config.c
--- ../git-2.16.0/config.c 2018-01-17 22:49:47.000000000 +0000
+++ ./config.c 2018-01-20 21:49:42.940523576 +0000
@@ -73,6 +73,25 @@
diff -u -r ../git-2.19.0/config.c ./config.c
--- ../git-2.19.0/config.c 2018-09-10 18:39:13.000000000 +0000
+++ ./config.c 2018-09-11 21:16:14.404718876 +0000
@@ -77,6 +77,25 @@
static int pack_compression_seen;
static int zlib_compression_seen;
@ -27,28 +27,28 @@ diff -u -r ../git-2.16.0/config.c ./config.c
static int config_file_fgetc(struct config_source *conf)
{
return getc_unlocked(conf->u.file);
@@ -2608,9 +2627,13 @@
@@ -2792,9 +2811,13 @@
in_fd = -1;
if (chmod(get_lock_file_path(&lock), st.st_mode & 07777) < 0) {
+#ifdef __ANDROID__
+ termux_warn_once_about_lockfile();
+#else
error_errno("chmod on %s failed", get_lock_file_path(&lock));
error_errno(_("chmod on %s failed"), get_lock_file_path(&lock));
ret = CONFIG_NO_WRITE;
goto out_free;
+#endif
}
if (store.seen == 0)
@@ -2810,9 +2833,13 @@
if (store.seen_nr == 0) {
@@ -3030,9 +3053,13 @@
}
if (chmod(get_lock_file_path(&lock), st.st_mode & 07777) < 0) {
+#ifdef __ANDROID__
+ termux_warn_once_about_lockfile();
+#else
ret = error_errno("chmod on %s failed",
ret = error_errno(_("chmod on %s failed"),
get_lock_file_path(&lock));
goto out;
+#endif