summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-apps/busybox/files/busybox-1.6.0-bb.patch')
-rw-r--r--sys-apps/busybox/files/busybox-1.6.0-bb.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/sys-apps/busybox/files/busybox-1.6.0-bb.patch b/sys-apps/busybox/files/busybox-1.6.0-bb.patch
new file mode 100644
index 000000000000..e58d19717658
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.6.0-bb.patch
@@ -0,0 +1,21 @@
+--- include/applets.h
++++ include/applets.h
+@@ -77,6 +77,7 @@
+ USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER, awk))
+ USE_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER, basename))
++USE_ASH(APPLET_NOUSAGE(bb, ash, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
+ //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_BUNZIP2(APPLET(bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
+--- shell/ash.c
++++ shell/ash.c
+@@ -6472,6 +6472,8 @@
+ }
+ /* re-exec ourselves with the new arguments */
+ execve(CONFIG_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 */
+ }