diff --git a/1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch b/1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch deleted file mode 100644 index b1aeb557d5f344d497f850b7c757fbab990161a4..0000000000000000000000000000000000000000 --- a/1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nuar e2fsprogs-1.44.6.orig/misc/mke2fs.conf.in e2fsprogs-1.44.6/misc/mke2fs.conf.in ---- e2fsprogs-1.44.6.orig/misc/mke2fs.conf.in 2019-03-06 04:11:11.000000000 +0800 -+++ e2fsprogs-1.44.6/misc/mke2fs.conf.in 2020-08-27 15:35:20.508576799 +0800 -@@ -11,7 +11,7 @@ - features = has_journal - } - ext4 = { -- features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize -+ features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize - inode_size = 256 - } - rhel6_ext4 = { diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..4a43047bd8812af0f2a3fe52406ef658db0285fa --- /dev/null +++ b/download @@ -0,0 +1 @@ +b3ff2a22462ecd545613923ab2c31da8 e2fsprogs-1.45.6.tar.xz diff --git a/e2fsprogs-1.45.6.tar.xz b/e2fsprogs-1.45.6.tar.xz deleted file mode 100644 index a978a1d9460a3457dd7c0751023949750b6d9f6d..0000000000000000000000000000000000000000 Binary files a/e2fsprogs-1.45.6.tar.xz and /dev/null differ diff --git a/e2fsprogs.spec b/e2fsprogs.spec index c99f7752fddf043ab1d6da28805bc847229f4e42..a437c653d546afae2f28da1f2fdee1b4d4166833 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,8 +1,7 @@ -%define anolis_release .0.1 Summary: Utilities for managing ext2, ext3, and ext4 file systems Name: e2fsprogs Version: 1.45.6 -Release: 2%{anolis_release}%{?dist} +Release: 3%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -37,10 +36,6 @@ Patch5: e2fsprogs-1.45.6-Revert-libext2fs-hide-struct-ext2fs_hashmap-as-an-in.pa Patch6: e2fsprogs-1.45.6-ext2fs-fix-ABI-change-in-the-struct_ext2_filsys-stru.patch Patch7: e2fsprogs-1.45.6-mke2fs-Escape-double-quotes-when-parsing-mke2fs.conf.patch -# Begin: Anolis customized patches -Patch1001: 1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch -# End: Anolis customized patches - %description The e2fsprogs package contains a number of utilities for creating, checking, modifying, and correcting any inconsistencies in second, @@ -166,7 +161,6 @@ It was originally inspired by the Multics SubSystem library. %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch1001 -p1 %build %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -329,8 +323,8 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog -* Thu Jan 13 2022 Weitao Zhou 1.45.6-2.0.1 -- Disable metadata_csum for ext4 by default +* Thu Jan 27 2022 Lukas Czerner 1.45.6-3 +- Rebuild to ship libss-devel package (#1947449) * Thu Jun 17 2021 Lukas Czerner 1.45.6-2 - Fix internal configuration pseudo file (#1889464)