summaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-27 11:50:37 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-27 11:50:37 +0000
commit7a1551ae774b1b323b055197fe8fe30913b28a79 (patch)
tree78b85ed6ff86cb53fe0372c8f9e5ada783ea8433 /package
parent9f6f11156f923674bde2d713f92465d618af5fb9 (diff)
package/busybox: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21185 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/busybox/patches/000-upstream-sed.patch10
1 files changed, 4 insertions, 6 deletions
diff --git a/package/busybox/patches/000-upstream-sed.patch b/package/busybox/patches/000-upstream-sed.patch
index 56d2304d2..9842cc86b 100644
--- a/package/busybox/patches/000-upstream-sed.patch
+++ b/package/busybox/patches/000-upstream-sed.patch
@@ -1,6 +1,5 @@
-diff -urpN busybox-1.16.1/editors/sed.c busybox-1.16.1-sed/editors/sed.c
---- busybox-1.16.1/editors/sed.c 2010-03-28 13:43:35.000000000 -0400
-+++ busybox-1.16.1-sed/editors/sed.c 2010-04-20 13:33:26.301975462 -0400
+--- a/editors/sed.c
++++ b/editors/sed.c
@@ -936,7 +936,15 @@ static void process_files(void)
/* Skip blocks of commands we didn't match */
if (sed_cmd->cmd == '{') {
@@ -27,9 +26,8 @@ diff -urpN busybox-1.16.1/editors/sed.c busybox-1.16.1-sed/editors/sed.c
goto discard_line;
/* Read file, append contents to output */
-diff -urpN busybox-1.16.1/testsuite/sed.tests busybox-1.16.1-sed/testsuite/sed.tests
---- busybox-1.16.1/testsuite/sed.tests 2010-03-19 22:58:07.000000000 -0400
-+++ busybox-1.16.1-sed/testsuite/sed.tests 2010-04-20 13:33:26.301975462 -0400
+--- a/testsuite/sed.tests
++++ b/testsuite/sed.tests
@@ -248,4 +248,14 @@ testing "sed beginning (^) matches only
">/usr</>lib<\n" "" \
"/usr/lib\n"