From f5df6813e305372e25b8a2124c491293a176e115 Mon Sep 17 00:00:00 2001
From: Danny O'Brien <danny@spesh.com>
Date: Fri, 3 Feb 2023 16:48:59 -0800
Subject: [PATCH] Fix failing build of icheck.

Building icheck fails with a duplicate symbol definition 
error. This allows the icheck executable to compile.

Submitted upstream[1] but not yet moderated/accepted.

[1] https://sourceforge.net/p/dbacl/discussion/239876/thread/87636b0114/

---
 src/icheck.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/icheck.c b/src/icheck.c
index efbb6a5..12a3b7a 100644
--- a/src/icheck.c
+++ b/src/icheck.c
@@ -39,9 +39,6 @@ extern regex_count_t regex_count;
 extern empirical_t empirical;
 
 extern int cmd;
-char *progname = "icheck";
-char *inputfile = "";
-long inputline = 0;
 
 extern long system_pagesize;
 extern void *in_iobuf;
-- 
2.39.1

 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=31e736dac29e6f0ff8a2de3f28e210a68684ad21'>refs</a><a class='active' href='/guix/log/gnu/build/linux-initrd.scm'>log</a><a href='/guix/tree/gnu/build/linux-initrd.scm?id=31e736dac29e6f0ff8a2de3f28e210a68684ad21'>tree</a><a href='/guix/commit/gnu/build/linux-initrd.scm?id=31e736dac29e6f0ff8a2de3f28e210a68684ad21'>commit</a><a href='/guix/diff/gnu/build/linux-initrd.scm?id=31e736dac29e6f0ff8a2de3f28e210a68684ad21'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/linux-initrd.scm'>
<input type='hidden' name='id' value='31e736dac29e6f0ff8a2de3f28e210a68684ad21'/><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=31e736dac29e6f0ff8a2de3f28e210a68684ad21'>root</a>/<a href='/guix/log/gnu?id=31e736dac29e6f0ff8a2de3f28e210a68684ad21'>gnu</a>/<a href='/guix/log/gnu/build?id=31e736dac29e6f0ff8a2de3f28e210a68684ad21'>build</a>/<a href='/guix/log/gnu/build/linux-initrd.scm?id=31e736dac29e6f0ff8a2de3f28e210a68684ad21'>linux-initrd.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/build/linux-initrd.scm?id=31e736dac29e6f0ff8a2de3f28e210a68684ad21&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-15 17:32:10 +0100'>2020-12-15</span></td><td><a href='/guix/commit/gnu/build/linux-initrd.scm?id=6a060ff27ff68384d7c90076baa36c349fff689d'>store-copy: 'populate-store' can optionally deduplicate files.</a><span class='msg-avail'>...<span class='msg-tooltip'>Until now deduplication was performed as an additional pass after
copying files, which involve re-traversing all the files that had just
been copied.

* guix/store/deduplication.scm (copy-file/deduplicate): New procedure.
* tests/store-deduplication.scm ("copy-file/deduplicate"): New test.
* guix/build/store-copy.scm (populate-store): Add #:deduplicate?
parameter and honor it.
* tests/gexp.scm ("gexp-&gt;derivation, store copy"): Pass #:deduplicate? #f
to 'populate-store'.
* gnu/build/image.scm (initialize-root-partition): Pass #:deduplicate?
to 'populate-store'.  Pass #:deduplicate? #f to 'register-closure'.
* gnu/build/vm.scm (root-partition-initializer): Likewise.
* gnu/build/install.scm (populate-single-profile-directory): Pass
 #:deduplicate? #f to 'populate-store'.
* gnu/build/linux-initrd.scm (build-initrd): Likewise.
* guix/scripts/pack.scm (self-contained-tarball)[import-module?]: New
procedure.
[build]: Pass it as an argument to 'source-module-closure'.
* guix/scripts/pack.scm (squashfs-image)[build]: Wrap in
'with-extensions'.
* gnu/system/linux-initrd.scm (expression-&gt;initrd)[import-module?]: New
procedure.
[builder]: Pass it to 'source-module-closure'.
* gnu/system/install.scm (cow-store-service-type)[import-module?]: New
procedure.  Pass it to 'source-module-closure'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-21 12:39:14 +0100'>2020-11-21</span></td><td><a href='/guix/commit/gnu/build/linux-initrd.scm?id=2200bb214690ebc78b9fa42887ac9dfb8035bd4f'>linux-initrd: Remove unnecessary timestamp reset phase.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/linux-initrd.scm (write-cpio-archive): Mention timestamps in
docstring.
(build-initrd): Remove unnecessary timestamp reset phase.
</span></span></td><td>Ludovic Courtès</td></tr>