diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-12-29 02:14:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-12-29 02:14:02 +0000 |
| commit | a493ba7d75043e8e649ee8d6d4942c1f4b31d1c5 (patch) | |
| tree | d9aef2725cb8f60bd6f5a47afa9778eb94114793 /app-alternatives | |
| parent | d7ef5a07f47da6898dcb2d1503790c59b0470571 (diff) | |
gentoo auto-resync : 29:12:2022 - 02:14:02
Diffstat (limited to 'app-alternatives')
| -rw-r--r-- | app-alternatives/Manifest.gz | bin | 1673 -> 1675 bytes | |||
| -rw-r--r-- | app-alternatives/sh/Manifest | 4 | ||||
| -rw-r--r-- | app-alternatives/sh/metadata.xml | 3 | ||||
| -rw-r--r-- | app-alternatives/sh/sh-0.ebuild | 14 |
4 files changed, 19 insertions, 2 deletions
diff --git a/app-alternatives/Manifest.gz b/app-alternatives/Manifest.gz Binary files differindex 2efcb15c5658..f26ab781770f 100644 --- a/app-alternatives/Manifest.gz +++ b/app-alternatives/Manifest.gz diff --git a/app-alternatives/sh/Manifest b/app-alternatives/sh/Manifest index 3137e367d114..317a3fd1ab1b 100644 --- a/app-alternatives/sh/Manifest +++ b/app-alternatives/sh/Manifest @@ -1,2 +1,2 @@ -EBUILD sh-0.ebuild 827 BLAKE2B b9615d38bd8bb2e1804f8d1bd63049986043e06592b93547803a06938aa870c3dedb825ee513bfed9926371e78fe83b5f31c4b9096c0509afaeb2445927826b8 SHA512 c23964f6d0c65ef17856cc8193516023e8590634f6623683e228f330cd652d33279cf4c8363690a126d5ed0f2d223b5d8c34722529b060acd280301804b14ee1 -MISC metadata.xml 759 BLAKE2B 4f691499f0da47c72c61999275d72604093856ff5440a7f72fdf9a6fe09ac86ce8d07e453d8a88ee9747142cf506cb4824223f9372ba2c8f0414086a3390a239 SHA512 2d2c06a26faf1cb72fea2f201a3bdabed020d8e2f1fb6bd86fdb985274a76db14080410982c74d3d5e5ccf483f1c280f2ea77d3d083d87985f36b54c190b2ec9 +EBUILD sh-0.ebuild 1475 BLAKE2B daeb47fdef6fc056335872b2f8b2ec01dfa40fd8c04aa04d7d55a13033f74b8218988bdbe182323cc285bd8107578188b6e34d8b777c3e030ee56690e689ee5a SHA512 f4a85e6c74c6eca72d9ece9546039777e12598fb66b8ba2ba289ef3e164ff6a1cc61902cf84a8d0df667a12de68c39933a304b698161fc1b6c46a75b437b58be +MISC metadata.xml 835 BLAKE2B e54fbb98c91e127319c5f0ec81d18ed6f7a8ea192308dc4927446a0f536d163d2fc53f79396ca24189e81fdbca15a36605dd6f0010bb484bf6990afd54d004be SHA512 a96a5121a92d90898d49d61a5096491c60b261292b3c8764f2e2fbd2825f8d0aa265042d7374462df3b0e9e2d547f43791867eabc8ee6a2b262ba6983a8474a7 diff --git a/app-alternatives/sh/metadata.xml b/app-alternatives/sh/metadata.xml index b91b8f41c94c..ab59369a30d1 100644 --- a/app-alternatives/sh/metadata.xml +++ b/app-alternatives/sh/metadata.xml @@ -13,6 +13,9 @@ <flag name="bash"> Symlink to <pkg>app-shells/bash</pkg> </flag> + <flag name="busybox"> + Symlink to <pkg>sys-apps/busybox</pkg> + </flag> <flag name="dash"> Symlink to <pkg>app-shells/dash</pkg> </flag> diff --git a/app-alternatives/sh/sh-0.ebuild b/app-alternatives/sh/sh-0.ebuild index 4cd530a89d9c..682533efb3bf 100644 --- a/app-alternatives/sh/sh-0.ebuild +++ b/app-alternatives/sh/sh-0.ebuild @@ -5,6 +5,7 @@ EAPI=8 ALTERNATIVES=( bash:app-shells/bash + busybox:sys-apps/busybox dash:app-shells/dash ksh:app-shells/ksh "lksh:app-shells/mksh[lksh]" @@ -20,6 +21,19 @@ RDEPEND=" !!app-eselect/eselect-sh " +pkg_setup() { + if [[ -z ${ROOT} ]] && use busybox ; then + # Needed to avoid busybox preferring internal applets over PATH lookups. + # https://web.archive.org/web/20221206223848/https://busybox.net/FAQ.html#standalone_shell. + if busybox bbconfig | grep -q "CONFIG_FEATURE_SH_STANDALONE=y" ; then + ewarn "busybox is configured with CONFIG_FEATURE_SH_STANDALONE=y!" + ewarn "This is not a safe configuration for busybox as /bin/sh." + ewarn "Please use savedconfig to disable CONFIG_FEATURE_SH_STANDALONE on busybox." + die "Aborting due to unsafe Busybox configuration (CONFIG_FEATURE_SH_STANDALONE=y)!" + fi + fi +} + src_install() { dosym "$(get_alternative)" /bin/sh || die } |