From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id MOQqKlyGJmFLmwAAgWs5BA (envelope-from ) for ; Wed, 25 Aug 2021 20:05:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id wKO3JVyGJmGhdQAAB5/wlQ (envelope-from ) for ; Wed, 25 Aug 2021 18:05:16 +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 72CF52BCCB for ; Wed, 25 Aug 2021 20:05:16 +0200 (CEST) Received: from localhost ([::1]:59000 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxH1-0001pt-F7 for larch@yhetil.org; Wed, 25 Aug 2021 14:05:15 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1629914716; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=qXPKL1xL6Lhsv0jx8bLs1ie94GQT6dqMk4A88wDGAzU=; b=MMZQMkvucuFeQOsZuCtGW191NATL01uBSZLLrUYLzkaNiW21wWsffDaBOjJ64RiMu9UUi/ hI/mQI99/tsddIXu+OM+ssVxdd7HPrhX2132CftTcyEykW91++nFw/IaXvGtOrbQ6eqSp7 ord21HLKiuyvdAb2ozkte06umavF1LMnscWNf+giIKZIdFoZRryOXlg5opn2WzVumq517B QQoqFjlkN67GzSL382jtRrSzNL7Glwck2urjN5+StGlVRfBE4T2t8gKYt0Ep+X/YIBaQgc PYfunESoOIAxs6OKZ43qPPtEyXJY4pFPWn34RUcd1hSd093vYpHcUEt6QjLOJQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1629914716; a=rsa-sha256; cv=none; b=b3ikiWEOPyAQNYqifGRGrEIvdLQVjclScyC2GefEOSZk9IGDYkeftfzcf5jg998yNgIQ0A a2VrARlfmF0r3zs+T/3CHekqVr0ezxuqsHGA2700V+VBtHvZ397/Qx2+x13Brz/i1hEpbQ G0cQ/dFMdCwcGL4bwBKvbgd3eCIRhHfZSXcuoPEKXM3MPgjKdXYQSsCPM0OVwCMi3NbUun 5eiRZcrkeOqqu2YYmVhwEoD8POYjADZLA9ImLS8fmL9uzrlmboKavLz/A76dDYLcwmRK5W q/FmKbBKSlyXgC2qQ5gk33IWVp3at1hTmCVppxb1vZ3Q9tU/bnTdiNsUW01DWg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=qj+Jk3km; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=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-Migadu-Spam-Score: 3.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r21 header.b=qj+Jk3km; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=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-Migadu-Queue-Id: 72CF52BCCB X-Spam-Score: 3.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: ieFwfFCTpkNZ * 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" -- 2.33.0