diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-17 23:22:28 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-17 23:22:28 -0400 |
| commit | cdd839f80e4e85b3bc46126c2acd20d0b19bba39 (patch) | |
| tree | 55f4108a81a0f0074da569a4340332c4495c1cac | |
| parent | a77c0bdc9d7352e29858241842103233e95363de (diff) | |
update android git to 2.8.0.rc3, fixing recent security holes
| -rw-r--r-- | standalone/android/Makefile | 4 | ||||
| -rw-r--r-- | standalone/android/git.patch | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/standalone/android/Makefile b/standalone/android/Makefile index 261259bf4..6f49b495f 100644 --- a/standalone/android/Makefile +++ b/standalone/android/Makefile @@ -49,8 +49,8 @@ $(GIT_ANNEX_ANDROID_SOURCETREE)/busybox/build-stamp: busybox_config $(GIT_ANNEX_ANDROID_SOURCETREE)/git/build-stamp: git.patch # This is a known-good version that the patch works with. - cat git.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && git reset --hard f9dc5d65ca31cb79893e1296efe37727bf58f3f3 && git am) - cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 HAVE_CLOCK_GETTIME= prefix= DESTDIR=installed-tree + cat git.patch | (cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && git reset --hard d9c691a759d62cef53a6cc11864a2ef4b0829244 && git am) + cd $(GIT_ANNEX_ANDROID_SOURCETREE)/git && $(MAKE) install NO_OPENSSL=1 NO_GETTEXT=1 NO_GECOS_IN_PWENT=1 NO_GETPASS=1 NO_NSEC=1 NO_MKDTEMP=1 NO_PTHREADS=1 NO_PERL=1 NO_CURL=1 NO_EXPAT=1 NO_TCLTK=1 NO_ICONV=1 HAVE_CLOCK_GETTIME= HAVE_GETDELIM= prefix= DESTDIR=installed-tree touch $@ $(GIT_ANNEX_ANDROID_SOURCETREE)/rsync/build-stamp: rsync.patch diff --git a/standalone/android/git.patch b/standalone/android/git.patch index ecf095849..ec81aaaeb 100644 --- a/standalone/android/git.patch +++ b/standalone/android/git.patch @@ -1,4 +1,4 @@ -From 6134cc328f513e32895462e884487513b28029ba Mon Sep 17 00:00:00 2001 +From e0fffe80a8815e64dbc1d690c79bf006651c7642 Mon Sep 17 00:00:00 2001 From: Joey Hess <joey@kitenet.net> Date: Wed, 13 Aug 2014 13:50:56 -0400 Subject: [PATCH] avoid using of chmod on android when changing config @@ -10,17 +10,17 @@ implentations, all total shite. 1 file changed, 4 insertions(+) diff --git a/config.c b/config.c -index 058505c..16854b2 100644 +index 9ba40bc..a350638 100644 --- a/config.c +++ b/config.c -@@ -1634,12 +1634,14 @@ int git_config_set_multivar_in_file(const char *config_filename, - MAP_PRIVATE, in_fd, 0); +@@ -2124,12 +2124,14 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, close(in_fd); + in_fd = -1; + /* not on android - if (chmod(lock->filename, st.st_mode & 07777) < 0) { + if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) { error("chmod on %s failed: %s", - lock->filename, strerror(errno)); + get_lock_file_path(lock), strerror(errno)); ret = CONFIG_NO_WRITE; goto out_free; } @@ -28,14 +28,14 @@ index 058505c..16854b2 100644 if (store.seen == 0) store.seen = 1; -@@ -1813,11 +1815,13 @@ int git_config_rename_section_in_file(const char *config_filename, +@@ -2329,11 +2331,13 @@ int git_config_rename_section_in_file(const char *config_filename, fstat(fileno(config_file), &st); + /* not on android - if (chmod(lock->filename, st.st_mode & 07777) < 0) { + if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) { ret = error("chmod on %s failed: %s", - lock->filename, strerror(errno)); + get_lock_file_path(lock), strerror(errno)); goto out; } + */ @@ -43,5 +43,5 @@ index 058505c..16854b2 100644 while (fgets(buf, sizeof(buf), config_file)) { int i; -- -2.1.0.rc1 +2.1.4 |