From patchwork Sun May 2 12:17:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Geissler X-Patchwork-Id: 43203 X-Patchwork-Delegate: siddhesh@gotplt.org Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BA465383303C; Sun, 2 May 2021 12:17:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BA465383303C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1619957839; bh=Z2kPgKvcoDraQ69F/wGQhfFml30fIhhEpquZ3Ykvzog=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=PWlGNVMoUSlGdBR3VKHgPKpoLFOl7QpYg7r1Dwrz+/ma1WI1Rxm30z85T0ecHqNl+ GAABxq984tnwywAhEfwbnx7SSXdXzkDg3PsCfA7ESsAXIqa/tjFTP0QKK5iWJf+ODn pauL3KY/fW2BBxnGpY7aV2klVBMBZXI6u/TisiIU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2067.outbound.protection.outlook.com [40.107.21.67]) by sourceware.org (Postfix) with ESMTPS id E1B973835820 for ; Sun, 2 May 2021 12:17:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E1B973835820 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nix0SOuY51vT1yQbZE+eT39O4jrsF5DBDMwlhKtQinjqYtUBqYhsf7rVI41fXjplDPO1dVuoUNmIO6IQLbVRZCiwMblByptLxq3tCInbkpEFaoMMoyvQ0sr+PWm5G06wouPnxNXOt+twQpEXhNMxoi25E/lCgWhRNvYdlzGXWkqvx4Vpjbq+by2bExif9BfmByvbmvDCB0r+1dHCl3E1e/cAEqeA5PuqIDr7mHbMxkYPwqJ/8zMd07mYs9hZseFDbK+dw4XgZZR+NGHxCAgbbgEjBClbDTd7+BinuGztqjU3oHIDm4qzigcPmMPv/TicKYCNa0tiIl7zx18d4TDNRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Z2kPgKvcoDraQ69F/wGQhfFml30fIhhEpquZ3Ykvzog=; b=eWZjOYdpuwa1wuhBt3bN4AEeUS7FYGqNRfLvjuBAaDiiO+VDtvaam1hpO/QQ7paA6LFZQpchk75g0DmiSk4TxRT+up2TSaX8YqOiDxQAR6QJxpIb1qOOc0jGAwofiwW0pXBlN2gFbD1QwNwZuYPNEM2s+/wxpLmBRpfp2OIG46oAeLxong0E7PJNbkXhWW0VZjdm9Pm9yok6rzgblUf7gl+G55eFnJgVoVvAGWdxD5uGYzg7N88gnAsqMZXoiAqdy+tyNcn7pzQHD37iU8D0e6cJG7hbkKxoQnngdSO4VtiGDGB1BPbAHv5vj7xS3W72OcH2YKGWo0+/aS5rRob0mQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amadeus.com; dmarc=pass action=none header.from=amadeus.com; dkim=pass header.d=amadeus.com; arc=none Received: from PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:4d::12) by PR3PR10MB3913.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:2b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.40; Sun, 2 May 2021 12:17:13 +0000 Received: from PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM ([fe80::25b5:8551:7d01:7878]) by PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM ([fe80::25b5:8551:7d01:7878%6]) with mapi id 15.20.4087.040; Sun, 2 May 2021 12:17:12 +0000 To: "libc-alpha@sourceware.org" Subject: [BZ 24106] Remove all usage of @BASH@ or ${BASH} in installed files, and hardcode /bin/bash instead Thread-Topic: [BZ 24106] Remove all usage of @BASH@ or ${BASH} in installed files, and hardcode /bin/bash instead Thread-Index: AQHXP00UxeBla0zzfkqpUvp/xOwuAQ== Date: Sun, 2 May 2021 12:17:12 +0000 Message-ID: <20210502121703.GA54708@ncerndobedev6097.etv.nce.amadeus.net> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: user-agent: Mutt/1.10.1 (2018-07-13) x-originating-ip: [46.218.23.44] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: ab034a55-65ff-4aab-1af5-08d90d643732 x-ms-traffictypediagnostic: PR3PR10MB3913: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:475; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: gnYdul7tiIu7ARhDqNQPgeNFU5TYBL1Ydtj7GPph3pkzMnUe8X1BWLXdmcJP/FjBYpp2b1+bUFI4ILgzs8I5Ii8HD4fDMtgYGg/35ypzE+R0+aqSp8WkjR13tnodpT1lTDjIuM+M0EHitNLqFUXgsD13vLrX6vZOAetrdWxnXpdvDWFIfum6T6AMTMR56eOOvYU1tgCm7pVbMzOmTXHNhR1ur5zZgC1txWkN0XnbLYhuNU1X1vtwI0b5Sh3+Qipz4/1qSXPghYbz6SkiCn87GuBTQKbehi2UiZ2gtorQ9C9I3R8PliB9JDW0G+elyQZMBzh8xrXw6/PD2K64tQfguwNkQYZ3jm34W17qV7WTI90oUmD3/J8z+Tzch59efiqWN0TXYVGAV458iNXyJRGsI1k6ROe5rXxeRoP73DorxNrr5AVYeflFxbtHbnnxBpLvgIBQyayPXM5hk7uIV8GFGy1n+jOf+w+qFChQhpTVd8dQBsRBli1m/dV1j1scEeZBD5aTJG0X2vQMyc4QA04XoDUPCoiTslSRb6DCTaLLpxUZUqlwMzerwrWmotgyMmH4zw8GpZryo2S3YH80Ik1YQw2t+O6jX3/iXMO7cEdP4Tl5MJZZzxMmKKzwSTewiwygaYt820G0Y8uKirAAY2bfzdm/fRnZjn8r4CP7xqQvNVRm2el4OeGaFiwW0kXIG1ma6yjRMV2kNjuBhv4B2P59120tBXdcUHlEuLIQeSsFTAxMsMY4kQSBHK7UPnRUSsO6 x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(376002)(39860400002)(396003)(346002)(83380400001)(8676002)(6916009)(2906002)(9686003)(6512007)(1076003)(508600001)(122000001)(6506007)(71200400001)(8936002)(186003)(5660300002)(966005)(33656002)(6486002)(26005)(76116006)(66946007)(66476007)(66556008)(64756008)(66446008)(86362001)(38100700002)(316002)(2004002)(228453006); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: kWy9AXXoS2ButUUp9IEDpqC/VCc2w6FZcKKJJDLnqzQeHYC+N+sN7pjQZxuYNOtWnYJWbYYDgoUUwGNSllmQr4pnBuxq3bkA4jwW1hS2h2As/ZT8W5zmwBJtA5wWHuJCyyYqE6Y/kT8vWOC7ZBmm1hfW24PwH++gMsQzS0yiw3BP4A8S90+bYki58M0NjDHcdxCFHy0nDnnWcl/vqzX4O26heZqGxfNgkQ4zxtfBlVuOmWPYTFgvNuzuWEHcov7YJaloySmNtu7h1lDxOJ1PAmThvSxWCiA529pa5kLiNd0FrjwyJ/T1FZTyK3ydXEE7yNMwXrd4P8jAKm9n9z5EpL4mgdvM2gxZkX1jlNMQt75hKymoEDIO18uAX5PqZAKm4VoI5xO62sn8HRu+LNDW93m25DmMBDEFPF0ZVkJ2w9yRL/St+hj70k6eBjL1vsrT27ILMpv6z9EL6XjBHBm6+E+6ifZskjPq1zfveZYKKc9gM35JpbUhHctMyoRaSVhKbqfz45mj5wlZ+1IQPYXucTg1MZ5doxDF3IW3PvAeU5/D4WnwPYQsgtnRGU2WdC0xe38lmZWqXwy0DK6e9QE+x60x+/P41JJkCnAp8DqWd5GXoAWkoyu5QGJv3Qu34pe+aMudbCheIflVFfXOt9pazGNKwpzWlEN+u7h31621lZEBmLwbAL0iqdywqqe0h3y5Du1tyQU77VzPpW/nPB7BGtLXbX7qsmapit9aYgOsgblX6U2++UfY86tfmu2ZrCakXysaMp8aRF9PBv8fnYN4M4stwFcv+qwAiBQ1G2ipeRORIS6luNyeZDJBf9dq6n38DHQNtdv2aDUbYGZ29L0q9p+LBafzbIj7OrxUpmWDKWZpRTv6jKYDS/rb/OyooZzhklr5UqSkBFHGUYIsI2QU2Rt1J3w2XEaic2RdLxTLX60qFw5ndJKILOhgTSRhmimoj97Z+58i7zXYvU2X52GdIPiwND/B8lrDTzPqsbI5Mqgn45vw78nQulxtNjqpNmLWyH1FVXYvCHth1aYCZXJ4anEo0BVVcCHRdODsaOZkEbJsxJsD1RXptQwINFnCMKfy15jXofkZkA8JmqJJsjhpY50FvLQCum3Lkbt/M13RxxwV81EKvBPunQyS1v6BqD6RNGSvEu5XBk5XBaGFr7cXq+NyMWZ7i49q8uFVLCyTew2VG5O5ZaLjcWegKzTHwdjgw8SgmVBpNTsZScsZURxK4G6d42+KJy7W1zVjSdZZFgXYsMb+C//WatHancpKrD93El54qX70tZbDDE5WBBacJ55Up6IvMlAR4YoKpN+ZPGFIvIxr9nZxiHndjfHsjFDX x-ms-exchange-transport-forked: True Content-ID: MIME-Version: 1.0 X-OriginatorOrg: amadeus.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PR3PR10MB3772.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: ab034a55-65ff-4aab-1af5-08d90d643732 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 May 2021 12:17:12.2501 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b3f4f7c2-72ce-4192-aba4-d6c7719b5766 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ZS4nhx7g5VfBKvtIIc34eih/fx9K7Wo9PJqgAFrQf0cPEVwMOkv84D3T1GjrqT23LE7O+axDP2+xG1KKJArg2lkBT+3Z1XbkJEbK/O3KIOw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR10MB3913 X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Romain GEISSLER via Libc-alpha From: Romain Geissler Reply-To: Romain GEISSLER Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Hi, (FYI, this is a repost of https://sourceware.org/pipermail/libc-alpha/2019-July/105035.html now that FSF papers have been signed and confirmed on FSF side). This trivial patch attemps to fix BZ 24106. Basically the bash locally used when building glibc on the host shall not leak on the installed glibc, as the system where it is installed might be different and use another bash location. So I have looked for all occurences of @BASH@ or $(BASH) in installed files, and replaced it by /bin/bash. This was suggested by Florian Weimer in the bug report. Cheers, Romain commit 6ae46cca1f851b9d271a6761e0d1427665649e47 Author: Romain Geissler Date: Tue Jul 16 17:14:54 2019 +0000 Remove all usage of @BASH@ or ${BASH} in installed files, and hardcode /bin/bash instead. Reviewed-by: Siddhesh Poyarekar diff --git a/debug/Makefile b/debug/Makefile index 3f66666c6c1..6893111cbfa 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -216,8 +216,7 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o $(objpfx)xtrace: xtrace.sh rm -f $@.new - sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \ - -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \ - -e 's|@PKGVERSION@|$(PKGVERSION)|' \ + sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \ + -e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \ -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \ && rm -f $@ && mv $@.new $@ && chmod +x $@ diff --git a/debug/xtrace.sh b/debug/xtrace.sh index 279fe59ac61..9697fbe0b41 100755 --- a/debug/xtrace.sh +++ b/debug/xtrace.sh @@ -1,4 +1,4 @@ -#! @BASH@ +#!/bin/bash # Copyright (C) 1999-2021 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper , 1999. diff --git a/elf/Makefile b/elf/Makefile index f09988f7d2d..a9dc4533b97 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -143,8 +143,7 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ $(common-objpfx)libc_nonshared.a $(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make - sed -e 's%@BASH@%$(BASH)%g' \ - -e 's%@VERSION@%$(version)%g' \ + sed -e 's%@VERSION@%$(version)%g' \ -e 's%@TEXTDOMAINDIR@%$(localedir)%g' \ -e 's%@PREFIX@%$(prefix)%g' \ -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ @@ -651,7 +650,6 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ -e 's%@VERSION@%$(version)%g' \ -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \ - -e 's%@BASH@%$(BASH)%g' \ -e 's%@TEXTDOMAINDIR@%$(localedir)%g' ifeq ($(ldd-rewrite-script),no) diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in index 57442bc3f23..ba736464ac5 100644 --- a/elf/ldd.bash.in +++ b/elf/ldd.bash.in @@ -1,4 +1,4 @@ -#! @BASH@ +#!/bin/bash # Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/elf/sotruss.sh b/elf/sotruss.sh index fd4da802440..003cf4d8253 100755 --- a/elf/sotruss.sh +++ b/elf/sotruss.sh @@ -1,4 +1,4 @@ -#! @BASH@ +#!/bin/bash # Copyright (C) 2011-2021 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/malloc/Makefile b/malloc/Makefile index 641967c5127..afcd296ef6b 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -238,9 +238,8 @@ $(objpfx)mtrace: mtrace.pl $(objpfx)memusage: memusage.sh rm -f $@.new - sed -e 's|@BASH@|$(BASH)|' -e 's|@VERSION@|$(version)|' \ - -e 's|@SLIBDIR@|$(sLIBdir)|' -e 's|@BINDIR@|$(bindir)|' \ - -e 's|@PKGVERSION@|$(PKGVERSION)|' \ + sed -e 's|@VERSION@|$(version)|' -e 's|@SLIBDIR@|$(sLIBdir)|' \ + -e 's|@BINDIR@|$(bindir)|' -e 's|@PKGVERSION@|$(PKGVERSION)|' \ -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \ && rm -f $@ && mv $@.new $@ && chmod +x $@ diff --git a/malloc/memusage.sh b/malloc/memusage.sh index c1cd4e23b73..0645f09911d 100755 --- a/malloc/memusage.sh +++ b/malloc/memusage.sh @@ -1,4 +1,4 @@ -#! @BASH@ +#!/bin/bash # Copyright (C) 1999-2021 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Ulrich Drepper , 1999. diff --git a/timezone/Makefile b/timezone/Makefile index 395abfeebde..c624a189b32 100644 --- a/timezone/Makefile +++ b/timezone/Makefile @@ -123,8 +123,7 @@ $(testdata)/XT%: testdata/XT% cp $< $@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make - sed -e 's|/bin/bash|$(BASH)|' \ - -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ + sed -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \