diff --git a/.e2fsprogs.metadata b/.e2fsprogs.metadata index 5a6248f..221adeb 100644 --- a/.e2fsprogs.metadata +++ b/.e2fsprogs.metadata @@ -1 +1,2 @@ -974b42b4049f1feae7ffbc969e54dd146e8709b1 SOURCES/e2fsprogs-1.46.2.tar.xz +9ff30a21d653e75728127ab165bda1749f157be0 SOURCES/e2fsprogs-1.46.5.tar.xz +e3d3e09e9dceeb7eaa5ecec3a7ba51cc4d936b6d SOURCES/tytso-key.asc diff --git a/.gitignore b/.gitignore index 837fe14..adeaba6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/e2fsprogs-1.46.2.tar.xz +SOURCES/e2fsprogs-1.46.5.tar.xz +SOURCES/tytso-key.asc diff --git a/SOURCES/0003-mke2fs.conf-Introduce-rhel6-rhel7-and-rhel8-fs_type.patch b/SOURCES/0003-mke2fs.conf-Introduce-rhel6-rhel7-and-rhel8-fs_type.patch index 0d4d850..af2e82b 100644 --- a/SOURCES/0003-mke2fs.conf-Introduce-rhel6-rhel7-and-rhel8-fs_type.patch +++ b/SOURCES/0003-mke2fs.conf-Introduce-rhel6-rhel7-and-rhel8-fs_type.patch @@ -1,7 +1,7 @@ -From 33a934794b80d1e43ffd7f15ef986b4eb8dfee9e Mon Sep 17 00:00:00 2001 +From bab98a0c110b6351634547821c337c2c26167061 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 +Subject: [PATCH] mke2fs.conf: Introduce rhel6, rhel7 and rhel8 fs_type Signed-off-by: Lukas Czerner --- @@ -9,12 +9,12 @@ Signed-off-by: Lukas Czerner 1 file changed, 14 insertions(+) diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in -index 01e35cf8..9a4804fb 100644 +index 05680992..b3345862 100644 --- a/misc/mke2fs.conf.in +++ b/misc/mke2fs.conf.in -@@ -14,6 +14,20 @@ +@@ -13,6 +13,20 @@ + ext4 = { 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 @@ -32,7 +32,7 @@ index 01e35cf8..9a4804fb 100644 + } small = { blocksize = 1024 - inode_size = 128 + inode_ratio = 4096 -- 2.31.1 diff --git a/SOURCES/e2fsprogs-1.46.5.tar.sign b/SOURCES/e2fsprogs-1.46.5.tar.sign new file mode 100644 index 0000000..3ee88c5 Binary files /dev/null and b/SOURCES/e2fsprogs-1.46.5.tar.sign differ diff --git a/SPECS/e2fsprogs.spec b/SPECS/e2fsprogs.spec index ed01f3e..a8dc9f3 100644 --- a/SPECS/e2fsprogs.spec +++ b/SPECS/e2fsprogs.spec @@ -1,11 +1,18 @@ Summary: Utilities for managing ext2, ext3, and ext4 file systems Name: e2fsprogs -Version: 1.46.2 +Version: 1.46.5 Release: 2%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 Source0: https://www.kernel.org/pub/linux/kernel/people/tytso/%{name}/v%{version}/%{name}-%{version}.tar.xz +Source1: https://www.kernel.org/pub/linux/kernel/people/tytso/%{name}/v%{version}/%{name}-%{version}.tar.sign +# GPG key fetched from https://thunk.org/tytso/tytso-key.asc +# which was linked from https://thunk.org/tytso/ +# Also verified fingerprint matches on https://www.kernel.org/doc/wot/tytso.html +# note that the GPG key linked off his MIT page is likely old, and is *not* the +# same as the above key ( http://web.mit.edu/tytso/www/home.html ) +Source2: tytso-key.asc Url: http://e2fsprogs.sourceforge.net/ Requires: e2fsprogs-libs%{?_isa} = %{version}-%{release} @@ -28,6 +35,9 @@ BuildRequires: multilib-rpm-config BuildRequires: systemd BuildRequires: make +# For gpg verifying the source tarball +BuildRequires: gnupg2 xz + 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 @@ -157,6 +167,7 @@ which means that it can only be done on file systems that are on a lvm managed device with some free space available in respective volume group. %prep +xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data=- %setup -q %patch0 -p1 @@ -190,7 +201,7 @@ chmod +w %{buildroot}%{_libdir}/*.a %find_lang %{name} %check -make fullcheck +make PRINT_FAILED=yes fullcheck %ldconfig_scriptlets libs @@ -332,6 +343,12 @@ make fullcheck %{_udevdir}/96-e2scrub.rules %changelog +* Thu Jan 20 2022 Lukas Czerner - 1.46.5-2 +- Rebuild, no changes + +* Thu Jan 20 2022 Lukas Czerner - 1.46.5-1 +- New upstream release + * Mon Aug 09 2021 Mohan Boddu - 1.46.2-2 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688