From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Sat, 12 Dec 2020 04:05:56 +0000
Original-Patch: https://bugs.debian.org/977177
Subject: [PATCH] Set uid, username, gid, and group name on files in
 generated tarball.

The user and group may otherwise vary between builds on different systems.

---
 util/meson_aux/skeletonmm-tarball.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/util/meson_aux/skeletonmm-tarball.py b/util/meson_aux/skeletonmm-tarball.py
index db9e650..89049b6 100755
--- a/util/meson_aux/skeletonmm-tarball.py
+++ b/util/meson_aux/skeletonmm-tarball.py
@@ -39,10 +39,18 @@ elif output_file.endswith('.gz'):
 else:
   mode = 'w'
 
+def reproducible(tarinfo):
+  # Set consistent user and group on files in the tar archive
+  tarinfo.uid = 0
+  tarinfo.uname = 'root'
+  tarinfo.gid = 0
+  tarinfo.gname = 'root'
+  return tarinfo
+
 with tarfile.open(output_file, mode=mode) as tar_file:
   os.chdir(source_dir) # Input filenames are relative to source_dir.
   for file in sys.argv[3:]:
-    tar_file.add(file)
+    tar_file.add(file, filter=reproducible)
 # Errors raise exceptions. If an exception is raised, Meson+ninja will notice
 # that the command failed, despite exit(0).
 sys.exit(0)
-- 
2.29.2

x/commit/doc/images/coreutils-graph.dot?id=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c'>commit</a><a href='/guix/diff/doc/images/coreutils-graph.dot?id=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/images/coreutils-graph.dot'>
<input type='hidden' name='id' value='3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c'/><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=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c'>root</a>/<a href='/guix/log/doc?id=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c'>doc</a>/<a href='/guix/log/doc/images?id=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c'>images</a>/<a href='/guix/log/doc/images/coreutils-graph.dot?id=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c'>coreutils-graph.dot</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/doc/images/coreutils-graph.dot?id=3545b0f9c3d0e80f2260513d7435c13a8cb8ff4c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-04-14 10:29:07 +0200'>2024-04-14</span></td><td><a href='/guix/commit/doc/images/coreutils-graph.dot?id=076670f7acb740e2bfbd8e3c8ef1be5221ed75c5'>doc: Use "dejavu sans" instead of "Helvetica" or "sans" in dot images.</a><span class='msg-avail'>...<span class='msg-tooltip'>Font-dejavu is (now) an input of fontconfig.  Specifying "dejavu sans" makes
generated images reproducible even when other fonts are installed (notably
font-google-noto).

* doc/images/bootstrap-graph.dot,
doc/images/bootstrap-packages.dot,
doc/images/coreutils-bag-graph.dot,
doc/images/coreutils-graph.dot,
doc/images/gcc-core-mesboot0-graph.dot,
doc/images/service-graph.dot,
doc/images/shepherd-graph.dot: Use fontname = "dejavu sans".
* doc/guix.texi (Full-Source Bootstrap): Update gcc-core-mesboot0.dot recipe
accordingly.

Change-Id: If21d7d39d45c66de5bceafb7b825a057d540ee50
</span></span></td><td>Janneke Nieuwenhuizen</td></tr>