From patchwork Wed Aug 25 18:03:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32266 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 E145227BBE3; Wed, 25 Aug 2021 19:05:21 +0100 (BST) 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_H2,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 895D227BBE1 for ; Wed, 25 Aug 2021 19:05:20 +0100 (BST) Received: from localhost ([::1]:59000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxH5-0001pt-BV for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:05:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxGo-0001dk-SC for guix-patches@gnu.org; Wed, 25 Aug 2021 14:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36202) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxGo-0001dk-Jb for guix-patches@gnu.org; Wed, 25 Aug 2021 14:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxGo-0002rS-C2 for guix-patches@gnu.org; Wed, 25 Aug 2021 14:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 26/52] gnu: heimdal: Use the cross-compiled bash in "su". Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991469410961 (code B ref 50201); Wed, 25 Aug 2021 18:05:02 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:04:54 +0000 Received: from localhost ([127.0.0.1]:47741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxGc-0002qY-5S for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:04:54 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:55672) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFa-0002hq-L9 for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:48 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3l8z; Wed, 25 Aug 2021 20:03:46 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:06 +0200 Message-Id: <20210825180332.5720-26-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914626; bh=qXPKL1xL6Lhsv0jx8bLs1ie94GQT6dqMk4A88wDGAzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qj+Jk3kmnPuRoh/84+SaaMZIZyLI3vRv+CqGpJfRPd1Jabiu1PAtzJFCnOzxaFrAY iAU7IfC8AlX6H5MtIis60sIfDhdgjJwQKHyn2zlfkCBij3NKYn08KcgkwVF5onaEzw X33iRdRutE2p7fRyqs2qZdkYFGIX0zOFcLTNzhzNAu5ZZWyL/B/4C/IPaPa7fBCcJ5 3/iJlQtGWHDwTwJVx4kDsQKpAurcq6FT8d0bi0qBpvydTnZWsLIenDsk/QhnvYn8TO q9rNsqloqT4mHlo7AnaFlzTq7f6ah6fP5PUbYCiu9n1MQ8YtD3uprvKumupzollOW1 NLGtNpBlzRM5A== 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/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}: Replace _PATH_BSHELL with the cross-compiled bin/sh when cross-compiling. --- gnu/packages/kerberos.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 9afc6a363f..126cdf4342 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -240,9 +240,15 @@ After installation, the system administrator should generate keys using '(#:key inputs #:allow-other-keys) '_) ,@(if (%current-target-system) - '((substitute* '("appl/afsutil/pagsh.c") + '((substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") (("/bin/sh") - (search-input-file inputs "bin/sh"))) + (search-input-file inputs "bin/sh")) + ;; Use the cross-compiled bash instead of the + ;; native bash (XXX shouldn't _PATH_BSHELL point + ;; to a cross-compiled bash?). + (("_PATH_BSHELL") + (string-append + "\"" (search-input-file inputs "bin/sh") "\""))) (substitute* '("tools/Makefile.in") (("/bin/sh") (which "sh")))) '((substitute* '("appl/afsutil/pagsh.c"