From patchwork Thu Jan 13 22:26:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 36296 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 48A0C27BBEA; Thu, 13 Jan 2022 22:27:26 +0000 (GMT) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 C53D727BBE9 for ; Thu, 13 Jan 2022 22:27:25 +0000 (GMT) Received: from localhost ([::1]:34336 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n88Z3-0008GR-03 for patchwork@mira.cbaines.net; Thu, 13 Jan 2022 17:27:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n88Yn-0008F1-FM for guix-patches@gnu.org; Thu, 13 Jan 2022 17:27:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n88Yf-0005mN-TI for guix-patches@gnu.org; Thu, 13 Jan 2022 17:27:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n88Yf-0005EV-MM for guix-patches@gnu.org; Thu, 13 Jan 2022 17:27:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53238] [PATCH] gnu: tree: Remove stddata feature. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Jan 2022 22:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53238 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Olivier Dion Cc: Tobias Geerinckx-Rice , 53238@debbugs.gnu.org Received: via spool by 53238-submit@debbugs.gnu.org id=B53238.164211279120064 (code B ref 53238); Thu, 13 Jan 2022 22:27:01 +0000 Received: (at 53238) by debbugs.gnu.org; 13 Jan 2022 22:26:31 +0000 Received: from localhost ([127.0.0.1]:34819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n88YB-0005DX-0g for submit@debbugs.gnu.org; Thu, 13 Jan 2022 17:26:31 -0500 Received: from mail-qv1-f42.google.com ([209.85.219.42]:37415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n88Y6-0005DB-O3 for 53238@debbugs.gnu.org; Thu, 13 Jan 2022 17:26:29 -0500 Received: by mail-qv1-f42.google.com with SMTP id fo11so8379943qvb.4 for <53238@debbugs.gnu.org>; Thu, 13 Jan 2022 14:26:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=+owQf6rbF8Em5c4wewuv8Ji1HUH7+LXzjgvlm51+Sb4=; b=GRiJavjYHJRGPIjwOgDz7IjzgO+yyfUiYxzjhi/R870EfCbdXvmzE6WiiyV+V/UrdZ Rd/DCA8Ed1xd/SIr1AJ38usPvMzt/Q7UbIurmFl2tqUB/mtuO8g53pMvk7KgBkqkCKYB 0SmMytgv/dyR2Vj1QsdU7yaQDMr9xJexPP5GOv+tBaBVJQCvSnu1f2Zyho3PGr1QFSnT 3drKtZhpiZBL009mX7uKFFXYCbi8stcwnbeaCIP+ljvoh9db3/qmT4QMqc91NrLXbRZk OiFRetWnpefSplZh1DRZwngr7rTCOaiH8kzZ0l3YZLRRYGGlZuh2bJsr60kb/yWeiLUT i2FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=+owQf6rbF8Em5c4wewuv8Ji1HUH7+LXzjgvlm51+Sb4=; b=JiLsxWuRt07xVEdd20FXbfo+mPtfcHoybw0XjwhU6mF5RQdtmqR4lkAzV/911dU069 i+3XVceHFsqdf3hrcam1xx6c6Mk8heiPSrO1MD0IoWePZi+VfG4JntNfqYytkzqOq88J 48/hWtEbKZVAafOdFQ701S0Ub0gOm6zXAvwJ8URu2GG+mMx1ViegNv8Oli98e8vMy0cA 9umxahUqM2uf8XwJYNRXKyhS1/v02n4slGgSr/gUV2MId8O1It1kraD8AQAEWRdn6RvU 0FiaCYeztYccQj07tKl5XshU5BeWY/462KGJ0Yl0BIU+FkJ59gm6u8pxog8WNhT49zxJ WoIQ== X-Gm-Message-State: AOAM530cnVZyUHoaGjf/r0Hk1dLluwpHMP2m+F+SlcF/KL47btyY6+yB bo3/TaCbRAoUG0wyjoM8dq1e0SAT4uL0ug== X-Google-Smtp-Source: ABdhPJxzTwz3/u6EkMzr+LKZKlUIHuFkeEU2hX8llucfxarXN9BUiLO3P7sNVCTkgZyEE2Pqrl6Czg== X-Received: by 2002:a05:6214:2686:: with SMTP id gm6mr6125706qvb.24.1642112780897; Thu, 13 Jan 2022 14:26:20 -0800 (PST) Received: from hurd (dsl-152-155.b2b2c.ca. [66.158.152.155]) by smtp.gmail.com with ESMTPSA id x10sm2906586qtw.60.2022.01.13.14.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Jan 2022 14:26:20 -0800 (PST) From: Maxim Cournoyer References: <87ee5bcqhy.fsf@nckx> <87ee5bwdzw.fsf@laura> Date: Thu, 13 Jan 2022 17:26:19 -0500 In-Reply-To: <87ee5bwdzw.fsf@laura> (Olivier Dion's message of "Thu, 13 Jan 2022 15:57:07 -0500") Message-ID: <87r19bxofo.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) 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 Hi, Olivier Dion writes: > On Thu, 13 Jan 2022, Tobias Geerinckx-Rice wrote: >> Olivier, >> >> Thanks again for tracking down this weird bug! >> >> Olivier Dion via Guix-patches via 写道： >>> This feature breaks some UNIX utilities. Fix it by disabling >>> the feature. >> >> Hm… How long would we have to carry this fork? My fear is we'd >> do so indefinitely. > > I've contacted the maintainer asking for removal of the feature in its > next release. I'm not sure if this will have some impact. Feel free to > do the same at , maybe adding more weight > in the balance would help. > >> How about creating a (possibly hidden) tree-without-stddata >> package variant, to use as input to packages who currently break >> with this feature enabled? That lets us refcount the need for it. > > It's more than just packages, it's also user scripts that can be broken > and believe me when I say that this is not an easy bug to track down ;-). I'm on the fence about this, it does indeed seem an undesirable change, especially since there's a --json option, but I am not the author of the 'tree' software. Attached is an alternative that adjusts password-store instead of removing this new tree "feature"... Thanks, Maxim From 2a30d95c46ff1eb0bdac9307c5d6bb8e460de02f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 13 Jan 2022 15:09:54 -0500 Subject: [PATCH] gnu: password-store: Fix test failure following 'tree' update. Thanks to Olivier Dion for diagnosing the source of the problem! * gnu/packages/password-utils.scm (password-store): Delete trailing #t. [phases]{adjust-for-tree-2}: New phase. --- gnu/packages/password-utils.scm | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 0ff8608c9c..16d889344b 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -487,6 +487,21 @@ (define-public password-store (arguments '(#:phases (modify-phases %standard-phases + (add-after 'unpack 'adjust-for-tree-2 + (lambda _ + ;; XXX: tree 2.0.1 has this new "stddata pipe" that is + ;; automatically used to output in JSON if the file descriptor 3 + ;; is available. This conflicts with the test harness use of + ;; file descriptor 3, causing one of the tests to fail. + ;; Increment the file descriptors used by the harness by one to + ;; avoid the conflict. + (substitute* "tests/sharness.sh" + (("exec 4>&2 3>&1") + "exec 5>&2 4>&1") + (("exec 4>/dev/null 3>/dev/null") + "exec 5>/dev/null 4>/dev/null") + (("&4") "&5") + (("&3") "&4")))) (delete 'configure) (delete 'build) (add-before 'install 'patch-system-extension-dir @@ -500,8 +515,7 @@ (define-public password-store (string-append " SYSTEM_EXTENSION_DIR=\"" "${PASSWORD_STORE_SYSTEM_EXTENSION_DIR:-" extension-dir - "}\"\n")))) - #t)) + "}\"\n")))))) (add-before 'install 'patch-passmenu-path ;; FIXME Wayland support requires ydotool and dmenu-wl packages ;; We are ignoring part of the script that gets executed if @@ -530,8 +544,7 @@ (define-public password-store '("coreutils" "getopt" "git" "gnupg" "qrencode" "sed" "tree" "which" "wl-clipboard" "xclip")))) (wrap-program (string-append out "/bin/pass") - `("PATH" ":" prefix (,(string-join path ":")))) - #t)))) + `("PATH" ":" prefix (,(string-join path ":")))))))) #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output) "WITH_ALLCOMP=yes" (string-append "BASHCOMPDIR=" -- 2.34.0