From patchwork Wed Mar 10 12:14:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 27597 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 361F127BC51; Wed, 10 Mar 2021 12:17:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9A53127BC50 for ; Wed, 10 Mar 2021 12:17:29 +0000 (GMT) Received: from localhost ([::1]:58998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJxmK-0000TQ-Lp for patchwork@mira.cbaines.net; Wed, 10 Mar 2021 07:17:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJxk2-0006p3-Jt for guix-patches@gnu.org; Wed, 10 Mar 2021 07:15:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJxjy-0005kt-Aj for guix-patches@gnu.org; Wed, 10 Mar 2021 07:15:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lJxjy-0000rm-52 for guix-patches@gnu.org; Wed, 10 Mar 2021 07:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#47044] [PATCH] gnu: xvfb-run: Fix =?utf-8?b?4oCYeHZmYi1ydW4g?= =?utf-8?b?LS1oZWxw4oCZ?= in a pure environment. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Mar 2021 12:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47044 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47044@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16153784833287 (code B ref -1); Wed, 10 Mar 2021 12:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 10 Mar 2021 12:14:43 +0000 Received: from localhost ([127.0.0.1]:49060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJxjf-0000qx-3I for submit@debbugs.gnu.org; Wed, 10 Mar 2021 07:14:43 -0500 Received: from lists.gnu.org ([209.51.188.17]:55376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lJxja-0000ql-E7 for submit@debbugs.gnu.org; Wed, 10 Mar 2021 07:14:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJxja-00066I-0F for guix-patches@gnu.org; Wed, 10 Mar 2021 07:14:38 -0500 Received: from andre.telenet-ops.be ([2a02:1800:120:4::f00:15]:53444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lJxjX-0005O1-SG for guix-patches@gnu.org; Wed, 10 Mar 2021 07:14:37 -0500 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id ecEY240010mfAB401cEYuG; Wed, 10 Mar 2021 13:14:32 +0100 Message-ID: <6e6e113e6843516a368f6abff5a536739cd99959.camel@telenet.be> From: Maxime Devos Date: Wed, 10 Mar 2021 13:14:15 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.34.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1615378472; bh=WzSSr0CofhRvR/cNvbALmUH9N0PnN8ynKOlhZgm2dks=; h=Subject:From:To:Date; b=Z8t1eQ0HCLKDH6AxQnKSzmLV30vX/tV4wliUf8WArh6kW4TMr/K6x042PvFgBuFD9 QCOADw/r8g+ClUy+ocqNVhfxBiQaP+OZ/ytmMqWGpZXlOjCw+ORpxa0Kusvuxs2JBV 4Bicywhgq2S3x0PCBSNRNv00wF7BGsevlWVxCX5CVcLGAJ0W294rQJOMzLuazkVN+I Po24LB2k+0aA5/oGm7P+RXr1QY4EBCELsGn1p8AyYosOIgT5T4D9lbf4fH3rFgVZGi uaDaTljSvO5RI4cQycUlfJN7zHMLU7R/cf8JRINY4AJ+UgAanuXjg/ixoshLo5+R1d Cuil/1EoAhQgg== Received-SPF: pass client-ip=2a02:1800:120:4::f00:15; envelope-from=maximedevos@telenet.be; helo=andre.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 * gnu/packages/xorg.scm (xvfb-run)[arguments]: Refer to ‘cat’ by absolute file name, and test whether ‘xvfb-run --help’ succeeds in a pure environment in the ‘check’ phase. --- gnu/packages/xorg.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 92ae6a824b..392a4f7c44 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2020, 2021 Michael Rohleder ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Jean-Baptiste Note +;;; Copyright © 2021 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -6799,7 +6800,7 @@ box, and a calendar. It uses GTK+, and will match your desktop theme.") (lambda _ (chmod "xvfb-run" #o755) (substitute* "xvfb-run" - (("(\\(| )(fmt|stty|awk|kill|getopt|mktemp|touch|rm|mcookie)" + (("(\\(| )(fmt|stty|awk|cat|kill|getopt|mktemp|touch|rm|mcookie)" _ prefix command) (string-append prefix (which command))) ;; These also feature in UI messages, so be more strict. @@ -6808,13 +6809,15 @@ box, and a calendar. It uses GTK+, and will match your desktop theme.") (string-append prefix (which command)))))) (replace 'check ;; There are no tests included. Here we test whether we can run - ;; a simple client without xvfb-run itself relying on $PATH. + ;; a simple client and whether xvfb-run --help succeeds + ;; without xvfb-run itself relying on $PATH. (lambda* (#:key tests? #:allow-other-keys) (when tests? (let ((old-PATH (getenv "PATH")) (xterm (which "xterm"))) (unsetenv "PATH") (invoke "./xvfb-run" xterm "-e" "true") + (invoke "./xvfb-run" "--help") (setenv "PATH" old-PATH))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys)