summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Ludd <solar@gentoo.org>2008-08-02 15:20:07 +0000
committerNed Ludd <solar@gentoo.org>2008-08-02 15:20:07 +0000
commite6b926dfd18a7a4fdc1be21b9c495855cae869ac (patch)
treef149a6fa5150168f61eff6d4ec67a29ab369058c /sys-apps/busybox/files
parentAdd helper script to make cross-compiling easier, remove old. (diff)
downloadgentoo-2-e6b926dfd18a7a4fdc1be21b9c495855cae869ac.tar.gz
gentoo-2-e6b926dfd18a7a4fdc1be21b9c495855cae869ac.tar.bz2
gentoo-2-e6b926dfd18a7a4fdc1be21b9c495855cae869ac.zip
- version bump. Thanks Christoph Gysin bug #230637
(Portage version: 2.1.4.4)
Diffstat (limited to 'sys-apps/busybox/files')
-rw-r--r--sys-apps/busybox/files/busybox-1.11.1-bb.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/sys-apps/busybox/files/busybox-1.11.1-bb.patch b/sys-apps/busybox/files/busybox-1.11.1-bb.patch
new file mode 100644
index 000000000000..be56d6c32e9d
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.11.1-bb.patch
@@ -0,0 +1,21 @@
+--- include/applets.h.orig 2008-07-29 13:26:42.371370968 +0200
++++ include/applets.h 2008-07-29 13:24:43.891381220 +0200
+@@ -78,6 +78,7 @@
+ USE_ASH(APPLET(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_ODDNAME(bb, ash, _BB_DIR_BIN, _BB_SUID_NEVER, ash))
+ USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
+ //USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
+ USE_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
+--- shell/ash.c.orig 2008-07-29 12:00:58.545222061 +0200
++++ shell/ash.c 2008-07-29 12:46:08.398280906 +0200
+@@ -6873,6 +6873,8 @@
+ run_applet_no_and_exit(applet_no, argv);
+ /* 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 */
+ }