diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2005-04-16 07:01:33 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-04-16 07:01:33 +0000 |
| commit | 28f24d77860c11225c0c03351376b1ccabf469ca (patch) | |
| tree | d006e0fe1cc20238c3129c8edcbfcedb74d71b9e /sys-apps/busybox/files | |
| parent | ia64 tests ! (diff) | |
| download | gentoo-2-28f24d77860c11225c0c03351376b1ccabf469ca.tar.gz gentoo-2-28f24d77860c11225c0c03351376b1ccabf469ca.tar.bz2 gentoo-2-28f24d77860c11225c0c03351376b1ccabf469ca.zip | |
Add fixes from upstream to support more bash code and more cp options #88841.
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-apps/busybox/files')
| -rw-r--r-- | sys-apps/busybox/files/1.00/bash-tests.patch | 45 | ||||
| -rw-r--r-- | sys-apps/busybox/files/1.00/cp-posix-opts.patch | 45 | ||||
| -rw-r--r-- | sys-apps/busybox/files/1.00/more-insmod-arches.patch | 19 | ||||
| -rw-r--r-- | sys-apps/busybox/files/digest-busybox-1.00-r2 | 1 |
4 files changed, 108 insertions, 2 deletions
diff --git a/sys-apps/busybox/files/1.00/bash-tests.patch b/sys-apps/busybox/files/1.00/bash-tests.patch new file mode 100644 index 000000000000..9e8b099049ca --- /dev/null +++ b/sys-apps/busybox/files/1.00/bash-tests.patch @@ -0,0 +1,45 @@ +Index: coreutils/test.c +=================================================================== +--- coreutils/test.c (revision 10073) ++++ coreutils/test.c (revision 10096) +@@ -51,7 +51,7 @@ + unary-operator ::= "-r"|"-w"|"-x"|"-f"|"-d"|"-c"|"-b"|"-p"| + "-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|"-L"|"-S"; + +- binary-operator ::= "="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"| ++ binary-operator ::= "="|"=="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"| + "-nt"|"-ot"|"-ef"; + operand ::= <any legal UNIX file name> + */ +@@ -135,6 +135,7 @@ + "-L", FILSYM, UNOP}, { + "-S", FILSOCK, UNOP}, { + "=", STREQ, BINOP}, { ++ "==", STREQ, BINOP}, { + "!=", STRNE, BINOP}, { + "<", STRLT, BINOP}, { + ">", STRGT, BINOP}, { +@@ -191,6 +192,11 @@ + bb_error_msg_and_die("missing ]"); + argv[argc] = NULL; + } ++ if (strcmp(bb_applet_name, "[[") == 0) { ++ if (strcmp(argv[--argc], "]]")) ++ bb_error_msg_and_die("missing ]]"); ++ argv[argc] = NULL; ++ } + /* Implement special cases from POSIX.2, section 4.62.4 */ + switch (argc) { + case 1: +Index: include/applets.h +=================================================================== +--- include/applets.h (revision 10073) ++++ include/applets.h (revision 10096) +@@ -50,6 +50,7 @@ + + #ifdef CONFIG_TEST + APPLET_NOUSAGE("[", test_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) ++ APPLET_NOUSAGE("[[", test_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) + #endif + #ifdef CONFIG_ADDGROUP + APPLET(addgroup, addgroup_main, _BB_DIR_BIN, _BB_SUID_NEVER) diff --git a/sys-apps/busybox/files/1.00/cp-posix-opts.patch b/sys-apps/busybox/files/1.00/cp-posix-opts.patch new file mode 100644 index 000000000000..f944bb1abb33 --- /dev/null +++ b/sys-apps/busybox/files/1.00/cp-posix-opts.patch @@ -0,0 +1,45 @@ +Grabbed from upstream SVN + +--- coreutils/cp.c ++++ coreutils/cp.c +@@ -42,7 +42,7 @@ + #include "libcoreutils/coreutils.h" + + /* WARNING!! ORDER IS IMPORTANT!! */ +-static const char cp_opts[] = "pdRfiar"; ++static const char cp_opts[] = "pdRfiarPHL"; + + extern int cp_main(int argc, char **argv) + { +@@ -79,6 +79,20 @@ + */ + flags |= FILEUTILS_DEREFERENCE; + } ++ if (flags & 128) { ++ /* Make -P a synonym for -d, ++ * -d is the GNU option while -P is the POSIX 2003 option ++ */ ++ flags |= FILEUTILS_DEREFERENCE; ++ } ++ /* Default behavior of cp is to dereference, so we don't have to do ++ * anything special when we are given -L. ++ * The behavior of -H is *almost* like -L, but not quite, so let's ++ * just ignore it too for fun. ++ if (flags & 256 || flags & 512) { ++ ; ++ } ++ */ + + flags ^= FILEUTILS_DEREFERENCE; /* The sense of this flag was reversed. */ + +--- include/usage.h ++++ include/usage.h +@@ -205,6 +205,7 @@ + "\n" \ + "\t-a\tSame as -dpR\n" \ +- "\t-d\tPreserves links\n" \ ++ "\t-d,-P\tPreserves links\n" \ ++ "\t-H,-L\tDereference all symlinks (implied by default)\n" \ + "\t-p\tPreserves file attributes if possible\n" \ + "\t-f\tforce (implied; ignored) - always set\n" \ + "\t-i\tinteractive, prompt before overwrite\n" \ diff --git a/sys-apps/busybox/files/1.00/more-insmod-arches.patch b/sys-apps/busybox/files/1.00/more-insmod-arches.patch index 7a88cb6fa31a..42e1f88708bd 100644 --- a/sys-apps/busybox/files/1.00/more-insmod-arches.patch +++ b/sys-apps/busybox/files/1.00/more-insmod-arches.patch @@ -4,8 +4,8 @@ RCS file: /var/cvs/busybox/modutils/insmod.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -r1.125 -r1.126 ---- busybox/modutils/insmod.c 2 Sep 2004 23:03:25 -0000 1.125 -+++ busybox/modutils/insmod.c 26 Dec 2004 09:13:32 -0000 1.126 +--- modutils/insmod.c 2 Sep 2004 23:03:25 -0000 1.125 ++++ modutils/insmod.c 26 Dec 2004 09:13:32 -0000 1.126 @@ -109,6 +109,14 @@ #endif @@ -41,3 +41,18 @@ diff -u -r1.125 -r1.126 /* H8/300 */ #if defined(__H8300H__) || defined(__H8300S__) #define MATCH_MACHINE(x) (x == EM_H8_300) +Index: modutils/insmod.c +=================================================================== +--- modutils/insmod.c (revision 9620) ++++ modutils/insmod.c (revision 10061) +@@ -290,8 +290,8 @@ + /* X86_64 */ + #if defined(__x86_64__) + #define MATCH_MACHINE(x) (x == EM_X86_64) +-#define SHT_RELM SHT_REL +-#define Elf64_RelM Elf64_Rel ++#define SHT_RELM SHT_RELA ++#define Elf64_RelM Elf64_Rela + #define ELFCLASSM ELFCLASS64 + #endif + diff --git a/sys-apps/busybox/files/digest-busybox-1.00-r2 b/sys-apps/busybox/files/digest-busybox-1.00-r2 new file mode 100644 index 000000000000..659145bbe83c --- /dev/null +++ b/sys-apps/busybox/files/digest-busybox-1.00-r2 @@ -0,0 +1 @@ +MD5 5c7ea9b5d3b3677dfcdcec38b281a756 busybox-1.00.tar.bz2 1118427 |