From e7085d0f820753fea01fe6a3f752785e3546afca Mon Sep 17 00:00:00 2001 From: liuh Date: Wed, 5 Jun 2024 09:36:35 +0800 Subject: [PATCH] e4crypt: fix spurious Success error message (cherry picked from commit 5f5dd8e368d10910b7485760be828cdb5de52552) --- ...t-fix-spurious-Success-error-message.patch | 39 +++++++++++++++++++ e2fsprogs.spec | 6 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0013-e4crypt-fix-spurious-Success-error-message.patch diff --git a/0013-e4crypt-fix-spurious-Success-error-message.patch b/0013-e4crypt-fix-spurious-Success-error-message.patch new file mode 100644 index 0000000..b5e71f1 --- /dev/null +++ b/0013-e4crypt-fix-spurious-Success-error-message.patch @@ -0,0 +1,39 @@ +From 1275bbaaea7ffd42346789f945c2f4dcddbfbbc8 Mon Sep 17 00:00:00 2001 +From: Jakub Wilk +Date: Wed, 27 Dec 2023 09:08:05 +0100 +Subject: [PATCH] e4crypt: fix spurious "Success" error message + +Before: + + # e4crypt set_policy 0000000000000000 /dev/null + /dev/null is not a directory + /dev/null: Success + +After: + + # e4crypt set_policy 0000000000000000 /dev/null + /dev/null: Not a directory + +Signed-off-by: Jakub Wilk +Link: https://lore.kernel.org/r/20231227080805.6801-1-jwilk@jwilk.net +Signed-off-by: Theodore Ts'o +--- + misc/e4crypt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/e4crypt.c b/misc/e4crypt.c +index 67d25d8..af90704 100644 +--- a/misc/e4crypt.c ++++ b/misc/e4crypt.c +@@ -144,7 +144,7 @@ static void validate_paths(int argc, char *argv[], int path_start_index) + if (ret < 0) + goto invalid; + if (!S_ISDIR(st.st_mode)) { +- fprintf(stderr, "%s is not a directory\n", argv[x]); ++ errno = ENOTDIR; + goto invalid; + } + } +-- +2.43.0 + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index d27101e..43f1f7b 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,6 +1,6 @@ Name: e2fsprogs Version: 1.47.0 -Release: 3 +Release: 4 Summary: Second extended file system management tools License: GPLv2+ and LGPLv2 and MIT URL: http://e2fsprogs.sourceforge.net/ @@ -19,6 +19,7 @@ Patch9: 0009-e2fsck-save-EXT2_ERROR_FS-flag-during-journal-replay.patch Patch10: 0010-tune2fs-fuse2fs-debugfs-save-error-information-durin.patch Patch11: 0011-mke2fs.conf-remove-metadata_csum_seed-and-orphan_fil.patch Patch12: 0012-debugfs-fix-infinite-loop-while-dumping-the-journal.patch +Patch13: 0013-e4crypt-fix-spurious-Success-error-message.patch BuildRequires: gcc pkgconfig texinfo BuildRequires: fuse-devel libblkid-devel libuuid-devel @@ -159,6 +160,9 @@ exit 0 %{_mandir}/man8/* %changelog +* Wed Jun 5 2024 liuh - 1.47.0-4 +- sync patch from community + * Thu Apr 18 2024 jinzhiguang - 1.47.0-3 - Upstream patches regress for debugfs. Fix infinite loop while dumping the journal. -- Gitee