diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-06-18 01:30:23 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-06-18 01:30:23 +0000 |
commit | 51712842b31202ab849cda3e57144a4b6118606e (patch) | |
tree | f7328b54ef5b84c33f2846fe2b940c6abeaeb3c4 /sys-apps/busybox | |
parent | Add missing dep x11-misc/xbitmaps to xview. bug #227587 (diff) | |
download | gentoo-2-51712842b31202ab849cda3e57144a4b6118606e.tar.gz gentoo-2-51712842b31202ab849cda3e57144a4b6118606e.tar.bz2 gentoo-2-51712842b31202ab849cda3e57144a4b6118606e.zip |
old
Diffstat (limited to 'sys-apps/busybox')
-rw-r--r-- | sys-apps/busybox/files/1.4.0/bb.patch | 21 | ||||
-rw-r--r-- | sys-apps/busybox/files/1.4.0/bin2hex.patch | 13 | ||||
-rw-r--r-- | sys-apps/busybox/files/1.4.0/data_extract_all.patch | 15 | ||||
-rw-r--r-- | sys-apps/busybox/files/1.4.0/selinux-link.patch | 23 | ||||
-rw-r--r-- | sys-apps/busybox/files/1.5.0/bb.patch | 21 | ||||
-rw-r--r-- | sys-apps/busybox/files/busybox-1.6.0-bb.patch | 21 | ||||
-rw-r--r-- | sys-apps/busybox/files/busybox-1.6.0-echo.patch | 11 | ||||
-rw-r--r-- | sys-apps/busybox/files/busybox-1.6.0-hushdep.patch | 32 |
8 files changed, 0 insertions, 157 deletions
diff --git a/sys-apps/busybox/files/1.4.0/bb.patch b/sys-apps/busybox/files/1.4.0/bb.patch deleted file mode 100644 index ca62521ac581..000000000000 --- a/sys-apps/busybox/files/1.4.0/bb.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- include/applets.h -+++ include/applets.h -@@ -61,6 +61,7 @@ - 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)) ---- 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.4.0/bin2hex.patch b/sys-apps/busybox/files/1.4.0/bin2hex.patch deleted file mode 100644 index 840e636f133c..000000000000 --- a/sys-apps/busybox/files/1.4.0/bin2hex.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- trunk/busybox/libbb/xfuncs.c 2007/01/24 22:02:01 17508 -+++ trunk/busybox/libbb/xfuncs.c 2007/01/26 23:31:05 17545 -@@ -343,8 +343,8 @@ - while (count) { - unsigned char c = *cp++; - /* put lowercase hex digits */ -- *p++ = 0x10 | bb_hexdigits_upcase[c >> 4]; -- *p++ = 0x10 | bb_hexdigits_upcase[c & 0xf]; -+ *p++ = 0x20 | bb_hexdigits_upcase[c >> 4]; -+ *p++ = 0x20 | bb_hexdigits_upcase[c & 0xf]; - count--; - } - return p; diff --git a/sys-apps/busybox/files/1.4.0/data_extract_all.patch b/sys-apps/busybox/files/1.4.0/data_extract_all.patch deleted file mode 100644 index be66a5a0a6fc..000000000000 --- a/sys-apps/busybox/files/1.4.0/data_extract_all.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- archival/libunarchive/data_extract_all.c.orig 2007-01-24 16:34:38.000000000 -0500 -+++ archival/libunarchive/data_extract_all.c 2007-02-11 17:22:14.000000000 -0500 -@@ -111,6 +111,12 @@ - lchown(file_header->name, file_header->uid, file_header->gid); - } - -+ if (!(archive_handle->flags & ARCHIVE_NOPRESERVE_PERM) && -+ (file_header->mode & S_IFMT) != S_IFLNK) -+ { -+ chmod(file_header->name, file_header->mode); -+ } -+ - if (archive_handle->flags & ARCHIVE_PRESERVE_DATE) { - struct utimbuf t; - t.actime = t.modtime = file_header->mtime; diff --git a/sys-apps/busybox/files/1.4.0/selinux-link.patch b/sys-apps/busybox/files/1.4.0/selinux-link.patch deleted file mode 100644 index ee5c645861de..000000000000 --- a/sys-apps/busybox/files/1.4.0/selinux-link.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- busybox-1.4.2/Makefile -+++ busybox-1.4.2/Makefile -@@ -564,7 +564,8 @@ - cmd_busybox__ ?= $(srctree)/scripts/trylink $(CC) $(LDFLAGS) \ - -o $@ \ - -Wl,--warn-common -Wl,--sort-common -Wl,--gc-sections \ -- -Wl,--start-group $(busybox-all) -Wl,--end-group -+ -Wl,--start-group $(busybox-all) -Wl,--end-group \ -+ $(LDLIBS) - - # Generate System.map - quiet_cmd_sysmap = SYSMAP ---- busybox-1.4.2/Makefile.flags -+++ busybox-1.4.2/Makefile.flags -@@ -28,4 +28,8 @@ - ifeq ($(CONFIG_STATIC),y) - LDFLAGS += -static - endif -+ -+ifeq ($(CONFIG_SELINUX),y) -+LDLIBS += -lselinux -lsepol -+endif - #LDFLAGS += -nostdlib diff --git a/sys-apps/busybox/files/1.5.0/bb.patch b/sys-apps/busybox/files/1.5.0/bb.patch deleted file mode 100644 index ca982e75ff7d..000000000000 --- a/sys-apps/busybox/files/1.5.0/bb.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- include/applets.h -+++ include/applets.h -@@ -61,6 +61,7 @@ - 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)) ---- shell/ash.c -+++ shell/ash.c -@@ -3740,6 +3740,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 */ - } diff --git a/sys-apps/busybox/files/busybox-1.6.0-bb.patch b/sys-apps/busybox/files/busybox-1.6.0-bb.patch deleted file mode 100644 index e58d19717658..000000000000 --- a/sys-apps/busybox/files/busybox-1.6.0-bb.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 */ - } diff --git a/sys-apps/busybox/files/busybox-1.6.0-echo.patch b/sys-apps/busybox/files/busybox-1.6.0-echo.patch deleted file mode 100644 index 74d3c2cacbae..000000000000 --- a/sys-apps/busybox/files/busybox-1.6.0-echo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- busybox-1.6.0/coreutils/echo.c Fri Jun 1 13:48:34 2007 -+++ busybox-1.6.0-echo/coreutils/echo.c Wed Jun 6 09:49:18 2007 -@@ -33,7 +33,7 @@ - eflag = '\\', - nflag = 1, /* 1 -- print '\n' */ - }; -- ++argv; -+ arg = ++argv; - #else - const char *p; - char nflag = 1; diff --git a/sys-apps/busybox/files/busybox-1.6.0-hushdep.patch b/sys-apps/busybox/files/busybox-1.6.0-hushdep.patch deleted file mode 100644 index 252267f44384..000000000000 --- a/sys-apps/busybox/files/busybox-1.6.0-hushdep.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- busybox-1.6.0/shell/Config.in Fri Jun 1 13:48:33 2007 -+++ busybox-1.6.0-hushdep/shell/Config.in Sun Jun 10 01:02:47 2007 -@@ -179,6 +179,7 @@ - config HUSH_HELP - bool "help builtin" - default n -+ depends on HUSH - help - Enable help builtin in hush. Code size + ~1 kbyte. - -@@ -206,18 +207,21 @@ - config HUSH_TICK - bool "Process substitution" - default n -+ depends on HUSH - help - Enable process substitution `command` and $(command) in hush. - - config HUSH_IF - bool "Support if/then/elif/else/fi" - default n -+ depends on HUSH - help - Enable if/then/elif/else/fi in hush. - - config HUSH_LOOPS - bool "Support for, while and until loops" - default n -+ depends on HUSH - help - Enable for, while and until loops in hush. - |