From cbf9a5b817d194cd0776d030bdf7c1fca5a0e547 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 11 Jun 2025 20:02:02 -0400 Subject: [PATCH] debian: update changelog for 1.47.2-3 Also update debian patches to indicate they are all upstream patches. Signed-off-by: Theodore Ts'o --- debian/changelog | 7 +++++++ debian/patches/0000-cover-letter.patch | 6 ++++-- ...sck-fix-logic-bug-when-there-are-no-references-to.patch | 2 +- ...st-fix-expect-files-which-changed-after-EA-bugfix.patch | 2 +- ...ext2fs-teach-ext2fs_extent_set_bmap-to-update-ext.patch | 2 +- debian/patches/0004-e2image.8-add-missing-comma.patch | 2 +- ...ugfs-byteswap-dirsearch-dirent-buf-on-big-endian-.patch | 2 +- .../patches/0006-fuse2fs-refuse-unsupported-features.patch | 2 +- ...e2fs-return-EOPNOTSUPP-when-we-don-t-recognize-a-.patch | 2 +- .../0008-fuse2fs-remove-posix-acl-translation.patch | 2 +- ...e2fs-clamp-timestamps-that-are-being-written-to-d.patch | 2 +- ...e2fs-update-new-child-timestamps-during-mkdir-sym.patch | 2 +- debian/patches/0011-fuse2fs-disable-renameat2.patch | 2 +- ...ugfs-abort-reading-a-file-on-failure-when-dumping.patch | 2 +- .../0013-mke2fs-disallow-O-verity-without-extents.patch | 2 +- ...sck-fix-e2fsck-E-unshare_blocks-when-there-are-no.patch | 2 +- ...reefrag-require-that-the-chunksize-must-be-greate.patch | 2 +- .../0016-mke2fs-add-range-checks-for-E-desc_size.patch | 2 +- ...ugfs-return-after-printing-the-usage-message-in-t.patch | 2 +- .../0020-mke2fs-fix-a-misindentation-in-the-man-page.patch | 2 +- ...ext2fs-fix-a-extent-tree-corruption-bug-in-ext2fs.patch | 2 +- ...ext2fs-fix-integer-overflow-in-ext2fs_punch-when-.patch | 2 +- 22 files changed, 31 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index 99533185..d965668e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +e2fsprogs (1.47.2-3) unstable; urgency=medium + + * Fix a typo in fuse2fs.postrm which breaks /usr-move mitigation + (Closes: #1107595) + + -- Theodore Y. Ts'o Tue, 10 Jun 2025 14:59:29 -0400 + e2fsprogs (1.47.2-2) unstable; urgency=medium * Fix integer overflow bug which resulted in fuse2fs failing to delete diff --git a/debian/patches/0000-cover-letter.patch b/debian/patches/0000-cover-letter.patch index d83391ea..9dbb96ce 100644 --- a/debian/patches/0000-cover-letter.patch +++ b/debian/patches/0000-cover-letter.patch @@ -25,7 +25,7 @@ Darrick J. Wong (6): Jakub Wilk (1): e2image.8: add missing comma -Theodore Ts'o (12): +Theodore Ts'o (13): e2fsck: fix logic bug when there are no references to an EA inode test: fix expect files which changed after EA bugfix libext2fs: teach ext2fs_extent_set_bmap() to update extents more @@ -42,9 +42,11 @@ Theodore Ts'o (12): ext2fs_extent_set_bmap() libext2fs: fix integer overflow in ext2fs_punch() when releasing more than 2**31 blocks + debian: fix typo in fuse2fs.postrm which breaks a /usr-move mitigation debian/control | 1 + debian/copyright | 8 +- + debian/fuse2fs.postrm | 2 +- debian/rules | 2 +- debugfs/dump.c | 4 +- debugfs/htree.c | 6 + @@ -61,7 +63,7 @@ Theodore Ts'o (12): tests/f_badcluster/expect | 8 +- tests/f_ea_inode_disconnected/expect.1 | 2 + tests/f_ea_inode_self_ref/expect.1 | 2 - - 18 files changed, 155 insertions(+), 304 deletions(-) + 18 files changed, 156 insertions(+), 305 deletions(-) -- 2.47.2 diff --git a/debian/patches/0001-e2fsck-fix-logic-bug-when-there-are-no-references-to.patch b/debian/patches/0001-e2fsck-fix-logic-bug-when-there-are-no-references-to.patch index e60bd312..94bbca5c 100644 --- a/debian/patches/0001-e2fsck-fix-logic-bug-when-there-are-no-references-to.patch +++ b/debian/patches/0001-e2fsck-fix-logic-bug-when-there-are-no-references-to.patch @@ -13,7 +13,7 @@ ext2fs_write_inode: Attempt to write to filesystem opened read-only while writin e2fsck: aborted Fixes: 849a9e6e133a ("e2fsck: add more checks for ea inode consistency") -Origin: https://github.com/tytso/e2fsprogs/commit/92b6e93936d7a0f6d7ce7a9f142e2c0ee9afbeaf +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/92b6e93936d7a0f6d7ce7a9f142e2c0ee9afbeaf --- e2fsck/pass4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/0002-test-fix-expect-files-which-changed-after-EA-bugfix.patch b/debian/patches/0002-test-fix-expect-files-which-changed-after-EA-bugfix.patch index be064861..32e40194 100644 --- a/debian/patches/0002-test-fix-expect-files-which-changed-after-EA-bugfix.patch +++ b/debian/patches/0002-test-fix-expect-files-which-changed-after-EA-bugfix.patch @@ -7,7 +7,7 @@ fixes that were never logged, and in some cases, corruption that was not cleaned up. Fix the tests so that they pass as expected. Fixes: 92b6e93936d7 ("e2fsck: fix logic bug when there are no references..." -Origin: https://github.com/tytso/e2fsprogs/commit/ddd4f796d9dfdb80e5639ca8411e8e4891d3c7f1 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/ddd4f796d9dfdb80e5639ca8411e8e4891d3c7f1 --- tests/f_ea_inode_disconnected/expect.1 | 2 ++ tests/f_ea_inode_self_ref/expect.1 | 2 -- diff --git a/debian/patches/0003-libext2fs-teach-ext2fs_extent_set_bmap-to-update-ext.patch b/debian/patches/0003-libext2fs-teach-ext2fs_extent_set_bmap-to-update-ext.patch index 7709fbf5..dd783312 100644 --- a/debian/patches/0003-libext2fs-teach-ext2fs_extent_set_bmap-to-update-ext.patch +++ b/debian/patches/0003-libext2fs-teach-ext2fs_extent_set_bmap-to-update-ext.patch @@ -37,7 +37,7 @@ extent landing in two different leaf blocks: This resulted a corrupted extent tree block and data loss. -Origin: https://github.com/tytso/e2fsprogs/commit/ea825a53bcb214de7356c2ebd8a10d005613bec3 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/ea825a53bcb214de7356c2ebd8a10d005613bec3 --- lib/ext2fs/extent.c | 25 ++++++++++++++++++++++++- tests/f_badcluster/expect | 8 ++++---- diff --git a/debian/patches/0004-e2image.8-add-missing-comma.patch b/debian/patches/0004-e2image.8-add-missing-comma.patch index 90340a32..6a7b22cd 100644 --- a/debian/patches/0004-e2image.8-add-missing-comma.patch +++ b/debian/patches/0004-e2image.8-add-missing-comma.patch @@ -1,6 +1,6 @@ From: Jakub Wilk Subject: e2image.8: add missing comma -Origin: https://github.com/tytso/e2fsprogs/commit/5a6ec683252be78ccda7dec7dac530f2ebc46ce6 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/5a6ec683252be78ccda7dec7dac530f2ebc46ce6 --- misc/e2image.8.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/0005-debugfs-byteswap-dirsearch-dirent-buf-on-big-endian-.patch b/debian/patches/0005-debugfs-byteswap-dirsearch-dirent-buf-on-big-endian-.patch index 487bd56b..04b32372 100644 --- a/debian/patches/0005-debugfs-byteswap-dirsearch-dirent-buf-on-big-endian-.patch +++ b/debian/patches/0005-debugfs-byteswap-dirsearch-dirent-buf-on-big-endian-.patch @@ -13,7 +13,7 @@ entries in the given block. This leads to garbage record and name length values, for example. To resolve this problem, byte swap the directory buffer on big endian systems. -Origin: https://github.com/tytso/e2fsprogs/commit/4be42019388d76c933e3b2ea80284aaf5b8eaecb +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/4be42019388d76c933e3b2ea80284aaf5b8eaecb --- debugfs/htree.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/patches/0006-fuse2fs-refuse-unsupported-features.patch b/debian/patches/0006-fuse2fs-refuse-unsupported-features.patch index 29b01045..2cb71de5 100644 --- a/debian/patches/0006-fuse2fs-refuse-unsupported-features.patch +++ b/debian/patches/0006-fuse2fs-refuse-unsupported-features.patch @@ -4,7 +4,7 @@ Subject: fuse2fs: refuse unsupported features Don't mount a filesystem with superblock features that we don't actually know how to support. -Origin: https://github.com/tytso/e2fsprogs/commit/ccbc6f24fed095b28f9faa7b575159e49787fae0 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/ccbc6f24fed095b28f9faa7b575159e49787fae0 --- misc/fuse2fs.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/debian/patches/0007-fuse2fs-return-EOPNOTSUPP-when-we-don-t-recognize-a-.patch b/debian/patches/0007-fuse2fs-return-EOPNOTSUPP-when-we-don-t-recognize-a-.patch index 19c912d6..bfa7fd5c 100644 --- a/debian/patches/0007-fuse2fs-return-EOPNOTSUPP-when-we-don-t-recognize-a-.patch +++ b/debian/patches/0007-fuse2fs-return-EOPNOTSUPP-when-we-don-t-recognize-a-.patch @@ -5,7 +5,7 @@ If we don't recognize a set bit in the mode parameter to fallocate, return EOPNOTSUPP to communicate that we don't support that mode instead of EINVAL. This avoids unnecessary failures in generic/521. -Origin: https://github.com/tytso/e2fsprogs/commit/7775293c08d2255e90b1e003ee532d826af52d95 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/7775293c08d2255e90b1e003ee532d826af52d95 --- misc/fuse2fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/0008-fuse2fs-remove-posix-acl-translation.patch b/debian/patches/0008-fuse2fs-remove-posix-acl-translation.patch index c6bd91fc..95939c1c 100644 --- a/debian/patches/0008-fuse2fs-remove-posix-acl-translation.patch +++ b/debian/patches/0008-fuse2fs-remove-posix-acl-translation.patch @@ -5,7 +5,7 @@ Remove the POSIX ACL format translation since libext2fs takes care of that now. Fixes: 0ee1eaf70c257e ("libext2fs: translate internal ext4 acl to Posix ACL in ext2fs_xattr_[sg]et()") -Origin: https://github.com/tytso/e2fsprogs/commit/0111bdb70a9c460052387111414a2e2dc8c06822 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/0111bdb70a9c460052387111414a2e2dc8c06822 --- misc/fuse2fs.c | 267 +------------------------------------------------ 1 file changed, 4 insertions(+), 263 deletions(-) diff --git a/debian/patches/0009-fuse2fs-clamp-timestamps-that-are-being-written-to-d.patch b/debian/patches/0009-fuse2fs-clamp-timestamps-that-are-being-written-to-d.patch index d00b7ccf..5a2b183d 100644 --- a/debian/patches/0009-fuse2fs-clamp-timestamps-that-are-being-written-to-d.patch +++ b/debian/patches/0009-fuse2fs-clamp-timestamps-that-are-being-written-to-d.patch @@ -5,7 +5,7 @@ Clamp the timestamps that we write to disk to the minimum and maximum values permitted given the ondisk format. This fixes y2038 support, as tested by generic/402. -Origin: https://github.com/tytso/e2fsprogs/commit/e13395876d63cebf008101b934ee9e5cdaae0150 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/e13395876d63cebf008101b934ee9e5cdaae0150 --- lib/ext2fs/ext2_fs.h | 4 ++++ misc/fuse2fs.c | 39 ++++++++++++++++++++++++++++++++------- diff --git a/debian/patches/0010-fuse2fs-update-new-child-timestamps-during-mkdir-sym.patch b/debian/patches/0010-fuse2fs-update-new-child-timestamps-during-mkdir-sym.patch index 35de549f..8a3e4c2d 100644 --- a/debian/patches/0010-fuse2fs-update-new-child-timestamps-during-mkdir-sym.patch +++ b/debian/patches/0010-fuse2fs-update-new-child-timestamps-during-mkdir-sym.patch @@ -4,7 +4,7 @@ Subject: fuse2fs: update new child timestamps during mkdir/symlink These two file creation functions fail to update the timestamps of the new child file, unlike the others (mknod/creat). Fix that. -Origin: https://github.com/tytso/e2fsprogs/commit/f73fbf8e2cee1f2d49f4e7573eadb9f1cf141879 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/f73fbf8e2cee1f2d49f4e7573eadb9f1cf141879 --- misc/fuse2fs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/patches/0011-fuse2fs-disable-renameat2.patch b/debian/patches/0011-fuse2fs-disable-renameat2.patch index 7d325bd5..94f77978 100644 --- a/debian/patches/0011-fuse2fs-disable-renameat2.patch +++ b/debian/patches/0011-fuse2fs-disable-renameat2.patch @@ -6,7 +6,7 @@ upcall, so we actually have to filter out nonzero flags because otherwise we do a regular rename for a RENAME_EXCHANGE/WHITEOUT, which is not what the user asked for. -Origin: https://github.com/tytso/e2fsprogs/commit/b431abbc8fe0fd1de4e414aae3520c4c19411048 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/b431abbc8fe0fd1de4e414aae3520c4c19411048 --- misc/fuse2fs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/patches/0012-debugfs-abort-reading-a-file-on-failure-when-dumping.patch b/debian/patches/0012-debugfs-abort-reading-a-file-on-failure-when-dumping.patch index 9962c1cc..5e9e395f 100644 --- a/debian/patches/0012-debugfs-abort-reading-a-file-on-failure-when-dumping.patch +++ b/debian/patches/0012-debugfs-abort-reading-a-file-on-failure-when-dumping.patch @@ -10,7 +10,7 @@ situation. [1] https://github.com/tytso/e2fsprogs/pull/149 -Origin: https://github.com/tytso/e2fsprogs/commit/51d68472456d22b6e64159244be63bce51473691 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/51d68472456d22b6e64159244be63bce51473691 --- debugfs/dump.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/patches/0013-mke2fs-disallow-O-verity-without-extents.patch b/debian/patches/0013-mke2fs-disallow-O-verity-without-extents.patch index e94fd892..a2c3e28f 100644 --- a/debian/patches/0013-mke2fs-disallow-O-verity-without-extents.patch +++ b/debian/patches/0013-mke2fs-disallow-O-verity-without-extents.patch @@ -5,7 +5,7 @@ Similar to 64-bit support, fs-verity support requires extents, so don't allow to create a filesystem that has -O verity unless it also supports extents. -Origin: https://github.com/tytso/e2fsprogs/commit/03fa1a5ee55d0653f5931cea3cab760599bab216 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/03fa1a5ee55d0653f5931cea3cab760599bab216 --- misc/mke2fs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/patches/0014-e2fsck-fix-e2fsck-E-unshare_blocks-when-there-are-no.patch b/debian/patches/0014-e2fsck-fix-e2fsck-E-unshare_blocks-when-there-are-no.patch index 215693b3..246bd32b 100644 --- a/debian/patches/0014-e2fsck-fix-e2fsck-E-unshare_blocks-when-there-are-no.patch +++ b/debian/patches/0014-e2fsck-fix-e2fsck-E-unshare_blocks-when-there-are-no.patch @@ -7,7 +7,7 @@ since e2fsck_pass1_dupblocks() is never called. Fix this by adding a check in e2fsck_pass1() to clear the shared blocks flag. Bug: https://github.com/tytso/e2fsprogs/issues/218 -Origin: https://github.com/tytso/e2fsprogs/commit/707af4359e132bc415c3f6339f4ced9f23b28c0b +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/707af4359e132bc415c3f6339f4ced9f23b28c0b --- e2fsck/pass1.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/patches/0015-e2freefrag-require-that-the-chunksize-must-be-greate.patch b/debian/patches/0015-e2freefrag-require-that-the-chunksize-must-be-greate.patch index bd6af948..c2e38e9d 100644 --- a/debian/patches/0015-e2freefrag-require-that-the-chunksize-must-be-greate.patch +++ b/debian/patches/0015-e2freefrag-require-that-the-chunksize-must-be-greate.patch @@ -5,7 +5,7 @@ Subject: e2freefrag: require that the chunksize must be greater than 0 message if the user specifies a zero chunksize. Addresses-Coverity-Bug: 1633767 -Origin: https://github.com/tytso/e2fsprogs/commit/3e059df08de94abde1ddd82008d0658584a35e5e +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/3e059df08de94abde1ddd82008d0658584a35e5e --- misc/e2freefrag.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/0016-mke2fs-add-range-checks-for-E-desc_size.patch b/debian/patches/0016-mke2fs-add-range-checks-for-E-desc_size.patch index 9f48511c..7fe3a4b3 100644 --- a/debian/patches/0016-mke2fs-add-range-checks-for-E-desc_size.patch +++ b/debian/patches/0016-mke2fs-add-range-checks-for-E-desc_size.patch @@ -4,7 +4,7 @@ Subject: mke2fs: add range checks for -E desc_size Prevent the user from specifying group descriptor that result in invalid/corrupted file systems. -Origin: https://github.com/tytso/e2fsprogs/commit/326e8ab43503dd9f44338754c84cb03a725ecc49 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/326e8ab43503dd9f44338754c84cb03a725ecc49 --- misc/mke2fs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/patches/0017-debugfs-return-after-printing-the-usage-message-in-t.patch b/debian/patches/0017-debugfs-return-after-printing-the-usage-message-in-t.patch index 63bc7bb9..12a36833 100644 --- a/debian/patches/0017-debugfs-return-after-printing-the-usage-message-in-t.patch +++ b/debian/patches/0017-debugfs-return-after-printing-the-usage-message-in-t.patch @@ -1,7 +1,7 @@ From: Theodore Ts'o Subject: debugfs: return after printing the usage message in the e2freefrag command -Origin: https://github.com/tytso/e2fsprogs/commit/0c675a67c5684252e3a228c824b0accb9f3ab5d7 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/0c675a67c5684252e3a228c824b0accb9f3ab5d7 --- misc/e2freefrag.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/patches/0020-mke2fs-fix-a-misindentation-in-the-man-page.patch b/debian/patches/0020-mke2fs-fix-a-misindentation-in-the-man-page.patch index 64c61246..d26cc3f0 100644 --- a/debian/patches/0020-mke2fs-fix-a-misindentation-in-the-man-page.patch +++ b/debian/patches/0020-mke2fs-fix-a-misindentation-in-the-man-page.patch @@ -3,7 +3,7 @@ Subject: mke2fs: fix a misindentation in the man page Problem existed since commit 3c22bf7e70 from twelve years ago. -Origin: https://github.com/tytso/e2fsprogs/commit/4d6cfa2557de7d0878fed3203ac36d3e91df183f +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/4d6cfa2557de7d0878fed3203ac36d3e91df183f --- misc/mke2fs.8.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/0021-libext2fs-fix-a-extent-tree-corruption-bug-in-ext2fs.patch b/debian/patches/0021-libext2fs-fix-a-extent-tree-corruption-bug-in-ext2fs.patch index 16c4ce80..a05e875d 100644 --- a/debian/patches/0021-libext2fs-fix-a-extent-tree-corruption-bug-in-ext2fs.patch +++ b/debian/patches/0021-libext2fs-fix-a-extent-tree-corruption-bug-in-ext2fs.patch @@ -20,7 +20,7 @@ ext2fs_extents_fix_parents(): ext2fs_extent_goto() after calling this function. Or simply don't map the same lblk with two extents, ever. -Origin: https://github.com/tytso/e2fsprogs/commit/b914701223255c116745a11f30563652c9fdbb4b +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/b914701223255c116745a11f30563652c9fdbb4b --- lib/ext2fs/extent.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/patches/0022-libext2fs-fix-integer-overflow-in-ext2fs_punch-when-.patch b/debian/patches/0022-libext2fs-fix-integer-overflow-in-ext2fs_punch-when-.patch index 9e60f44c..1e24f3ed 100644 --- a/debian/patches/0022-libext2fs-fix-integer-overflow-in-ext2fs_punch-when-.patch +++ b/debian/patches/0022-libext2fs-fix-integer-overflow-in-ext2fs_punch-when-.patch @@ -1,6 +1,6 @@ From: Theodore Ts'o Subject: libext2fs: fix integer overflow in ext2fs_punch() when releasing more than 2**31 blocks -Origin: https://github.com/tytso/e2fsprogs/commit/34b2a4a1f9794498ca403393003cc5840c240d42 +Origin: upstream, https://github.com/tytso/e2fsprogs/commit/34b2a4a1f9794498ca403393003cc5840c240d42 Bug-Debian: http://bugs.debian.org/1106241 --- lib/ext2fs/punch.c | 8 ++++---- -- 2.47.2