diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-08-16 21:31:59 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-08-16 22:21:53 +0200 |
| commit | 76c888cb940f7817b8c6c570a760fdf5f0c176cc (patch) | |
| tree | 7a7085cb73e5ec7de90ce3e7aa71e33f69a75ded /gnu/packages/patches/extundelete-e2fsprogs-1.44.patch | |
| parent | 1d9b96c08f62d4237c1f074f688cc00f30fc49fe (diff) | |
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.
Diffstat (limited to 'gnu/packages/patches/extundelete-e2fsprogs-1.44.patch')
| -rw-r--r-- | gnu/packages/patches/extundelete-e2fsprogs-1.44.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/gnu/packages/patches/extundelete-e2fsprogs-1.44.patch b/gnu/packages/patches/extundelete-e2fsprogs-1.44.patch new file mode 100644 index 0000000000..5a93a39b23 --- /dev/null +++ b/gnu/packages/patches/extundelete-e2fsprogs-1.44.patch @@ -0,0 +1,23 @@ +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++) |