Merge ~upils/ubuntu/+source/e2fsprogs:disable-orphan-file-feature into ubuntu/+source/e2fsprogs:ubuntu/devel

[Paul Mars]

Cherry-picked existing mantic fix d23608d502300e36743905e762e4ce2df44202d7

Fix LP: #2025339 and LP: #2028564

[Steve Langasek (vorlon)]

please rebase, there are merge conflicts

Unmerged commits

832a4af... by Paul Mars on 2023-10-27

update changelog

d23608d... by Theodore Ts'o on 2023-03-05

Disable metadata_csum_seed and orphan_file by default for Debian

Gbp-Pq: disable-metadata_csum_seed-and-orphan_file-by-default.

4810207... by Julian Andres Klode on 2023-02-17

1.47.0-1ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index 43a94ba..41ea797 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 e2fsprogs (1.47.0-2ubuntu1) mantic; urgency=medium
 
   * Merge from Debian Unstable. Remaining changes:
@@ -21,6 +22,13 @@ e2fsprogs (1.47.0-1ubuntu2) mantic; urgency=medium
     SRUed into jammy. LP: #2025339
 
  -- Dimitri John Ledkov <[e-mail]>  Thu, 29 Jun 2023 10:14:32 +0100
+=======
+e2fsprogs (1.47.0-1ubuntu2) lunar; urgency=medium
+
+  * Disable the orphan_file feature (LP: #2025339)
+
+ -- Paul Mars <[e-mail]>  Fri, 27 Oct 2023 18:44:01 +0200
+>>>>>>> debian/changelog
 
 e2fsprogs (1.47.0-1ubuntu1) lunar; urgency=low
 
diff --git a/debian/patches/default-to-4k.patch b/debian/patches/default-to-4k.patch
index a47f531..c0c9268 100644
--- a/debian/patches/default-to-4k.patch
+++ b/debian/patches/default-to-4k.patch
@@ -7,7 +7,11 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/1817097
 --- a/misc/mke2fs.conf.in
 +++ b/misc/mke2fs.conf.in
 @@ -14,11 +14,9 @@
+<<<<<<< debian/patches/default-to-4k.patch
  		features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
+=======
+ 		features = has_journal,extent,huge_file,flex_bg,metadata_csum,metadata_csum_seed,64bit,dir_nlink,extra_isize,orphan_file
+>>>>>>> debian/patches/default-to-4k.patch
  	}
  	small = {
 -		blocksize = 1024
diff --git a/debian/patches/series b/debian/patches/series
index 47e0720..1213ced 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,7 @@
+<<<<<<< debian/patches/series
 disable-metadata_csum_seed-and-orphan_file-by-default
 default-to-4k.patch
+=======
+default-to-4k.patch
+default-no-metadata_csum_seed.patch
+>>>>>>> debian/patches/series
diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
index b7fc95d..0568099 100644
--- a/misc/mke2fs.conf.in
+++ b/misc/mke2fs.conf.in
@@ -11,7 +11,7 @@
 		features = has_journal
 	}
 	ext4 = {
-		features = has_journal,extent,huge_file,flex_bg,metadata_csum,metadata_csum_seed,64bit,dir_nlink,extra_isize,orphan_file
+		features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
 	}
 	small = {
 		blocksize = 1024