Accepting request 729248 from filesystems

- Update to release 20190826

OBS-URL: https://build.opensuse.org/request/show/729248
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/erofs-utils?expand=0&rev=4

_service

@@ -2,9 +2,9 @@
 	<service mode="disabled" name="tar_scm">
 		<param name="url">https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/</param>
 		<param name="scm">git</param>
-		<param name="revision">erofs-utils_20190803</param>
+		<param name="revision">erofs-utils_20190826</param>
 		<param name="parent-tag">589ab3accd0908f4664c839c6a3a320fa56346ec</param>
-		<param name="versionformat">0.1+20190803</param>
+		<param name="versionformat">0.1+20190826</param>
 	</service>
 	<service mode="disabled" name="recompress">
 		<param name="file">*.tar</param>

erofs-utils-0.1+20190803.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:662c87787c7775bcf3fcd0a67df0e05d48ee1af67f526f4c6790e9f725291bcf
-size 29004

erofs-utils-0.1+20190826.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1bf58a8da1c86d46e0122a40283cfd11c4010691990f5a4e971eb9604aa42c3
+size 29220

erofs-utils.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun Sep  8 14:26:05 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 20190826
+  * fix up "-E legacy-compress"
+  * fix a memory leak of compressmeta
+  * fail the image creation when source path is not a directory file
+- Add long.patch
+
 -------------------------------------------------------------------
 Fri Aug 23 04:45:53 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
 

erofs-utils.spec

@@ -17,7 +17,7 @@
 
 
 Name:           erofs-utils
-Version:        0.1+20190803
+Version:        0.1+20190826
 Release:        0
 Summary:        Utilities for the Extendable Read-Only Filesystem (EROFS)
 License:        GPL-2.0-or-later
@@ -25,6 +25,7 @@ Group:          System/Filesystems
 URL:            https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/
 
 Source:         %name-%version.tar.xz
+Patch1:         long.patch
 BuildRequires:  autoconf >= 2.69
 BuildRequires:  automake
 BuildRequires:  libtool

long.patch

@@ -0,0 +1,56 @@
+From 5c314e288719b59fb8bad90fd1a75b8076baceee Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sun, 8 Sep 2019 16:52:56 +0200
+Subject: [PATCH] build: cure compiler warnings
+
+On i586 I observe:
+
+In file included from inode.c:16:
+inode.c: In function 'erofs_mkfs_build_tree':
+../include/erofs/print.h:27:21: error: format '%lu' expects argument of type
+'long unsigned int', but argument 7 has type 'erofs_nid_t' {aka 'long long unsigned int'} [-Werror=format=]
+   27 | #define pr_fmt(fmt) "EROFS: " FUNC_LINE_FMT fmt "\n"
+../include/erofs/print.h:43:4: note: in expansion of macro 'pr_fmt'
+   43 |    pr_fmt(fmt),    \
+inode.c:792:3: note: in expansion of macro 'erofs_info'
+  792 |   erofs_info("add file %s/%s (nid %lu, type %d)",
+inode.c:792:37: note: format string is defined here
+  792 |   erofs_info("add file %s/%s (nid %lu, type %d)",
+---
+ lib/compress.c | 4 ++--
+ lib/inode.c    | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/lib/compress.c b/lib/compress.c
+index a977c87..cadf598 100644
+--- a/lib/compress.c
++++ b/lib/compress.c
+@@ -457,8 +457,8 @@ int erofs_write_compressed_file(struct erofs_inode *inode)
+ 	ret = erofs_bh_balloon(bh, blknr_to_addr(compressed_blocks));
+ 	DBG_BUGON(ret);
+ 
+-	erofs_info("compressed %s (%lu bytes) into %u blocks",
+-		   inode->i_srcpath, inode->i_size, compressed_blocks);
++	erofs_info("compressed %s (%llu bytes) into %u blocks",
++		   inode->i_srcpath, (unsigned long long)inode->i_size, compressed_blocks);
+ 
+ 	/*
+ 	 * TODO: need to move erofs_bdrop to erofs_write_tail_end
+diff --git a/lib/inode.c b/lib/inode.c
+index 141a300..db9ad99 100644
+--- a/lib/inode.c
++++ b/lib/inode.c
+@@ -789,8 +789,8 @@ fail:
+ 
+ 		d->type = erofs_type_by_mode[d->inode->i_mode >> S_SHIFT];
+ 		erofs_d_invalidate(d);
+-		erofs_info("add file %s/%s (nid %lu, type %d)",
+-			   dir->i_srcpath, d->name, d->nid, d->type);
++		erofs_info("add file %s/%s (nid %llu, type %d)",
++			   dir->i_srcpath, d->name, (unsigned long long)d->nid, d->type);
+ 	}
+ 	erofs_write_dir_file(dir);
+ 	erofs_write_tail_end(dir);
+-- 
+2.23.0
+