From patchwork Mon Aug 8 06:10:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philip McGrath X-Patchwork-Id: 41356 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 84D3227BBE9; Mon, 8 Aug 2022 07:11:41 +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 EB20C27BBE9 for ; Mon, 8 Aug 2022 07:11:40 +0100 (BST) Received: from localhost ([::1]:52334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oKvzI-0003lO-3Y for patchwork@mira.cbaines.net; Mon, 08 Aug 2022 02:11:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oKvyh-0003jg-NX for guix-patches@gnu.org; Mon, 08 Aug 2022 02:11:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oKvyg-0002ni-Qs for guix-patches@gnu.org; Mon, 08 Aug 2022 02:11:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oKvyg-0002ty-MJ for guix-patches@gnu.org; Mon, 08 Aug 2022 02:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57050] [PATCH 2/6] 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: Mon, 08 Aug 2022 06:11:02 +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 Received: via spool by 57050-submit@debbugs.gnu.org id=B57050.165993903111053 (code B ref 57050); Mon, 08 Aug 2022 06:11:02 +0000 Received: (at 57050) by debbugs.gnu.org; 8 Aug 2022 06:10:31 +0000 Received: from localhost ([127.0.0.1]:38932 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKvyB-0002sD-3F for submit@debbugs.gnu.org; Mon, 08 Aug 2022 02:10:31 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:42516) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oKvy9-0002rm-Mu for 57050@debbugs.gnu.org; Mon, 08 Aug 2022 02:10:30 -0400 Received: by mail-qk1-f179.google.com with SMTP id o1so5771307qkg.9 for <57050@debbugs.gnu.org>; Sun, 07 Aug 2022 23:10:29 -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=1w0XFErZb+3ZZ4FYstzgkYHHV/b0yMlZZXWqzhsmXx4=; b=SeV8xuAhgVSX7DFylIkBn0W/Y/6BdMb2jMHfZ7bvLPNEF0XgYzWvjS84YaNS7YbXvG OQ05XH0wtG3FQ/XuqTqJDHjXd6/NgRazTuxa/QniXPvLO4IiKO/YwyKIyruFs2v2zSfe EGyxJBYMXdDZCMKiCd1WqHFGc8ExzFOozcS90KCbJGbzz81RCGLfWyM21cqwjQBT3BI0 6FQzgRnO0h/9cnLHzIeEx6l4vYnVFln9s0YnTAJ9cHGUPtIKunnF3x1Au6aRNXz/q6oL HHw7E2MZQhPu+DLKpkZRdXwG+bIM9qZLMLfGPkktOuyMUa5ZSRl8xjTAr6f/Ln6e6wUt wTWQ== 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=1w0XFErZb+3ZZ4FYstzgkYHHV/b0yMlZZXWqzhsmXx4=; b=CYPw275TsQm5G43p5N+ooVrcIvWJvoRgmTLDlv+vQJ2aCs39Y3g+1XzaBs9zA4nqJ+ +JeG3WvsTdfg8xcHi2CdGS/8SvApwbJ4T9rEHl/t0bZQw9IKeShwgzr2u/uZLv+S03Kn SP98PiIVSkRzj9hm/bKtHkcHJjjQtKdIip7/QjLvNvF1a2LlvRG7Xm2gAi2YbcSY6Rmw tauTJlGJ3DVL8A4fsuuRv1bc8JA85t0ckn0kQTfMxDbXDDHvgHNP2/JpSMenZkL9m1Kv 1nUYlU+a3M4WqVq65b/sEslCO5vdIq0XalVIxdiYSomocD72NfI6yPacVbjkKqPecRE1 vgSQ== X-Gm-Message-State: ACgBeo3ru1Mhwl1beNCRQteUqozo/63Oh7VWfaVH3WpfYD+hXXJfRVEV JUk587jezNzT7TOaM/v/2sCxlJAomBxz71xW X-Google-Smtp-Source: AA6agR56bbqUaLpuvuXiCJbETQBGIqe5DnYYTTOKztJppnncombPVU8Rh72rjktbaDsl9Ad6naTxgQ== X-Received: by 2002:ae9:f805:0:b0:6b8:e67d:475e with SMTP id x5-20020ae9f805000000b006b8e67d475emr12602328qkh.745.1659939024055; Sun, 07 Aug 2022 23:10:24 -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 m20-20020a05620a24d400b006a787380a5csm9251066qkn.67.2022.08.07.23.10.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 07 Aug 2022 23:10:23 -0700 (PDT) From: Philip McGrath Date: Mon, 8 Aug 2022 02:10:03 -0400 Message-Id: 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. [version]: Increment revision to 1.2.2-3.afa6075. --- gnu/local.mk | 1 + gnu/packages/chez.scm | 5 ++- .../stex-copy-from-immutable-store.patch | 41 +++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/stex-copy-from-immutable-store.patch diff --git a/gnu/local.mk b/gnu/local.mk index a837d16e34..234f21ad33 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1822,6 +1822,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..4c253effa0 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -595,7 +595,7 @@ (define-public stex-bootstrap ;; This commit includes a fix which we would otherwise want to use as ;; patch. Let's revert to tagged releases as soon as one becomes available. (let ((commit "afa607564a5662ffd748e824801277a6b5a3d11c") - (revision "2")) + (revision "3")) (hidden-package (package (name "stex") @@ -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 +