Revision: 5903 Author: pebender Date: Thu Dec 3 20:20:36 2009 Log: - Updated busybox fixes.
http://code.google.com/p/minimyth/source/detail?r=5903 Added: /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.15.2-grep.patch Modified: /trunk/gar-minimyth/script/utils/busybox/Makefile /trunk/gar-minimyth/script/utils/busybox/checksums /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.15.2-ash.patch ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.15.2-grep.patch Thu Dec 3 20:20:36 2009 @@ -0,0 +1,25 @@ +diff -urpN busybox-1.15.2/findutils/grep.c busybox-1.15.2-grep/findutils/grep.c +--- busybox-1.15.2/findutils/grep.c 2009-09-26 15:14:57.000000000 +0200 ++++ busybox-1.15.2-grep/findutils/grep.c 2009-12-04 02:46:43.000000000 +0100 +@@ -377,6 +377,8 @@ static int grep_file(FILE *file) + print_line(line + gl->matched_range.rm_so, + end - gl->matched_range.rm_so, + linenum, ':'); ++ if (old == '\0') ++ break; + line[end] = old; + #if !ENABLE_EXTRA_COMPAT + if (regexec(&gl->compiled_regex, line + end, +diff -urpN busybox-1.15.2/testsuite/grep.tests busybox-1.15.2-grep/testsuite/grep.tests +--- busybox-1.15.2/testsuite/grep.tests 2009-09-26 15:14:57.000000000 +0200 ++++ busybox-1.15.2-grep/testsuite/grep.tests 2009-12-04 02:46:43.000000000 +0100 +@@ -90,4 +90,9 @@ testing "grep -E -o prints all matches" + "00:19:3E:00:AA:5E\n00:1D:60:3D:3A:FB\n00:22:43:49:FB:AA\n" \ + "" "00:19:3E:00:AA:5E 00:1D:60:3D:3A:FB 00:22:43:49:FB:AA\n" + ++testing "grep -o does not loop forever" \ ++ 'grep -o "[^/]*$"' \ ++ "test\n" \ ++ "" "/var/test\n" ++ + exit $FAILCOUNT ======================================= --- /trunk/gar-minimyth/script/utils/busybox/Makefile Mon Nov 30 20:50:46 2009 +++ /trunk/gar-minimyth/script/utils/busybox/Makefile Thu Dec 3 20:20:36 2009 @@ -10,6 +10,7 @@ busybox-1.15.2-awk.patch \ busybox-1.15.2-buildsys.patch \ busybox-1.15.2-flash.patch \ + busybox-1.15.2-grep.patch \ busybox-1.15.2-ping.patch \ busybox-1.15.2-split.patch PATCHFILES += $(DISTNAME)-dhcp_options.patch $(DISTNAME)-dhcp_timezone.patch $(DISTNAME)-tftp_timeout.patch ======================================= --- /trunk/gar-minimyth/script/utils/busybox/checksums Mon Nov 30 20:50:46 2009 +++ /trunk/gar-minimyth/script/utils/busybox/checksums Thu Dec 3 20:20:36 2009 @@ -1,8 +1,9 @@ d5653e5b74b17dbb1eeecda8b8f22c0a download/busybox-1.15.2.tar.bz2 -5f2de78386de592d62b896e5a6670edb download/busybox-1.15.2-ash.patch +4701ffe22d88f827263ceb511e5485ae download/busybox-1.15.2-ash.patch b2561ebb0affb5beceb00fdd23a0f548 download/busybox-1.15.2-awk.patch bc5b6b22525677f5d3bc9e5262f86675 download/busybox-1.15.2-buildsys.patch e17c29443351844a2e6ed897c4103764 download/busybox-1.15.2-flash.patch +a5cb2dfba0eee676626a6f0eec2776ce download/busybox-1.15.2-grep.patch a9a7ea81d43041300cb6504d8302dafb download/busybox-1.15.2-ping.patch 148ba6f39f527abed06fa9a9eff98c5e download/busybox-1.15.2-split.patch a84371f2810b6516a7c104201418f03d download/busybox-1.15.2-dhcp_options.patch ======================================= --- /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.15.2-ash.patch Mon Nov 30 20:50:46 2009 +++ /trunk/gar-minimyth/script/utils/busybox/files/busybox-1.15.2-ash.patch Thu Dec 3 20:20:36 2009 @@ -1,6 +1,6 @@ diff -urpN busybox-1.15.2/shell/ash.c busybox-1.15.2-ash/shell/ash.c --- busybox-1.15.2/shell/ash.c 2009-10-08 03:18:15.000000000 +0200 -+++ busybox-1.15.2-ash/shell/ash.c 2009-11-29 01:18:53.000000000 +0100 ++++ busybox-1.15.2-ash/shell/ash.c 2009-12-04 04:17:52.000000000 +0100 @@ -258,9 +258,6 @@ static void trace_vprintf(const char *fm /* ============ Utility functions */ #define xbarrier() do { __asm__ __volatile__ ("": : :"memory"); } while (0) @@ -1114,7 +1114,18 @@ break; } /* fall through */ -@@ -13311,7 +13302,7 @@ int ash_main(int argc UNUSED_PARAM, char +@@ -13056,6 +13047,10 @@ init(void) + + /* from trap.c: */ + signal(SIGCHLD, SIG_DFL); ++ /* bash re-enables SIGHUP which is SIG_IGNed on entry. ++ * Try: "trap '' HUP; bash; echo RET" and type "kill -HUP $$" ++ */ ++ signal(SIGHUP, SIG_DFL); + + /* from var.c: */ + { +@@ -13311,7 +13306,7 @@ int ash_main(int argc UNUSED_PARAM, char } if (sflag || minusc == NULL) { -- You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en.
