Browse Source

git: Update from 2.8.4 to 2.9.0

android-5
Fredrik Fornwall 9 years ago
parent
commit
40c3588bd7
  1. 2
      packages/git/build.sh
  2. 17
      packages/git/config.c.patch

2
packages/git/build.sh

@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://git-scm.com/
TERMUX_PKG_DESCRIPTION="Distributed version control system designed to handle everything from small to very large projects with speed and efficiency" 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. # 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_DEPENDS="libcurl, less"
TERMUX_PKG_VERSION=2.8.4 TERMUX_PKG_VERSION=2.9.0
TERMUX_PKG_SRCURL=https://www.kernel.org/pub/software/scm/git/git-${TERMUX_PKG_VERSION}.tar.xz 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: ## 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="--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"

17
packages/git/config.c.patch

@ -1,6 +1,6 @@
diff -u -r ../git-2.8.1/config.c ./config.c diff -u -r ../git-2.9.0/config.c ./config.c
--- ../git-2.8.1/config.c 2016-04-03 15:07:18.000000000 -0400 --- ../git-2.9.0/config.c 2016-06-13 15:07:49.000000000 -0400
+++ ./config.c 2016-04-21 18:37:26.707906688 -0400 +++ ./config.c 2016-06-19 20:16:44.473791157 -0400
@@ -49,6 +49,25 @@ @@ -49,6 +49,25 @@
*/ */
static struct config_set the_config_set; static struct config_set the_config_set;
@ -27,30 +27,29 @@ diff -u -r ../git-2.8.1/config.c ./config.c
static int config_file_fgetc(struct config_source *conf) static int config_file_fgetc(struct config_source *conf)
{ {
return getc_unlocked(conf->u.file); return getc_unlocked(conf->u.file);
@@ -2125,10 +2147,14 @@ @@ -2123,9 +2142,13 @@
in_fd = -1; in_fd = -1;
if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) { if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
+#ifdef __ANDROID__ +#ifdef __ANDROID__
+ termux_warn_once_about_lockfile(); + termux_warn_once_about_lockfile();
+#else +#else
error("chmod on %s failed: %s", error_errno("chmod on %s failed", get_lock_file_path(lock));
get_lock_file_path(lock), strerror(errno));
ret = CONFIG_NO_WRITE; ret = CONFIG_NO_WRITE;
goto out_free; goto out_free;
+#endif +#endif
} }
if (store.seen == 0) if (store.seen == 0)
@@ -2330,9 +2356,13 @@ @@ -2330,9 +2353,13 @@
fstat(fileno(config_file), &st); fstat(fileno(config_file), &st);
if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) { if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
+#ifdef __ANDROID__ +#ifdef __ANDROID__
+ termux_warn_once_about_lockfile(); + termux_warn_once_about_lockfile();
+#else +#else
ret = error("chmod on %s failed: %s", ret = error_errno("chmod on %s failed",
get_lock_file_path(lock), strerror(errno)); get_lock_file_path(lock));
goto out; goto out;
+#endif +#endif
} }

Loading…
Cancel
Save