| 1 |
commit: 58414b6f079cd6e3134624c6b834f39b87d0a925 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 2 11:41:06 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 2 11:42:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58414b6f |
| 7 |
|
| 8 |
sys-apps/busybox: fix 'make-symlinks' safeguard |
| 9 |
|
| 10 |
Thanks-to: Ionen Wolkens <sudinave <AT> gmail.com> |
| 11 |
Bug: https://bugs.gentoo.org/703936 |
| 12 |
Closes: https://bugs.gentoo.org/752162 |
| 13 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 15 |
|
| 16 |
.../busybox/{busybox-1.31.1-r2.ebuild => busybox-1.31.1-r3.ebuild} | 2 +- |
| 17 |
.../busybox/{busybox-1.32.0.ebuild => busybox-1.32.0-r1.ebuild} | 2 +- |
| 18 |
sys-apps/busybox/busybox-9999.ebuild | 6 +++--- |
| 19 |
3 files changed, 5 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-apps/busybox/busybox-1.31.1-r2.ebuild b/sys-apps/busybox/busybox-1.31.1-r3.ebuild |
| 22 |
similarity index 99% |
| 23 |
rename from sys-apps/busybox/busybox-1.31.1-r2.ebuild |
| 24 |
rename to sys-apps/busybox/busybox-1.31.1-r3.ebuild |
| 25 |
index 8457f9229a4..ad50d096b74 100644 |
| 26 |
--- a/sys-apps/busybox/busybox-1.31.1-r2.ebuild |
| 27 |
+++ b/sys-apps/busybox/busybox-1.31.1-r3.ebuild |
| 28 |
@@ -303,7 +303,7 @@ src_install() { |
| 29 |
} |
| 30 |
|
| 31 |
pkg_preinst() { |
| 32 |
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then |
| 33 |
+ if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then |
| 34 |
ewarn "setting USE=make-symlinks and emerging to / is very dangerous." |
| 35 |
ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." |
| 36 |
ewarn "If you are creating a binary only and not merging this is probably ok." |
| 37 |
|
| 38 |
diff --git a/sys-apps/busybox/busybox-1.32.0.ebuild b/sys-apps/busybox/busybox-1.32.0-r1.ebuild |
| 39 |
similarity index 99% |
| 40 |
rename from sys-apps/busybox/busybox-1.32.0.ebuild |
| 41 |
rename to sys-apps/busybox/busybox-1.32.0-r1.ebuild |
| 42 |
index e4d93e71de3..6d7a5811169 100644 |
| 43 |
--- a/sys-apps/busybox/busybox-1.32.0.ebuild |
| 44 |
+++ b/sys-apps/busybox/busybox-1.32.0-r1.ebuild |
| 45 |
@@ -302,7 +302,7 @@ src_install() { |
| 46 |
} |
| 47 |
|
| 48 |
pkg_preinst() { |
| 49 |
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then |
| 50 |
+ if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then |
| 51 |
ewarn "setting USE=make-symlinks and emerging to / is very dangerous." |
| 52 |
ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." |
| 53 |
ewarn "If you are creating a binary only and not merging this is probably ok." |
| 54 |
|
| 55 |
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild |
| 56 |
index bf29c9fb1d8..a82a8aa3331 100644 |
| 57 |
--- a/sys-apps/busybox/busybox-9999.ebuild |
| 58 |
+++ b/sys-apps/busybox/busybox-9999.ebuild |
| 59 |
@@ -3,7 +3,7 @@ |
| 60 |
|
| 61 |
# See `man savedconfig.eclass` for info on how to use USE=savedconfig. |
| 62 |
|
| 63 |
-EAPI=6 |
| 64 |
+EAPI=7 |
| 65 |
|
| 66 |
inherit flag-o-matic savedconfig toolchain-funcs |
| 67 |
|
| 68 |
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND} |
| 69 |
RDEPEND="${COMMON_DEPEND} |
| 70 |
mdev? ( !<sys-apps/openrc-0.13 )" |
| 71 |
|
| 72 |
-S=${WORKDIR}/${MY_P} |
| 73 |
+S="${WORKDIR}/${MY_P}" |
| 74 |
|
| 75 |
busybox_config_option() { |
| 76 |
local flag=$1 ; shift |
| 77 |
@@ -298,7 +298,7 @@ src_install() { |
| 78 |
} |
| 79 |
|
| 80 |
pkg_preinst() { |
| 81 |
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then |
| 82 |
+ if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then |
| 83 |
ewarn "setting USE=make-symlinks and emerging to / is very dangerous." |
| 84 |
ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)." |
| 85 |
ewarn "If you are creating a binary only and not merging this is probably ok." |
Archives