commit: 39459a6f1c69544844fe75855f4a8293be0ef651
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 28 22:14:27 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 22:14:43 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39459a6f
sys-apps/busybox: version bump 1.26.2
Package-Manager: portage-2.3.3
sys-apps/busybox/Manifest | 1 +
.../{busybox-9999.ebuild => busybox-1.26.2.ebuild} | 4 +--
sys-apps/busybox/busybox-9999.ebuild | 4 +--
sys-apps/busybox/files/busybox-1.26.2-bb.patch | 42 ++++++++++++++++++++++
4 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 3518adf..f15dd27 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,2 +1,3 @@
DIST busybox-1.25.1.tar.bz2 2103070 SHA256
27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e SHA512
9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb
WHIRLPOOL
4b7bc6d3a88559812797feb4574975b9fdeb6eac6ac7a0fe51e4750a3b05a614ecb8bd9d58547047cdf1e0b66d9bcd189c8a4193fc2f3b491a6268bc06761ad1
DIST busybox-1.26.0.tar.bz2 2143958 SHA256
3ad227375ee870d529007f6ce83f173b8bd5a37df624ecb460295554261c0f4c SHA512
9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3
WHIRLPOOL
c8a7419bd711d3e0249807ef9f9ff6123ff8d0767479ea3b3e54ef48f6132514942bc37b79334ca2afd6009d32c5e242712bd6b3995f49904c33040c66df9dcc
+DIST busybox-1.26.2.tar.bz2 2120931 SHA256
da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16 SHA512
9926d211d0b4f34b513d934d7b111ebbf933c2dc31206bdd80426a62d47d5b1475b70bec5aaa14a26b94a202ab1465d994062a002750a312dcb8167096eb3719
WHIRLPOOL
64fdbd3ede8e382d0237b1576000555f563c4ca93d58cfbb72f71374b662e3201863110a069f0e4a27dab7c0a6102d98ccfd4d57f1dfe44c9b12a17c6a30128a
diff --git a/sys-apps/busybox/busybox-9999.ebuild
b/sys-apps/busybox/busybox-1.26.2.ebuild
similarity index 99%
copy from sys-apps/busybox/busybox-9999.ebuild
copy to sys-apps/busybox/busybox-1.26.2.ebuild
index b91df29..accdd8d 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-1.26.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -67,7 +67,7 @@ src_prepare() {
use ppc64 && append-flags -mminimal-toc #130943
# patches go here!
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+ epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
# epatch "${FILESDIR}"/${P}-*.patch
cp "${FILESDIR}"/ginit.c init/ || die
diff --git a/sys-apps/busybox/busybox-9999.ebuild
b/sys-apps/busybox/busybox-9999.ebuild
index b91df29..accdd8d 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -67,7 +67,7 @@ src_prepare() {
use ppc64 && append-flags -mminimal-toc #130943
# patches go here!
- epatch "${FILESDIR}"/${PN}-1.19.0-bb.patch
+ epatch "${FILESDIR}"/${PN}-1.26.2-bb.patch
# epatch "${FILESDIR}"/${P}-*.patch
cp "${FILESDIR}"/ginit.c init/ || die
diff --git a/sys-apps/busybox/files/busybox-1.26.2-bb.patch
b/sys-apps/busybox/files/busybox-1.26.2-bb.patch
new file mode 100644
index 00000000..f120340
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.26.2-bb.patch
@@ -0,0 +1,42 @@
+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
+@@ -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))
+ //applet:IF_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, BB_DIR_BIN, BB_SUID_DROP,
ash))
++//applet:IF_ASH(APPLET_ODDNAME(bb, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
++//applet:IF_ASH(APPLET_ODDNAME(bbsh, ash, BB_DIR_BIN, BB_SUID_DROP, ash))
+
+ //kbuild:lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o shell_common.o
+ //kbuild:lib-$(CONFIG_SH_IS_ASH) += ash.o ash_ptr_hack.o shell_common.o
+@@ -7572,6 +7574,8 @@
+ }
+ /* re-exec ourselves with the new arguments */
+ execve(bb_busybox_exec_path, argv, envp);
++ execve("/bin/busybox.static", argv, envp);
++ execve("/bin/busybox", argv, envp);
+ /* 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
+@@ -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))
+ //applet:IF_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, BB_DIR_BIN, BB_SUID_DROP,
hush))
++//applet:IF_HUSH(APPLET_ODDNAME(bb, hush, BB_DIR_BIN, BB_SUID_DROP, hush))
++//applet:IF_HUSH(APPLET_ODDNAME(bbsh, hush, BB_DIR_BIN, BB_SUID_DROP, hush))
+
+ //kbuild:lib-$(CONFIG_HUSH) += hush.o match.o shell_common.o
+ //kbuild:lib-$(CONFIG_SH_IS_HUSH) += hush.o match.o shell_common.o
+@@ -6073,6 +6075,8 @@
+ 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);
+ /* Fallback. Useful for init=/bin/hush usage etc */
+ if (argv[0][0] == '/')
+ execve(argv[0], argv, pp);
