From 2ab96b66bd0e3bd5da462bf46068f9a0ceb60fbf Mon Sep 17 00:00:00 2001 From: Lukas Czerner Date: Mon, 3 Jan 2022 13:26:40 +0100 Subject: [PATCH] New upstream release 1.46.5 Signed-off-by: Lukas Czerner --- .gitignore | 2 + ...ect-files-for-f_large_dir-and-f_larg.patch | 37 ----------------- ...pdate-expect-files-for-f_mmp_garbage.patch | 40 ------------------- e2fsprogs.spec | 11 +++-- sources | 4 +- 5 files changed, 9 insertions(+), 85 deletions(-) delete mode 100644 0001-tests-update-expect-files-for-f_large_dir-and-f_larg.patch delete mode 100644 0001-tests-update-expect-files-for-f_mmp_garbage.patch diff --git a/.gitignore b/.gitignore index 3b3e915..3c81e04 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ e2fsprogs-1.41.12.tar.gz /e2fsprogs-1.46.3.tar.xz /e2fsprogs-1.46.4.tar.xz /e2fsprogs-1.46.4.tar.sign +/e2fsprogs-1.46.5.tar.xz +/e2fsprogs-1.46.5.tar.sign diff --git a/0001-tests-update-expect-files-for-f_large_dir-and-f_larg.patch b/0001-tests-update-expect-files-for-f_large_dir-and-f_larg.patch deleted file mode 100644 index 26da8fd..0000000 --- a/0001-tests-update-expect-files-for-f_large_dir-and-f_larg.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2a484409ddd7c19b3aabe736a84fdad02dec15b1 Mon Sep 17 00:00:00 2001 -From: Lukas Czerner -Date: Tue, 24 Aug 2021 11:09:35 +0200 -Subject: [PATCH 2/2] tests: update expect files for f_large_dir and - f_large_dir_csum - -Update expect files for f_large_dir and f_large_dir_csum tests to -include the warning about missing y2038 support with 128-byte inodes. - -Fixes: a23b50cd ("mke2fs: warn about missing y2038 support when formatting fresh ext4 fs") -Signed-off-by: Lukas Czerner ---- - tests/f_large_dir/expect | 1 + - tests/f_large_dir_csum/expect | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/tests/f_large_dir/expect b/tests/f_large_dir/expect -index 028234cc..495ea85d 100644 ---- a/tests/f_large_dir/expect -+++ b/tests/f_large_dir/expect -@@ -1,3 +1,4 @@ -+128-byte inodes cannot handle dates beyond 2038 and are deprecated - Creating filesystem with 108341 1k blocks and 65072 inodes - Superblock backups stored on blocks: - 8193, 24577, 40961, 57345, 73729 -diff --git a/tests/f_large_dir_csum/expect b/tests/f_large_dir_csum/expect -index aa9f33f1..44770f7b 100644 ---- a/tests/f_large_dir_csum/expect -+++ b/tests/f_large_dir_csum/expect -@@ -1,3 +1,4 @@ -+128-byte inodes cannot handle dates beyond 2038 and are deprecated - Creating filesystem with 31002 1k blocks and 64 inodes - Superblock backups stored on blocks: - 8193, 24577 --- -2.31.1 - diff --git a/0001-tests-update-expect-files-for-f_mmp_garbage.patch b/0001-tests-update-expect-files-for-f_mmp_garbage.patch deleted file mode 100644 index 1e527e9..0000000 --- a/0001-tests-update-expect-files-for-f_mmp_garbage.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 46a9f9ae2760263252595ea2cc67e2dde4542842 Mon Sep 17 00:00:00 2001 -From: Lukas Czerner -Date: Tue, 24 Aug 2021 11:08:31 +0200 -Subject: [PATCH 1/2] tests: update expect files for f_mmp_garbage - -Update expect file for f_mmp_garbage test to work correctly with the -new default 256 inode size. - -Fixes: d730be5ceeba ("tests: update mke2fs.conf to create 256 byte inodes by default") -Signed-off-by: Lukas Czerner ---- - tests/f_mmp_garbage/expect.1 | 2 +- - tests/f_mmp_garbage/expect.2 | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/f_mmp_garbage/expect.1 b/tests/f_mmp_garbage/expect.1 -index a8add101..4134eaea 100644 ---- a/tests/f_mmp_garbage/expect.1 -+++ b/tests/f_mmp_garbage/expect.1 -@@ -5,5 +5,5 @@ Pass 2: Checking directory structure - Pass 3: Checking directory connectivity - Pass 4: Checking reference counts - Pass 5: Checking group summary information --test_filesys: 11/64 files (0.0% non-contiguous), 13/100 blocks -+test_filesys: 11/64 files (0.0% non-contiguous), 15/100 blocks - Exit status is 0 -diff --git a/tests/f_mmp_garbage/expect.2 b/tests/f_mmp_garbage/expect.2 -index 66300025..3bca182e 100644 ---- a/tests/f_mmp_garbage/expect.2 -+++ b/tests/f_mmp_garbage/expect.2 -@@ -3,5 +3,5 @@ Pass 2: Checking directory structure - Pass 3: Checking directory connectivity - Pass 4: Checking reference counts - Pass 5: Checking group summary information --test_filesys: 11/64 files (0.0% non-contiguous), 13/100 blocks -+test_filesys: 11/64 files (0.0% non-contiguous), 15/100 blocks - Exit status is 0 --- -2.31.1 - diff --git a/e2fsprogs.spec b/e2fsprogs.spec index e761468..bd4be08 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,6 +1,6 @@ Summary: Utilities for managing ext2, ext3, and ext4 file systems Name: e2fsprogs -Version: 1.46.4 +Version: 1.46.5 Release: 1%{?dist} # License tags based on COPYING file distinctions for various components @@ -39,8 +39,6 @@ BuildRequires: make BuildRequires: gnupg2 xz Patch0: 0001-remove-local-PATH.patch -Patch1: 0001-tests-update-expect-files-for-f_mmp_garbage.patch -Patch2: 0001-tests-update-expect-files-for-f_large_dir-and-f_larg.patch %description The e2fsprogs package contains a number of utilities for creating, @@ -171,8 +169,6 @@ xzcat '%{SOURCE0}' | %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1} %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 # Remove flawed tests rm -rf tests/m_rootdir_acl @@ -200,7 +196,7 @@ chmod +w %{buildroot}%{_libdir}/*.a %find_lang %{name} %check -make fullcheck +make PRINT_FAILED=yes fullcheck %ldconfig_scriptlets libs @@ -342,6 +338,9 @@ make fullcheck %{_udevdir}/96-e2scrub.rules %changelog +* Mon Jan 3 2021 Lukas Czerner - 1.46.5-1 +- New upstream release + * Wed Jul 28 2021 Lukas Czerner - 1.46.3-1 - New upstream release diff --git a/sources b/sources index 343edec..b525188 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (e2fsprogs-1.46.4.tar.xz) = 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d -SHA512 (e2fsprogs-1.46.4.tar.sign) = 3a2358128dd017cc98fae74253ded9d78aec568bf7d8506118c9eb52e19ad6f4c559c2381fae3d121810eb78e684a09d44c4f8882fc41d0e90c9f4918b7cc65d +SHA512 (e2fsprogs-1.46.5.tar.xz) = 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa +SHA512 (e2fsprogs-1.46.5.tar.sign) = 42c823265e3d3e711452255a595387ab664093ae8e5815489d0dccf4380b7c98c3bf02b484634a4125d9ebd7b857d7e2ef8ccacf8cd19b4cebba9f9cafc3fdca