Update debian/changelog and debian/patches for a tentative 1.47.0-3 release

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

3 files changed, 61 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 0888b3346..38fbe9efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+e2fsprogs (1.47.0-3) unstable; urgency=medium
+
+  * Re-enable metadata_csum_seed and orphan_file by default now that
+    Debian Bookworm is released
+  * Suppress "Feature orphan_present is set but orphan file is
+    clean" nessage when running in preen mode.
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Tue, 30 May 2023 16:16:28 -0400
+
 e2fsprogs (1.47.0-2) unstable; urgency=medium
 
   * Don't enable metadata_csum_seed and orhpan_file by default (Closes:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 000000000..ac4f342c6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+suppress-orphan-file-is-clean-message-in-preen-mode.patch
diff --git a/debian/patches/suppress-orphan-file-is-clean-message-in-preen-mode.patch b/debian/patches/suppress-orphan-file-is-clean-message-in-preen-mode.patch
new file mode 100644
index 000000000..889235938
--- /dev/null
+++ b/debian/patches/suppress-orphan-file-is-clean-message-in-preen-mode.patch
@@ -0,0 +1,51 @@
+From: Theodore Ts'o <tytso@mit.edu>
+Description: e2fsck: Suppress "orphan file is clean" message in preen mode
+ .
+ The e2fsck report, "Feature orphan_present is set but orphan file is
+ clean" is intended to request permission before removing the r/o
+ compat feature, orphan_present.  However, it is normal if the orphan
+ file is empty, and removing the r/o compat feature is a good thing so
+ that the file system can be mounted on older kernels.
+ .
+ When a file system with an orphan_file feature is mounted, the
+ orphan_present feature is set, and it is cleared when the file system
+ is cleanly unmounted.  IF the sytstem crashes when there are no inodes
+ in the orphan file, e2fsck should just silently clear the flag in
+ preen mode.
+ .
+Origin: upstream,https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?h=next&id=24a11cc371a46ca9e68aed8f2cf4aabd22ea81eb
+---
+ e2fsck/problem.c | 2 +-
+ e2fsck/super.c   | 3 ++-
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/e2fsck/problem.c b/e2fsck/problem.c
+index 6ad6fb84..013ace24 100644
+--- a/e2fsck/problem.c
++++ b/e2fsck/problem.c
+@@ -2327,7 +2327,7 @@ static struct e2fsck_problem problem_table[] = {
+ 	/* orphan_present set but orphan file is empty */
+ 	{ PR_6_ORPHAN_PRESENT_CLEAN_FILE,
+ 	  N_("Feature orphan_present is set but orphan file is clean.\n"),
+-	  PROMPT_CLEAR, PR_PREEN_OK },
++	  PROMPT_CLEAR, PR_PREEN_OK | PR_NO_OK | PR_PREEN_NOMSG },
+ 
+ 	/* orphan_present set but orphan_file is not */
+ 	{ PR_6_ORPHAN_PRESENT_NO_FILE,
+diff --git a/e2fsck/super.c b/e2fsck/super.c
+index 9495e029..be40dd8f 100644
+--- a/e2fsck/super.c
++++ b/e2fsck/super.c
+@@ -1388,7 +1388,8 @@ void check_super_block(e2fsck_t ctx)
+  * away.
+  */
+ #define FEATURE_RO_COMPAT_IGNORE	(EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
+-					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
++					 EXT4_FEATURE_RO_COMPAT_DIR_NLINK| \
++					 EXT4_FEATURE_RO_COMPAT_ORPHAN_PRESENT)
+ #define FEATURE_INCOMPAT_IGNORE		(EXT3_FEATURE_INCOMPAT_EXTENTS| \
+ 					 EXT3_FEATURE_INCOMPAT_RECOVER)
+ 
+-- 
+2.31.0
+