diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-12-21 23:32:46 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-12-21 23:32:46 +0000 |
| commit | fb925d70a8f781dcf643e4707684134651c28e53 (patch) | |
| tree | 4a43b43b2a48bf91a1fe4f1a7576e84b6976c357 /sys-apps/busybox/files | |
| parent | tweak src_install too to handle static build with USE=pam #345665 (diff) | |
| download | historical-fb925d70a8f781dcf643e4707684134651c28e53.tar.gz historical-fb925d70a8f781dcf643e4707684134651c28e53.tar.bz2 historical-fb925d70a8f781dcf643e4707684134651c28e53.zip | |
Version bump.
Package-Manager: portage-2.2.0_alpha8/cvs/Linux x86_64
Diffstat (limited to 'sys-apps/busybox/files')
| -rw-r--r-- | sys-apps/busybox/files/busybox-1.18.0-bb.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/sys-apps/busybox/files/busybox-1.18.0-bb.patch b/sys-apps/busybox/files/busybox-1.18.0-bb.patch new file mode 100644 index 000000000000..309d2430b3d2 --- /dev/null +++ b/sys-apps/busybox/files/busybox-1.18.0-bb.patch @@ -0,0 +1,22 @@ +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -75,6 +75,8 @@ + //applet:IF_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_DROP)) + //applet:IF_FEATURE_SH_IS_ASH(APPLET_ODDNAME(sh, ash, _BB_DIR_BIN, _BB_SUID_DROP, sh)) + //applet:IF_FEATURE_BASH_IS_ASH(APPLET_ODDNAME(bash, ash, _BB_DIR_BIN, _BB_SUID_DROP, bash)) ++//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_ASH_RANDOM_SUPPORT) += random.o +--- a/shell/ash.c ++++ b/shell/ash.c +@@ -7255,6 +7255,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 */ + } |