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++)
ht'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=f5c6e6966c020722700ef0343ab0a6030e2d61b5'>refs</a><a class='active' href='/guix/log/build-aux/cuirass'>log</a><a href='/guix/tree/build-aux/cuirass?id=f5c6e6966c020722700ef0343ab0a6030e2d61b5'>tree</a><a href='/guix/commit/build-aux/cuirass?id=f5c6e6966c020722700ef0343ab0a6030e2d61b5'>commit</a><a href='/guix/diff/build-aux/cuirass?id=f5c6e6966c020722700ef0343ab0a6030e2d61b5'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/build-aux/cuirass'>
<input type='hidden' name='id' value='f5c6e6966c020722700ef0343ab0a6030e2d61b5'/><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/log/?id=f5c6e6966c020722700ef0343ab0a6030e2d61b5'>root</a>/<a href='/guix/log/build-aux?id=f5c6e6966c020722700ef0343ab0a6030e2d61b5'>build-aux</a>/<a href='/guix/log/build-aux/cuirass?id=f5c6e6966c020722700ef0343ab0a6030e2d61b5'>cuirass</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/build-aux/cuirass?id=f5c6e6966c020722700ef0343ab0a6030e2d61b5&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-10-04 14:04:14 +0200'>2020-10-04</span></td><td><a href='/guix/commit/build-aux/cuirass?id=fdbf8a7a75e9d63957ea6d8a63181aa131edeaea'>cuirass: Add hurd-manifest.</a><span class='msg-avail'>...<span class='msg-tooltip'>* build-aux/cuirass/hurd-manifest.scm: New file.
</span></span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>
age.sh: Adjust Emacs regexp in --with-source test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-02-23 12:47:13 +0100'>2020-02-23</span></td><td><a href='/guix/commit/tests/ui.scm?id=fa99c4bbc7acdb8def9ce14a05aacb73f99fe3b1'>ui: (size-&gt;number "1.M") is correctly parsed.</a><span class='msg-avail'>...<span class='msg-tooltip'>Reported by Pierre Neidhardt &lt;mail@ambrevar.xyz&gt;.

* guix/ui.scm (size-&gt;number)[unit-pos]: Add #\. to CHAR-SET:DIGIT.
* tests/ui.scm ("size-&gt;number, 1.M"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-19 23:24:04 +0200'>2019-09-19</span></td><td><a href='/guix/commit/tests/ui.scm?id=d2cdef65605b9e14bfa02c3bf1612ab6b62f4a89'>ui: 'relevance' connects regexps with a logical and.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://bugs.gnu.org/36763&gt;.
Previously, the logical and connecting the regexps did not output the expected
results (introduced in 8874faaaac665100a095ef25e39c9a389f5a397f).

* guix/ui.scm (relevance)
[score]: Change its arguments.
[regexp-&gt;score]: New procedure.
* tests/ui.scm ("package-relevance"): Add test.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>zimoun</td></tr>
<tr><td><span title='2019-06-27 11:14:40 +0200'>2019-06-27</span></td><td><a href='/guix/commit/tests/ui.scm?id=8874faaaac665100a095ef25e39c9a389f5a397f'>ui: 'relevance' considers regexps connected with a logical and.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/ui.scm (relevance)[score]: Change to return 0 when one of REGEXPS
doesn't match.
* tests/ui.scm ("package-relevance"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>