From 617aa4995a2ea97e9663cac26744d67ea726745a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sat, 12 Dec 2009 23:41:16 +0100 Subject: busybox: bump 1.15.x stable version Signed-off-by: Peter Korsgaard --- package/busybox/busybox-1.15.2-grep.patch | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 package/busybox/busybox-1.15.2-grep.patch (limited to 'package/busybox/busybox-1.15.2-grep.patch') diff --git a/package/busybox/busybox-1.15.2-grep.patch b/package/busybox/busybox-1.15.2-grep.patch deleted file mode 100644 index cc7d6761b..000000000 --- a/package/busybox/busybox-1.15.2-grep.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 -- cgit v1.2.3