From f926b97bb4ca0ec30c10ee9075bd3fd3b1df2be7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 21 Jan 2023 18:24:18 +0000 Subject: gentoo auto-resync : 21:01:2023 - 18:24:18 --- sys-fs/erofs-utils/Manifest | 3 - .../files/1.4-dump-fix-de-nid-issues.patch | 134 --------------------- .../files/1.4-fsck-add-missing-include.patch | 31 ----- sys-fs/erofs-utils/files/1.4-werror.patch | 63 ---------- 4 files changed, 231 deletions(-) delete mode 100644 sys-fs/erofs-utils/files/1.4-dump-fix-de-nid-issues.patch delete mode 100644 sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch delete mode 100644 sys-fs/erofs-utils/files/1.4-werror.patch (limited to 'sys-fs/erofs-utils') diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest index d50541d971c0..cebf7aa00205 100644 --- a/sys-fs/erofs-utils/Manifest +++ b/sys-fs/erofs-utils/Manifest @@ -1,6 +1,3 @@ -AUX 1.4-dump-fix-de-nid-issues.patch 4849 BLAKE2B 48e29859955f5e7b13af7657a2411bad139de6cc373f17392bcd0b6cde55a83993795ff3f298f87fdfd950a0222c0f70714de161e02e9b2ad32b2afc513d8e4d SHA512 50d734ebbb7a7bd1c16bd90bae59e639213e607b2017cb16e65e1e3c653f604761136309564f77e80573196d7693e6ed90c30f9e35b9d3dafdb8365c38e1b0c3 -AUX 1.4-fsck-add-missing-include.patch 878 BLAKE2B e7d32eced8199a6c282d7398cea068cf560d9715caf035c67127f25fdf7055492fe25c56703e166a683f40cbb7d6ed6723c5d97467bec22f67418bb9b3bcfc5b SHA512 4cffb6faf7e1bb8150347ba8e47e0b05ad1b7d5dd4eb265330a33d6054dc6157e780a38b80a17cb61d3ab1fb2b41f36fcf65c39846f30003bc6013d23028c1fa -AUX 1.4-werror.patch 2523 BLAKE2B e794e82eb2bbc2bdc76cefb054e37a8e07a3ce1abb3d94dcbcbf115189e719677fbe18b965f1d84353853b0963ab188638634f6ebc5c32d4790ebbf0850a94a1 SHA512 3856b297ba273389e5db9ce859291ee1bbdacbeda4cdf560250f1721af81fa2037a9e3b06d955ed4caab795fec15428397cc6b03d81e79269ae963dbd0e7d51a DIST erofs-utils-1.5.tar.gz 106559 BLAKE2B 69a2b93c0ba8c50fb3f75a53cc224490ab31f55e24055932091e85032a637c2be6d937ab42f068a2937e5b9d8b6054fd756e89b9333f47a6b6b35c20a421ed49 SHA512 0a9d593a9fef3c5976dc63e2927f47d070121ed07e6dda727b0a715b72cfe560c83bdf26ce41fe07b8cb5b66b0660105848e3f7c5a84f222296eb422d1cd5cba EBUILD erofs-utils-1.5-r1.ebuild 907 BLAKE2B dac0f19a9b237f5a4c0f4e581ad56f92d148936197249b8115d5f8abf4e46d4fc6e6b97e76fa1955b72107958b6c21e448efdb7b3176ac2aa0b3599e1e13ca41 SHA512 1d7f8f52d38b515180c8e735cd339d09d54bf5d0a01c178aedc3742b624dde4fd156d42e28f502be94738379731f4841b7c3d9f56d7f25161832ef0be026ed82 EBUILD erofs-utils-1.5.ebuild 996 BLAKE2B 74f4069fa1416348a30f472b6c10000d60143f254c1d37b5bafa1e484ba8b301a58b8272d7b17f85e64045c2dede82a074024515a82991494fe97c01f814650c SHA512 92dddf7ff7e9d25f5c21f8ac2d47aa441f49d927ff790f08da3447837aafa36803d261cb5d711f502130f51ba539704944c043f7955de9c202d39e0887b7fa33 diff --git a/sys-fs/erofs-utils/files/1.4-dump-fix-de-nid-issues.patch b/sys-fs/erofs-utils/files/1.4-dump-fix-de-nid-issues.patch deleted file mode 100644 index 4c833d737fa2..000000000000 --- a/sys-fs/erofs-utils/files/1.4-dump-fix-de-nid-issues.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 35b15cc9c75cc2d7782f36433bad90326e9cb060 Mon Sep 17 00:00:00 2001 -From: Gao Xiang -Date: Mon, 22 Nov 2021 07:48:48 +0800 -Subject: [PATCH 1/2] erofs-utils: dump: fix de->nid issues - -As David Michael reported, " - In file included from main.c:11: - main.c: In function 'erofs_checkdirent': - ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] - 68 | " " PR_FMT_FUNC_LINE(fmt), \ - | ^~~~~~ - main.c:264:17: note: in expansion of macro 'erofs_err' - 264 | erofs_err("invalid file type %llu", de->nid); - | ^~~~~~~~~ - main.c: In function 'erofs_read_dirent': - ../include/erofs/print.h:68:25: error: format '%llu' expects argument of type 'long long unsigned int', but argument 3 has type '__le64' {aka 'long unsigned int'} [-Werror=format=] - 68 | " " PR_FMT_FUNC_LINE(fmt), \ - | ^~~~~~ - main.c:303:25: note: in expansion of macro 'erofs_err' - 303 | erofs_err("parse dir nid %llu error occurred\n", - | ^~~~~~~~~ - cc1: all warnings being treated as errors -" - -Also there are many de->nid lacking of endianness handling. -Should fix them together. - -Link: https://lore.kernel.org/r/20211121234848.12663-1-xiang@kernel.org -Fixes: cf8be8a4352a ("erofs-utils: dump: add feature for collecting filesystem statistics") -Cc: Wang Qi -Cc: Guo Xuenan -Reported-by: David Michael -Signed-off-by: Gao Xiang ---- - dump/main.c | 31 ++++++++++++++++--------------- - 1 file changed, 16 insertions(+), 15 deletions(-) - -diff --git a/dump/main.c b/dump/main.c -index b7560ec..f85903b 100644 ---- a/dump/main.c -+++ b/dump/main.c -@@ -242,11 +242,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, - { - int dname_len; - unsigned int nameoff = le16_to_cpu(de->nameoff); -+ erofs_nid_t nid = le64_to_cpu(de->nid); - - if (nameoff < sizeof(struct erofs_dirent) || - nameoff >= PAGE_SIZE) { - erofs_err("invalid de[0].nameoff %u @ nid %llu", -- nameoff, de->nid | 0ULL); -+ nameoff, nid | 0ULL); - return -EFSCORRUPTED; - } - -@@ -255,13 +256,12 @@ static inline int erofs_checkdirent(struct erofs_dirent *de, - /* a corrupted entry is found */ - if (nameoff + dname_len > maxsize || - dname_len > EROFS_NAME_LEN) { -- erofs_err("bogus dirent @ nid %llu", -- le64_to_cpu(de->nid) | 0ULL); -+ erofs_err("bogus dirent @ nid %llu", nid | 0ULL); - DBG_BUGON(1); - return -EFSCORRUPTED; - } - if (de->file_type >= EROFS_FT_MAX) { -- erofs_err("invalid file type %llu", de->nid); -+ erofs_err("invalid file type %llu", nid | 0ULL); - return -EFSCORRUPTED; - } - return dname_len; -@@ -273,7 +273,7 @@ static int erofs_read_dirent(struct erofs_dirent *de, - { - int err; - erofs_off_t occupied_size = 0; -- struct erofs_inode inode = { .nid = de->nid }; -+ struct erofs_inode inode = { .nid = le64_to_cpu(de->nid) }; - - stats.files++; - stats.file_category_stat[de->file_type]++; -@@ -296,12 +296,12 @@ static int erofs_read_dirent(struct erofs_dirent *de, - update_file_size_statatics(occupied_size, inode.i_size); - } - -- if ((de->file_type == EROFS_FT_DIR) -- && de->nid != nid && de->nid != parent_nid) { -- err = erofs_read_dir(de->nid, nid); -+ if (de->file_type == EROFS_FT_DIR && inode.nid != nid && -+ inode.nid != parent_nid) { -+ err = erofs_read_dir(inode.nid, nid); - if (err) { - erofs_err("parse dir nid %llu error occurred\n", -- de->nid); -+ inode.nid | 0ULL); - return err; - } - } -@@ -338,7 +338,8 @@ static int erofs_read_dir(erofs_nid_t nid, erofs_nid_t parent_nid) - int ret; - - /* skip "." and ".." dentry */ -- if (de->nid == nid || de->nid == parent_nid) { -+ if (le64_to_cpu(de->nid) == nid || -+ le64_to_cpu(de->nid) == parent_nid) { - de++; - continue; - } -@@ -399,18 +400,18 @@ static int erofs_get_pathname(erofs_nid_t nid, erofs_nid_t parent_nid, - if (len < 0) - return len; - -- if (de->nid == target) { -+ if (le64_to_cpu(de->nid) == target) { - memcpy(path + pos, dname, len); - path[pos + len] = '\0'; - return 0; - } - - if (de->file_type == EROFS_FT_DIR && -- de->nid != parent_nid && -- de->nid != nid) { -+ le64_to_cpu(de->nid) != parent_nid && -+ le64_to_cpu(de->nid) != nid) { - memcpy(path + pos, dname, len); -- err = erofs_get_pathname(de->nid, nid, -- target, path, pos + len); -+ err = erofs_get_pathname(le64_to_cpu(de->nid), -+ nid, target, path, pos + len); - if (!err) - return 0; - memset(path + pos, 0, len); --- -2.34.1 - diff --git a/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch b/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch deleted file mode 100644 index 8e4f6ac3d336..000000000000 --- a/sys-fs/erofs-utils/files/1.4-fsck-add-missing-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2ac662b01de904802da4e84d0738e47bf573efde Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 6 Dec 2021 20:14:03 +0100 -Subject: [PATCH 2/2] fsck/main.c: add missing include - -Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR -definitions. - -Link: https://lore.kernel.org/r/20211206191403.1435229-1-alex@linutronix.de -Reviewed-by: Gao Xiang -Signed-off-by: Alexander Kanavin -Signed-off-by: Gao Xiang ---- - fsck/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fsck/main.c b/fsck/main.c -index aefa881..ad48e35 100644 ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - #include "erofs/print.h" - #include "erofs/io.h" - #include "erofs/decompress.h" --- -2.34.1 - diff --git a/sys-fs/erofs-utils/files/1.4-werror.patch b/sys-fs/erofs-utils/files/1.4-werror.patch deleted file mode 100644 index 21740d646c54..000000000000 --- a/sys-fs/erofs-utils/files/1.4-werror.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR([config.h.in]) - AC_CONFIG_HEADERS([config.h]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_AUX_DIR(config) --AM_INIT_AUTOMAKE([foreign -Wall -Werror]) -+AM_INIT_AUTOMAKE([foreign -Wall]) - - # Checks for programs. - AM_PROG_AR ---- a/dump/Makefile.am -+++ b/dump/Makefile.am -@@ -5,6 +5,6 @@ AUTOMAKE_OPTIONS = foreign - bin_PROGRAMS = dump.erofs - AM_CPPFLAGS = ${libuuid_CFLAGS} - dump_erofs_SOURCES = main.c --dump_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -+dump_erofs_CFLAGS = -Wall -I$(top_srcdir)/include - dump_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ - ${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS} ---- a/fsck/Makefile.am -+++ b/fsck/Makefile.am -@@ -5,6 +5,6 @@ AUTOMAKE_OPTIONS = foreign - bin_PROGRAMS = fsck.erofs - AM_CPPFLAGS = ${libuuid_CFLAGS} - fsck_erofs_SOURCES = main.c --fsck_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -+fsck_erofs_CFLAGS = -Wall -I$(top_srcdir)/include - fsck_erofs_LDADD = $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ - ${libuuid_LIBS} ${liblz4_LIBS} ${liblzma_LIBS} ---- a/fuse/Makefile.am -+++ b/fuse/Makefile.am -@@ -3,7 +3,7 @@ - AUTOMAKE_OPTIONS = foreign - bin_PROGRAMS = erofsfuse - erofsfuse_SOURCES = dir.c main.c --erofsfuse_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -+erofsfuse_CFLAGS = -Wall -I$(top_srcdir)/include - erofsfuse_CFLAGS += -DFUSE_USE_VERSION=26 ${libfuse_CFLAGS} ${libselinux_CFLAGS} - erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la ${libfuse_LIBS} ${liblz4_LIBS} \ - ${libselinux_LIBS} ${liblzma_LIBS} ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -27,7 +27,7 @@ noinst_HEADERS += compressor.h - liberofs_la_SOURCES = config.c io.c cache.c super.c inode.c xattr.c exclude.c \ - namei.c data.c compress.c compressor.c zmap.c decompress.c \ - compress_hints.c hashmap.c sha256.c blobchunk.c --liberofs_la_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -+liberofs_la_CFLAGS = -Wall -I$(top_srcdir)/include - if ENABLE_LZ4 - liberofs_la_CFLAGS += ${LZ4_CFLAGS} - liberofs_la_SOURCES += compressor_lz4.c ---- a/mkfs/Makefile.am -+++ b/mkfs/Makefile.am -@@ -4,6 +4,6 @@ AUTOMAKE_OPTIONS = foreign - bin_PROGRAMS = mkfs.erofs - AM_CPPFLAGS = ${libuuid_CFLAGS} ${libselinux_CFLAGS} - mkfs_erofs_SOURCES = main.c --mkfs_erofs_CFLAGS = -Wall -Werror -I$(top_srcdir)/include -+mkfs_erofs_CFLAGS = -Wall -I$(top_srcdir)/include - mkfs_erofs_LDADD = ${libuuid_LIBS} $(top_builddir)/lib/liberofs.la ${libselinux_LIBS} \ - ${liblz4_LIBS} ${liblzma_LIBS} -- cgit v1.2.3