From 2b183d9ca9c9f1f6d484dee059bf13b1bd01bcfa Mon Sep 17 00:00:00 2001 From: Lukas Czerner Date: Fri, 2 Jul 2021 14:27:20 +0200 Subject: [PATCH] e2fsprogs-1.46.2-1 Rebase to the newest upstream release 1.46.2 (#1979905) Resolves: rhbz#1979905 Signed-off-by: Lukas Czerner --- .gitignore | 1 + ...PATH.patch => 0001-Remove-local-PATH.patch | 29 ++-- ...ut-RHEL9-supported-features-and-moun.patch | 133 ++++++++++++++++++ ...roduce-rhel6-rhel7-and-rhel8-fs_type.patch | 38 +++++ e2fsprogs.spec | 16 ++- gating.yaml | 7 +- sources | 2 +- 7 files changed, 210 insertions(+), 16 deletions(-) rename 0001-remove-local-PATH.patch => 0001-Remove-local-PATH.patch (51%) create mode 100644 0002-man-Add-note-about-RHEL9-supported-features-and-moun.patch create mode 100644 0003-mke2fs.conf-Introduce-rhel6-rhel7-and-rhel8-fs_type.patch diff --git a/.gitignore b/.gitignore index 45dc685..22169f0 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ e2fsprogs-1.41.12.tar.gz /e2fsprogs-1.45.4.tar.xz /e2fsprogs-1.45.5.tar.xz /e2fsprogs-1.45.6.tar.xz +/e2fsprogs-1.46.2.tar.xz diff --git a/0001-remove-local-PATH.patch b/0001-Remove-local-PATH.patch similarity index 51% rename from 0001-remove-local-PATH.patch rename to 0001-Remove-local-PATH.patch index 0f38eb1..689424a 100644 --- a/0001-remove-local-PATH.patch +++ b/0001-Remove-local-PATH.patch @@ -1,7 +1,17 @@ -Index: e2fsprogs-1.45.6/scrub/e2scrub.in -=================================================================== ---- e2fsprogs-1.45.6.orig/scrub/e2scrub.in -+++ e2fsprogs-1.45.6/scrub/e2scrub.in +From e788b8ae43e176221c6d5c4a20e6ca7b4198ac45 Mon Sep 17 00:00:00 2001 +From: Lukas Czerner +Date: Fri, 2 Jul 2021 11:56:02 +0200 +Subject: [PATCH 1/4] Remove local PATH + +--- + scrub/e2scrub.in | 2 +- + scrub/e2scrub_all.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scrub/e2scrub.in b/scrub/e2scrub.in +index 30ab7cbd..bfca1ce4 100644 +--- a/scrub/e2scrub.in ++++ b/scrub/e2scrub.in @@ -23,7 +23,7 @@ # check filesystems in VGs that have at least 256MB (or so) of # free space. @@ -11,10 +21,10 @@ Index: e2fsprogs-1.45.6/scrub/e2scrub.in if (( $EUID != 0 )); then echo "e2scrub must be run as root" -Index: e2fsprogs-1.45.6/scrub/e2scrub_all.in -=================================================================== ---- e2fsprogs-1.45.6.orig/scrub/e2scrub_all.in -+++ e2fsprogs-1.45.6/scrub/e2scrub_all.in +diff --git a/scrub/e2scrub_all.in b/scrub/e2scrub_all.in +index 4288b969..606ac254 100644 +--- a/scrub/e2scrub_all.in ++++ b/scrub/e2scrub_all.in @@ -18,7 +18,7 @@ # along with this program; if not, write the Free Software Foundation, # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. @@ -24,3 +34,6 @@ Index: e2fsprogs-1.45.6/scrub/e2scrub_all.in if (( $EUID != 0 )); then echo "e2scrub_all must be run as root" +-- +2.31.1 + diff --git a/0002-man-Add-note-about-RHEL9-supported-features-and-moun.patch b/0002-man-Add-note-about-RHEL9-supported-features-and-moun.patch new file mode 100644 index 0000000..c532a92 --- /dev/null +++ b/0002-man-Add-note-about-RHEL9-supported-features-and-moun.patch @@ -0,0 +1,133 @@ +From 149067bb91ba7b3be60a1cdd326ae253176816c6 Mon Sep 17 00:00:00 2001 +From: Lukas Czerner +Date: Wed, 18 Dec 2019 11:03:37 +0100 +Subject: [PATCH 3/4] man: Add note about RHEL9 supported features and mount + options + +Signed-off-by: Lukas Czerner +--- + misc/ext4.5.in | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + misc/mke2fs.8.in | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 96 insertions(+) + +diff --git a/misc/ext4.5.in b/misc/ext4.5.in +index 1db61a5f..634a6f51 100644 +--- a/misc/ext4.5.in ++++ b/misc/ext4.5.in +@@ -19,6 +19,54 @@ previously intended for use with the ext2 and ext3 file systems can be + mounted using the ext4 file system driver, and indeed in many modern + Linux distributions, the ext4 file system driver has been configured + to handle mount requests for ext2 and ext3 file systems. ++.SH RED HAT ENTERPRISE LINUX 9 ++The Ext4 file system is fully supported by Red Hat when using default ++mke2fs and mount options. In addition, the following non-default mke2fs ++features and mount options are also fully supported. ++.SH "Non-default features:" ++project ++.br ++quota ++.br ++mmp ++.br ++.SH "Non-default mount options:" ++bsddf|minixdf ++.br ++grpid|bsdgroups and nogrpid|sysvgroups ++.br ++resgid=n and resuid=n ++.br ++errors={continue|remount-ro|panic} ++.br ++commit=nrsec ++.br ++max_batch_time=usec ++.br ++min_batch_time=usec ++.br ++grpquota|noquota|quota|usrquota ++.br ++prjquota ++.br ++dax ++.br ++lazytime|nolazytime ++.br ++discard|nodiscard ++.br ++init_itable|noinit_itable ++.br ++jqfmt={vfsold|vfsv0|vfsv1} ++.br ++usrjquota=aquota.user|grpjquota=aquota.group ++.PP ++For more information on features and mount options, see the ++.BR ext4 ++man page. Ext4 features and mount options not listed above may not be ++fully supported by Red Hat. If your workload requires a feature or mount ++option that is not fully in this Red Hat release, contact Red Hat support ++to evaluate it for inclusion in our supported list. + .SH FILE SYSTEM FEATURES + A file system formatted for ext2, ext3, or ext4 can have some + collection of the following file system feature flags enabled. Some of +diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in +index e6bfc6d6..b4d44af5 100644 +--- a/misc/mke2fs.8.in ++++ b/misc/mke2fs.8.in +@@ -204,6 +204,54 @@ overridden by the options listed below, are controlled by the + configuration file. See the + .BR mke2fs.conf (5) + manual page for more details. ++.SH RED HAT ENTERPRISE LINUX 9 ++The Ext4 file system is fully supported by Red Hat when using default ++mke2fs and mount options. In addition, the following non-default mke2fs ++features and mount options are also fully supported. ++.SH "Non-default features:" ++project ++.br ++quota ++.br ++mmp ++.br ++.SH "Non-default mount options:" ++bsddf|minixdf ++.br ++grpid|bsdgroups and nogrpid|sysvgroups ++.br ++resgid=n and resuid=n ++.br ++errors={continue|remount-ro|panic} ++.br ++commit=nrsec ++.br ++max_batch_time=usec ++.br ++min_batch_time=usec ++.br ++grpquota|noquota|quota|usrquota ++.br ++prjquota ++.br ++dax ++.br ++lazytime|nolazytime ++.br ++discard|nodiscard ++.br ++init_itable|noinit_itable ++.br ++jqfmt={vfsold|vfsv0|vfsv1} ++.br ++usrjquota=aquota.user|grpjquota=aquota.group ++.PP ++For more information on features and mount options, see the ++.BR ext4 ++man page. Ext4 features and mount options not listed above may not be ++fully supported by Red Hat. If your workload requires a feature or mount ++option that is not fully in this Red Hat release, contact Red Hat support ++to evaluate it for inclusion in our supported list. + .SH OPTIONS + .TP + .BI \-b " block-size" +-- +2.31.1 + diff --git a/0003-mke2fs.conf-Introduce-rhel6-rhel7-and-rhel8-fs_type.patch b/0003-mke2fs.conf-Introduce-rhel6-rhel7-and-rhel8-fs_type.patch new file mode 100644 index 0000000..0d4d850 --- /dev/null +++ b/0003-mke2fs.conf-Introduce-rhel6-rhel7-and-rhel8-fs_type.patch @@ -0,0 +1,38 @@ +From 33a934794b80d1e43ffd7f15ef986b4eb8dfee9e Mon Sep 17 00:00:00 2001 +From: Lukas Czerner +Date: Tue, 17 Dec 2019 11:24:31 +0100 +Subject: [PATCH 4/4] mke2fs.conf: Introduce rhel6, rhel7 and rhel8 fs_type + +Signed-off-by: Lukas Czerner +--- + misc/mke2fs.conf.in | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in +index 01e35cf8..9a4804fb 100644 +--- a/misc/mke2fs.conf.in ++++ b/misc/mke2fs.conf.in +@@ -14,6 +14,20 @@ + features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize + inode_size = 256 + } ++ rhel6_ext4 = { ++ features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize ++ inode_size = 256 ++ enable_periodic_fsck = 1 ++ default_mntopts = "" ++ } ++ rhel7_ext4 = { ++ features = has_journal,extent,huge_file,flex_bg,uninit_bg,dir_nlink,extra_isize,64bit ++ inode_size = 256 ++ } ++ rhel8_ext4 = { ++ features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize ++ inode_size = 256 ++ } + small = { + blocksize = 1024 + inode_size = 128 +-- +2.31.1 + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index fa99dea..2d4b297 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.45.6 -Release: 6%{?dist} +Version: 1.46.2 +Release: 1%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -28,7 +28,9 @@ BuildRequires: multilib-rpm-config BuildRequires: systemd BuildRequires: make -Patch0: 0001-remove-local-PATH.patch +Patch0: 0001-Remove-local-PATH.patch +Patch1: 0002-man-Add-note-about-RHEL9-supported-features-and-moun.patch +Patch2: 0003-mke2fs.conf-Introduce-rhel6-rhel7-and-rhel8-fs_type.patch %description The e2fsprogs package contains a number of utilities for creating, @@ -158,6 +160,11 @@ managed device with some free space available in respective volume group. %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +# Remove flawed tests +rm -rf tests/m_rootdir_acl %global _udevdir %{_prefix}/lib/udev/rules.d @@ -325,6 +332,9 @@ make fullcheck %{_udevdir}/96-e2scrub.rules %changelog +* Fri Jul 2 2021 Lukas Czerner - 1.46.2-1 +- New upstream release + * Thu Apr 15 2021 Mohan Boddu - 1.45.6-6 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/gating.yaml b/gating.yaml index 4a1c38a..c190bde 100644 --- a/gating.yaml +++ b/gating.yaml @@ -1,7 +1,6 @@ --- !Policy product_versions: - - fedora-* -decision_context: bodhi_update_push_testing + - rhel-9 +decision_context: osci_compose_gate rules: - - !PassingTestCaseRule {test_case_name: dist.depcheck} - - !PassingTestCaseRule {test_case_name: dist.abicheck} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/sources b/sources index 9048b46..4f884d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (e2fsprogs-1.45.6.tar.xz) = f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84 +SHA512 (e2fsprogs-1.46.2.tar.xz) = 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d