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

kages/iso-codes.scm?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811'>commit</a><a href='/guix/diff/gnu/packages/iso-codes.scm?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/iso-codes.scm'>
<input type='hidden' name='id' value='5488c0ac0659f65ea43cabfafa0c97cdd44fd811'/><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=5488c0ac0659f65ea43cabfafa0c97cdd44fd811'>root</a>/<a href='/guix/log/gnu?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811'>gnu</a>/<a href='/guix/log/gnu/packages?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811'>packages</a>/<a href='/guix/log/gnu/packages/iso-codes.scm?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811'>iso-codes.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/packages/iso-codes.scm?id=5488c0ac0659f65ea43cabfafa0c97cdd44fd811&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-01-08 16:27:59 +0100'>2023-01-08</span></td><td><a href='/guix/commit/gnu/packages/iso-codes.scm?id=583a197b00c4c274a83a6c236430b6d1032da5b0'>gnu: python-iso3166: Update to 2.1.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/iso-codes.scm (python-iso3166): Update to 2.1.1.
</span></span></td><td>Liliana Marie Prikler</td></tr>
<tr><td><span title='2022-07-16 18:32:12 +0200'>2022-07-16</span></td><td><a href='/guix/commit/gnu/packages/iso-codes.scm?id=f49eef43fd62aba548f8b18e4a8e2e2764735414'>gnu: iso-codes: Remove input labels.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/iso-codes.scm (iso-codes/official)[native-inputs]: Remove
conditional and labels.
[inputs]: Remove.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-05-29 02:00:00 +0200'>2022-05-29</span></td><td><a href='/guix/commit/gnu/packages/iso-codes.scm?id=48e66b01d6c0e330dc96a6a480d97006c064187b'>gnu: Add iso-codes variant for use within Guix.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/iso-codes.scm (iso-codes):
Replace with hidden-package that inherits…
(iso-codes/official): …this ‘new’ variable with its previous value.
* gnu/packages/gtk.scm (gtk+)[inputs]:
Use iso-codes/official to prevent mass rebuilds.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2022-05-31 14:52:30 -0400'>2022-05-31</span></td><td><a href='/guix/commit/gnu/packages/iso-codes.scm?id=0082e6523fe729a462ea1e1c9f0d081cfda5c27e'>gnu: Remove python2-iso639.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/iso-codes.scm (python2-iso639): Delete variable.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2022-05-31 14:52:30 -0400'>2022-05-31</span></td><td><a href='/guix/commit/gnu/packages/iso-codes.scm?id=f2a579f8cb90313e73a40d7317b835c0fe29ea3e'>gnu: Remove python2-iso3166.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/iso-codes.scm (python2-iso3166): Delete variable.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-09-20 11:15:06 +0000'>2021-09-20</span></td><td><a href='/guix/commit/gnu/packages/iso-codes.scm?id=c170e9b75fbda901aaf46d3b8e09975cb9b422bb'>gnu: iso-codes: Move inputs to native-inputs when cross-compiling.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/iso-codes.scm
  (iso-codes)[inputs]: Move "gettext", "perl" and "python" to ...
  (iso-codes)[native-inputs]: ... here when cross-compiling.
</span></span></td><td>Maxime Devos</td></tr>