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 76B6B1580B9 for ; Thu, 26 Aug 2021 22:52:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98658E08A0; Thu, 26 Aug 2021 22:52:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7DBA1E08BD for ; Thu, 26 Aug 2021 22:52:18 +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 5B69C342C51 for ; Thu, 26 Aug 2021 22:52:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6399B8DF for ; Thu, 26 Aug 2021 22:52:14 +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: <1630018213.5c8d34c127412c5d8b4fd3dc13e970f265be211c.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.33.1-r1.ebuild sys-apps/busybox/busybox-1.33.1-r2.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: 5c8d34c127412c5d8b4fd3dc13e970f265be211c X-VCS-Branch: master Date: Thu, 26 Aug 2021 22:52:14 +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: d3fb6317-1b20-4344-9560-ef6c7ab4d45f X-Archives-Hash: 9283741905da97b5f2df751b4d486bf9 commit: 5c8d34c127412c5d8b4fd3dc13e970f265be211c Author: Jakov Smolic sartura hr> AuthorDate: Thu Aug 19 17:21:00 2021 +0000 Commit: Sam James gentoo org> CommitDate: Thu Aug 26 22:50:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c8d34c1 sys-apps/busybox: Disable standalone shell mode with USE=make-symlinks * Busybox has by default enabled CONFIG_FEATURE_PREFER_APPLETS and CONFIG_FEATURE_SH_STANDALONE which means it will bypass all PATH lookups and use its builtin applets. This is problematic as we sometimes might want to use the original program instead of Busybox applets, so let's disable those two options when building with USE=make-symlinks. This also enables users to disable a builtin by deleting the corresponding symlink. Closes: https://bugs.gentoo.org/729184 Signed-off-by: Jakov Smolic sartura.hr> Closes: https://github.com/gentoo/gentoo/pull/22038 Signed-off-by: Sam James gentoo.org> .../{busybox-1.33.1-r1.ebuild => busybox-1.33.1-r2.ebuild} | 8 ++++++++ sys-apps/busybox/busybox-9999.ebuild | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/sys-apps/busybox/busybox-1.33.1-r1.ebuild b/sys-apps/busybox/busybox-1.33.1-r2.ebuild similarity index 96% rename from sys-apps/busybox/busybox-1.33.1-r1.ebuild rename to sys-apps/busybox/busybox-1.33.1-r2.ebuild index 19eb891b560..8297592e530 100644 --- a/sys-apps/busybox/busybox-1.33.1-r1.ebuild +++ b/sys-apps/busybox/busybox-1.33.1-r2.ebuild @@ -141,6 +141,14 @@ src_configure() { busybox_config_option n FEATURE_VI_REGEX_SEARCH fi + # Disable standalone shell mode when using make-symlinks, else Busybox calls its + # applets by default without looking up in PATH. + # This also enables users to disable a builtin by deleting the corresponding symlink. + if use make-symlinks; then + busybox_config_option n FEATURE_PREFER_APPLETS + busybox_config_option n FEATURE_SH_STANDALONE + fi + # If these are not set and we are using a uclibc/busybox setup # all calls to system() will fail. busybox_config_option y ASH diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild index 19eb891b560..8297592e530 100644 --- a/sys-apps/busybox/busybox-9999.ebuild +++ b/sys-apps/busybox/busybox-9999.ebuild @@ -141,6 +141,14 @@ src_configure() { busybox_config_option n FEATURE_VI_REGEX_SEARCH fi + # Disable standalone shell mode when using make-symlinks, else Busybox calls its + # applets by default without looking up in PATH. + # This also enables users to disable a builtin by deleting the corresponding symlink. + if use make-symlinks; then + busybox_config_option n FEATURE_PREFER_APPLETS + busybox_config_option n FEATURE_SH_STANDALONE + fi + # If these are not set and we are using a uclibc/busybox setup # all calls to system() will fail. busybox_config_option y ASH