diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-12-29 23:29:54 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-12-29 23:29:54 +0000 |
| commit | ff5b965a10515540a59b6910c383e67c44559820 (patch) | |
| tree | 68482bd9d2e21d3c1fefadd51b0039732fe8378e /sys-apps/busybox/files | |
| parent | Mask aqua and coreaudio useflags in base profile and unmask only in darwin/ma... (diff) | |
| download | gentoo-2-ff5b965a10515540a59b6910c383e67c44559820.tar.gz gentoo-2-ff5b965a10515540a59b6910c383e67c44559820.tar.bz2 gentoo-2-ff5b965a10515540a59b6910c383e67c44559820.zip | |
Version bump #158636 by Pavel Shirov.
(Portage version: 2.1.2_rc4-r1)
Diffstat (limited to 'sys-apps/busybox/files')
| -rw-r--r-- | sys-apps/busybox/files/1.3.0/bb.patch | 27 | ||||
| -rw-r--r-- | sys-apps/busybox/files/1.3.0/ld.patch | 13 | ||||
| -rw-r--r-- | sys-apps/busybox/files/digest-busybox-1.3.1 | 3 |
3 files changed, 43 insertions, 0 deletions
diff --git a/sys-apps/busybox/files/1.3.0/bb.patch b/sys-apps/busybox/files/1.3.0/bb.patch new file mode 100644 index 000000000000..bbdcdd2cd01e --- /dev/null +++ b/sys-apps/busybox/files/1.3.0/bb.patch @@ -0,0 +1,27 @@ +--- include/applets.h ++++ include/applets.h +@@ -61,11 +61,13 @@ + USE_ASH(APPLET_NOUSAGE(ash, ash, _BB_DIR_BIN, _BB_SUID_NEVER)) + USE_AWK(APPLET(awk, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) + USE_BASENAME(APPLET(basename, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) ++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)) + /* Always enabled. */ + APPLET_NOUSAGE(busybox, busybox, _BB_DIR_BIN, _BB_SUID_MAYBE) ++APPLET_NOUSAGE(busybox.static, busybox, _BB_DIR_BIN, _BB_SUID_MAYBE) + USE_BUNZIP2(APPLET_ODDNAME(bzcat, bunzip2, _BB_DIR_USR_BIN, _BB_SUID_NEVER, bzcat)) + USE_CAL(APPLET(cal, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) + USE_CAT(APPLET(cat, _BB_DIR_BIN, _BB_SUID_NEVER)) +--- shell/ash.c ++++ shell/ash.c +@@ -3740,6 +3740,8 @@ + if(find_applet_by_name(cmd) != NULL) { + /* 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 */ + } diff --git a/sys-apps/busybox/files/1.3.0/ld.patch b/sys-apps/busybox/files/1.3.0/ld.patch new file mode 100644 index 000000000000..eb3c02fc163d --- /dev/null +++ b/sys-apps/busybox/files/1.3.0/ld.patch @@ -0,0 +1,13 @@ +Index: Makefile +=================================================================== +--- Makefile (revision 17102) ++++ Makefile (working copy) +@@ -273,7 +273,7 @@ MAKEFLAGS += -rR + # Make variables (CC, etc...) + + AS = $(CROSS_COMPILE)as +-LD = $(CROSS_COMPILE)ld ++LD = $(CROSS_COMPILE)gcc -nostdlib + CC = $(CROSS_COMPILE)gcc + CPP = $(CC) -E + AR = $(CROSS_COMPILE)ar diff --git a/sys-apps/busybox/files/digest-busybox-1.3.1 b/sys-apps/busybox/files/digest-busybox-1.3.1 new file mode 100644 index 000000000000..9368ef7299d7 --- /dev/null +++ b/sys-apps/busybox/files/digest-busybox-1.3.1 @@ -0,0 +1,3 @@ +MD5 571531cfa83726947ccb566de017ad4f busybox-1.3.1.tar.bz2 1485979 +RMD160 bdfb93353aa899ef246cea0180c7341c32e6a8ac busybox-1.3.1.tar.bz2 1485979 +SHA256 5bf9ead9cca99620d2e56ddf79fdf5fb306fd7f30087b5556e0956e3b1948206 busybox-1.3.1.tar.bz2 1485979 |