Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 233927
Collapse All | Expand All

(-)include/applets.h.orig (+1 lines)
Lines 78-83 Link Here
78 
USE_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_NEVER))
 78 
USE_ASH(APPLET(ash, _BB_DIR_BIN, _BB_SUID_NEVER))
79 
USE_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER, awk))
 79 
USE_AWK(APPLET_NOEXEC(awk, awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER, awk))
80 
USE_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER, basename))
 80 
USE_BASENAME(APPLET_NOFORK(basename, basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER, basename))
81 
USE_ASH(APPLET_ODDNAME(bb, ash, _BB_DIR_BIN, _BB_SUID_NEVER, ash))
81 
USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
 82 
USE_BBCONFIG(APPLET(bbconfig, _BB_DIR_BIN, _BB_SUID_NEVER))
82 
//USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
 83 
//USE_BBSH(APPLET(bbsh, _BB_DIR_BIN, _BB_SUID_NEVER))
83 
USE_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
 84 
USE_BRCTL(APPLET(brctl, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
(-)shell/ash.c.orig (-2 / +5 lines)
Lines 6873-6878 Link Here
6873 
			run_applet_no_and_exit(applet_no, argv);
 6873 
			run_applet_no_and_exit(applet_no, argv);
6874 
		/* re-exec ourselves with the new arguments */
 6874 
		/* re-exec ourselves with the new arguments */
6875 
		execve(bb_busybox_exec_path, argv, envp);
 6875 
		execve(bb_busybox_exec_path, argv, envp);
6876 
		execve("/bin/busybox.static", argv, envp);
6877 
		execve("/bin/busybox", argv, envp);
6876 
		/* If they called chroot or otherwise made the binary no longer
 6878 
		/* If they called chroot or otherwise made the binary no longer
6877 
		 * executable, fall through */
 6879 
		 * executable, fall through */
6878 
	}
 6880 
	}
6879 
-- modutils/insmod.c.orig      2008-08-04 12:35:11.000000000 -0400
 6881 
++ modutils/insmod.c   2008-08-04 11:16:06.000000000 -0400
Lines 840-846 Link Here
840 
				ElfW(RelM) *rel, ElfW(Addr) v)
 840 
				ElfW(RelM) *rel, ElfW(Addr) v)
841 
{
 841 
{
842 
#if defined(__arm__) || defined(__i386__) || defined(__mc68000__) \
 842 
#if defined(__arm__) || defined(__i386__) || defined(__mc68000__) \
843 
 || defined(__sh__) || defined(__s390__) || defined(__x86_64__)
 843 
 || defined(__sh__) || defined(__s390__) || defined(__x86_64__) \
844 
 || defined(__powerpc__)
844 
	struct arch_file *ifile = (struct arch_file *) f;
 845 
	struct arch_file *ifile = (struct arch_file *) f;
845 
#endif
 846 
#endif
846 
	enum obj_reloc ret = obj_reloc_ok;
 847 
	enum obj_reloc ret = obj_reloc_ok;

Return to bug 233927