From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id +O06JbjOTGeQRQEAe85BDQ:P1 (envelope-from ) for ; Sun, 01 Dec 2024 21:01:44 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id +O06JbjOTGeQRQEAe85BDQ (envelope-from ) for ; Sun, 01 Dec 2024 22:01:44 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=eRwKqGI5; dkim=fail ("headers rsa verify failed") header.d=whispers-vpn.org header.s=protonmail header.b=aMPk+Uj8; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1733086904; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=cpozZIQMH2y9OYC+MWEyuWScUeC5l5rvw4+4wYnWQ2Q=; b=P/yQYTupZsUzw1qgZkoHhHWsGP18xcoacj+Kia9vDgla4IwY3sSjlbOxvctLvOOT/9dILt pJjRoc4GpSDW7DNsF2qWwN+u3FI0uT9/vxJZQF2D/FZKdMvMAaHzZjLIRgrsxUFczCvAiK N2CJMLhlrwQnfaf6643p6T8MSyG8qlE5Ki3cCioZR0w5X0hT9HNrUcF2d+OB1UVnDwZ4C6 RhuXX9cMUYNL510niMD1mV5seUMyvivGQSh6GZlX3K5h47Hv88GpZ9kMyCjFqE6xFVgMB7 aLBzMz7Yh0VIpYXgncFzzX+xUeJVbZ/fyaadZOj4Qdr68mWyN0gwsbagfEvWgg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=eRwKqGI5; dkim=fail ("headers rsa verify failed") header.d=whispers-vpn.org header.s=protonmail header.b=aMPk+Uj8; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1733086904; a=rsa-sha256; cv=none; b=TffPZ9EFV715im/7bETs7/Z5BXl59dEhb/xSx0sORXx6CIDKvSHF7wgLJrdUprQjX+tSzL G3yIhhM1rYh0pRMwrNNUmPUmvSHd1JC8yplcECbSSE7kPLI3Mj+PbZJucn+lFEqKm2xYnk GdpT/vN6xDbnGayFGwPw65bUgsHakJo37Z+3ixR+R+K5nC1Rq0WzdqD9Bc+eVWSjfEoRze 4G6/b8V6QROyXCN4YAV5Psve3OH6M5VPleKb/AEv06jFlx75fKdBZCAPtVThvF7SiF4rw5 0PKy0jLxaOv2Swr9rW7UDGxA3jHtV9g5STVLfB/GH4p30SVa1P9Vs5PnoGgiAA== 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 5DEE183C7C for ; Sun, 01 Dec 2024 22:01:44 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tHr4J-0000KI-IZ; Sun, 01 Dec 2024 16:01:27 -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 1tHr3v-0000Fq-Tn for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:06 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tHr3v-000614-H7 for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=cpozZIQMH2y9OYC+MWEyuWScUeC5l5rvw4+4wYnWQ2Q=; b=eRwKqGI50uqhDnljRN9LFnV1Q3ACDhdS4yR8v5CGUOlwdx4U5ebkcK4encolBYvaF80/+Ktq0AdMn/Oa5+L9jlmItD64LzvL5H4tMBACGqxZbbZV2o3MXLsh/VTJ65YEw66Vw5/dN4WY8f3dNCEc8WmMkBtH4It3AsQI0yE94RaNylrBUnGxSjq5T6UyBhjZL+ian4mv8XaCibmsTHlwwdcisce0c+s+FntDicBjB2bu8c8UP6XWfIHvEsiRIM9grYSSnTbH1EkAItJfHoCXoia8/cSqjlJ5AGWO51wfg8wZIfI/n1eTmB2PbMU0rcAuHmuXccaEmSCOlVVL6qIOyg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tHr3v-0008Rv-AF for guix-patches@gnu.org; Sun, 01 Dec 2024 16:01:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74411] [PATCH v3 5/5] gnu: freedict-tools: Fix non-determinism of dictzip compressed file headers. Resent-From: Runciter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Dec 2024 21:01:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74411 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74411@debbugs.gnu.org Cc: Runciter Received: via spool by 74411-submit@debbugs.gnu.org id=B74411.173308684332407 (code B ref 74411); Sun, 01 Dec 2024 21:01:03 +0000 Received: (at 74411) by debbugs.gnu.org; 1 Dec 2024 21:00:43 +0000 Received: from localhost ([127.0.0.1]:53269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr3b-0008Qd-90 for submit@debbugs.gnu.org; Sun, 01 Dec 2024 16:00:43 -0500 Received: from mail-10625.protonmail.ch ([79.135.106.25]:61411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tHr3Z-0008QN-40 for 74411@debbugs.gnu.org; Sun, 01 Dec 2024 16:00:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=whispers-vpn.org; s=protonmail; t=1733086834; x=1733346034; bh=cpozZIQMH2y9OYC+MWEyuWScUeC5l5rvw4+4wYnWQ2Q=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=aMPk+Uj8VFDhyrgHrSTJ+oQIkYRFT4JcjicFqX59hqvd7YetPfigUnqzG05VoHwfm S2jBU7lTeeWwsMp4ijVYn9d0TMs38UTAaSCxrbbQhzbnhCifMxniSoz52tdhfxzSl/ l+ZqYTNoaQIzGsqli4EMbNqTIe+VzqKw4N2AJBVqDkuhzQNtqP99zemVjgE15qWfYO c0vP3pl2r2ZvRyKyJRWRhsPvd+hR52Z2C3IzmH3UWEOEPTJzkP9LfkX+y2WNumqRI0 882Y+7BMSJCe3Bxs/xNwPbCh1W1JmYoaE6nKmZiqOEAP2l4M4b60n9KBEYAOPsp3mg 2DaEPZOBJ1/GA== Date: Sun, 01 Dec 2024 21:00:29 +0000 Message-ID: <7eff2fc08e8f01e7f696b40d4addcd1646fd65e4.1733086737.git.runciter@whispers-vpn.org> In-Reply-To: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> References: <5aeac28fdf163ab55801c6185c0dc47f35e649ef.1733086737.git.runciter@whispers-vpn.org> Feedback-ID: 119317227:user:proton X-Pm-Message-ID: 7d828cfd997610de88867c9599943bf9e96c66dd MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Reply-to: Runciter X-ACL-Warn: , Runciter via Guix-patches From: Runciter via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -2.65 X-Spam-Score: -2.65 X-Migadu-Queue-Id: 5DEE183C7C X-TUID: ap9QEhtD6E3C Reset .dict file mtime to start of the epoch before compressing with dictzi= p. * gnu/packages/patches/freedict-tools-fix-determinism.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/dictionaries.scm (freedict-tools): Use it. Signed-off-by: Runciter --- gnu/local.mk | 1 + gnu/packages/dictionaries.scm | 3 ++- .../freedict-tools-fix-determinism.patch | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/freedict-tools-fix-determinism.pat= ch diff --git a/gnu/local.mk b/gnu/local.mk index 7004d02547..f6b465441a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1291,6 +1291,7 @@ dist_patch_DATA =3D=09=09=09=09=09=09\ %D%/packages/patches/fpc-glibc-2.34-compat.patch=09=09\ %D%/packages/patches/fpm-newer-clamp-fix.patch=09=09\ %D%/packages/patches/freecad-vtk-9.3.patch=09=09\ + %D%/packages/patches/freedict-tools-fix-determinism.patch=09\ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch=09\ %D%/packages/patches/freeimage-libtiff-compat.patch=09=09\ %D%/packages/patches/freeimage-libraw-0.21-compat.patch=09\ diff --git a/gnu/packages/dictionaries.scm b/gnu/packages/dictionaries.scm index e6f9f7f5a8..da86b4f797 100644 --- a/gnu/packages/dictionaries.scm +++ b/gnu/packages/dictionaries.scm @@ -483,7 +483,8 @@ (define-public freedict-tools (url "https://github.com/freedict/tools") (commit "3596640e6e0582cc5fb76a342e5d8e7413aa4b34"))) (sha256 - (base32 "1raayynvn1j8x0ck8pnbbljl6zxnsyzzil7y54xz03dpj7k9w7mk")))) + (base32 "1raayynvn1j8x0ck8pnbbljl6zxnsyzzil7y54xz03dpj7k9w7mk")) + (patches (search-patches "freedict-tools-fix-determinism.patch")))) (inputs (list espeak-ng python perl diff --git a/gnu/packages/patches/freedict-tools-fix-determinism.patch b/gn= u/packages/patches/freedict-tools-fix-determinism.patch new file mode 100644 index 0000000000..ad100bbba9 --- /dev/null +++ b/gnu/packages/patches/freedict-tools-fix-determinism.patch @@ -0,0 +1,22 @@ +The compression utility dictzip writes the compressed file's mtime in a he= ader +of the compressed file. No command-line switch is documented to control or +suppress this behavior. This makes the build of packages relying on +freedict-tools such as freedict-dictionaries non-deterministic. + +This patch sets the mtime of the .dict file to be compressed by dictzip to= the +start of the epoch on the Greenwich meridian, restoring build determinism. + +diff --git a/mk/dicts.mk b/mk/dicts.mk +index 08e8923..e671cf3 100644 +--- a/mk/dicts.mk ++++ b/mk/dicts.mk +@@ -265,7 +265,8 @@ $(BUILD_DICTD)/%.dict $(BUILD_DICTD)/%.index: $(BUILD_= DICTD)/%.c5 query-dictd + =09=09dictfmt --without-time -t --headword-separator %%% $(DICTFMTFLAGS) = $* < $(notdir $<) +=20 + $(BUILD_DICTD)/%.dict.dz: $(BUILD_DICTD)/%.dict +-=09dictzip -k $< ++=09touch -m -d "$$(date -u -R -d @0)" $< && \ ++=09=09dictzip -k $< +=20 + # prevent make from removing our precious file + .PRECIOUS: $(BUILD_DICTD)/$(dictname).dict --=20 2.46.0