From: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Date: Sat, 17 Aug 2019 16:29:49 +0000 (+0800)
Subject: tools/mtd-utils: update to 2.1.1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=faaa52eff96c425935ca190b2e137565065ea34d;p=openwrt%2Fstaging%2Fxback.git

tools/mtd-utils: update to 2.1.1

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
(cherry picked from commit 1664d6698169bed1373db70acdf8ad46fa786b2e)
---

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index ff000b99e3..e0e083d2b6 100644
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -7,11 +7,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd-utils
-PKG_VERSION:=2.0.2
+PKG_VERSION:=2.1.1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/mtd-utils/
-PKG_HASH:=fb3de61be8e932abb424e8ea3c30298f553d5f970ad158a737bb303bbf9660b8
+PKG_HASH:=8d15e8b70f036d6af1a66011f8ca0e048e9675fa7983d33bea92c24313a232d2
 
 PKG_FIXUP:=autoreconf
 
@@ -32,7 +32,9 @@ HOST_CONFIGURE_VARS+= \
 
 HOST_CONFIGURE_ARGS+= \
 	--disable-tests \
+	--without-crypto \
 	--without-xattr \
+	--without-zstd \
 	--without-lzo
 
 HOST_MAKE_FLAGS += \
diff --git a/tools/mtd-utils/patches/110-portability.patch b/tools/mtd-utils/patches/110-portability.patch
index a2942270d7..067526171a 100644
--- a/tools/mtd-utils/patches/110-portability.patch
+++ b/tools/mtd-utils/patches/110-portability.patch
@@ -70,7 +70,7 @@
  #include <sys/types.h>
 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
 +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
-@@ -1219,6 +1219,7 @@ static int add_inode(struct stat *st, in
+@@ -1503,6 +1503,7 @@ static int add_inode(struct stat *st, in
  
  	if (c->default_compr != UBIFS_COMPR_NONE)
  		use_flags |= UBIFS_COMPR_FL;
@@ -78,15 +78,15 @@
  	if (flags & FS_COMPR_FL)
  		use_flags |= UBIFS_COMPR_FL;
  	if (flags & FS_SYNC_FL)
-@@ -1229,6 +1230,7 @@ static int add_inode(struct stat *st, in
- 		use_flags |= UBIFS_APPEND_FL;
- 	if (flags & FS_DIRSYNC_FL && S_ISDIR(st->st_mode))
+@@ -1515,6 +1516,7 @@ static int add_inode(struct stat *st, in
  		use_flags |= UBIFS_DIRSYNC_FL;
+ 	if (fctx)
+ 		use_flags |= UBIFS_CRYPT_FL;
 +#endif
- 
  	memset(ino, 0, UBIFS_INO_NODE_SZ);
  
-@@ -1293,7 +1295,9 @@ static int add_dir_inode(const char *pat
+ 	ino_key_init(&key, inum);
+@@ -1600,7 +1602,9 @@ static int add_dir_inode(const char *pat
  		fd = dirfd(dir);
  		if (fd == -1)
  			return sys_err_msg("dirfd failed");
@@ -96,15 +96,15 @@
  			flags = 0;
  	}
  
-@@ -1476,6 +1480,7 @@ static int add_file(const char *path_nam
+@@ -1811,6 +1815,7 @@ static int add_file(const char *path_nam
+ 		dn->ch.node_type = UBIFS_DATA_NODE;
  		key_write(&key, &dn->key);
- 		dn->size = cpu_to_le32(bytes_read);
  		out_len = NODE_BUFFER_SIZE - UBIFS_DATA_NODE_SZ;
 +#ifndef NO_NATIVE_SUPPORT
  		if (c->default_compr == UBIFS_COMPR_NONE &&
- 		    (flags & FS_COMPR_FL))
+ 		    !c->encrypted && (flags & FS_COMPR_FL))
  #ifdef WITHOUT_LZO
-@@ -1484,6 +1489,7 @@ static int add_file(const char *path_nam
+@@ -1819,6 +1824,7 @@ static int add_file(const char *path_nam
  			use_compr = UBIFS_COMPR_LZO;
  #endif
  		else
@@ -112,7 +112,7 @@
  			use_compr = c->default_compr;
  		compr_type = compress_data(buf, bytes_read, &dn->data,
  					   &out_len, use_compr);
-@@ -1527,7 +1533,9 @@ static int add_non_dir(const char *path_
+@@ -1876,7 +1882,9 @@ static int add_non_dir(const char *path_
  		if (fd == -1)
  			return sys_err_msg("failed to open file '%s'",
  					   path_name);
diff --git a/tools/mtd-utils/patches/201-ubinize-add-terminator-support.patch b/tools/mtd-utils/patches/201-ubinize-add-terminator-support.patch
index 0da28b71f2..d765cdc6cc 100644
--- a/tools/mtd-utils/patches/201-ubinize-add-terminator-support.patch
+++ b/tools/mtd-utils/patches/201-ubinize-add-terminator-support.patch
@@ -47,7 +47,7 @@
  		case 'v':
  			args.verbose = 1;
  			break;
-@@ -559,6 +569,18 @@ int main(int argc, char * const argv[])
+@@ -582,6 +592,18 @@ int main(int argc, char * const argv[])
  			printf("\n");
  	}