From fd726fa45a3b36e63509c3ff9a5f1f33b9bcb930 Mon Sep 17 00:00:00 2001 From: Carlos Maiolino Date: Mon, 22 Jul 2024 13:17:44 +0200 Subject: [PATCH] metadata_csum_seed and orphan_file features should be off by default Resolves: RHEL-49800 These settings were enabled by default upstream. We don't support them in RHEL and we don't want to, so disable them by default on mkfs. Because this configuration is default only for rhel, this is of course a RHEL-Only patch. Signed-off-by: Carlos Maiolino --- e2fsprogs.spec | 9 +++++- rhelonly-metadata_csum_orphan_file_off.patch | 33 ++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 rhelonly-metadata_csum_orphan_file_off.patch diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 4af3b7f..19e280a 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing ext2, ext3, and ext4 file systems Name: e2fsprogs Version: 1.47.1 -Release: 1%{?dist} +Release: 2%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -38,6 +38,8 @@ BuildRequires: make # For gpg verifying the source tarball BuildRequires: gnupg2 xz +Patch0: rhelonly-metadata_csum_orphan_file_off.patch + %description The e2fsprogs package contains a number of utilities for creating, checking, modifying, and correcting any inconsistencies in second, @@ -166,6 +168,8 @@ managed device with some free space available in respective volume group. xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=- %setup -q +%patch0 -p1 + # Remove flawed tests rm -rf tests/m_rootdir_acl @@ -334,6 +338,9 @@ make PRINT_FAILED=yes fullcheck %{_udevdir}/96-e2scrub.rules %changelog +* Mon Jul 22 2024 Carlos Maiolino - 1.47.1-2 +- Disable metadata_csum_seed and orphan_file features in mke2fs.conf + * Tue Jun 25 2024 Carlos Maiolino - 1.47.1-1 - Rebase to new upstream - Remove stale patch from the package diff --git a/rhelonly-metadata_csum_orphan_file_off.patch b/rhelonly-metadata_csum_orphan_file_off.patch new file mode 100644 index 0000000..ccb069b --- /dev/null +++ b/rhelonly-metadata_csum_orphan_file_off.patch @@ -0,0 +1,33 @@ +From c14854e7d66a45742342a6e217af1c7901eeb92d Mon Sep 17 00:00:00 2001 +From: Carlos Maiolino +Date: Fri, 19 Jul 2024 12:57:36 +0200 +Subject: [PATCH] metadata_csum_seed and orphan_file features should be off by default + +Resolves: RHEL-49800 + +These settings were enabled by default upstream. We don't support them +in RHEL and we don't want to, so disable them by default on mkfs. +Because this configuration is default only for rhel, this is of course a +RHEL-Only patch. + +Signed-off-by: Carlos Maiolino +--- + misc/mke2fs.conf.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in +index b7fc95df..05680992 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 +-- +2.45.2 +