[arch-commits] Commit in android-tools/trunk (PKGBUILD fix_build_e2fsprogs.patch)

[Anatol Pomozov]

    Date: Thursday, June 7, 2018 @ 20:02:47
  Author: anatolik
Revision: 341893

upgpkg: android-tools 8.1.0_r33-1

Modified:
  android-tools/trunk/PKGBUILD
  android-tools/trunk/fix_build_e2fsprogs.patch

---------------------------+
 PKGBUILD                  |    4 +--
 fix_build_e2fsprogs.patch |   49 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-07 19:33:25 UTC (rev 341892)
+++ PKGBUILD	2018-06-07 20:02:47 UTC (rev 341893)
@@ -4,7 +4,7 @@
 # Contributor: Alucryd <alucryd at gmail dot com>
 
 pkgname=android-tools
-pkgver=8.1.0_r7
+pkgver=8.1.0_r33
 pkgrel=1
 pkgdesc='Android platform tools'
 arch=(x86_64)
@@ -35,7 +35,7 @@
           '89c0b62805506c729f76c1aa3c901c4ea2e3bfbe'
           'e6ab688d0decfae64302d1402e1eee6678fc2549'
           'ec473160d7445f97bccabd1c32ac0ae2f77900c1'
-          '8ccb2ef791a5b517b4371af7f529f4e731ce7260'
+          'e0d19de229f1a41a066ddb7a84f8e56e67bbc8bc'
           '7004dbd0c193668827174880de6f8434de8ceaee')
 
 prepare() {

Modified: fix_build_e2fsprogs.patch
===================================================================
--- fix_build_e2fsprogs.patch	2018-06-07 19:33:25 UTC (rev 341892)
+++ fix_build_e2fsprogs.patch	2018-06-07 20:02:47 UTC (rev 341893)
@@ -1,3 +1,12 @@
+diff --git a/contrib/android/e2fsdroid.c b/contrib/android/e2fsdroid.c
+index f043822b..4d49bee4 100644
+--- a/contrib/android/e2fsdroid.c
++++ b/contrib/android/e2fsdroid.c
+@@ -1,3 +1,4 @@
++#define _GNU_SOURCE // for asprintf
+ #include <stdio.h>
+ #include <getopt.h>
+ #include <string.h>
 diff --git a/contrib/android/perms.c b/contrib/android/perms.c
 index 9ae8e586..433506fd 100644
 --- a/contrib/android/perms.c
@@ -41,3 +50,43 @@
  #else
  #ifdef __GNUC__
  #define _INLINE_ extern __inline__
+diff --git a/misc/create_inode.c b/misc/create_inode.c
+index 94c29b8d..6e59151c 100644
+--- a/misc/create_inode.c
++++ b/misc/create_inode.c
+@@ -403,7 +403,7 @@ static ssize_t my_pread(int fd, void *buf, size_t count, off_t offset)
+ }
+ #endif /* !defined HAVE_PREAD64 && !defined HAVE_PREAD */
+ 
+-static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
++static errcode_t e2_copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
+ 				 off_t start, off_t end, char *buf,
+ 				 char *zerobuf)
+ {
+@@ -477,7 +477,7 @@ static errcode_t try_lseek_copy(ext2_filsys fs, int fd, struct stat *statbuf,
+ 
+ 		data_blk = data & ~(fs->blocksize - 1);
+ 		hole_blk = (hole + (fs->blocksize - 1)) & ~(fs->blocksize - 1);
+-		err = copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf,
++		err = e2_copy_file_range(fs, fd, e2_file, data_blk, hole_blk, buf,
+ 				      zerobuf);
+ 		if (err)
+ 			return err;
+@@ -527,7 +527,7 @@ static errcode_t try_fiemap_copy(ext2_filsys fs, int fd, ext2_file_t e2_file,
+ 		}
+ 		for (i = 0, ext = ext_buf; i < fiemap_buf->fm_mapped_extents;
+ 		     i++, ext++) {
+-			err = copy_file_range(fs, fd, e2_file, ext->fe_logical,
++			err = e2_copy_file_range(fs, fd, e2_file, ext->fe_logical,
+ 					      ext->fe_logical + ext->fe_length,
+ 					      buf, zerobuf);
+ 			if (err)
+@@ -580,7 +580,7 @@ static errcode_t copy_file(ext2_filsys fs, int fd, struct stat *statbuf,
+ 		goto out;
+ #endif
+ 
+-	err = copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf,
++	err = e2_copy_file_range(fs, fd, e2_file, 0, statbuf->st_size, buf,
+ 			      zerobuf);
+ out:
+ 	ext2fs_free_mem(&zerobuf);