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 BD207138359 for ; Mon, 2 Nov 2020 11:42:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E009FE07DB; Mon, 2 Nov 2020 11:42:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 5CA5BE07DB for ; Mon, 2 Nov 2020 11:42:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8C944335D94 for ; Mon, 2 Nov 2020 11:42:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 196A61DF for ; Mon, 2 Nov 2020 11:42:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1604317326.58414b6f079cd6e3134624c6b834f39b87d0a925.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/busybox/busybox-1.31.1-r2.ebuild sys-apps/busybox/busybox-1.31.1-r3.ebuild sys-apps/busybox/busybox-1.32.0-r1.ebuild sys-apps/busybox/busybox-1.32.0.ebuild sys-apps/busybox/busybox-9999.ebuild X-VCS-Directories: sys-apps/busybox/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 58414b6f079cd6e3134624c6b834f39b87d0a925 X-VCS-Branch: master Date: Mon, 2 Nov 2020 11:42:12 +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: 73ecb338-df89-410b-b9ed-9b6d36c86be4 X-Archives-Hash: c599148cacc77b25bb976ce728c86ba1 commit: 58414b6f079cd6e3134624c6b834f39b87d0a925 Author: Sam James gentoo org> AuthorDate: Mon Nov 2 11:41:06 2020 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 2 11:42:06 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58414b6f sys-apps/busybox: fix 'make-symlinks' safeguard Thanks-to: Ionen Wolkens gmail.com> Bug: https://bugs.gentoo.org/703936 Closes: https://bugs.gentoo.org/752162 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> .../busybox/{busybox-1.31.1-r2.ebuild => busybox-1.31.1-r3.ebuild} | 2 +- .../busybox/{busybox-1.32.0.ebuild => busybox-1.32.0-r1.ebuild} | 2 +- sys-apps/busybox/busybox-9999.ebuild | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys-apps/busybox/busybox-1.31.1-r2.ebuild b/sys-apps/busybox/busybox-1.31.1-r3.ebuild similarity index 99% rename from sys-apps/busybox/busybox-1.31.1-r2.ebuild rename to sys-apps/busybox/busybox-1.31.1-r3.ebuild index 8457f9229a4..ad50d096b74 100644 --- a/sys-apps/busybox/busybox-1.31.1-r2.ebuild +++ b/sys-apps/busybox/busybox-1.31.1-r3.ebuild @@ -303,7 +303,7 @@ src_install() { } pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then ewarn "setting USE=make-symlinks and emerging to / is very dangerous." ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." ewarn "If you are creating a binary only and not merging this is probably ok." diff --git a/sys-apps/busybox/busybox-1.32.0.ebuild b/sys-apps/busybox/busybox-1.32.0-r1.ebuild similarity index 99% rename from sys-apps/busybox/busybox-1.32.0.ebuild rename to sys-apps/busybox/busybox-1.32.0-r1.ebuild index e4d93e71de3..6d7a5811169 100644 --- a/sys-apps/busybox/busybox-1.32.0.ebuild +++ b/sys-apps/busybox/busybox-1.32.0-r1.ebuild @@ -302,7 +302,7 @@ src_install() { } pkg_preinst() { - if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then + if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then ewarn "setting USE=make-symlinks and emerging to / is very dangerous." ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." ewarn "If you are creating a binary only and not merging this is probably ok." diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index bf29c9fb1d8..a82a8aa3331 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -3,7 +3,7 @@ # See `man savedconfig.eclass` for info on how to use USE=savedconfig. -EAPI=6 +EAPI=7 inherit flag-o-matic savedconfig toolchain-funcs @@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} mdev? ( !