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++)
ass='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=c880c50019e39604a1444bbc5114e4652dbcaff1'>refs</a><a class='active' href='/guix/log/gnu/services/docker.scm'>log</a><a href='/guix/tree/gnu/services/docker.scm?id=c880c50019e39604a1444bbc5114e4652dbcaff1'>tree</a><a href='/guix/commit/gnu/services/docker.scm?id=c880c50019e39604a1444bbc5114e4652dbcaff1'>commit</a><a href='/guix/diff/gnu/services/docker.scm?id=c880c50019e39604a1444bbc5114e4652dbcaff1'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/docker.scm'>
<input type='hidden' name='id' value='c880c50019e39604a1444bbc5114e4652dbcaff1'/><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=c880c50019e39604a1444bbc5114e4652dbcaff1'>root</a>/<a href='/guix/log/gnu?id=c880c50019e39604a1444bbc5114e4652dbcaff1'>gnu</a>/<a href='/guix/log/gnu/services?id=c880c50019e39604a1444bbc5114e4652dbcaff1'>services</a>/<a href='/guix/log/gnu/services/docker.scm?id=c880c50019e39604a1444bbc5114e4652dbcaff1'>docker.scm</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/gnu/services/docker.scm?id=c880c50019e39604a1444bbc5114e4652dbcaff1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-06-06 13:55:20 +0800'>2024-06-06</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=2b2337f275a6421a0d0964c54987df4ac74162e6'>services: oci-container: Fix provided image is string.</a><span class='msg-avail'>...<span class='msg-tooltip'>gnu/services/docker.scm (oci-container-shepherd-service): When image is
oci-image, call %oci-image-loader.

Change-Id: I26105e82643affe9e7037975e42ec9690089545b
</span></span></td><td>Zheng Junjie</td></tr>
<tr><td><span title='2024-05-25 15:34:53 +0200'>2024-05-25</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=c07731a777137b673725a4318411a3df6e221d29'>gnu: docker: Allow passing tarballs for images in oci-container-configuration.</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit allows for loading an OCI image tarball before running an
OCI backed Shepherd service. It does so by adding a one shot Shepherd
service to the dependencies of the OCI backed service that at boot runs
docker load on the tarball.

* gnu/services/docker.scm (oci-image): New record;
(lower-oci-image): new variable, lower it;
(string-or-oci-image?): sanitize it;
(oci-container-configuration)[image]: allow also for oci-image records;
(oci-container-shepherd-service): use it;
(%oci-image-loader): new variable.

Change-Id: Ie504f479ea0d47f74b0ec5df9085673ffd3f639d
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Giacomo Leidi</td></tr>
<tr><td><span title='2024-05-25 15:34:47 +0200'>2024-05-25</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=68adfaea25a31247c1555f503839f928ba2e9a04'>gnu: docker: Allow setting Shepherd dependencies in oci-container-configuration.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/docker.scm (oci-container-configuration)
[requirement]: New field;
(list-of-symbols): sanitize it;
(oci-container-shepherd-service): use it.
* doc/guix.texi: Document it.

Change-Id: Ic0ba336a2257d6ef7c658cfc6cd630116661f581
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Giacomo Leidi</td></tr>
<tr><td><span title='2024-05-25 15:34:43 +0200'>2024-05-25</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=e68c1af4f4cb2223b37c7bdcc925ca6ad551da24'>gnu: docker: Allow setting host environment variables in oci-container-config...</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/docker.scm (oci-container-configuration)
[host-environment]: New field;
(oci-sanitize-host-environment): sanitize it;
(oci-container-shepherd-service): use it.
* doc/guix.texi: Document it.

Change-Id: I4d54d37736cf09f042a71cb0b6e673abc0948d9c
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Giacomo Leidi</td></tr>
<tr><td><span title='2024-05-25 15:34:38 +0200'>2024-05-25</span></td><td><a href='/guix/commit/gnu/services/docker.scm?id=003c89a85ced239e2dac4f89cc52117e188e2810'>gnu: docker: Provide escape hatch in oci-container-configuration.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/docker.scm (exports): Add missing procedures;
(oci-container-service-type)[description]: Docker and OCI images should
mean the same thing;
(oci-container-configuration): clarify field types;
[extra-arguments]: new field;
(oci-sanitize-extra-arguments): sanitize it;
(oci-container-shepherd-service): use it.
* doc/guix.texi: Document it.

Change-Id: I64e9d82c8ae538d59d1c482f23070a880156ddf7
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Giacomo Leidi</td></tr>