diff options
Diffstat (limited to 'package/busybox/patches/922-shell.patch')
| -rw-r--r-- | package/busybox/patches/922-shell.patch | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/package/busybox/patches/922-shell.patch b/package/busybox/patches/922-shell.patch index 66d3506fc..4f0058e38 100644 --- a/package/busybox/patches/922-shell.patch +++ b/package/busybox/patches/922-shell.patch @@ -8,14 +8,12 @@ } /* Lives far away from here, needed for forkchild */ -diff -urpN busybox-1.17.1/shell/ash_test/ash-signals/signal7.right busybox-1.17.1-shell/shell/ash_test/ash-signals/signal7.right ---- busybox-1.17.1/shell/ash_test/ash-signals/signal7.right 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.1-shell/shell/ash_test/ash-signals/signal7.right 2010-07-25 13:09:32.000000000 +0200 +--- /dev/null ++++ b/shell/ash_test/ash-signals/signal7.right @@ -0,0 +1 @@ +Bug detected: 0 -diff -urpN busybox-1.17.1/shell/ash_test/ash-signals/signal7.tests busybox-1.17.1-shell/shell/ash_test/ash-signals/signal7.tests ---- busybox-1.17.1/shell/ash_test/ash-signals/signal7.tests 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.1-shell/shell/ash_test/ash-signals/signal7.tests 2010-07-25 13:09:32.000000000 +0200 +--- /dev/null ++++ b/shell/ash_test/ash-signals/signal7.tests @@ -0,0 +1,18 @@ +bug() { + trap : exit @@ -35,9 +33,8 @@ diff -urpN busybox-1.17.1/shell/ash_test/ash-signals/signal7.tests busybox-1.17. +&& test x"$REAL_CHILD" = x"$PARENTS_IDEA_OF_CHILD" +echo "Bug detected: $?" +} -diff -urpN busybox-1.17.1/shell/hush.c busybox-1.17.1-shell/shell/hush.c ---- busybox-1.17.1/shell/hush.c 2010-07-25 00:12:43.000000000 +0200 -+++ busybox-1.17.1-shell/shell/hush.c 2010-07-25 13:09:32.000000000 +0200 +--- a/shell/hush.c ++++ b/shell/hush.c @@ -3901,8 +3901,6 @@ static void insert_bg_job(struct pipe *p if (G_interactive_fd) @@ -56,14 +53,12 @@ diff -urpN busybox-1.17.1/shell/hush.c busybox-1.17.1-shell/shell/hush.c G.last_exitcode = rcode = EXIT_SUCCESS; debug_printf_exec(": cmd&: exitcode EXIT_SUCCESS\n"); } else { -diff -urpN busybox-1.17.1/shell/hush_test/hush-trap/signal7.right busybox-1.17.1-shell/shell/hush_test/hush-trap/signal7.right ---- busybox-1.17.1/shell/hush_test/hush-trap/signal7.right 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.1-shell/shell/hush_test/hush-trap/signal7.right 2010-07-25 13:09:32.000000000 +0200 +--- /dev/null ++++ b/shell/hush_test/hush-trap/signal7.right @@ -0,0 +1 @@ +Bug detected: 0 -diff -urpN busybox-1.17.1/shell/hush_test/hush-trap/signal7.tests busybox-1.17.1-shell/shell/hush_test/hush-trap/signal7.tests ---- busybox-1.17.1/shell/hush_test/hush-trap/signal7.tests 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.17.1-shell/shell/hush_test/hush-trap/signal7.tests 2010-07-25 13:09:32.000000000 +0200 +--- /dev/null ++++ b/shell/hush_test/hush-trap/signal7.tests @@ -0,0 +1,18 @@ +bug() { + trap : exit @@ -83,9 +78,8 @@ diff -urpN busybox-1.17.1/shell/hush_test/hush-trap/signal7.tests busybox-1.17.1 +&& test x"$REAL_CHILD" = x"$PARENTS_IDEA_OF_CHILD" +echo "Bug detected: $?" +} -diff -urpN busybox-1.17.1/shell/shell_common.c busybox-1.17.1-shell/shell/shell_common.c ---- busybox-1.17.1/shell/shell_common.c 2010-07-06 04:25:54.000000000 +0200 -+++ busybox-1.17.1-shell/shell/shell_common.c 2010-07-27 08:41:43.000000000 +0200 +--- a/shell/shell_common.c ++++ b/shell/shell_common.c @@ -428,9 +428,14 @@ shell_builtin_ulimit(char **argv) val <<= l->factor_shift; } |