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

/home/services/utils.scm?id=8bea1e05fac2e24ac926f155d76e42aa90690467'>commit</a><a href='/guix/diff/gnu/home/services/utils.scm?id=8bea1e05fac2e24ac926f155d76e42aa90690467'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/home/services/utils.scm'>
<input type='hidden' name='id' value='8bea1e05fac2e24ac926f155d76e42aa90690467'/><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=8bea1e05fac2e24ac926f155d76e42aa90690467'>root</a>/<a href='/guix/log/gnu?id=8bea1e05fac2e24ac926f155d76e42aa90690467'>gnu</a>/<a href='/guix/log/gnu/home?id=8bea1e05fac2e24ac926f155d76e42aa90690467'>home</a>/<a href='/guix/log/gnu/home/services?id=8bea1e05fac2e24ac926f155d76e42aa90690467'>services</a>/<a href='/guix/log/gnu/home/services/utils.scm?id=8bea1e05fac2e24ac926f155d76e42aa90690467'>utils.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/home/services/utils.scm?id=8bea1e05fac2e24ac926f155d76e42aa90690467&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-11-14 17:35:30 -0800'>2021-11-14</span></td><td><a href='/guix/commit/gnu/home/services/utils.scm?id=e1498538459f366e97eb96e92067391b163b00b4'>gnu: home: services: Fix typo.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/home/services/utils.scm: Fix spelling of "anything".
</span></span></td><td>Vagrant Cascadian</td></tr>
<tr><td><span title='2021-10-08 15:36:18 +0300'>2021-10-08</span></td><td><a href='/guix/commit/gnu/home/services/utils.scm?id=ba8ddb348045f81f061a1c7f51c0f7c2b0024e71'>gnu: Move (gnu home-services) to (gnu home services).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/home-services/configuration.scm: Move the content ...
* gnu/home/services/configuration.scm: ... here.
* doc/guix.texi:
Replace (gnu home-services mcron) with (gnu home services mcron).
Replace (gnu home-services) with (gnu home services).
* gnu/home.scm:
Replace (gnu home-services fontutils) with (gnu services fontutils).
Replace (gnu home-services shells) with (gnu home services shells).
Replace (gnu home-services symlink-manager) with
(gnu home services symlink-manager).
Replace (gnu home-services xdg) with (gnu home services xdg).
* gnu/home-services/fontutils.scm: Rename to gnu/services/fontutils.scm.
* gnu/home-services/mcron.scm: Move to gnu/home/services/mcron.scm.
Replace (gnu home-services shepherd) with (gnu home services shepherd).
* gnu/home-services.scm (%service-type-path):
Search home services in "gnu/services".
* gnu/home-services/shells.scm: Replace (gnu home-services configuration) with
(gnu home services configuration).
Rename to gnu/home/services/shells.scm.
Replace (gnu home-services utils) with (gnu home services utils).
* gnu/home-services/shepherd.scm: Move to gnu/home/services/shepherd.scm.
* gnu/home-services/symlink-manager.scm:
Rename to gnu/home/services/symlink-manager.scm.
* gnu/home-services/utils.scm: Rename to gnu/home/services/utils.scm.
* gnu/home-services/xdg.scm: Rename to gnu/home/services/xdg.scm.
* guix/scripts/home/import.scm:
Replace (gnu home-services bash) with (gnu home services bash).
* gnu/home-services.scm: Update documentation string.
* doc/he-config-bare-bones.scm:
Apply new (gnu home-services ...) modules location.
* gnu/local.mk (GNU_SYSTEM_MODULES): Same.
</span></span></td><td>Oleg Pykhalov</td></tr>