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++)
ut type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=485e006c9e8cbb8c16c79d3d488d9e3a8e622142'>refs</a><a href='/guix/log/gnu/packages'>log</a><a href='/guix/tree/gnu/packages?id=485e006c9e8cbb8c16c79d3d488d9e3a8e622142'>tree</a><a href='/guix/commit/gnu/packages?id=485e006c9e8cbb8c16c79d3d488d9e3a8e622142'>commit</a><a class='active' href='/guix/diff/gnu/packages?id=485e006c9e8cbb8c16c79d3d488d9e3a8e622142&amp;id2=0b4c385f8faf7f3436eb9af3ccb36cbd70da653b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages'>
<input type='hidden' name='id' value='485e006c9e8cbb8c16c79d3d488d9e3a8e622142'/><input type='hidden' name='id2' value='0b4c385f8faf7f3436eb9af3ccb36cbd70da653b'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/diff/?id=485e006c9e8cbb8c16c79d3d488d9e3a8e622142&amp;id2=0b4c385f8faf7f3436eb9af3ccb36cbd70da653b'>root</a>/<a href='/guix/diff/gnu?id=485e006c9e8cbb8c16c79d3d488d9e3a8e622142&amp;id2=0b4c385f8faf7f3436eb9af3ccb36cbd70da653b'>gnu</a>/<a href='/guix/diff/gnu/packages?id=485e006c9e8cbb8c16c79d3d488d9e3a8e622142&amp;id2=0b4c385f8faf7f3436eb9af3ccb36cbd70da653b'>packages</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='485e006c9e8cbb8c16c79d3d488d9e3a8e622142'/><input type='hidden' name='id2' value='0b4c385f8faf7f3436eb9af3ccb36cbd70da653b'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/guix/diff/?id=485e006c9e8cbb8c16c79d3d488d9e3a8e622142&amp;id2=0b4c385f8faf7f3436eb9af3ccb36cbd70da653b'>Diffstat</a> (limited to 'gnu/packages')</div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/guix/diff/gnu/packages/package-management.scm?id=485e006c9e8cbb8c16c79d3d488d9e3a8e622142&amp;id2=0b4c385f8faf7f3436eb9af3ccb36cbd70da653b'>gnu/packages/package-management.scm</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='6%'><tr><td class='add' style='width: 50.0%;'/><td class='rem' style='width: 50.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 3 insertions, 3 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm<br/>index 1570992b26..4f1f7f577d 100644<br/>--- a/<a href='/guix/tree/gnu/packages/package-management.scm?id=0b4c385f8faf7f3436eb9af3ccb36cbd70da653b'>gnu/packages/package-management.scm</a><br/>+++ b/<a href='/guix/tree/gnu/packages/package-management.scm?id=485e006c9e8cbb8c16c79d3d488d9e3a8e622142'>gnu/packages/package-management.scm</a></div><div class='hunk'>@@ -85,8 +85,8 @@</div><div class='ctx'>   ;; Note: the 'update-guix-package.scm' script expects this definition to</div><div class='ctx'>   ;; start precisely like this.</div><div class='ctx'>   (let ((version "0.13.0")</div><div class='del'>-        (commit "ff23b47dbee038236386ddc2ed2fff4c77ad3aa1")</div><div class='del'>-        (revision 9))</div><div class='add'>+        (commit "0b4c385f8faf7f3436eb9af3ccb36cbd70da653b")</div><div class='add'>+        (revision 10))</div><div class='ctx'>     (package</div><div class='ctx'>       (name "guix")</div><div class='ctx'> </div><div class='hunk'>@@ -102,7 +102,7 @@</div><div class='ctx'>                       (commit commit)))</div><div class='ctx'>                 (sha256</div><div class='ctx'>                  (base32</div><div class='del'>-                  "19y39fm4bjvq4rz3360p8avxpsmflsgrz83l8ig49819a38qs6zm"))</div><div class='add'>+                  "05q2c751lyh8dkcg7bfn4qpk5137zwbxgfm1sifz1aiq9xnb0d1a"))</div><div class='ctx'>                 (file-name (string-append "guix-" version "-checkout"))))</div><div class='ctx'>       (build-system gnu-build-system)</div><div class='ctx'>       (arguments</div></td></tr></table></div> <!-- class=content -->
                         <div class=footer>generated by
                             <a href="https://git.zx2c4.com/cgit/about/">
                                 cgit
                             </a>
                         </div>
                        </div> <!-- id=cgit -->
</body>
</html>