From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 0HnbAliz7WM0DQAAbAwnHQ (envelope-from ) for ; Thu, 16 Feb 2023 05:38:48 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CEQaA1iz7WPhyQAA9RJhRA (envelope-from ) for ; Thu, 16 Feb 2023 05:38:48 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AC48C39F80 for ; Thu, 16 Feb 2023 05:38:47 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSW23-0005zc-T2; Wed, 15 Feb 2023 23:38:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pSW21-0005yR-JF for bug-guix@gnu.org; Wed, 15 Feb 2023 23:38:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pSW21-0007h5-An for bug-guix@gnu.org; Wed, 15 Feb 2023 23:38:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pSW21-0003OH-6t for bug-guix@gnu.org; Wed, 15 Feb 2023 23:38:05 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#32026: [PATCH 04/10] gnu: icecat: Make language packs reproducible. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 16 Feb 2023 04:38:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32026 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 32026@debbugs.gnu.org Cc: mhw@netris.org, ludo@gnu.org, Jonathan Brielmaier , Maxim Cournoyer Received: via spool by 32026-submit@debbugs.gnu.org id=B32026.167652223812903 (code B ref 32026); Thu, 16 Feb 2023 04:38:05 +0000 Received: (at 32026) by debbugs.gnu.org; 16 Feb 2023 04:37:18 +0000 Received: from localhost ([127.0.0.1]:34587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW1F-0003Lw-2k for submit@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:17 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:33553) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSW17-0003KC-7a for 32026@debbugs.gnu.org; Wed, 15 Feb 2023 23:37:09 -0500 Received: by mail-qv1-f42.google.com with SMTP id j9so634648qvt.0 for <32026@debbugs.gnu.org>; Wed, 15 Feb 2023 20:37:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C8tAC0gLN223JcRUZxcLMJJFMyu8tkdoxKUnuFEAyfc=; b=ErTJUJVvFySzp57Uu9kIcaIUe/NfbcJY4Is8FOvYLO/Fea/jDSMOy4S3hjqB5Eptn6 As+HuRLzVRSKH6B8dzfsSsMND0zIFQrPFXU5zIc7sraztysHRqJ0cr85vlBQq7jgw4cx sx8da4lzVPgRo8P6ThacTvOaqFYMCD8Sn0B82qPuMP5n3OBsFmRjTyq/TVdXgJzTfKVe r0IQu/yGwjtNAimjPE+uMPbOErvY8FdtVLx9WJm89JAtmkjaZpXnbICKjVb2RaGKiEYI ue9MX5b9WTKw/DzbVKmJw31llL3zykfTLdn6xyAvJEFxw+vGIsMwaBX2qpgGlDW0XQeD kcsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C8tAC0gLN223JcRUZxcLMJJFMyu8tkdoxKUnuFEAyfc=; b=Y/q5lz4uYk2vAqp6aZzsJlOBboPxKmQEFTw8q5zFu9SZNE4G8BSWY65dgCTSyMSFC6 7g++BrKHH+yyMcN7l86B/yRuq/QFNyFd5pJjpXMh6PkI7FFULIx9p6EyAaIe6w4gtljV gwH9tBOUpJknd2W+QuOuti0xuHzwiI/ggj89kzPGS3PFeKBHVO44VlRTaT82qV7ed4Uc 358vKDHgnM/FoMqIM/Yqkiz9POamwJaZSw4sHWG0+AeFRiJC8/Vv025wF2aySpQTzOUk pYTgYfhzPFl+qjCdGPHYxx25TRqp8kTZAQHpUo3TQ8Li2dI66eA5U4p81QFLg9VOZOaF J7AQ== X-Gm-Message-State: AO0yUKUqX2CT/m0sJriQ4W1DsnOjhaH6LeQS/Smn6feAZCvYcHprSxWr e+l2mbDyH4O1PKJ4cNNSb1ZxnewUfJyR9Uln X-Google-Smtp-Source: AK7set93SFPK4kOCsk46XkZwch3c+FTB0nitRi8NdsG57b2GVy4edX89rLbFS+RPadaRKsTkbjj6zA== X-Received: by 2002:a05:6214:5186:b0:56e:aa8b:9103 with SMTP id kl6-20020a056214518600b0056eaa8b9103mr7943090qvb.52.1676522223421; Wed, 15 Feb 2023 20:37:03 -0800 (PST) Received: from localhost.localdomain (dsl-155-109.b2b2c.ca. [66.158.155.109]) by smtp.gmail.com with ESMTPSA id t85-20020a374658000000b007186c9e167esm452992qka.52.2023.02.15.20.37.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 20:37:03 -0800 (PST) From: Maxim Cournoyer Date: Wed, 15 Feb 2023 23:36:42 -0500 Message-Id: <20230216043649.32119-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230216043649.32119-1-maxim.cournoyer@gmail.com> References: <20230216043649.32119-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676522327; a=rsa-sha256; cv=none; b=uyM8VETC5Q+TWjZPNKpWABqL3rbBx+mdSO3TdfwJV86dgHqiAkXZvKOb96ZNTeG1G6+F3B IRScIawgq2/5GoZP7MiCTsVA+4ujMScdHG3dz1L5tHdglNKLqlOQlbhbFzj0QrBtDJ3Hsq MLmiqyu0V0XfZkcBvGUHHhAj6iE3YHZzh760IV3KV1hNlsRDZGBZKFqKvO73FU6arqEVLg tlAhaeL41G4pOZIF1ulitvq5bDbnC5o2iWxvaw4KSMFbsThWKQXfKh8bYV942PP8vtn33C YO2BbyZrOgSKjme4DAHL0PCjfyScQvsk/Kkhm0YtXag47z21glzbut9eS8WbtA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=ErTJUJVv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676522327; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=C8tAC0gLN223JcRUZxcLMJJFMyu8tkdoxKUnuFEAyfc=; b=kcVSN+N1fDYOtUvdrs+//FvMYFfaYIo+hPzPK3rBfWrVDY8zjYMgLqmg0R1jUMJWyxhI4E A5KVfGoNaMQXTGRSx2vNnfPW/nxYw5Wg81oO62yc5Y43tcZCgn/rOsJqSoECkGnquhPl6r LS4E4AQ8UaYAbRuDHlcRHNKSsd+bRCl3QaVJ7/rCKNO+MJRbwiwc84+8qWykAEtAP/Aeby nnFSuDCabUPbo2WX65Y4NZBq5k291QUd16mEDF3P0/E7lcVRJV2P/5pvEW7F/8uAOGNC+N /vop4fdyvGZZgKi4uBkbSoRjfbHgE59bIV+AymyLePWXZPeUujhl1z47eMFDTA== X-Migadu-Scanner: scn1.migadu.com X-Spam-Score: 1.48 X-Migadu-Queue-Id: AC48C39F80 X-Migadu-Spam-Score: 1.48 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=ErTJUJVv; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-TUID: TmqgCqJUsBKo * gnu/packages/patches/icecat-reproducible-langpacks.patch: New file. * gnu/local.mk (dist_patch_DATA): Register. it. * gnu/packages/gnuzilla.scm (icecat-source): Apply it. --- (no changes since v1) gnu/local.mk | 1 + gnu/packages/gnuzilla.scm | 1 + .../icecat-reproducible-langpacks.patch | 45 +++++++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 gnu/packages/patches/icecat-reproducible-langpacks.patch diff --git a/gnu/local.mk b/gnu/local.mk index 07a7a0f527..d6f1f4482a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1327,6 +1327,7 @@ dist_patch_DATA = \ %D%/packages/patches/i7z-gcc-10.patch \ %D%/packages/patches/icecat-makeicecat.patch \ %D%/packages/patches/icecat-avoid-bundled-libraries.patch \ + %D%/packages/patches/icecat-reproducible-langpacks.patch \ %D%/packages/patches/icecat-use-system-graphite2+harfbuzz.patch \ %D%/packages/patches/icecat-use-system-media-libs.patch \ %D%/packages/patches/icedtea-7-hotspot-aarch64-use-c++98.patch\ diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1bafa92377..17edb9fa7e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -554,6 +554,7 @@ (define icecat-source (method computed-origin-method) (file-name (string-append "icecat-" %icecat-version ".tar.xz")) (sha256 #f) + (patches (search-patches "icecat-reproducible-langpacks.patch")) (uri (delay (with-imported-modules '((guix build utils)) diff --git a/gnu/packages/patches/icecat-reproducible-langpacks.patch b/gnu/packages/patches/icecat-reproducible-langpacks.patch new file mode 100644 index 0000000000..b36a770cc6 --- /dev/null +++ b/gnu/packages/patches/icecat-reproducible-langpacks.patch @@ -0,0 +1,45 @@ +Prevent the extension manifests from embedding the current date. + +This is inspired by the Debian +"Use-build-id-as-langpack-version-for-reproducibility.patch" maintained for +their Firefox package as well as reproducible-builds.org guidelines from +https://reproducible-builds.org/docs/source-date-epoch/. + +Upstream status: https://phabricator.services.mozilla.com/D169979 + +--- ./python/mozbuild/mozbuild/action/langpack_manifest.py.old 2023-02-13 11:01:21.051537347 -0500 ++++ ./python/mozbuild/mozbuild/action/langpack_manifest.py 2023-02-13 11:04:33.141817330 -0500 +@@ -36,6 +36,15 @@ + pushlog_api_url = "{0}/json-rev/{1}" + + ++import os ++import time ++import datetime ++ ++def get_build_date(): ++ """Honor SOURCE_DATE_EPOCH for reproducibility.""" ++ return datetime.datetime.utcfromtimestamp( ++ int(os.environ.get('SOURCE_DATE_EPOCH', time.time()))) ++ + ### + # Retrievers a UTC datetime of the push for the current commit + # from a mercurial clone directory. +@@ -54,7 +63,7 @@ + with mozversioncontrol.get_repository_object(path=path) as repo: + phase = repo._run("log", "-r", ".", "-T" "{phase}") + if phase.strip() != "public": +- return datetime.datetime.utcnow() ++ return get_build_date() + repo_url = repo._run("paths", "default") + repo_url = repo_url.strip().replace("ssh://", "https://") + repo_url = repo_url.replace("hg://", "https://") +@@ -105,7 +114,7 @@ + dt = get_dt_from_hg(path) + + if dt is None: +- dt = datetime.datetime.utcnow() ++ dt = get_build_date() + + dt = dt.replace(microsecond=0) + return dt.strftime("%Y%m%d%H%M%S") -- 2.39.1