public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/files/, sys-apps/busybox/
Date: Wed, 26 Apr 2017 21:12:33 +0000 (UTC)	[thread overview]
Message-ID: <1493241146.5c7ecf36f0bbbe18b513d7afb82b0f7bf342889c.vapier@gentoo> (raw)

commit:     5c7ecf36f0bbbe18b513d7afb82b0f7bf342889c
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Wed Apr 26 21:09:04 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Apr 26 21:12:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c7ecf36

sys-apps/busybox: fix default shell handling

Make sure we explicitly select sh->ash by default as newer versions
are defaulting to sh->hush.

Also fix up the hush patch to include the /bin/busybox fallbacks.

 ...ybox-1.26.2.ebuild => busybox-1.26.2-r1.ebuild} |  1 +
 sys-apps/busybox/files/busybox-1.26.2-bb.patch     | 29 ++++++++++++++++------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/sys-apps/busybox/busybox-1.26.2.ebuild b/sys-apps/busybox/busybox-1.26.2-r1.ebuild
similarity index 99%
rename from sys-apps/busybox/busybox-1.26.2.ebuild
rename to sys-apps/busybox/busybox-1.26.2-r1.ebuild
index 1feb3a5ac22..6c42e41a452 100644
--- a/sys-apps/busybox/busybox-1.26.2.ebuild
+++ b/sys-apps/busybox/busybox-1.26.2-r1.ebuild
@@ -126,6 +126,7 @@ src_configure() {
 	# If these are not set and we are using a uclibc/busybox setup
 	# all calls to system() will fail.
 	busybox_config_option y ASH
+	busybox_config_option y SH_IS_ASH
 	busybox_config_option n HUSH
 
 	busybox_config_option '"/run"' PID_FILE_PATH

diff --git a/sys-apps/busybox/files/busybox-1.26.2-bb.patch b/sys-apps/busybox/files/busybox-1.26.2-bb.patch
index f120340162b..5e2405c3a67 100644
--- a/sys-apps/busybox/files/busybox-1.26.2-bb.patch
+++ b/sys-apps/busybox/files/busybox-1.26.2-bb.patch
@@ -1,6 +1,11 @@
-diff -Naur busybox-1.26.2.orig/shell/ash.c busybox-1.26.2/shell/ash.c
---- busybox-1.26.2.orig/shell/ash.c	2017-01-10 10:55:51.000000000 -0500
-+++ busybox-1.26.2/shell/ash.c	2017-01-28 17:02:08.961584737 -0500
+add `bb` and `bbsh` shortcuts as aliases to the main shell so we can install
+symlinks in Gentoo at /bin/bb as our recovery shell.
+
+we also add fallbacks to /bin/busybox and /bin/busybox.static in case /proc
+is not yet mounted during early boot.
+
+--- a/shell/ash.c
++++ b/shell/ash.c
 @@ -144,6 +144,8 @@
  //applet:IF_ASH(APPLET(ash, BB_DIR_BIN, BB_SUID_DROP))
  //applet:IF_SH_IS_ASH(APPLET_ODDNAME(sh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
@@ -19,9 +24,8 @@ diff -Naur busybox-1.26.2.orig/shell/ash.c busybox-1.26.2/shell/ash.c
  		/* If they called chroot or otherwise made the binary no longer
  		 * executable, fall through */
  	}
-diff -Naur busybox-1.26.2.orig/shell/hush.c busybox-1.26.2/shell/hush.c
---- busybox-1.26.2.orig/shell/hush.c	2017-01-10 10:55:51.000000000 -0500
-+++ busybox-1.26.2/shell/hush.c	2017-01-28 17:05:13.235936850 -0500
+--- a/shell/hush.c
++++ b/shell/hush.c
 @@ -221,6 +221,8 @@
  //applet:IF_MSH(APPLET_ODDNAME(msh, hush, BB_DIR_BIN, BB_SUID_DROP, hush))
  //applet:IF_SH_IS_HUSH(APPLET_ODDNAME(sh, hush, BB_DIR_BIN, BB_SUID_DROP, hush))
@@ -35,8 +39,17 @@ diff -Naur busybox-1.26.2.orig/shell/hush.c busybox-1.26.2/shell/hush.c
  	if (SPECIAL_JOBSTOP_SIGS != 0)
  		switch_off_special_sigs(G.special_sig_mask & SPECIAL_JOBSTOP_SIGS);
  	execve(bb_busybox_exec_path, argv, pp);
-+	execve("/bin/busybox.static", argv, envp);
-+	execve("/bin/busybox", argv, envp);
++	execve("/bin/busybox.static", argv, pp);
++	execve("/bin/busybox", argv, pp);
  	/* Fallback. Useful for init=/bin/hush usage etc */
  	if (argv[0][0] == '/')
  		execve(argv[0], argv, pp);
+@@ -6931,6 +6931,8 @@
+ 			if (SPECIAL_JOBSTOP_SIGS != 0)
+ 				switch_off_special_sigs(G.special_sig_mask & SPECIAL_JOBSTOP_SIGS);
+ 			execv(bb_busybox_exec_path, argv);
++			execv("/bin/busybox.static", argv);
++			execv("/bin/busybox", argv);
+ 			/* If they called chroot or otherwise made the binary no longer
+ 			 * executable, fall through */
+ 		}


             reply	other threads:[~2017-04-26 21:12 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-26 21:12 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-05-24 15:35 [gentoo-commits] repo/gentoo:master commit in: sys-apps/busybox/files/, sys-apps/busybox/ Viorel Munteanu
2017-03-12  4:41 Mike Frysinger
2016-12-22  6:15 Mike Frysinger
2016-12-09 23:20 Mike Frysinger
2016-04-20  3:58 Mike Frysinger
2016-03-21 18:48 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1493241146.5c7ecf36f0bbbe18b513d7afb82b0f7bf342889c.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox