From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id uEIjCmayXV8RYQAA0tVLHw (envelope-from ) for ; Sun, 13 Sep 2020 05:47:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sB9UBGayXV8MUQAAB5/wlQ (envelope-from ) for ; Sun, 13 Sep 2020 05:47:18 +0000 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 D4A5C9402A2 for ; Sun, 13 Sep 2020 05:47:17 +0000 (UTC) Received: from localhost ([::1]:35778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHKr6-0004QM-Pc for larch@yhetil.org; Sun, 13 Sep 2020 01:47:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHKqs-0004Pn-I8 for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37802) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHKqs-00027U-9F for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHKqs-0000vp-69 for guix-patches@gnu.org; Sun, 13 Sep 2020 01:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43367] [PATCH 1/5] utils: wrap-program: Refuse to wrap .X-real files. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 05:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43367@debbugs.gnu.org Received: via spool by 43367-submit@debbugs.gnu.org id=B43367.15999759843485 (code B ref 43367); Sun, 13 Sep 2020 05:47:02 +0000 Received: (at 43367) by debbugs.gnu.org; 13 Sep 2020 05:46:24 +0000 Received: from localhost ([127.0.0.1]:49336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqG-0000u9-5z for submit@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:24 -0400 Received: from mout-p-102.mailbox.org ([80.241.56.152]:50636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHKqF-0000ts-0Y for 43367@debbugs.gnu.org; Sun, 13 Sep 2020 01:46:23 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4Bpz4m6Tr2zKmV1 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1599975975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FSlbc1KMo1TRSTALdnQ1FHgRvX/spQIlHUx6WcN6IYk=; b=kOovU+aZdX//4Vk1Pw3vzi1l2PRsTnRO3arVDVg7Xj+pOsPeJ1kT5ELreqgBHajjM2ybwD /f3tCbhAzCZKDu6HdJ0NVEcTeir1/SrC7P/CD+XUiHHRYzBuoKaQ21XUn+43YnB1FZhtJD nIOuTtqt8uuqO9kyoyPpLpJexZQrp65QJQcbO3k3ohk/hcYCQu0PgeoWoMpaFIKe5uAR7U /+nyBZ2Od7d/CDDr7m9Z9czLGIKWPJX2Rrm+L07/e82b9KqLf/62NJc8iX7xUS1A0OZiuf lxzLfNLNFTldt38JJR99h006D1pmf67QMTTRZFT1fr88qqbhE6x26g4+5VLLug== Received: from smtp2.mailbox.org ([80.241.60.241]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id OD_Vp6VVa-P1 for <43367@debbugs.gnu.org>; Sun, 13 Sep 2020 07:46:13 +0200 (CEST) From: Brendan Tildesley Date: Sun, 13 Sep 2020 15:45:53 +1000 Message-Id: <20200913054557.12911-1-mail@brendan.scot> In-Reply-To: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> References: <83311dc4-6e9b-e70b-e379-9993bfcd0554@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-MBO-SPAM-Probability: * X-Rspamd-Score: 1.48 / 15.00 / 15.00 X-Rspamd-Queue-Id: D85C0271 X-Rspamd-UID: 9d3abe X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.7 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 X-Spam-Score: 6.49 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=brendan.scot header.s=MBO0001 header.b=kOovU+aZ; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam: Yes X-TUID: /V/8ocVYhg5f * guix/build/utils.scm: (wrap-program): Error if wrap-program was mistakenly passed a .X-real file. This prevents and forces us to fix cases where a double wrapped ..X-real-real file is created, such as can be seen with: find /gnu/ -iname '.*-real-real' --- guix/build/utils.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index e872cfffd3..822191f4de 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -1194,6 +1194,9 @@ with definitions for VARS." (format #f "export ~a=\"$~a${~a:+:}~a\"" var var var (string-join rest ":"))))) + (when (wrapped-program? prog) + (error (string-append prog " is a wrapper. Refusing to wrap."))) + (if already-wrapped? ;; PROG is already a wrapper: add the new "export VAR=VALUE" lines just -- 2.28.0