From patchwork Sat Aug 20 02:51:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 41784 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E35A727BBEA; Sat, 20 Aug 2022 03:52:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 40BEA27BBE9 for ; Sat, 20 Aug 2022 03:52:12 +0100 (BST) Received: from localhost ([::1]:42106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oPEap-0003VR-EG for patchwork@mira.cbaines.net; Fri, 19 Aug 2022 22:52:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oPEai-0003VF-4D for guix-patches@gnu.org; Fri, 19 Aug 2022 22:52:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oPEah-0001Gc-0z for guix-patches@gnu.org; Fri, 19 Aug 2022 22:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oPEag-0006CZ-EO for guix-patches@gnu.org; Fri, 19 Aug 2022 22:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57304] Fix mm-common reproduciblility issues Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 20 Aug 2022 02:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57304 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 57304@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166096391823828 (code B ref -1); Sat, 20 Aug 2022 02:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Aug 2022 02:51:58 +0000 Received: from localhost ([127.0.0.1]:59439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oPEac-0006CF-07 for submit@debbugs.gnu.org; Fri, 19 Aug 2022 22:51:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:52908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oPEaX-0006C5-TJ for submit@debbugs.gnu.org; Fri, 19 Aug 2022 22:51:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oPEaX-0003V1-Ng for guix-patches@gnu.org; Fri, 19 Aug 2022 22:51:53 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:49778) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oPEaV-0001F1-7M for guix-patches@gnu.org; Fri, 19 Aug 2022 22:51:53 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:20]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 4DF6C1ABC5 for ; Fri, 19 Aug 2022 19:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=reproducible-builds.org; s=1.vagrant; t=1660963902; bh=jIMsGWW6GdO4Oy1tdGoC+vROwZ97kiXdy8Zz/qb+vpQ=; h=From:To:Subject:Date:From; b=hFpHx77e6Swbf5nvkJyov88IC9/SHOF5PTXJEXlDBwdRTXWM1utBD0ODqEGpnd0ya o21yfrHv9v10flrr6pSsaWSKFt+SKUpT2YB9HkLRuV1cUBpFewPM0ZEBwnD9KTQzcn 0UwNTLKbmYb7TlLMlzOC7ppgIMVx4t9fet0RMtYyDn5nvF4y9SNfFVjjkLZQ2kilsw L/EfGBzUc0lO0mpbScge/HHDLa8n09Pd7BOqwfFvnFmfo+gIQ0ekhgY1vYiKl+EZWP pmDWX247qCxi5gis/ZxS4L/H+IHhd9SuUtavJyqAKCVR4eJljKWGUSW4u3UGwQCHAI ZQRVmcYyqcKfQ== From: Vagrant Cascadian Date: Fri, 19 Aug 2022 19:51:37 -0700 Message-ID: <874jy7k4p2.fsf@contorta> MIME-Version: 1.0 Received-SPF: pass client-ip=173.255.214.101; envelope-from=vagrant@reproducible-builds.org; helo=cascadia.aikidev.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches The userid used during the build is embedded in a shipped tarball in the mm-common package. Some abbreviated diffoscope output from guix challenge against builds from ci.guix.gnu.org and bordeax.guix.gnu.org: │ │ │ │ --- /tmp/guix-directory.rKX8CR/share/doc/mm-common/skeletonmm.tar.xz │ │ │ ├── +++ /tmp/guix-directory.rlW2tI/share/doc/mm-common/skeletonmm.tar.xz │ │ │ │ ├── skeletonmm.tar │ │ │ │ │ ├── file list │ │ │ │ │ │ @@ -1,36 +1,36 @@ │ │ │ │ │ │ +-rw-r--r-- 0 nixbld (996) nixbld (30000) 60 2021-05-20 08:57:07.009229 skeletonmm/.gitignore │ │ │ │ │ │ +-rw-r--r-- 0 nixbld (996) nixbld (30000) 59 2021-05-20 08:57:07.009229 skeletonmm/AUTHORS │ │ │ │ │ │ +-rw-r--r-- 0 nixbld (996) nixbld (30000) 26527 2021-05-20 08:57:07.009229 skeletonmm/COPYING ... │ │ │ │ │ │ --rw-r--r-- 0 nixbld (995) nixbld (30000) 60 2021-05-20 08:57:07.009229 skeletonmm/.gitignore │ │ │ │ │ │ --rw-r--r-- 0 nixbld (995) nixbld (30000) 59 2021-05-20 08:57:07.009229 skeletonmm/AUTHORS │ │ │ │ │ │ --rw-r--r-- 0 nixbld (995) nixbld (30000) 26527 2021-05-20 08:57:07.009229 skeletonmm/COPYING The attached patch fixes this by setting the user, group, uid and gid consistently. $ guix refresh --list-dependent mm-common Building the following 1138 packages would ensure 2236 dependent packages are rebuilt: ... Looks like it will have to wait for core-updates at least... live well, vagrant From 4b359c9bbc918e6dcf1cab1141a9651d6d7bf271 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 19 Aug 2022 19:32:08 -0700 Subject: [PATCH] gnu: mm-common: Build reproducibly. * gnu/packages/patches/mm-common-consistent-user-and-group-in-tarball.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. * gnu/packages/gnome.scm (mm-common)[source]: Add patch. --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 5 ++- ...consistent-user-and-group-in-tarball.patch | 40 +++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/mm-common-consistent-user-and-group-in-tarball.patch diff --git a/gnu/local.mk b/gnu/local.mk index 4e4ad908ce..20d322e27f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1516,6 +1516,7 @@ dist_patch_DATA = \ %D%/packages/patches/mit-krb5-hurd.patch \ %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch \ %D%/packages/patches/mixxx-system-googletest-benchmark.patch \ + %D%/packages/patches/mm-common-consistent-user-and-group-in-tarball.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/mpg321-CVE-2019-14247.patch \ %D%/packages/patches/mpg321-gcc-10.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ae46e55c51..790881b9d8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1143,7 +1143,10 @@ (define-public mm-common "mm-common-" version ".tar.xz")) (sha256 (base32 - "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8")))) + "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8")) + (patches + (search-patches + "mm-common-consistent-user-and-group-in-tarball.patch")))) (build-system meson-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/mm-common-consistent-user-and-group-in-tarball.patch b/gnu/packages/patches/mm-common-consistent-user-and-group-in-tarball.patch new file mode 100644 index 0000000000..f0890aaf57 --- /dev/null +++ b/gnu/packages/patches/mm-common-consistent-user-and-group-in-tarball.patch @@ -0,0 +1,40 @@ +From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001 +From: Vagrant Cascadian +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 + -- 2.35.1