From patchwork Thu Aug 25 08:54:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 41938 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 7344A27BBE9; Thu, 25 Aug 2022 09:56:38 +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 E109C27BBEA for ; Thu, 25 Aug 2022 09:56:37 +0100 (BST) Received: from localhost ([::1]:34100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oR8fF-0000ro-2Q for patchwork@mira.cbaines.net; Thu, 25 Aug 2022 04:56:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oR8ei-0000kS-1a for guix-patches@gnu.org; Thu, 25 Aug 2022 04:56:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59134) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oR8eh-0002zp-4l for guix-patches@gnu.org; Thu, 25 Aug 2022 04:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oR8eh-0002Z5-1B for guix-patches@gnu.org; Thu, 25 Aug 2022 04:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57050] [PATCH v3 02/14] gnu: stex: Fix read-only gifs and math directories. Resent-From: Philip McGrath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Aug 2022 08:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57050 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57050@debbugs.gnu.org Cc: Philip McGrath , Thiago Jung Bauermann , "\(" , Maxime Devos , Liliana Marie Prikler , Efraim Flashner , Liliana Marie Prikler Received: via spool by 57050-submit@debbugs.gnu.org id=B57050.16614177329736 (code B ref 57050); Thu, 25 Aug 2022 08:56:03 +0000 Received: (at 57050) by debbugs.gnu.org; 25 Aug 2022 08:55:32 +0000 Received: from localhost ([127.0.0.1]:48865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR8eB-0002Ww-M2 for submit@debbugs.gnu.org; Thu, 25 Aug 2022 04:55:32 -0400 Received: from mail-vs1-f47.google.com ([209.85.217.47]:39808) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR8e6-0002WK-09 for 57050@debbugs.gnu.org; Thu, 25 Aug 2022 04:55:26 -0400 Received: by mail-vs1-f47.google.com with SMTP id c3so20186357vsc.6 for <57050@debbugs.gnu.org>; Thu, 25 Aug 2022 01:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=philipmcgrath.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=Y3+vNJPpga1Q1V+rF5NtVFTZ7yIvUQWMYLczF9BwSFU=; b=aoNOE4CWlbkPDbXwcqkVbvcEh8xZNabO6cPZUKvBh7IoydOWEjcj/gikTQJRWvxpCW OKuZXYBlxIECfWlqIRacQajX+IiXafnVULVrld2NlQibyQNE2ZiKvIMlYUXnwndcSlN3 M2FNSgbd9LlJfzQzWZ187694I1L+VKbLzj/ehDbY8Myng8haUOcoEPwQ/eyvQkQePp8Y 0zfrJuoAczvIG9q83Unl4MaLuJZmf1LNLo5kYUkF8IcbTFVO5RKm+PtT/exsU7z+JEE0 YZoYpNj+KwczRUh8gX1IyYPJ2DaBLrx8ErS2k2Pr9fXRpljivwlsGaAdhbT5tCaIzQKw lwqQ== 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; bh=Y3+vNJPpga1Q1V+rF5NtVFTZ7yIvUQWMYLczF9BwSFU=; b=yZc9ZluwhnNVbZrEfeSCyrVi/g5NtIg+B5rpmBDSB05WTL7qZkNobGp59UsUUGpH9p Q/4FP8hCKBv5tOqgXkOsrF04E6aYojXccBCUGtmFchg2M9qthTD7FWixp3A4dWI5RJ91 qZDzEBrNaBF2Hcq9G9hut1M6jifMwYApakeh1+aBCucWPAxyA7MYrkYQ/gFm63EZrDYn fWSC7ThcXqU5YsSivYWTOoRWkfljeJOfW2OftLPEIFlod1zv0S5wMM2eZyjcz71iJCKn Ne740XidhTb5cJjUG7e01MGJz22CXxJ8rQc7xAZ8NCSRitFaA6dcsX8/fSrzQctkxqBt 4wRg== X-Gm-Message-State: ACgBeo37/9OoWVgmOLqbsIhsLsWIyYsRPUjSLNYAcXZo9wVLN+Hk5qtt Ao4Dp/k1BK6RDAHDjkMke/qtZ1ByGt+5yaNs X-Google-Smtp-Source: AA6agR4Q374E4aSkULtGgtBKipPtvvSYklQr0LyfZdMye6jOmdTmks2Mtj0ardxZMqqKpL04rbBvUA== X-Received: by 2002:a05:6102:109:b0:390:2da8:2c64 with SMTP id z9-20020a056102010900b003902da82c64mr1039414vsq.70.1661417720399; Thu, 25 Aug 2022 01:55:20 -0700 (PDT) Received: from localhost (c-73-125-98-51.hsd1.fl.comcast.net. [73.125.98.51]) by smtp.gmail.com with UTF8SMTPSA id g4-20020ab039c4000000b0039eedc0e387sm11330370uaw.13.2022.08.25.01.55.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Aug 2022 01:55:20 -0700 (PDT) From: Philip McGrath Date: Thu, 25 Aug 2022 04:54:04 -0400 Message-Id: <4f6b9cc1870adc84a421d101e4a4e6f4ea5102cd.1661416343.git.philip@philipmcgrath.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: References: MIME-Version: 1.0 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 Excplicitly set the user write bit when initializing the gifs or math directories from the skeletons installed in the store. See also upstream discussion at . This problem would be exposed by the upcoming changes to Racket's build system. * gnu/packages/patches/stex-copy-from-immutable-store.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/chez.scm (stex-bootstrap)[patches]: Use it. --- gnu/local.mk | 1 + gnu/packages/chez.scm | 3 ++ .../stex-copy-from-immutable-store.patch | 41 +++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 gnu/packages/patches/stex-copy-from-immutable-store.patch diff --git a/gnu/local.mk b/gnu/local.mk index 26dfb6afe2..558fed8a0d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1821,6 +1821,7 @@ dist_patch_DATA = \ %D%/packages/patches/slim-reset.patch \ %D%/packages/patches/slim-login.patch \ %D%/packages/patches/slim-display.patch \ + %D%/packages/patches/stex-copy-from-immutable-store.patch \ %D%/packages/patches/syslinux-gcc10.patch \ %D%/packages/patches/syslinux-strip-gnu-property.patch \ %D%/packages/patches/snappy-add-O2-flag-in-CmakeLists.txt.patch \ diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 043f2ae47a..812d41fc5b 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -613,6 +613,9 @@ (define-public stex-bootstrap (sha256 (base32 "0n6dryv5j7cw2qmsj55wqb0ph901h83a2hl4j891ppxp0xx18nkp")) (file-name (git-file-name name version)) + (patches + ;; submitted upstream in https://github.com/dybvig/stex/pull/6 + (search-patches "stex-copy-from-immutable-store.patch")) (snippet #~(for-each delete-file '("sbin/install" "doc/stex.pdf" "doc/stex.html"))))) diff --git a/gnu/packages/patches/stex-copy-from-immutable-store.patch b/gnu/packages/patches/stex-copy-from-immutable-store.patch new file mode 100644 index 0000000000..4562e431c1 --- /dev/null +++ b/gnu/packages/patches/stex-copy-from-immutable-store.patch @@ -0,0 +1,41 @@ +From 9434b4a36646c036db8de326158056aa3293fb82 Mon Sep 17 00:00:00 2001 +From: Philip McGrath +Date: Thu, 28 Apr 2022 22:56:20 -0400 +Subject: [PATCH] fix read-only gifs and math directories + +An installed copy of stex might have all write permission bits removed, +even for the owner of the installed files: this is the case with Guix +package of stex, for example. If such an installation is used to +initialize the gifs or math directories (e.g. for an out-of-source +build), tar likewise creates them without write permissions, preventing +subdirectories from being created later. Set the user write bit +explicitly to avoid this problem. + Mf-stex + +Related to https://github.com/racket/racket/pull/4203 +--- + +Submitted upstream in https://github.com/dybvig/stex/pull/6 + + Mf-stex | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Mf-stex b/Mf-stex +index 09ec6f3..11fb214 100644 +--- a/Mf-stex ++++ b/Mf-stex +@@ -112,9 +112,11 @@ $(x).mathrun: gifs $(mathfiles) + + gifs: + (cd $(STEXLIB); tar -cf - gifs) | tar -xpf - ++ chmod u+w gifs + + math: + (cd $(STEXLIB); tar -cf - math) | tar -xpf - ++ chmod u+w math + + $(mathfiles): $(x).hthirdrun $(figps) + echo -n gifs= > $(mathfiles) +-- +2.32.0 +