3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
guix/gnu/packages/patches/extundelete-e2fsprogs-1.44.patch
Tobias Geerinckx-Rice 76c888cb94
gnu: e2fsprogs: Update to 1.44.3.
* gnu/packages/linux.scm (e2fsprogs): Update to 1.44.3.
[source]: Remove glibc-2.27 patch.
(extundelete)[source]: Apply e2fsprogs-1.44 patch.
* gnu/packages/patches/e2fsprogs-glibc-2.27.patch: Delete file...
* gnu/local.mk (dist_patch_DATA): ...remove it, and add...
* gnu/packages/patches/extundelete-e2fsprogs-1.44.patch: ...this new
file.
2018-08-16 22:21:53 +02:00

23 lines
956 B
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Thu, 16 Aug 2018 21:12:30 +0200
Subject: extundelete: Fix build with e2fsprogs 1.44.
The inode.i_file_acl field was replaced with inode.i_size_high. I'm
not sure the field name is still accurate or useful, so don't print it
at all.
Based on this[0] patch by conikost[1].
[0]: https://sourceforge.net/p/extundelete/tickets/5/
[1]: https://sourceforge.net/u/conikost
--- a/src/insertionops.cc 2012-12-30 18:23:32.000000000 +0100
+++ b/src/insertionops.cc 2018-05-07 22:58:13.065868723 +0200
@@ -33,7 +33,6 @@
os << "File flags: " << inode.i_flags << std::endl;
os << "File version (for NFS): " << inode.i_generation << std::endl;
os << "File ACL: " << inode.i_file_acl << std::endl;
- os << "Directory ACL: " << inode.i_dir_acl << std::endl;
os << "Fragment address: " << inode.i_faddr << std::endl;
os << "Direct blocks: ";
for (int n = 0; n < EXT2_NDIR_BLOCKS; n++)