From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63C621382C5 for ; Mon, 21 Jun 2021 18:16:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B98EBE0877; Mon, 21 Jun 2021 18:16:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 84723E0877 for ; Mon, 21 Jun 2021 18:16:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8A849335C2A for ; Mon, 21 Jun 2021 18:16:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C932A235 for ; Mon, 21 Jun 2021 18:16:40 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1624299374.89b32081e7c8404b35f7d3cf82f105877331454b.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/bash/bash-5.0_p18.ebuild app-shells/bash/bash-5.1_p8.ebuild X-VCS-Directories: app-shells/bash/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 89b32081e7c8404b35f7d3cf82f105877331454b X-VCS-Branch: master Date: Mon, 21 Jun 2021 18:16:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8d895a5c-d039-4a48-ad21-b28772089262 X-Archives-Hash: 052265d9052af5b778fa339acb82f1a0 commit: 89b32081e7c8404b35f7d3cf82f105877331454b Author: Mike Gilbert gentoo org> AuthorDate: Mon Jun 21 14:20:40 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Jun 21 18:16:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b32081 app-shells/bash: remove /bin/sh logic from pkg_preinst This was added back in 2008 to handle some migration in file ownership. I expect all users have upgraded many times since then. Closes: https://bugs.gentoo.org/778311 Signed-off-by: Mike Gilbert gentoo.org> app-shells/bash/bash-5.0_p18.ebuild | 9 --------- app-shells/bash/bash-5.1_p8.ebuild | 9 --------- 2 files changed, 18 deletions(-) diff --git a/app-shells/bash/bash-5.0_p18.ebuild b/app-shells/bash/bash-5.0_p18.ebuild index 3ea29fe66b1..ab801c88333 100644 --- a/app-shells/bash/bash-5.0_p18.ebuild +++ b/app-shells/bash/bash-5.0_p18.ebuild @@ -255,15 +255,6 @@ pkg_preinst() { mkdir -p "${EROOT}"/etc/bash mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ fi - - if [[ -L ${EROOT}/bin/sh ]] ; then - # rewrite the symlink to ensure that its mtime changes. having /bin/sh - # missing even temporarily causes a fatal error with paludis. - local target=$(readlink "${EROOT}"/bin/sh) - local tmp="${T}"/sh - ln -sf "${target}" "${tmp}" - mv -f "${tmp}" "${EROOT}"/bin/sh - fi } pkg_postinst() { diff --git a/app-shells/bash/bash-5.1_p8.ebuild b/app-shells/bash/bash-5.1_p8.ebuild index a8f2880bece..88199a177aa 100644 --- a/app-shells/bash/bash-5.1_p8.ebuild +++ b/app-shells/bash/bash-5.1_p8.ebuild @@ -255,15 +255,6 @@ pkg_preinst() { mkdir -p "${EROOT}"/etc/bash mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/ fi - - if [[ -L ${EROOT}/bin/sh ]] ; then - # Rewrite the symlink to ensure that its mtime changes. Having /bin/sh - # missing even temporarily causes a fatal error with paludis. - local target=$(readlink "${EROOT}"/bin/sh) - local tmp="${T}"/sh - ln -sf "${target}" "${tmp}" - mv -f "${tmp}" "${EROOT}"/bin/sh - fi } pkg_postinst() {